diff --git a/Launcher/Launcher_2.0_C.bin b/Launcher/Launcher_2.0_C.bin index 5e2d60a..af86005 100644 Binary files a/Launcher/Launcher_2.0_C.bin and b/Launcher/Launcher_2.0_C.bin differ diff --git a/Launcher/Launcher_2.0_CYD-2-USB.bin b/Launcher/Launcher_2.0_CYD-2-USB.bin index f8449f8..d181e93 100644 Binary files a/Launcher/Launcher_2.0_CYD-2-USB.bin and b/Launcher/Launcher_2.0_CYD-2-USB.bin differ diff --git a/Launcher/Launcher_2.0_CYD-2432S028.bin b/Launcher/Launcher_2.0_CYD-2432S028.bin index 6840f06..b69f7e7 100644 Binary files a/Launcher/Launcher_2.0_CYD-2432S028.bin and b/Launcher/Launcher_2.0_CYD-2432S028.bin differ diff --git a/Launcher/Launcher_2.0_Cardputer.bin b/Launcher/Launcher_2.0_Cardputer.bin index 00f15af..e87d756 100644 Binary files a/Launcher/Launcher_2.0_Cardputer.bin and b/Launcher/Launcher_2.0_Cardputer.bin differ diff --git a/Launcher/Launcher_2.0_CoreS3.bin b/Launcher/Launcher_2.0_CoreS3.bin index c3e6399..8307433 100644 Binary files a/Launcher/Launcher_2.0_CoreS3.bin and b/Launcher/Launcher_2.0_CoreS3.bin differ diff --git a/Launcher/Launcher_2.0_Marauder-Mini.bin b/Launcher/Launcher_2.0_Marauder-Mini.bin index 1826092..f4624ef 100644 Binary files a/Launcher/Launcher_2.0_Marauder-Mini.bin and b/Launcher/Launcher_2.0_Marauder-Mini.bin differ diff --git a/Launcher/Launcher_2.0_Marauder-v4-OG.bin b/Launcher/Launcher_2.0_Marauder-v4-OG.bin index 24ed82a..17aa6ec 100644 Binary files a/Launcher/Launcher_2.0_Marauder-v4-OG.bin and b/Launcher/Launcher_2.0_Marauder-v4-OG.bin differ diff --git a/Launcher/Launcher_2.0_T-Display-S3-Touchscreen.bin b/Launcher/Launcher_2.0_T-Display-S3-Touchscreen.bin index a0cd3d4..11f876b 100644 Binary files a/Launcher/Launcher_2.0_T-Display-S3-Touchscreen.bin and b/Launcher/Launcher_2.0_T-Display-S3-Touchscreen.bin differ diff --git a/Launcher/Launcher_2.0_core2.bin b/Launcher/Launcher_2.0_core2.bin index ca16c69..3c4f1b8 100644 Binary files a/Launcher/Launcher_2.0_core2.bin and b/Launcher/Launcher_2.0_core2.bin differ diff --git a/Launcher/Launcher_2.0_core_16Mb.bin b/Launcher/Launcher_2.0_core_16Mb.bin index e429353..ee91b7a 100644 Binary files a/Launcher/Launcher_2.0_core_16Mb.bin and b/Launcher/Launcher_2.0_core_16Mb.bin differ diff --git a/Launcher/Launcher_2.0_cplus1_1.bin b/Launcher/Launcher_2.0_cplus1_1.bin index a0e6859..dae437b 100644 Binary files a/Launcher/Launcher_2.0_cplus1_1.bin and b/Launcher/Launcher_2.0_cplus1_1.bin differ diff --git a/Launcher/Launcher_2.0_cplus2.bin b/Launcher/Launcher_2.0_cplus2.bin index 30920f3..7ee609f 100644 Binary files a/Launcher/Launcher_2.0_cplus2.bin and b/Launcher/Launcher_2.0_cplus2.bin differ diff --git a/README.md b/README.md index fc482c5..cd91272 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,9 @@ Sourcecode will be released in the future.. * 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.2.5: + * [x] Changed framework to remove all Watchdog Timers https://github.com/bmorcelli/M5Stick-Launcher/issues/61 https://github.com/bmorcelli/M5Stick-Launcher/issues/63 and solve some SD related issues + * [x] Set Grove pins to LOW state on StickCs and Cardputer to avoid 433Mhz jamming while RF433T is connected * 2.2.4: * [x] Finally ported to CoreS3 and CoreS3-SE * [x] Added reset to watchdog on WebUI and check for free memory when loading files to WebUI, to avoid crashes. diff --git a/lib/M5Stack-HTTPUpdate/src/M5-HTTPUpdate.cpp b/lib/M5Stack-HTTPUpdate/src/M5-HTTPUpdate.cpp index a4441db..4da4f12 100644 --- a/lib/M5Stack-HTTPUpdate/src/M5-HTTPUpdate.cpp +++ b/lib/M5Stack-HTTPUpdate/src/M5-HTTPUpdate.cpp @@ -433,7 +433,6 @@ bool HTTPUpdate::runUpdate(Stream& in, uint32_t size, String md5, int command) StreamString error; - disableCore0WDT(); // disable WDT it as suggested by twitter.com/@lovyan03 if (_cbProgress) { Update.onProgress(_cbProgress); @@ -444,7 +443,6 @@ bool HTTPUpdate::runUpdate(Stream& in, uint32_t size, String md5, int command) Update.printError(error); error.trim(); // remove line ending log_e("Update.begin failed! (%s)\n", error.c_str()); - enableCore0WDT(); return false; } @@ -456,7 +454,6 @@ bool HTTPUpdate::runUpdate(Stream& in, uint32_t size, String md5, int command) if(!Update.setMD5(md5.c_str())) { _lastError = HTTP_UE_SERVER_FAULTY_MD5; log_e("Update.setMD5 failed! (%s)\n", md5.c_str()); - enableCore0WDT(); return false; } } @@ -468,7 +465,6 @@ bool HTTPUpdate::runUpdate(Stream& in, uint32_t size, String md5, int command) Update.printError(error); error.trim(); // remove line ending log_e("Update.writeStream failed! (%s)\n", error.c_str()); - enableCore0WDT(); return false; } @@ -481,11 +477,9 @@ bool HTTPUpdate::runUpdate(Stream& in, uint32_t size, String md5, int command) Update.printError(error); error.trim(); // remove line ending log_e("Update.end failed! (%s)\n", error.c_str()); - enableCore0WDT(); return false; } - enableCore0WDT(); return true; } diff --git a/platformio.ini b/platformio.ini index 80896b2..886d06e 100644 --- a/platformio.ini +++ b/platformio.ini @@ -25,7 +25,7 @@ default_envs = [common] build_flags = - -DLAUNCHER='"2.2.4"' + -DLAUNCHER='"2.2.5"' -DMAXFILES=256 -DEEPROMSIZE=128 -DLH=8 @@ -33,13 +33,13 @@ build_flags = -DCONFIG_FILE='"/config.conf"' lib_deps = - AsyncTCP + https://github.com/bmorcelli/AsyncTCP/ esphome/ESPAsyncWebServer-esphome bblanchon/ArduinoJson @ ^7.0.4 [env:m5stack-cplus2] -platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.2/platform-espressif32.zip +platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.3/platform-espressif32.zip board = m5stick-c framework = arduino monitor_speed = 115200 @@ -109,7 +109,7 @@ lib_deps = ${common.lib_deps} [env:m5stack-cplus1_1] -platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.2/platform-espressif32.zip +platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.3/platform-espressif32.zip board = m5stick-c framework = arduino monitor_speed = 115200 @@ -169,7 +169,7 @@ lib_deps = ${common.lib_deps} [env:m5stack-cardputer] -platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.2/platform-espressif32.zip +platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.3/platform-espressif32.zip board = m5stack-stamps3 framework = arduino monitor_speed = 115200 @@ -232,7 +232,7 @@ lib_deps = [env:m5stack-c] -platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.2/platform-espressif32.zip +platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.3/platform-espressif32.zip board = m5stick-c framework = arduino monitor_speed = 115200 @@ -278,7 +278,7 @@ lib_deps = [env:m5stack-core2] -platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.2/platform-espressif32.zip +platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.3/platform-espressif32.zip board = m5stack-core2 framework = arduino monitor_speed = 115200 @@ -346,7 +346,7 @@ lib_deps = [env:m5stack-core] -platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.2/platform-espressif32.zip +platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.3/platform-espressif32.zip board = m5stack-core2 framework = arduino monitor_speed = 115200 @@ -414,7 +414,7 @@ lib_deps = ${common.lib_deps} [env:m5stack-cores3] -platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.2/platform-espressif32.zip +platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.3/platform-espressif32.zip board = m5stack-cores3 framework = arduino monitor_speed = 115200 @@ -480,7 +480,7 @@ lib_deps = [env:lilygo-t-display-S3] -platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.2/platform-espressif32.zip +platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.3/platform-espressif32.zip board = lilygo-t-display-s3 framework = arduino monitor_speed = 115200 @@ -534,7 +534,7 @@ lib_deps = [env:CYD-2432S028] -platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.2/platform-espressif32.zip +platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.3/platform-espressif32.zip board = esp32dev monitor_speed = 115200 monitor_filters = esp32_exception_decoder @@ -609,7 +609,7 @@ lib_deps = [env:CYD-2-USB] -platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.2/platform-espressif32.zip +platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.3/platform-espressif32.zip board = esp32dev monitor_speed = 115200 monitor_filters = esp32_exception_decoder @@ -683,7 +683,7 @@ lib_deps = ${common.lib_deps} [env:Marauder-v4-OG] -platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.2/platform-espressif32.zip +platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.3/platform-espressif32.zip board = esp32dev monitor_speed = 115200 monitor_filters = esp32_exception_decoder @@ -755,7 +755,7 @@ lib_deps = ${common.lib_deps} [env:Marauder-Mini] -platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.2/platform-espressif32.zip +platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.3/platform-espressif32.zip board = esp32dev monitor_speed = 115200 monitor_filters = esp32_exception_decoder diff --git a/src/display.cpp b/src/display.cpp index 7e6d911..19df64b 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -94,7 +94,7 @@ void TdisplayS3Footer2(uint16_t color) { ** Description: Start Display functions and display bootscreen ***************************************************************************************/ void initDisplay(bool doAll) { - tft.drawRoundRect(5,5,WIDTH-10,HEIGHT-10,5,FGCOLOR); + tft.drawRoundRect(3,3,WIDTH-6,HEIGHT-6,5,FGCOLOR); tft.setTextSize(FONT_P); tft.setCursor(10,10); int cor = 0; diff --git a/src/main.cpp b/src/main.cpp index 1580d05..8fe7a79 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -119,15 +119,31 @@ void setup() { pinMode(DW_BTN, INPUT); pinMode(4, OUTPUT); digitalWrite(4,HIGH); + //Grove pins down + pinMode(32, OUTPUT); + pinMode(33, OUTPUT); + digitalWrite(32,LOW); + digitalWrite(33,LOW); + #elif defined(STICK_C_PLUS) axp192.begin(); pinMode(SEL_BTN, INPUT); pinMode(DW_BTN, INPUT); + //Grove Pins down + pinMode(32, OUTPUT); + pinMode(33, OUTPUT); + digitalWrite(32,LOW); + digitalWrite(33,LOW); #elif defined(M5STACK) && defined(CORE3) M5.begin(); // Begin after TFT, for SDCard to work #elif defined(CARDPUTER) Keyboard.begin(); pinMode(10, INPUT); + //Grove Pins down + pinMode(1, OUTPUT); + pinMode(2, OUTPUT); + digitalWrite(1,LOW); + digitalWrite(2,LOW); #elif defined(T_DISPLAY_S3) SD_MMC.setPins(PIN_SD_CLK, PIN_SD_CMD, PIN_SD_D0); gpio_hold_dis((gpio_num_t)21);//PIN_TOUCH_RES diff --git a/src/onlineLauncher.cpp b/src/onlineLauncher.cpp index 444afb5..6796a00 100644 --- a/src/onlineLauncher.cpp +++ b/src/onlineLauncher.cpp @@ -273,11 +273,10 @@ void downloadFirmware(String file_str, String fileName, String folder) { while(!checkSelPress()) yield(); } file.close(); - delay(2000); break; } else { http.end(); - delay(1000); + delay(500); } } http.end(); diff --git a/src/webInterface.cpp b/src/webInterface.cpp index d55ba46..e6fb15d 100644 --- a/src/webInterface.cpp +++ b/src/webInterface.cpp @@ -178,10 +178,8 @@ void handleUpload(AsyncWebServerRequest *request, String filename, size_t index, // stream the incoming chunk to the opened file if(!update) { request->_tempFile.write(data, len); - esp_task_wdt_reset(); } else { if(!Update.write(data,len)) displayRedStripe("FAIL 172"); - esp_task_wdt_reset(); } } @@ -195,7 +193,6 @@ void handleUpload(AsyncWebServerRequest *request, String filename, size_t index, if(!Update.end()) { displayRedStripe("Fail 183: " + String(Update.getError())); delay(3000); } else displayRedStripe("Restart your device"); } - enableCore0WDT(); } } else { return request->requestAuthentication(); @@ -415,11 +412,6 @@ void startWebUi(String ssid, int encryptation, bool mode_ap) { server->begin(); delay(500); - //log_i("Disabling WatchDogs"); - disableCore0WDT(); // disable WDT - disableCore1WDT(); // disable WDT - disableLoopWDT(); // disable WDT - tft.drawRoundRect(5,5,WIDTH-10,HEIGHT-10,5,ALCOLOR); tft.fillSmoothRoundRect(6,6,WIDTH-12,HEIGHT-12,5,BGCOLOR); setTftDisplay(7,7,ALCOLOR,FONT_P,BGCOLOR);