Merge pull request #42 from bmorcelli/dev

2.2.0

.vscode/settings.json

@@ -8,6 +8,8 @@
         "vector": "cpp",
         "string_view": "cpp",
         "initializer_list": "cpp",
-        "regex": "cpp"
+        "regex": "cpp",
+        "list": "cpp",
+        "unordered_set": "cpp"
     }
 }

README.md

@@ -1,30 +1,42 @@
 # M5Stick Launcher
-Application Launcher for Cardputer, M5StickC, M5StickC Plus, and M5StickC Plus 2.
+Application Launcher for Cardputer, M5StickC, M5StickC Plus, M5StickC Plus 2, Core (16Mb), Core2 & Tough and CoreS3.
 
 
 <p align="center" width="100%">
     <img src="https://github.com/bmorcelli/M5Stick-Launcher/blob/main/M5Launcher.png?raw=true">  <img src="https://github.com/bmorcelli/M5Stick-Launcher/blob/main/New Launcher.jpg?raw=true" width="240" height="135"> 
 </p>
 
 ## With M5Launcher you'll be able to:
-### OTA Update
+### *OTA* OTA Update
 - Install binaries from M5Burner repository (yes, online, without the need of a USB Cable)
 - Install binaries from a WebUI, that you can start from CFG option, installing binaries you have on your computer or smartphone
 - Install binaries from your SD Card
 
-### SD Card Management
+### *SD* SD Card Management
 - Create new Folders,
 - Delete files and folders,
 - Rename files,
 - Copy and paste files,
 - Install binaries
 
-### Customization
-- You can change brightness
-- change rotation (StickCs)
-- Start WebUI
-- set to see all files on SD Card (see only .bins is default)
-- (new) change Partition Scheme (allows installing big apps or UiFlow, for example)
+### *WUI* Web User Interface 
+- 
+
+### *CFG* Configurations (Customization)
+- Charge Mode
+- Change brightness
+- Change Dim Time
+- Change UI Color
+- Avoid/Ask Spiffs (Change to not ask to install Spiffs file system, only Orca One uses this feature)
+- Change rotation
+- All files/Only Bins (see all files or only .bins - default)
+- Change Partition Scheme (allows installing big apps or UiFlow2, for example)
+- List of Partitions
+- Clear FAT partition
+- Save SPIFFS (Save a copy of the SPIFFS partition to restore when needed)
+- Save FAT vfs (Save a copy of the FAT partition to restore when needed)
+- Restore SPIFFS
+- Restore FAT vfs
 
 ## tips
 * Having an SD card is good for better experience, but not really needed. [SDCard Hat for M5StickCs](https://www.thingiverse.com/thing:6459069) 
@@ -46,11 +58,22 @@ Application Launcher for Cardputer, M5StickC, M5StickC Plus, and M5StickC Plus 2
 ## Install from source
 Sourcecode will be released in the future..
 
+## Known Issues
+* UiFlow 1 doesn´t work with M5Launcher.. it uses an old MicroPython distro, that uses an old ESP-IDF distro with lots os secrets that I couldn´t figure out.
+
 ## Changelog
-* 2.?.? (Future):
-     * [ ] Save more SSIDs and pwd, connect automatically if is a known network (config.conf)
-     * [ ] change default folder for download (config.conf)
-     * [ ] Allow M5Launcher to be updated through OTA
+* 2.2.0: 
+     * [x] M5Launcher 2.2+ now can be updated OverTheAir or Using SD Card
+     * [x] Ui Color settings (can be customized on /config.conf file)
+     * [x] Reduced flickering on SD files navigation
+     * [x] Fixed problem when firmware names have "/" that prevent downloading
+     * [x] Appended firmware Version into download Name.
+     * [x] Added Dim time to lower brightness and CPU freq while idle
+     * [x] Added "Chage Mode" on settings, reducing CPU fre to 80Mhz and brightness to 5%, https://github.com/bmorcelli/M5Stick-Launcher/issues/40
+     * [x] Fixed Download progressbar https://github.com/bmorcelli/M5Stick-Launcher/issues/41
+     * [x] Change default folder for download (manually on /config.conf) https://github.com/bmorcelli/M5Stick-Launcher/issues/15     
+     * [x] Save more SSIDs and pwd, connect automatically if is a known network (config.conf) https://github.com/bmorcelli/M5Stick-Launcher/issues/30
+     * [x] Slightlty increased Wifi Download/OTA Speed, using a customized framework.
 * 2.1.2:
      * [x] Fixed OTA error message
      * [x] Increased Options Menu width and reduced menu flickering

custom_16Mb.csv

@@ -5,4 +5,15 @@ app1,       app,  ota_0,     0x200000, 0x800000,
 sys,        data,  FAT,      0xA00000, 0x100000,
 vfs,        data,  FAT,      0xB00000, 0x200000,
 spiffs,     data, spiffs,    0xD00000, 0x2F0000,
-coredump,   data, coredump,  0xFF0000, 0x10000,
+coredump,   data, coredump,  0xFF0000, 0x10000,
+# Name,     Type, SubType,   Offset,   Size,    Flags
+#nvs,        data, nvs,       0x9000,   0x6000,
+#phy_init,   data, phy,       0xf000,   4K,
+#app0,       app,  test,      0x10000,  0x1D0000,
+#app1,       app,  ota_0,     0x1E0000, 0x4E0000,
+#vfs,        data,  FAT,      0x6c0000, 0x530000,
+#config,     64,     64,      0xBFE000,4K,
+#wifi,       80,     80,      0xBFF000,4K,
+#sys,        data,   FAT,     0xC00000, 0x100000,
+#spiffs,     data,   spiffs,  0xd00000, 0x2F0000,
+#coredump,   data, coredump,  0xFF0000, 0x10000,

custom_4Mb.csv

@@ -1,4 +1,4 @@
-# Default, , , , 
+# Default, , , , ,
 # Name,   Type, SubType, Offset,   Size, Flags
 nvs,      data, nvs,     0x9000,   0x6000,
 test,     app,  test,    0x10000,  0x170000,

merge_files.bat

@@ -1,7 +1,7 @@
-esptool --chip esp32s3 merge_bin --output Launcher/Launcher_2.0_Cardputer.bin 0x0 .pio/build/m5stack-cardputer/bootloader.bin 0x8000 .pio/build/m5stack-cardputer/partitions.bin 0x9000 support_files/UiFlow2_nvs.bin 0x10000 .pio/build/m5stack-cardputer/firmware.bin
-esptool --chip esp32s3 merge_bin --output Launcher/Launcher_2.0_CoreS3.bin 0x0 .pio/build/m5stack-cores3/bootloader.bin 0x8000 .pio/build/m5stack-cores3/partitions.bin 0x9000 support_files/UiFlow2_nvs.bin 0x10000 .pio/build/m5stack-cores3/firmware.bin
-esptool --chip esp32 merge_bin --output Launcher/Launcher_2.0_cplus2.bin 0x1000 .pio/build/m5stack-cplus2/bootloader.bin 0x8000 .pio/build/m5stack-cplus2/partitions.bin 0x9000 support_files/UiFlow2_nvs.bin 0x10000 .pio/build/m5stack-cplus2/firmware.bin
-esptool --chip esp32 merge_bin --output Launcher/Launcher_2.0_cplus1_1.bin 0x1000 .pio/build/m5stack-cplus1_1/bootloader.bin 0x8000 .pio/build/m5stack-cplus1_1/partitions.bin 0x9000 support_files/UiFlow2_nvs.bin 0x10000 .pio/build/m5stack-cplus1_1/firmware.bin
-esptool --chip esp32 merge_bin --output Launcher/Launcher_2.0_C.bin 0x1000 .pio/build/m5stack-c/bootloader.bin 0x8000 .pio/build/m5stack-c/partitions.bin 0x9000 support_files/UiFlow2_nvs.bin 0x10000 .pio/build/m5stack-c/firmware.bin
-esptool --chip esp32 merge_bin --output Launcher/Launcher_2.0_core2.bin 0x1000 .pio/build/m5stack-core2/bootloader.bin 0x8000 .pio/build/m5stack-core2/partitions.bin 0x9000 support_files/UiFlow2_nvs.bin 0x10000 .pio/build/m5stack-core2/firmware.bin
-esptool --chip esp32 merge_bin --output Launcher/Launcher_2.0_core_16Mb.bin 0x1000 .pio/build/m5stack-core/bootloader.bin 0x8000 .pio/build/m5stack-core/partitions.bin 0x9000 support_files/UiFlow2_nvs.bin 0x10000 .pio/build/m5stack-core/firmware.bin
+esptool --chip esp32 merge_bin --output Launcher/Launcher_2.0_cplus1_1.bin      0x1000 .pio/build/m5stack-cplus1_1/bootloader.bin   0x8000 .pio/build/m5stack-cplus1_1/partitions.bin                                                                             0x10000 .pio/build/m5stack-cplus1_1/firmware.bin
+esptool --chip esp32 merge_bin --output Launcher/Launcher_2.0_C.bin             0x1000 .pio/build/m5stack-c/bootloader.bin          0x8000 .pio/build/m5stack-c/partitions.bin                                                                                    0x10000 .pio/build/m5stack-c/firmware.bin
+esptool --chip esp32s3 merge_bin --output Launcher/Launcher_2.0_Cardputer.bin   0x0 .pio/build/m5stack-cardputer/bootloader.bin     0x8000 .pio/build/m5stack-cardputer/partitions.bin  0x9000 support_files/UiFlow2_nvs.bin                                      0x10000 .pio/build/m5stack-cardputer/firmware.bin
+esptool --chip esp32 merge_bin --output Launcher/Launcher_2.0_cplus2.bin        0x1000 .pio/build/m5stack-cplus2/bootloader.bin     0x8000 .pio/build/m5stack-cplus2/partitions.bin     0x9000 support_files/UiFlow2_nvs.bin                                      0x10000 .pio/build/m5stack-cplus2/firmware.bin
+esptool --chip esp32 merge_bin --output Launcher/Launcher_2.0_core2.bin         0x1000 .pio/build/m5stack-core2/bootloader.bin      0x8000 .pio/build/m5stack-core2/partitions.bin      0x9000 support_files/UiFlow2_nvs.bin 0xF000 support_files/UiFlow1_phi.bin 0x10000 .pio/build/m5stack-core2/firmware.bin
+esptool --chip esp32 merge_bin --output Launcher/Launcher_2.0_core_16Mb.bin     0x1000 .pio/build/m5stack-core/bootloader.bin       0x8000 .pio/build/m5stack-core/partitions.bin       0x9000 support_files/UiFlow2_nvs.bin 0xF000 support_files/UiFlow1_phi.bin 0x10000 .pio/build/m5stack-core/firmware.bin
+esptool --chip esp32s3 merge_bin --output Launcher/Launcher_2.0_CoreS3.bin      0x0 .pio/build/m5stack-cores3/bootloader.bin        0x8000 .pio/build/m5stack-cores3/partitions.bin     0x9000 support_files/UiFlow2_nvs.bin 0xF000 support_files/UiFlow1_phi.bin 0x10000 .pio/build/m5stack-cores3/firmware.bin

merge_files.sh

@@ -1,7 +1,7 @@
-esptool.py --chip esp32s3 merge_bin --output Launcher/Launcher_2.0_Cardputer.bin 0x0 .pio/build/m5stack-cardputer/bootloader.bin 0x8000 .pio/build/m5stack-cardputer/partitions.bin 0x9000 support_files/UiFlow2_nvs.bin 0x10000 .pio/build/m5stack-cardputer/firmware.bin
-esptool.py --chip esp32s3 merge_bin --output Launcher/Launcher_2.0_CoreS3.bin 0x0 .pio/build/m5stack-cores3/bootloader.bin 0x8000 .pio/build/m5stack-cores3/partitions.bin 0x9000 support_files/UiFlow2_nvs.bin 0x10000 .pio/build/m5stack-cores3/firmware.bin
-esptool.py --chip esp32 merge_bin --output Launcher/Launcher_2.0_cplus2.bin 0x1000 .pio/build/m5stack-cplus2/bootloader.bin 0x8000 .pio/build/m5stack-cplus2/partitions.bin 0x9000 support_files/UiFlow2_nvs.bin 0x10000 .pio/build/m5stack-cplus2/firmware.bin
-esptool.py --chip esp32 merge_bin --output Launcher/Launcher_2.0_cplus1_1.bin 0x1000 .pio/build/m5stack-cplus1_1/bootloader.bin 0x8000 .pio/build/m5stack-cplus1_1/partitions.bin 0x9000 support_files/UiFlow2_nvs.bin 0x10000 .pio/build/m5stack-cplus1_1/firmware.bin
-esptool.py --chip esp32 merge_bin --output Launcher/Launcher_2.0_C.bin 0x1000 .pio/build/m5stack-c/bootloader.bin 0x8000 .pio/build/m5stack-c/partitions.bin 0x9000 support_files/UiFlow2_nvs.bin 0x10000 .pio/build/m5stack-c/firmware.bin
-esptool.py --chip esp32 merge_bin --output Launcher/Launcher_2.0_core2.bin 0x1000 .pio/build/m5stack-core2/bootloader.bin 0x8000 .pio/build/m5stack-core2/partitions.bin 0x9000 support_files/UiFlow2_nvs.bin 0x10000 .pio/build/m5stack-core2/firmware.bin
-esptool.py --chip esp32 merge_bin --output Launcher/Launcher_2.0_core_16Mb.bin 0x1000 .pio/build/m5stack-core/bootloader.bin 0x8000 .pio/build/m5stack-core/partitions.bin 0x9000 support_files/UiFlow2_nvs.bin 0x10000 .pio/build/m5stack-core/firmware.bin
+esptool.py --chip esp32 merge_bin --output Launcher/Launcher_2.0_cplus1_1.bin      0x1000 .pio/build/m5stack-cplus1_1/bootloader.bin   0x8000 .pio/build/m5stack-cplus1_1/partitions.bin                                                                             0x10000 .pio/build/m5stack-cplus1_1/firmware.bin
+esptool.py --chip esp32 merge_bin --output Launcher/Launcher_2.0_C.bin             0x1000 .pio/build/m5stack-c/bootloader.bin          0x8000 .pio/build/m5stack-c/partitions.bin                                                                                    0x10000 .pio/build/m5stack-c/firmware.bin
+esptool.py --chip esp32s3 merge_bin --output Launcher/Launcher_2.0_Cardputer.bin   0x0 .pio/build/m5stack-cardputer/bootloader.bin     0x8000 .pio/build/m5stack-cardputer/partitions.bin  0x9000 support_files/UiFlow2_nvs.bin                                      0x10000 .pio/build/m5stack-cardputer/firmware.bin
+esptool.py --chip esp32 merge_bin --output Launcher/Launcher_2.0_cplus2.bin        0x1000 .pio/build/m5stack-cplus2/bootloader.bin     0x8000 .pio/build/m5stack-cplus2/partitions.bin     0x9000 support_files/UiFlow2_nvs.bin                                      0x10000 .pio/build/m5stack-cplus2/firmware.bin
+esptool.py --chip esp32 merge_bin --output Launcher/Launcher_2.0_core2.bin         0x1000 .pio/build/m5stack-core2/bootloader.bin      0x8000 .pio/build/m5stack-core2/partitions.bin      0x9000 support_files/UiFlow2_nvs.bin 0xF000 support_files/UiFlow1_phi.bin 0x10000 .pio/build/m5stack-core2/firmware.bin
+esptool.py --chip esp32 merge_bin --output Launcher/Launcher_2.0_core_16Mb.bin     0x1000 .pio/build/m5stack-core/bootloader.bin       0x8000 .pio/build/m5stack-core/partitions.bin       0x9000 support_files/UiFlow2_nvs.bin 0xF000 support_files/UiFlow1_phi.bin 0x10000 .pio/build/m5stack-core/firmware.bin
+esptool.py --chip esp32s3 merge_bin --output Launcher/Launcher_2.0_CoreS3.bin      0x0 .pio/build/m5stack-cores3/bootloader.bin        0x8000 .pio/build/m5stack-cores3/partitions.bin     0x9000 support_files/UiFlow2_nvs.bin 0xF000 support_files/UiFlow1_phi.bin 0x10000 .pio/build/m5stack-cores3/firmware.bin

platformio.ini

@@ -20,7 +20,7 @@ default_envs =
 
 [common]
 build_flags = 
-	-DLAUNCHER='"2.1.2"'
+	-DLAUNCHER='"2.2.0"'
 	-DMAXFILES=256
 	-DEEPROMSIZE=128
 	-DLH=8
@@ -34,7 +34,7 @@ lib_deps =
 
 
 [env:m5stack-cplus2]
-platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.1/platform-espressif32.zip
+platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.2/platform-espressif32.zip
 board = m5stick-c
 framework = arduino
 extra_scripts = pre:support_files/nvs_script.py
@@ -100,7 +100,7 @@ lib_deps =
 	${common.lib_deps}
 
 [env:m5stack-cplus1_1]
-platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.1/platform-espressif32.zip
+platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.2/platform-espressif32.zip
 board = m5stick-c
 framework = arduino
 extra_scripts = pre:support_files/nvs_script.py
@@ -153,7 +153,7 @@ lib_deps =
 	${common.lib_deps}
 
 [env:m5stack-cardputer]
-platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.1/platform-espressif32.zip
+platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.2/platform-espressif32.zip
 board = m5stack-stamps3
 framework = arduino
 extra_scripts = pre:support_files/nvs_script.py
@@ -213,7 +213,7 @@ lib_deps =
 
 
 [env:m5stack-c]
-platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.1/platform-espressif32.zip
+platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.2/platform-espressif32.zip
 board = m5stick-c
 framework = arduino
 board_build.partitions = custom_4Mb.csv
@@ -253,7 +253,7 @@ lib_deps =
 
 
 [env:m5stack-c-test]
-platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.1/platform-espressif32.zip
+platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.2/platform-espressif32.zip
 board = m5stack-stamps3
 framework = arduino
 extra_scripts = pre:support_files/nvs_script.py
@@ -318,7 +318,7 @@ lib_deps =
 
 
 [env:m5stack-core2]
-platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.1/platform-espressif32.zip
+platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.2/platform-espressif32.zip
 board = m5stack-core2
 framework = arduino
 extra_scripts = pre:support_files/nvs_script.py
@@ -384,7 +384,7 @@ lib_deps =
 
 
 [env:m5stack-core]
-platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.1/platform-espressif32.zip
+platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.2/platform-espressif32.zip
 board = m5stack-core2
 framework = arduino
 extra_scripts = pre:support_files/nvs_script.py
@@ -450,7 +450,7 @@ lib_deps =
 	${common.lib_deps}
 
 [env:m5stack-cores3]
-platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.1/platform-espressif32.zip
+platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.2/platform-espressif32.zip
 board = m5stack-cores3
 framework = arduino
 extra_scripts = pre:support_files/nvs_script.py