tweaks and fixes / FWUpdater

Author: tobozo

README.md

@@ -20,9 +20,13 @@
 
 ## ABOUT
 
-- **M5Stack-SD-Updater is an [Platform.io](https://platformio.org/lib/show/2575/M5Stack-SD-Updater)/[Arduino library](https://www.arduinolibraries.info/libraries/m5-stack-sd-updater) for [M5Stack](http://m5stack.com/) or [Odroid-Go](https://forum.odroid.com/viewtopic.php?t=31705) to package your apps on a SD card and load them from a menu such as the [default SD Menu example](https://github.com/tobozo/M5Stack-SD-Updater/tree/master/examples/M5Stack-SD-Menu) of this project or [@lovyan03](https://github.com/lovyan03)'s [Treeview based SD Menu](https://github.com/lovyan03/M5Stack_LovyanLauncher). For a Micropython compatible version of this library, see the [M5Stack_MicroPython  custom_sdupdater](https://github.com/ciniml/M5Stack_MicroPython/tree/custom_sdupdater)**
+- **M5Stack-SD-Updater is an [Platform.io](https://platformio.org/lib/show/2575/M5Stack-SD-Updater)/[Arduino library](https://www.arduinolibraries.info/libraries/m5-stack-sd-updater) for [M5Stack](http://m5stack.com/) or [Odroid-Go](https://forum.odroid.com/viewtopic.php?t=31705) to package your apps on a SD card and load them from a menu such as the [default SD Menu example](https://github.com/tobozo/M5Stack-SD-Updater/tree/master/examples/M5Stack-SD-Menu) of this project or [@lovyan03](https://github.com/lovyan03)'s [Treeview based SD Menu](https://github.com/lovyan03/M5Stack_LovyanLauncher).
 
-- It is inspired by gamebuino, however it does not use a modified bootloader.
+For a Micropython compatible version of this library, see the [M5Stack_MicroPython  custom_sdupdater](https://github.com/ciniml/M5Stack_MicroPython/tree/custom_sdupdater)**
+
+For a boot based launcher see the [@bmorcelli's Launcher](https://github.com/bmorcelli/Launcher).
+
+- M5Stack-SD-Updater is inspired by gamebuino, however it does not use a modified bootloader.
 
 - [Video demonstration](https://www.youtube.com/watch?v=myQfeYxyc3o)
 

examples/GzLauncher/GzLauncher.ino

@@ -1,4 +1,5 @@
-#include <ESP32-Chimera-Core.h> // https://github.com/tobozo/ESP32-Chimera-Core
+// #include <ESP32-Chimera-Core.h> // https://github.com/tobozo/ESP32-Chimera-Core
+#include <M5Unified.h>
 #define tft M5.Lcd
 
 #define DEST_FS_USES_SD
@@ -17,7 +18,7 @@ void byteCountSI(int64_t b, char* dest )
   const int64_t unit = 1000;
   const char* units = "kMGTPE";
   if( b < unit ) {
-    sprintf(dest, "%d B", b);
+    sprintf(dest, "%lld B", b);
   }
   int64_t div = unit;
   int64_t exp = 0;
@@ -33,7 +34,7 @@ void byteCountIEC( int64_t b, char* dest )
   const int64_t unit = 1024;
   const char* units = "KMGTPE";
   if( b < unit ) {
-    sprintf(dest, "%d B", b);
+    sprintf(dest, "%lld B", b);
   }
   int64_t div = unit;
   int64_t exp = 0;

examples/M5Stack-FW-Menu/ReadMe.md

@@ -1,6 +1,10 @@
 ## Factory Partition Firmware Launcher
 
-/!\ This app launcher depends on special partition schemes that include the factory type and at least 4 OTA (app) partitions.
+⚠️ This app launcher depends on special partition schemes that include the `factory` type and at least 4 OTA (`app` type) partitions.
+Such partitions are available for M5CoreS3 in the Arduino IDE 3.x.x and superior under the following names:
+
+- partitions-16MB-factory-4-apps
+- partitions-16MB-factory-6-apps
 
 The intent of this launcher is to provide an application manager to hanle firmwares directly from the flash.
 

examples/M5Stack-FW-Menu/partition_manager.py

@@ -0,0 +1,12 @@
+Import('env')
+import os.path
+import sys
+
+# add esp32partitiontool to path
+sys.path.append(os.path.abspath( env.PioPlatform().get_package_dir("tool-esp32partitiontool") ))
+# import module
+from esp32partitiontool import *
+# run module
+load_pm(env)
+
+

examples/M5Stack-FW-Menu/partitions.csv

@@ -0,0 +1,13 @@
+# 6 Apps + Factory
+# Name,   Type, SubType,    Offset,     Size
+nvs,      data, nvs,        0x9000,   0x5000
+otadata,  data, ota,        0xe000,   0x2000
+ota_0,    0,    ota_0,     0x10000, 0x200000
+ota_1,    0,    ota_1,    0x210000, 0x200000
+ota_2,    0,    ota_2,    0x410000, 0x200000
+ota_3,    0,    ota_3,    0x610000, 0x200000
+ota_4,    0,    ota_4,    0x810000, 0x200000
+ota_5,    0,    ota_5,    0xA10000, 0x200000
+firmware, app,  factory,  0xC10000, 0x0F0000
+spiffs,   data, spiffs,   0xD00000, 0x2F0000
+coredump, data, coredump, 0xFF0000,  0x10000

examples/M5Stack-FW-Menu/platformio.ini

@@ -1,48 +1,72 @@
 [platformio]
-default_envs      = m5stack-cores3
-src_dir           = src
+default_envs            = m5stack-cores3-dev
+src_dir                 = src
 
 
 [env]
-framework         = arduino
-board             = m5stack-core-esp32
-build_type        = debug
-lib_ldf_mode      = deep
-platform          = https://github.com/tasmota/platform-espressif32
-platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32/releases/download/2.0.9/esp32-2.0.9.zip
-board_build.partitions = partitions/partitions-16MB-factory-4-apps.csv
+framework               = arduino
+board                   = m5stack-core-esp32
+build_type              = debug
+lib_ldf_mode            = deep
+;platform                = https://github.com/tasmota/platform-espressif32/releases/download/2023.11.01/platform-espressif32.zip
+;platform_packages       = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32/releases/download/2.0.14/esp32-2.0.14.zip
+board_build.partitions  = partitions/partitions-16MB-factory-4-apps.csv
 board_upload.flash_size = 16MB
-lib_deps          =
+lib_deps                =
   SPI
   SD
   M5Stack-SD-Updater
   M5GFX
   M5Unified
-upload_speed = 1500000
-upload_port = /dev/ttyACM0
-monitor_speed = 115200
+upload_speed            = 1500000
+upload_port             = /dev/ttyACM0
+monitor_speed           = 115200
 
 
 [CoreS3]
 board = esp32-s3-devkitc-1
+platform                = https://github.com/tasmota/platform-espressif32/releases/download/2023.11.01/platform-espressif32.zip
+platform_packages       = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32/releases/download/2.0.14/esp32-2.0.14.zip
 ;board_upload.maximum_size = 2097152
 ;board_upload.maximum_size = 3145728
 board_build.arduino.memory_type = qio_qspi
 build_flags =
     ${env.build_flags}
     -DARDUINO_M5STACK_CORES3
     -DBOARD_HAS_PSRAM
-    -DARDUINO_UDB_MODE=1
+    -DARDUINO_USB_MODE=1
 
 
 [env:m5stack-cores3]
 extends = CoreS3
-
+platform                = https://github.com/tasmota/platform-espressif32/releases/download/2023.11.01/platform-espressif32.zip
+platform_packages       = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32/releases/download/2.0.14/esp32-2.0.14.zip
 
 
 [env:m5stack-cores3-dev]
-extends = CoreS3
-lib_deps          =
+extends                 = CoreS3
+platform                = https://github.com/tasmota/platform-espressif32/releases/download/2023.11.01/platform-espressif32.zip
+platform_packages       = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32/releases/download/2.0.14/esp32-2.0.14.zip
+;platform                = espressif32
+; platform_packages       =
+;   framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32/releases/download/3.0.0-alpha3/esp32-3.0.0-alpha3.zip
+;   framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.0-alpha3/esp32-arduino-libs-3.0.0-alpha3.zip
+board                   = m5stack-cores3
+board_build.partitions  = partitions/partitions_16MB_factory_6_apps.csv
+lib_deps                =
   git+https://github.com/M5Stack/M5GFX#develop
   git+https://github.com/M5Stack/M5Unified#develop
-  git+https://github.com/tobozo/M5Stack-SD-Updater#1.2.8
+  git+https://github.com/tobozo/M5Stack-SD-Updater#1.2.9
+
+
+[env:build-partition]
+platform               = espressif32
+extra_scripts          = partition_manager.py
+platform_packages      = tool-esp32partitiontool @ https://github.com/tobozo/esp32partitiontool/releases/download/v1.4.1/esp32partitiontool-platformio.zip
+;platform_packages      = tool-esp32partitiontool @ https://github.com/tobozo/esp32partitiontool/releases/download/v1.4.1/esp32partitiontool-platformio.zip
+board_build.partitions = partitions/partitions-16MB-factory-4-apps.csv
+board                  = esp32dev
+; lib_deps                =
+;   git+https://github.com/M5Stack/M5GFX#develop
+;   git+https://github.com/M5Stack/M5Unified#develop
+;  git+https://github.com/tobozo/M5Stack-SD-Updater#1.2.9