config.conf working

* 2.2.0 (Future):
     * [x] Save more SSIDs and pwd, connect automatically if is a known network (config.conf) #30
     * [x] change default folder for download (config.conf) #15
     * [x] Allow M5Launcher to be updated OverTheAir
     * [x] Reduced flickering on SD files navigation
     * [x] Fixed Download progressbar #41

README.md

@@ -48,10 +48,11 @@ Sourcecode will be released in the future..
 
 ## Changelog
 * 2.2.0 (Future):
-     * [ ] Save more SSIDs and pwd, connect automatically if is a known network (config.conf)
-     * [ ] change default folder for download (config.conf)
-     * [x] Allow M5Launcher to be updated through OTA
+     * [x] Save more SSIDs and pwd, connect automatically if is a known network (config.conf) https://github.com/bmorcelli/M5Stick-Launcher/issues/30
+     * [x] change default folder for download (config.conf) https://github.com/bmorcelli/M5Stick-Launcher/issues/15
+     * [x] Allow M5Launcher to be updated OverTheAir
      * [x] Reduced flickering on SD files navigation
+     * [x] Fixed Download progressbar https://github.com/bmorcelli/M5Stick-Launcher/issues/41
 * 2.1.2:
      * [x] Fixed OTA error message
      * [x] Increased Options Menu width and reduced menu flickering

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 0xF000 support_files/UiFlow1_phi.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 0xF000 support_files/UiFlow1_phi.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 0xF000 support_files/UiFlow1_phi.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 0xF000 support_files/UiFlow1_phi.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 0xF000 support_files/UiFlow1_phi.bin 0x10000 .pio/build/m5stack-c/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 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 0xF000 support_files/UiFlow1_phi.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 0xF000 support_files/UiFlow1_phi.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 0xF000 support_files/UiFlow1_phi.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 0xF000 support_files/UiFlow1_phi.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 0xF000 support_files/UiFlow1_phi.bin 0x10000 .pio/build/m5stack-c/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 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

src/display.cpp

@@ -461,9 +461,9 @@ void drawBatteryStatus() {
 void listFiles(int index, String fileList[][3]) {
     tft.setCursor(10,10);
     tft.setTextSize(FONT_M);
+    int i=0;
     int arraySize = 0;
     while(fileList[arraySize][2]!="" && arraySize < MAXFILES) arraySize++;
-    int i=0;
     int start=0;
     if(index>=MAX_ITEMS) {
         start=index-MAX_ITEMS+1;
@@ -473,10 +473,11 @@ void listFiles(int index, String fileList[][3]) {
     String txt=">";
     while(i<arraySize) {
         if(i>=start && fileList[i][2]!="") {
+            tft.setCursor(10,tft.getCursorY());
             if(fileList[i][2]=="folder") tft.setTextColor(FGCOLOR-0x1111, BGCOLOR);
             else if(fileList[i][2]=="operator") tft.setTextColor(ALCOLOR, BGCOLOR);
-            else tft.setTextColor(FGCOLOR,BGCOLOR);
-            tft.setCursor(10,tft.getCursorY());
+            else { tft.setTextColor(FGCOLOR,BGCOLOR); }
+
             if (index==i) txt=">";
             else txt=" ";
             txt+=fileList[i][0] + "                       ";
@@ -616,7 +617,7 @@ void loopVersions() {
       // Definição da matriz "Options"
       options = {
           {"OTA Install", [=]() { installFirmware(String(file), app_size, spiffs, spiffs_offset, spiffs_size, nb, fat, (uint32_t*)FAT_offset, (uint32_t*)FAT_size); }},
-          {"Download->SD", [=]() { downloadFirmware(String(file), String(name), dwn_path); }},
+          {"Download->SD", [=]() { downloadFirmware(String(file), String(name) + "." + String(version).substring(0,10), dwn_path); }},
           {"Main Menu", [=]() { returnToMenu=true; }},
       };
       delay(200);

src/globals.h

@@ -59,7 +59,7 @@ extern int rotation;
 
 extern bool returnToMenu;
 
-extern uint8_t buff[4096];
+extern uint8_t buff[1024];
 
 extern const int bufSize;
 

src/main.cpp

@@ -47,8 +47,8 @@ String dwn_path = "/downloads/";
 JsonDocument doc;
 JsonDocument settings;
 std::vector<std::pair<std::string, std::function<void()>>> options;
-const int bufSize = 4096;
-uint8_t buff[4096] = {0};
+const int bufSize = 1024;
+uint8_t buff[1024] = {0};
 
 
 #include "display.h"
@@ -111,8 +111,8 @@ void setup() {
   Serial.begin(115200);
 
   EEPROM.begin(EEPROMSIZE); // open eeprom
-  if(EEPROM.read(0) > 3 || EEPROM.read(1) > 240 || EEPROM.read(2) > 100 || EEPROM.read(9) > 1 || EEPROM.read(EEPROMSIZE-1) > 1) {
-    log_i("EEPROM back to default\n0=%d\n1=%d\n2=%d\n9=%d\nES-1=%d",EEPROM.read(0),EEPROM.read(1),EEPROM.read(2),EEPROM.read(9),EEPROM.read(EEPROMSIZE-1) );
+  if(EEPROM.read(0) > 3 || EEPROM.read(1) > 240 || EEPROM.read(2) > 100 || EEPROM.read(9) > 1 || EEPROM.read(EEPROMSIZE-2) > 1) {
+    log_i("EEPROM back to default\n0=%d\n1=%d\n2=%d\n9=%d\nES-1=%d",EEPROM.read(0),EEPROM.read(1),EEPROM.read(2),EEPROM.read(9),EEPROM.read(EEPROMSIZE-2) );
   #if defined(CARDPUTER) || defined(M5STACK)
     EEPROM.write(0, 1);    // Right rotation for cardputer
   #else
@@ -218,7 +218,7 @@ void setup() {
     if(checkSelPress())        
   #endif
      {
-        tft.fillScreen(TFT_BLACK);
+        tft.fillScreen(BGCOLOR);
         goto Launcher;
       }
 
@@ -247,7 +247,7 @@ void setup() {
   // If M5 or Enter button is pressed, continue from here
   Launcher:
   get_partition_sizes();
-  tft.fillScreen(TFT_BLACK);
+  tft.fillScreen(BGCOLOR);
 }
 
 /**********************************************************************
@@ -337,6 +337,8 @@ void loop() {
 
       if(index == 3) {  
         options = {
+
+          {"Charge Mode", [=](){ chargeMode(); }},
           {"Brightness", [=]() { setBrightnessMenu(); }},
           {"Dim time", [=]()   { setdimmerSet();}},
           {"UI Color", [=]()   { setUiColor();}},
@@ -352,13 +354,14 @@ void loop() {
       #if !defined(CARDPUTER)
         options.push_back({"Rotate 180",  [=]() { gsetRotation(true); }});
       #endif
-      #if defined(STICK_C_PLUS) || defined(STICK_C_PLUS2) || defined(CARDPUTER)
+
         options.push_back({"Part Change",  [=]() { partitioner(); }});
         options.push_back({"Part List",  [=]() { partList(); }});
-      #endif
+
       #ifndef STICK_C_PLUS
         options.push_back({"Clear FAT",  [=]() { eraseFAT(); }});
       #endif
+
         if(MAX_SPIFFS>0) options.push_back({"Save SPIFFS",  [=]() { dumpPartition("spiffs", "/bkp/spiffs.bin"); }});
         //if(MAX_FAT_sys>0) options.push_back({"Bkp FAT sys",  [=]() { dumpPartition("sys", "/bkp/FAT_sys.bin"); }});    //Test only
         if(MAX_FAT_vfs>0) options.push_back({"Save FAT vfs",  [=]() { dumpPartition("vfs", "/bkp/FAT_vfs.bin"); }});
@@ -371,6 +374,7 @@ void loop() {
         delay(200);
         loopOptions(options);
         tft.fillScreen(BGCOLOR);
+        tft.fillScreen(BGCOLOR);
         redraw=true;
       }
       returnToMenu = false;

src/mykeyboard.cpp

@@ -121,7 +121,7 @@ bool checkPrevPress() {
 bool checkSelPress(bool dimmOff){
   if(!dimmOff && (dimmerTemp+dimmerSet*1000) < millis() && !dimmer) {
     dimmer = true;
-    setBrightness(10,false);
+    setBrightness(5,false);
     setCpuFrequencyMhz(80);
   }  
   #if defined (CARDPUTER)

src/onlineLauncher.cpp

@@ -36,84 +36,105 @@ const char* root_ca3 =
 ** Description:   Connects to wifiNetwork
 ***************************************************************************************/
 void wifiConnect(String ssid, int encryptation, bool isAP) {
-
-  if(!isAP) {
+  if (!isAP) {
     bool found = false;
     bool wrongPass = false;
     getConfigs();
-    JsonObject setting = settings[0];
-    JsonArray WifiList = setting["wifi"];
-    JsonObject wifi = WifiList[0];
-    if(sdcardMounted) {
-      for(int i=0; i<WifiList.size(); i++) {
-        wifi = WifiList[i];
-        String name = wifi["ssid"].as<String>();
-        String pass = wifi["pwd"].as<String>();
-        log_i("Usr: %s, Pass: %s", name, pass);
-        if(name==ssid) { 
+    JsonArray WifiList = settings["wifi"].as<JsonArray>();
+    EEPROM.begin(EEPROMSIZE);
+    pwd = EEPROM.readString(10);
+    EEPROM.end();
+
+    if (sdcardMounted) {
+      for (JsonObject wifiEntry : WifiList) {
+        String name = wifiEntry["ssid"].as<String>();
+        String pass = wifiEntry["pwd"].as<String>();
+        log_i("SSID: %s, Pass: %s", name, pass);
+        if (name == ssid) {
           pwd = pass;
           found = true;
+          log_i("Found SSID: %s", name);
           break;
         }
       }
     }
 
-Retry:    
-    if(!found || wrongPass) {
-      EEPROM.begin(EEPROMSIZE);
-      pwd = EEPROM.readString(10);
+  Retry:
+    if (!found || wrongPass) {
       delay(200);
-      if(encryptation>0) pwd = keyboard(pwd,63, "Network Password:");
-
-      if (pwd!=EEPROM.readString(10)) {
+      if (encryptation > 0) pwd = keyboard(pwd, 63, "Network Password:");
+
+      EEPROM.begin(EEPROMSIZE);
+      if (pwd != EEPROM.readString(10)) {  
         EEPROM.writeString(10, pwd);
         EEPROM.commit(); // Store data to EEPROM
-        EEPROM.end(); // Free EEPROM memory
       }
-
-      if(sdcardMounted && !found) {
-          // Cria um novo objeto JSON para adicionar ao array "wifi"
+      EEPROM.end(); // Free EEPROM memory
+      if (sdcardMounted && !found) {
+        // Cria um novo objeto JSON para adicionar ao array "wifi"
         JsonObject newWifi = WifiList.add<JsonObject>();
         newWifi["ssid"] = ssid;
         newWifi["pwd"] = pwd;
+        found=true;
         saveConfigs();
-      }
-      else if(found && wrongPass) {
-        wifi["pwd"] = pwd;
+      } else if (sdcardMounted && found && wrongPass) {
+        for (JsonObject wifiEntry : WifiList) {
+          if (wifiEntry["ssid"].as<String>() == ssid) {
+            wifiEntry["pwd"] = pwd;
+            log_i("Mudou pwd de SSID: %s", ssid);
+            break;
+          }
+        }
         saveConfigs();
       }
 
     }
 
-    WiFi.begin(ssid, pwd);
+    WiFi.begin(ssid.c_str(), pwd.c_str());
 
-    resetTftDisplay(10, 10, FGCOLOR,FONT_P);
-
-    tftprint("Connecting to: " + ssid + ".",10);
+    resetTftDisplay(10, 10, FGCOLOR, FONT_P);
+    tft.fillScreen(BGCOLOR);
+    tftprint("Connecting to: " + ssid + ".", 10);
     tft.drawSmoothRoundRect(5,5,5,5,WIDTH-10,HEIGHT-10,FGCOLOR,BGCOLOR);
+    // Simulação da função de desenho no display TFT
     int count = 0;
     while (WiFi.status() != WL_CONNECTED) {
       delay(500);
-      tftprint(".",10);
+      tftprint(".", 10);
       count++;
-      if(count>20) { 
-        wrongPass=true;
+      if (count > 20) {
+        wrongPass = true;
         goto Retry;
       }
     }
 
-  } else { //Running in Access point mode
+  } else { // Running in Access point mode
     IPAddress AP_GATEWAY(172, 0, 0, 1);
     WiFi.mode(WIFI_AP);
     WiFi.softAPConfig(AP_GATEWAY, AP_GATEWAY, IPAddress(255, 255, 255, 0));
-    WiFi.softAP("M5Launcher", "",6,0,1,false);
-    Serial.print("IP: "); Serial.println(WiFi.softAPIP());
-  } 
+    WiFi.softAP("M5Launcher", "", 6, 0, 1, false);
+    Serial.print("IP: ");
+    Serial.println(WiFi.softAPIP());
+  }
 
   delay(200);
-
 }
-
+/***************************************************************************************
+** Function name: replaceChars
+** Description:   Replace some characters for _
+***************************************************************************************/
+String replaceChars(String input) {
+  // Define os caracteres que devem ser substituídos
+  const char charsToReplace[] = {'/', '\\', '\"', '\'', '`'};
+  // Define o caractere de substituição (neste exemplo, usamos um espaço)
+  const char replacementChar = '_';
+
+  // Percorre a string e substitui os caracteres especificados
+  for (size_t i = 0; i < sizeof(charsToReplace); i++) {
+    input.replace(String(charsToReplace[i]), String(replacementChar));
+  }
+  return input;
+}
 /***************************************************************************************
 ** Function name: GetJsonFromM5
 ** Description:   Gets JSON from github server
@@ -168,6 +189,7 @@ bool GetJsonFromM5() {
 ***************************************************************************************/
 void downloadFirmware(String file_str, String fileName, String folder) {
   String fileAddr = "https://m5burner-cdn.m5stack.com/firmware/" + file_str;
+  fileName = replaceChars(fileName);
   prog_handler = 2;
   if(!setupSdCard()) {
     displayRedStripe("SDCard Not Found");

src/partitioner.cpp

@@ -181,8 +181,10 @@ void partitioner() {
         {"Doom", [&](){ partition = 1; }},
         {"UiFlow2", [&](){ partition = 2; }},
       #elif defined(STICK_C_PLUS)
-        {"Doom", [&](){ partition = 1; }},
-      #endif
+        {"Orca", [&](){ partition = 1; }},
+      #elif defined(CORE) || defined(CORE2) || defined(CORE3)
+        {"UiFlow1", [&](){ partition = 1; }},
+      #endif      
     };
     delay(200);
     loopOptions(options);
@@ -205,6 +207,8 @@ void partitioner() {
                 break;
       #elif defined(CORE) || defined(CORE2) || defined(CORE3)
         case 1: data = uiFlow1;
+                displayRedStripe("Experimental");
+                delay(2000);
                 data_size = sizeof(uiFlow1);
                 break;                
       #endif
@@ -262,7 +266,7 @@ void partList() {
     }
     esp_partition_iterator_release(it);
     displayRedStripe(txt);
-    delay(200);
+    delay(300);
     while(!checkSelPress()) yield();
     while(checkSelPress()) yield();    
   }