Merge pull request #10422 from gemu2015/ufsys

Ufsys

tasmota/language/af_AF.h

@@ -864,7 +864,7 @@
 #define D_CONFIGURE_SCRIPT     "Wysig skrif"
 #define D_SCRIPT               "wysig skrif"
 #define D_SDCARD_UPLOAD        "lêer oplaai"
-#define D_SDCARD_DIR           "sd card directory"
+#define D_UFSDIR               "ufs directory"
 #define D_UPL_DONE             "Klaar"
 #define D_SCRIPT_CHARS_LEFT    "karakters oor"
 #define D_SCRIPT_CHARS_NO_MORE "nie meer karakters nie"

tasmota/language/bg_BG.h

@@ -863,7 +863,7 @@
 #define D_CONFIGURE_SCRIPT     "Редакция на скрипт"
 #define D_SCRIPT               "редактирай скрипт"
 #define D_SDCARD_UPLOAD        "изпрати файл"
-#define D_SDCARD_DIR           "директория на SD картата"
+#define D_UFSDIR               "директория на UFS картата"
 #define D_UPL_DONE             "Готово"
 #define D_SCRIPT_CHARS_LEFT    "оставащи символи"
 #define D_SCRIPT_CHARS_NO_MORE "няма повече символи"

tasmota/language/cs_CZ.h

@@ -864,7 +864,7 @@
 #define D_CONFIGURE_SCRIPT     "Edit script"
 #define D_SCRIPT               "edit script"
 #define D_SDCARD_UPLOAD        "file upload"
-#define D_SDCARD_DIR           "sd card directory"
+#define D_UFSDIR               "ufs card directory"
 #define D_UPL_DONE             "Done"
 #define D_SCRIPT_CHARS_LEFT    "chars left"
 #define D_SCRIPT_CHARS_NO_MORE "no more chars"

tasmota/language/de_DE.h

@@ -864,7 +864,7 @@
 #define D_CONFIGURE_SCRIPT     "Skript konfigurieren"
 #define D_SCRIPT               "Skript bearbeiten"
 #define D_SDCARD_UPLOAD        "Datei speichern"
-#define D_SDCARD_DIR           "SD Card Verzeichnis"
+#define D_UFSDIR               "UFS Verzeichnis"
 #define D_UPL_DONE             "Fertig"
 #define D_SCRIPT_CHARS_LEFT    "Zeichen übrig"
 #define D_SCRIPT_CHARS_NO_MORE "kein Speicher mehr"

tasmota/language/el_GR.h

@@ -864,7 +864,7 @@
 #define D_CONFIGURE_SCRIPT     "Edit script"
 #define D_SCRIPT               "edit script"
 #define D_SDCARD_UPLOAD        "file upload"
-#define D_SDCARD_DIR           "sd card directory"
+#define D_UFSDIR               "ufs directory"
 #define D_UPL_DONE             "Done"
 #define D_SCRIPT_CHARS_LEFT    "chars left"
 #define D_SCRIPT_CHARS_NO_MORE "no more chars"

tasmota/language/en_GB.h

@@ -864,7 +864,7 @@
 #define D_CONFIGURE_SCRIPT     "Edit script"
 #define D_SCRIPT               "edit script"
 #define D_SDCARD_UPLOAD        "file upload"
-#define D_SDCARD_DIR           "sd card directory"
+#define D_UFSDIR               "ufs directory"
 #define D_UPL_DONE             "Done"
 #define D_SCRIPT_CHARS_LEFT    "chars left"
 #define D_SCRIPT_CHARS_NO_MORE "no more chars"

tasmota/language/es_ES.h

@@ -864,7 +864,7 @@
 #define D_CONFIGURE_SCRIPT     "Editar Script"
 #define D_SCRIPT               "Editar Script"
 #define D_SDCARD_UPLOAD        "Subir Archivo"
-#define D_SDCARD_DIR           "Directorio en Tarjeta SD"
+#define D_UFSDIR               "Directorio en Tarjeta UFS"
 #define D_UPL_DONE             "Listo"
 #define D_SCRIPT_CHARS_LEFT    "Caracteres disponibles"
 #define D_SCRIPT_CHARS_NO_MORE "No hay mas espacio"

tasmota/language/fr_FR.h

@@ -857,7 +857,7 @@
 #define D_CONFIGURE_SCRIPT     "Éditer le script"
 #define D_SCRIPT               "édition du script"
 #define D_SDCARD_UPLOAD        "Envoi du fichier"
-#define D_SDCARD_DIR           "Dossier carte SD"
+#define D_UFSDIR               "Dossier UFS"
 #define D_UPL_DONE             "Terminé"
 #define D_SCRIPT_CHARS_LEFT    "car. restant"
 #define D_SCRIPT_CHARS_NO_MORE "plus de car."

tasmota/language/he_HE.h

@@ -864,7 +864,7 @@
 #define D_CONFIGURE_SCRIPT     "Edit script"
 #define D_SCRIPT               "edit script"
 #define D_SDCARD_UPLOAD        "file upload"
-#define D_SDCARD_DIR           "sd card directory"
+#define D_UFSDIR               "ufs directory"
 #define D_UPL_DONE             "Done"
 #define D_SCRIPT_CHARS_LEFT    "chars left"
 #define D_SCRIPT_CHARS_NO_MORE "no more chars"

tasmota/language/hu_HU.h

@@ -864,7 +864,7 @@
 #define D_CONFIGURE_SCRIPT     "Edit script"
 #define D_SCRIPT               "edit script"
 #define D_SDCARD_UPLOAD        "file upload"
-#define D_SDCARD_DIR           "sd card directory"
+#define D_UFSDIR               "ufs directory"
 #define D_UPL_DONE             "Done"
 #define D_SCRIPT_CHARS_LEFT    "chars left"
 #define D_SCRIPT_CHARS_NO_MORE "no more chars"

tasmota/language/it_IT.h

@@ -1,7 +1,7 @@
 /*
   it-IT.h - localization for Italian - Italy for Tasmota
 
-  Copyright (C) 2021  Gennaro Tortone - some mods by Antonio Fragola - Updated by bovirus - rev. 05.01.2021
+  Copyright (C) 2021  Gennaro Tortone - some mods by Antonio Fragola - Updated by bovirus - rev. 24.12.2020
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -778,7 +778,7 @@
 #define D_SENSOR_ST7789_DC     "ST7789 - DC"
 #define D_SENSOR_SSD1331_CS    "SSD1331 - CS"
 #define D_SENSOR_SSD1331_DC    "SSD1331 - DC"
-#define D_SENSOR_SDCARD_CS     "Scheda SD - CS"
+#define D_SENSOR_SDCARD_CS     "SDCard - CS"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -864,7 +864,7 @@
 #define D_CONFIGURE_SCRIPT     "Modifica script"
 #define D_SCRIPT               "modifica script"
 #define D_SDCARD_UPLOAD        "upload file"
-#define D_SDCARD_DIR           "cartella scheda SD"
+#define D_UFSDIR               "cartella scheda UFS"
 #define D_UPL_DONE             "Completato"
 #define D_SCRIPT_CHARS_LEFT    "caratteri rimanenti"
 #define D_SCRIPT_CHARS_NO_MORE "nessun altro carattere"

tasmota/language/ko_KO.h

@@ -864,7 +864,7 @@
 #define D_CONFIGURE_SCRIPT     "Edit script"
 #define D_SCRIPT               "edit script"
 #define D_SDCARD_UPLOAD        "file upload"
-#define D_SDCARD_DIR           "sd card directory"
+#define D_UFSDIR               "ufs directory"
 #define D_UPL_DONE             "Done"
 #define D_SCRIPT_CHARS_LEFT    "chars left"
 #define D_SCRIPT_CHARS_NO_MORE "no more chars"

tasmota/language/nl_NL.h

@@ -864,7 +864,7 @@
 #define D_CONFIGURE_SCRIPT     "Edit script"
 #define D_SCRIPT               "edit script"
 #define D_SDCARD_UPLOAD        "file upload"
-#define D_SDCARD_DIR           "sd card directory"
+#define D_UFSDIR               "ufs directory"
 #define D_UPL_DONE             "Done"
 #define D_SCRIPT_CHARS_LEFT    "chars left"
 #define D_SCRIPT_CHARS_NO_MORE "no more chars"

tasmota/language/pl_PL.h

@@ -864,7 +864,7 @@
 #define D_CONFIGURE_SCRIPT     "Edit script"
 #define D_SCRIPT               "edit script"
 #define D_SDCARD_UPLOAD        "file upload"
-#define D_SDCARD_DIR           "sd card directory"
+#define D_UFSDIR               "ufs directory"
 #define D_UPL_DONE             "Done"
 #define D_SCRIPT_CHARS_LEFT    "chars left"
 #define D_SCRIPT_CHARS_NO_MORE "no more chars"

tasmota/language/pt_BR.h

@@ -864,7 +864,7 @@
 #define D_CONFIGURE_SCRIPT     "Edit script"
 #define D_SCRIPT               "edit script"
 #define D_SDCARD_UPLOAD        "file upload"
-#define D_SDCARD_DIR           "sd card directory"
+#define D_UFSDIR               "ufs directory"
 #define D_UPL_DONE             "Done"
 #define D_SCRIPT_CHARS_LEFT    "chars left"
 #define D_SCRIPT_CHARS_NO_MORE "no more chars"

tasmota/language/pt_PT.h

@@ -864,7 +864,7 @@
 #define D_CONFIGURE_SCRIPT     "Edit script"
 #define D_SCRIPT               "edit script"
 #define D_SDCARD_UPLOAD        "file upload"
-#define D_SDCARD_DIR           "sd card directory"
+#define D_UFSDIR               "ufs directory"
 #define D_UPL_DONE             "Done"
 #define D_SCRIPT_CHARS_LEFT    "chars left"
 #define D_SCRIPT_CHARS_NO_MORE "no more chars"

tasmota/language/ro_RO.h

@@ -864,7 +864,7 @@
 #define D_CONFIGURE_SCRIPT     "Configurare script"
 #define D_SCRIPT               "editează script"
 #define D_SDCARD_UPLOAD        "Încarcă fișier"
-#define D_SDCARD_DIR           "director sd card"
+#define D_UFSDIR               "director ufs"
 #define D_UPL_DONE             "Terminat"
 #define D_SCRIPT_CHARS_LEFT    "caractere rămase"
 #define D_SCRIPT_CHARS_NO_MORE "caractere terminate"

tasmota/language/ru_RU.h

@@ -864,7 +864,7 @@
 #define D_CONFIGURE_SCRIPT     "Edit script"
 #define D_SCRIPT               "edit script"
 #define D_SDCARD_UPLOAD        "file upload"
-#define D_SDCARD_DIR           "sd card directory"
+#define D_UFSDIR               "ufs directory"
 #define D_UPL_DONE             "Done"
 #define D_SCRIPT_CHARS_LEFT    "chars left"
 #define D_SCRIPT_CHARS_NO_MORE "no more chars"

tasmota/language/sk_SK.h

@@ -864,7 +864,7 @@
 #define D_CONFIGURE_SCRIPT     "Edit script"
 #define D_SCRIPT               "edit script"
 #define D_SDCARD_UPLOAD        "file upload"
-#define D_SDCARD_DIR           "sd card directory"
+#define D_UFSDIR               "ufs directory"
 #define D_UPL_DONE             "Done"
 #define D_SCRIPT_CHARS_LEFT    "chars left"
 #define D_SCRIPT_CHARS_NO_MORE "no more chars"

tasmota/language/sv_SE.h

@@ -864,7 +864,7 @@
 #define D_CONFIGURE_SCRIPT     "Edit script"
 #define D_SCRIPT               "edit script"
 #define D_SDCARD_UPLOAD        "file upload"
-#define D_SDCARD_DIR           "sd card directory"
+#define D_UFSDIR               "ufs directory"
 #define D_UPL_DONE             "Done"
 #define D_SCRIPT_CHARS_LEFT    "chars left"
 #define D_SCRIPT_CHARS_NO_MORE "no more chars"

tasmota/language/tr_TR.h

@@ -864,7 +864,7 @@
 #define D_CONFIGURE_SCRIPT     "Edit script"
 #define D_SCRIPT               "edit script"
 #define D_SDCARD_UPLOAD        "file upload"
-#define D_SDCARD_DIR           "sd card directory"
+#define D_UFSDIR               "ufs directory"
 #define D_UPL_DONE             "Done"
 #define D_SCRIPT_CHARS_LEFT    "chars left"
 #define D_SCRIPT_CHARS_NO_MORE "no more chars"

tasmota/language/uk_UA.h

@@ -864,7 +864,7 @@
 #define D_CONFIGURE_SCRIPT     "Конфігурація сценарія"
 #define D_SCRIPT               "Редагування сценарія"
 #define D_SDCARD_UPLOAD        "завантажити файл на карту SD"
-#define D_SDCARD_DIR           "завантажити файл в каталог на карту SD"
+#define D_UFSDIR               "завантажити файл в каталог на карту UFS"
 #define D_UPL_DONE             "Готово"
 #define D_SCRIPT_CHARS_LEFT    "символів ще вільно"
 #define D_SCRIPT_CHARS_NO_MORE "більше немає місця"

tasmota/language/vi_VN.h

@@ -864,7 +864,7 @@
 #define D_CONFIGURE_SCRIPT     "Chỉnh sửa kịch bản"
 #define D_SCRIPT               "chỉnh sửa kịch bản"
 #define D_SDCARD_UPLOAD        "tải lên tệp"
-#define D_SDCARD_DIR           "thư mục thẻ nhớ sd"
+#define D_UFSDIR               "thư mục thẻ nhớ ufs"
 #define D_UPL_DONE             "Hoàn thành"
 #define D_SCRIPT_CHARS_LEFT    "ký tự đã dùng"
 #define D_SCRIPT_CHARS_NO_MORE "không còn ký tự trống"

tasmota/language/zh_CN.h

@@ -864,7 +864,7 @@
 #define D_CONFIGURE_SCRIPT     "Edit script"
 #define D_SCRIPT               "edit script"
 #define D_SDCARD_UPLOAD        "file upload"
-#define D_SDCARD_DIR           "sd card directory"
+#define D_UFSDIR               "ufs directory"
 #define D_UPL_DONE             "Done"
 #define D_SCRIPT_CHARS_LEFT    "chars left"
 #define D_SCRIPT_CHARS_NO_MORE "no more chars"

tasmota/language/zh_TW.h

@@ -864,7 +864,7 @@
 #define D_CONFIGURE_SCRIPT     "編輯腳本"
 #define D_SCRIPT               "編輯腳本"
 #define D_SDCARD_UPLOAD        "上傳檔案"
-#define D_SDCARD_DIR           "記憶卡目錄"
+#define D_UFSDIR               "記憶卡目錄"
 #define D_UPL_DONE             "完成"
 #define D_SCRIPT_CHARS_LEFT    "剩餘字元"
 #define D_SCRIPT_CHARS_NO_MORE "放不下更多字元了"

tasmota/xdrv_98_filesystem.ino

@@ -70,6 +70,8 @@ The driver enabled by #define USE_UFILESYS
 
 // global file system pointer
 FS *ufsp;
+// flash file system pointer on esp32
+FS *ffsp;
 char ufs_path[48];
 File ufs_upload_file;
 
@@ -83,6 +85,7 @@ uint8_t ufs_type;
 
 void UFSInit(void) {
   ufs_type = 0;
+  ffsp = 0;
   // check for fs options,
   // 1. check for SD card
   // 2. check for littlefs or FAT
@@ -104,6 +107,16 @@ void UFSInit(void) {
       ufsp = &SD;
 #endif  // ESP32
       ufs_type = UFS_TSDC;
+      // now detect ffs
+      ffsp = &LITTLEFS;
+      if (!LITTLEFS.begin()) {
+        // ffat is second
+        ffsp = &FFat;
+        if (!FFat.begin(true)) {
+          ffsp = 0;
+          return;
+        }
+      }
       return;
     }
   }
@@ -126,10 +139,12 @@ void UFSInit(void) {
       return;
     }
     ufs_type = UFS_TFAT;
+    ffsp = ufsp;
     return;
   }
 #endif // ESP32
   ufs_type = UFS_TLFS;
+  ffsp = ufsp;
   return;
 }
 
@@ -267,7 +282,7 @@ void UFS_free(void) {
 
 const char UFS_WEB_DIR[] PROGMEM =
   "<p><form action='" "ufsd" "' method='get'><button>" "%s" "</button></form></p>";
-const char UFS_FILE_UPLOAD[] PROGMEM = D_SDCARD_DIR;
+const char UFS_FILE_UPLOAD[] PROGMEM = D_UFSDIR;
 const char UFS_FORM_FILE_UPLOAD[] PROGMEM =
   "<div id='f1' name='f1' style='display:block;'>"
   "<fieldset><legend><b>&nbsp;%s"  "&nbsp;</b></legend>";
@@ -278,7 +293,7 @@ const char UFS_FORM_FILE_UPG[] PROGMEM =
 const char UFS_FORM_FILE_UPGc[] PROGMEM =
   "<div style='text-align:left;color:green;'>total size: %s kB - free: %s kB</div>";
 const char UFS_FORM_SDC_DIRa[] PROGMEM =
-  "<div style='text-align:left'>";
+  "<div style='text-align:left;overflow:scroll;height:400px;'>";
 const char UFS_FORM_SDC_DIRc[] PROGMEM =
   "</div>";
 const char UFS_FORM_FILE_UPGb[] PROGMEM =
@@ -309,7 +324,7 @@ void UFSdirectory(void) {
 
   WSContentStart_P(UFS_FILE_UPLOAD);
   WSContentSendStyle();
-  WSContentSend_P(UFS_FORM_FILE_UPLOAD,D_SDCARD_DIR);
+  WSContentSend_P(UFS_FORM_FILE_UPLOAD, D_UFSDIR);
   WSContentSend_P(UFS_FORM_FILE_UPG, D_SCRIPT_UPLOAD);
   char ts[16];
   char fs[16];
@@ -495,7 +510,7 @@ void UFSFileUploadSuccess(void) {
   WSContentStop();
 }
 
-#define D_UFSDIR "UFS directory"
+
 
 /*********************************************************************************************\
  * Interface