changes to update firmware from sd card using mlff (#1046)

* make libssh into a component

* cast types in console for uart channel

* define dependencies to eliminate the need for a deep+ scan

* add missing source file

* add spaces around macros to eliminate warning

* changes to update firmware from sd card using mlff

* add a few more sdkconfig files

* add defines to update_firmware only for ESP_PLATFORM
add one more sdkconfig

Author: idolpx

lib/FileSystem/fnFsLittleFS.cpp

@@ -223,10 +223,10 @@ bool FileSystemLittleFS::start()
     // strlcpy(_basepath, "/flash", sizeof(_basepath));
 
     esp_vfs_littlefs_conf_t conf = {
-      .base_path = "",
-      .partition_label = "storage",
-      .format_if_mount_failed = false,
-      .dont_mount = false
+        .base_path = "",
+        .partition_label = "storage",
+        .format_if_mount_failed = false,
+        .dont_mount = false
     };
 
     esp_err_t e = esp_vfs_littlefs_register(&conf);
@@ -236,7 +236,7 @@ bool FileSystemLittleFS::start()
         #ifdef DEBUG
         Debug_printv("Failed to mount LittleFS partition, err = %d\r\n", e);
         #endif
-        _started = false;
+        //_started = false;
     }
     else
     {
@@ -254,4 +254,34 @@ bool FileSystemLittleFS::start()
     return _started;
 }
 
+
+bool FileSystemLittleFS::stop()
+{
+    if(!_started)
+        return true;
+
+    esp_err_t e = esp_vfs_littlefs_unregister("storage");
+
+    if (e != ESP_OK)
+    {
+        #ifdef DEBUG
+        Debug_printv("Failed to unmount LittleFS partition, err = %d\r\n", e);
+        #endif
+    }
+    else
+    {
+        _started = false;
+    #ifdef DEBUG        
+        Debug_println("LittleFS unmounted.");
+        /*
+        size_t total = 0, used = 0;
+        esp_littlefs_info(NULL, &total, &used);
+        Debug_printv("  partition size: %u, used: %u, free: %u\r\n", total, used, total-used);
+        */
+    #endif
+    }
+
+    return !_started;
+}
+
 #endif // FLASH_LITTLEFS

lib/FileSystem/fnFsLittleFS.h

@@ -14,6 +14,7 @@ class FileSystemLittleFS : public FileSystem
 public:
     FileSystemLittleFS();
     bool start();
+    bool stop();
 
     fsType type() override { return FSTYPE_LITTLEFS; };
     const char * typestring() override { return type_to_string(FSTYPE_LITTLEFS); };

lib/FileSystem/fnFsSPIFFS.cpp

@@ -174,18 +174,18 @@ bool FileSystemSPIFFS::start()
 
 #ifdef ESP_PLATFORM
     esp_vfs_spiffs_conf_t conf = {
-      .base_path = _basepath,
-      .partition_label = "storage",
-      .max_files = 10, // from SPIFFS.h
-      .format_if_mount_failed = false
+        .base_path = _basepath,
+        .partition_label = "storage",
+        .max_files = 10, // from SPIFFS.h
+        .format_if_mount_failed = false
     };
 
     esp_err_t e = esp_vfs_spiffs_register(&conf);
 
     if (e != ESP_OK)
     {
         Debug_printf("Failed to mount SPIFFS partition, err = %d\r\n", e);
-        _started = false;
+        //_started = false;
     }
     else
 #endif // ESP_PLATFORM
@@ -204,4 +204,33 @@ bool FileSystemSPIFFS::start()
     return _started;
 }
 
+bool FileSystemSPIFFS::stop()
+{
+    if(!_started)
+        return true;
+
+#ifdef ESP_PLATFORM
+    esp_err_t e = esp_vfs_spiffs_unregister("storage");
+
+    if (e != ESP_OK)
+    {
+        Debug_printf("Failed to unmount SPIFFS partition, err = %d\r\n", e);
+    }
+    else
+#endif // ESP_PLATFORM
+    {
+        _started = false;
+        Debug_println("SPIFFS unmounted.");
+    #ifdef DEBUG
+        /*
+        size_t total = 0, used = 0;
+        esp_spiffs_info(NULL, &total, &used);
+        Debug_printf("  partition size: %u, used: %u, free: %u\r\n", total, used, total-used);
+        */
+    #endif
+    }
+
+    return !_started;
+}
+
 #endif // FLASH_SPIFFS

lib/FileSystem/fnFsSPIFFS.h

@@ -14,6 +14,7 @@ class FileSystemSPIFFS : public FileSystem
 public:
     FileSystemSPIFFS();
     bool start();
+    bool stop();
 
     fsType type() override { return FSTYPE_SPIFFS; };
     const char * typestring() override { return type_to_string(FSTYPE_SPIFFS); };

lib/fuji/fujiCmd.h

@@ -77,6 +77,7 @@
 #define FUJICMD_GET_DEVICE1_FULLPATH       0xA0
 #define FUJICMD_STATUS                     0x53
 #define FUJICMD_HSIO_INDEX                 0x3F
+#define FUJICMD_UPDATE_FIRMWARE            0x10
 #define FUJICMD_SEND_ERROR                 0x02
 #define FUJICMD_SEND_RESPONSE              0x01
 #define FUJICMD_DEVICE_READY               0x00

lib/hardware/fnSystem.cpp

@@ -30,6 +30,8 @@
 #endif
 #include <soc/rtc.h>
 
+#include <mlff.h>
+
 // ESP_PLATFORM
 #else
 // !ESP_PLATFORM
@@ -507,6 +509,20 @@ void SystemManager::update_hostname(const char *hostname)
     }
 }
 
+void SystemManager::update_firmware()
+{
+#ifdef ESP_PLATFORM
+    Serial.printf("Stopping flash filesystem...\r\n");
+    fsFlash.stop();
+
+    Serial.println("Flash bin files from '/sd/.bin/'");
+    mlff_update(PIN_SD_HOST_CS, PIN_SD_HOST_MISO, PIN_SD_HOST_MOSI, PIN_SD_HOST_SCK);
+
+    Serial.println("Reboot to run update app and flash 'main.*.bin'...");
+    reboot();
+#endif
+}
+
 const char *SystemManager::get_current_time_str()
 {
     time_t tt = time(nullptr);

lib/hardware/fnSystem.h

@@ -140,6 +140,7 @@ class SystemManager
     const char *get_current_time_str();
     void update_timezone(const char *timezone);
     void update_hostname(const char *hostname);
+    void update_firmware();
 
     const char *get_fujinet_version(bool shortVersionOnly = false);
 

sdkconfig.defaults

@@ -1197,9 +1197,9 @@ CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread"
 # CONFIG_SPI_FLASH_VERIFY_WRITE is not set
 # CONFIG_SPI_FLASH_ENABLE_COUNTERS is not set
 CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y
-CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y
+# CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS is not set
 # CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS is not set
-# CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED is not set
+CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y
 # CONFIG_SPI_FLASH_USE_LEGACY_IMPL is not set
 # CONFIG_SPI_FLASH_SHARE_SPI1_BUS is not set
 # CONFIG_SPI_FLASH_BYPASS_BLOCK_ERASE is not set

sdkconfig.fujiapple-iec

@@ -1683,9 +1683,9 @@ CONFIG_MMU_PAGE_SIZE=0x10000
 # CONFIG_SPI_FLASH_VERIFY_WRITE is not set
 # CONFIG_SPI_FLASH_ENABLE_COUNTERS is not set
 CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y
-CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y
+# CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS is not set
 # CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS is not set
-# CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED is not set
+CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y
 # CONFIG_SPI_FLASH_SHARE_SPI1_BUS is not set
 # CONFIG_SPI_FLASH_BYPASS_BLOCK_ERASE is not set
 CONFIG_SPI_FLASH_YIELD_DURING_ERASE=y

sdkconfig.fujiapple-rev0

@@ -2121,9 +2121,9 @@ CONFIG_SPI_FLASH_SUSPEND_TSUS_VAL_US=50
 # CONFIG_SPI_FLASH_VERIFY_WRITE is not set
 # CONFIG_SPI_FLASH_ENABLE_COUNTERS is not set
 CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y
-CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y
+# CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS is not set
 # CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS is not set
-# CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED is not set
+CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y
 # CONFIG_SPI_FLASH_SHARE_SPI1_BUS is not set
 # CONFIG_SPI_FLASH_BYPASS_BLOCK_ERASE is not set
 CONFIG_SPI_FLASH_YIELD_DURING_ERASE=y
@@ -2716,9 +2716,9 @@ CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY=y
 # CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1 is not set
 CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=-1
 CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
-CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y
+# CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS is not set
 # CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_FAILS is not set
-# CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ALLOWED is not set
+CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ALLOWED=y
 # CONFIG_ESP32_ULP_COPROC_ENABLED is not set
 CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y
 CONFIG_SUPPORT_TERMIOS=y