Merge branch 'MoonModules:mdev' into downsample4x

Author: troyhacks

.github/ISSUE_TEMPLATE/bug.yml

@@ -48,7 +48,7 @@ body:
     attributes:
       label: What version/release of MM WLED?
       description: You can find this in by going to Config -> Security & Updates -> Scroll to Bottom. Copy and paste the entire line after "Server message"
-      placeholder: "e.g. build 2401030, WLEDMM_0.14.0-b29.35_esp32_4MB_M.bin"
+      placeholder: "e.g. build 2401290, WLEDMM_0.14.1-b30.36_esp32_4MB_M.bin"
     validations:
       required: true
   - type: dropdown

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "wled",
-  "version": "0.14.0-b29.35",
+  "version": "0.14.1-b30.36",
   "description": "Tools for WLED project",
   "main": "tools/cdata.js",
   "directories": {

package.json

@@ -42,6 +42,7 @@
 ; default_envs = esp32s2_saola
 ; default_envs = esp32c3dev
 ; default_envs = lolin_s2_mini
+; default_envs = esp32s3dev_16MB_PSRAM_opi
 
 ; MoonModules entries
 ; ===================
@@ -635,6 +636,11 @@ board_build.f_flash = 80000000L
 board_build.flash_mode = qio
 monitor_filters = esp32_exception_decoder
 
+[env:esp32s3dev_16MB_PSRAM_opi]
+extends = env:esp32s3dev_8MB_PSRAM_opi
+board_build.partitions = tools/WLED_ESP32_16MB.csv
+board_upload.flash_size = 16MB
+
 [env:esp32s3dev_8MB_PSRAM_qspi]
 ;; ESP32-TinyS3 development board, with 8MB FLASH and PSRAM (memory_type: qio_qspi)
 extends = env:esp32s3dev_8MB_PSRAM_opi
@@ -753,6 +759,8 @@ upload_speed = 115200
 lib_deps = ${esp32c3.lib_deps}
 board_build.partitions = tools/WLED_ESP32_2MB_noOTA.csv
 board_build.flash_mode = dio
+board_upload.flash_size = 2MB
+board_upload.maximum_size = 2097152
 
 ;WLEDMM: see below
 ; [env:wemos_shield_esp32]
@@ -1072,7 +1080,7 @@ build_flags = ${common.build_flags} ${common_mm.build_flags_S}   ;; do not inclu
   ;-Wsuggest-attribute=const -Wsuggest-attribute=pure ;;  ask compiler for hints on attributes
   -D WLED_ENABLE_DMX_INPUT
 lib_deps = ${common_mm.lib_deps_S}                               ;;  do not include ${esp32.lib_depsV4} here !!!!
-  https://github.com/someweisguy/esp_dmx.git#v3.0.2-beta  ;; for DMX_INPUT
+  https://github.com/someweisguy/esp_dmx.git#47db25d  ;; for DMX_INPUT
 esp32_build_flags = ${esp32.build_flagsV4} ${esp32_4MB_V4_S_base.build_flags} ;; this is for esp32 only, including specific "V4" flags
 esp32_lib_deps = ${esp32.lib_depsV4} ${esp32_4MB_V4_S_base.lib_deps}  ;; this is for esp32 only, including specific "V4" flags
 board_build.partitions = ${esp32.default_partitions}
@@ -1192,15 +1200,9 @@ build_flags = ${esp32_4MB_XL_base.build_flags}
   ;-D WLED_DISABLE_INFRARED
   -D WLEDMM_SAVE_FLASH    ;; a humble attempt to save a few extra bytes
 build_unflags = ${esp32_4MB_XL_base.build_unflags}
-  -D USERMOD_ANIMARTRIX   ;; Tips our memory usage over the limit
-  -D USERMOD_BUZZER       ;; Over the limits, and steals GPIO 32
-  -D USERMOD_SN_PHOTORESISTOR ;; Over the limits
-  -D WLEDMM_FASTPATH      ;; Over the limits
-; RAM:   [==        ]  24.4% (used 80060 bytes from 327680 bytes)
-; Flash: [==========]  95.3% (used 1499037 bytes from 1572864 bytes)
-; !!! HELP !!!!! :
-; RAM:   [===       ]  26.2% (used 85756 bytes from 327680 bytes)
-; Flash: [==========]  100.0% (used 1572553 bytes from 1572864 bytes)
+board_build.partitions = tools/WLED_ESP32_4MB_256KB_FS.csv
+; RAM:   [===       ]  26.3% (used 86172 bytes from 327680 bytes)
+; Flash: [========= ]  85.0% (used 1615569 bytes from 1900544 bytes)
 
 ;; standard framework build for 16MB flash, optimized for speed
 [env:esp32_16MB_S]

platformio.ini

@@ -50,7 +50,7 @@ starlette==0.23.1
     # via platformio
 tabulate==0.9.0
     # via platformio
-urllib3==1.26.15
+urllib3==1.26.18
     # via requests
 uvicorn==0.20.0
     # via platformio

requirements.txt

@@ -17,6 +17,12 @@
 #include "soc/spi_reg.h"
 #include <soc/efuse_reg.h>
 
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 0, 0)
+  #include "esp_chip_info.h"  // esp-idf v4.4.x
+#else
+  #include "esp_system.h"     // esp-idf v3.x
+#endif
+
 #if CONFIG_IDF_TARGET_ESP32
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 0, 0)
   #include "esp32/rom/spi_flash.h"
@@ -163,7 +169,9 @@ typedef struct {
       case 3:
         if (single_core) { return F("ESP32-S0WD-OEM"); }   // Max 160MHz, Single core, QFN 5*5, Xiaomi Yeelight
         else {             return F("ESP32-D0WD-OEM"); }   // Max 240MHz, Dual core, QFN 5*5
-      case 4:              return F("ESP32-U4WDH");        // Max 160MHz, Single core, QFN 5*5, 4MB embedded flash, ESP32-MINI-1, ESP32-DevKitM-1
+      case 4:
+        if (single_core) { return F("ESP32-U4WDH-S"); }    // Max 160MHz, Single core, QFN 5*5, 4MB embedded flash, ESP32-MINI-1, ESP32-DevKitM-1
+        else {             return F("ESP32-U4WDH-D"); }    // Max 240MHz, Dual core, QFN 5*5, 4MB embedded flash
       case 5:
         if (rev3)        { return F("ESP32-PICO-V3"); }    // Max 240MHz, Dual core, LGA 7*7, ESP32-PICO-V3-ZERO, ESP32-PICO-V3-ZERO-DevKit
         else {             return F("ESP32-PICO-D4"); }    // Max 240MHz, Dual core, LGA 7*7, 4MB embedded flash, ESP32-PICO-KIT
@@ -295,11 +303,14 @@ String my_GetDeviceHardwareRevision(void) {
 
   esp_chip_info_t chip_info;
   esp_chip_info(&chip_info);
-  char revision[10] = { 0 };
+  char revision[24] = { 0 };
   if (chip_info.revision) {
-    snprintf_P(revision, sizeof(revision), PSTR(" rev.%d"), chip_info.revision);
+    snprintf_P(revision, sizeof(revision), PSTR(" rev.%d (0x%x)"), chip_info.revision, chip_info.revision);
   }
   result += revision;                    // ESP32-C3 rev.3
+#if CONFIG_ESP32_ECO3_CACHE_LOCK_FIX
+  result += soc_has_cache_lock_bug() ? F(", chip has cache lock bug") : F(", free of cache lock bug");
+#endif
 
   return result;
 }
@@ -318,12 +329,17 @@ static void my_show_chip_info(void) {
 #if 0
   Serial.println("ESP Chip Info:");
   switch ((int)my_info.model) {
-    case (int)CHIP_ESP32: Serial.print("ESP32 "); break;
-    case 2: Serial.print("ESP32-S2 "); break;
-    case 9: Serial.print("ESP32-S3 "); break;
-    case 5: Serial.print("ESP32-C3 "); break;
-    case 6: Serial.print("ESP32-H2 "); break;
+    case 1:  Serial.print("ESP32 "); break;
+    case 2:  Serial.print("ESP32-S2 "); break;
+    case 9:  Serial.print("ESP32-S3 "); break;
+    case 5:  Serial.print("ESP32-C3 "); break;
+    case 6:  Serial.print("ESP32-H2/H4 "); break; // ESP-IFD 4.x
     case 12: Serial.print("ESP32-C2 "); break;
+    case 13: Serial.print("ESP32-C6 "); break;
+    case 16: Serial.print("ESP32-H2 "); break; // ESP-IFD 5.x
+    case 17: Serial.print("ESP32-C5 beta3 "); break;
+    case 18: Serial.print("ESP32-P4 "); break;
+    case 999: Serial.print("POSIX/Linux simulator "); break;
     default: Serial.print("(unknown) 0x"); Serial.print((int)my_info.model, HEX); Serial.print(" "); break;
   }
   Serial.print(" Rev ");
@@ -394,6 +410,7 @@ static void my_show_chip_info(void) {
 //    reason > 6 = user-defined reason codes
 #endif
 
+#if 0  // duplicate - this info is also printed by getCoreResetReason()
 void my_print_reset_reason(int reason)
 {
   Serial.print(reason);
@@ -449,7 +466,7 @@ void my_verbose_print_reset_reason(int reason)
     default : Serial.print ("other "); Serial.print(reason);
   }
 }
-
+#endif
 
 /* 
  * parts below were created by softhack007, licenced under GPL v3.0
@@ -461,7 +478,7 @@ void show_psram_info_part1(void)
   //if (esp_spiram_is_initialized() == false) esp_spiram_init();
   Serial.println(psramFound() ? "ESP32 PSRAM: found.": "ESP32 PSRAM: not found!"); 
   if (!psramFound()) return;
-  psramInit();
+  //psramInit();  // already doe by arduino framework
 
   // the next part only works on "classic" ESP32
   #if !defined(CONFIG_IDF_TARGET_ESP32S3) && !defined(CONFIG_IDF_TARGET_ESP32S2)  && !defined(CONFIG_IDF_TARGET_ESP32C3)
@@ -527,19 +544,23 @@ void show_psram_info_part2(void)
 void showRealSpeed() {
   //Serial.begin(115200);
   Serial.flush();
-  Serial.println(F("\n===================================="));
-  Serial.print(  F("Chip info for ")); Serial.println(ESP.getChipModel());
+  Serial.println(F("\n"));
+  for(int aa=0; aa<65; aa++) Serial.print("="); Serial.println();
+#if 0  // duplicate - same info is printed in wled.cpp
+  Serial.print(  F("Chip info for ")); Serial.print(ESP.getChipModel());
+  Serial.print(F(", ")); Serial.print(ESP.getChipCores()); Serial.print(F(" core(s)"));
+  Serial.print(F(", ")); Serial.print(ESP.getCpuFreqMHz()); Serial.println(F("MHz."));
+#endif
+  Serial.print(  F("ESP32 device: ")); Serial.println(my_GetDeviceHardwareRevision());
   Serial.print(  F("SDK:          ")); Serial.println(ESP.getSdkVersion());
-  Serial.println(F("------------------------------------\n"));
+  for(int aa=0; aa<42; aa++) Serial.print("-"); Serial.println();
+
+  my_show_chip_info();
 
   Serial.print(" XTAL FREQ: "); Serial.print(getXtalFrequencyMhz()); Serial.println("   MHz");
   Serial.print(" APB FREQ:  "); Serial.print(getApbFrequency() / 1000000.0, 1); Serial.println(" MHz");
   Serial.print(" CPU FREQ:  "); Serial.print(getCpuFrequencyMhz()); Serial.println("  MHz\n");
-
-  Serial.print("ESP32 DEVICE:    "); Serial.print(my_GetDeviceHardwareRevision());
-  Serial.print(F(", ")); Serial.print(ESP.getChipCores()); Serial.print(F(" core(s)"));
-  Serial.print(F(", ")); Serial.print(ESP.getCpuFreqMHz()); Serial.println(F("MHz.\n"));
-  my_show_chip_info();
+  for(int aa=0; aa<42; aa++) Serial.print("-"); Serial.println("\n");
 
   Serial.print("FLASH CHIP FREQ (magic): "); Serial.print(ESP.getFlashChipSpeed()/1000000.0, 1); Serial.println(" MHz");
   Serial.print("FLASH SIZE (magic byte): "); Serial.print(ESP.getFlashChipSize() / (1024.0 * 1024), 2); Serial.println(" MB");
@@ -553,7 +574,7 @@ void showRealSpeed() {
   Serial.print("FLASH REAL SIZE: "); Serial.print(my_ESP_getFlashChipRealSize() / (1024.0 * 1024), 2); Serial.println(" MB");
   Serial.print("FLASH REAL MODE: "); Serial.println(my_ESP_getFlashChipMode());
 
-  Serial.println(F("\n------------------------------------"));
+  for(int aa=0; aa<42; aa++) Serial.print("-"); Serial.println();
   Serial.flush();
   Serial.print(  "RAM HEAP SIZE:  "); Serial.print(ESP.getHeapSize() / 1024.0, 2); Serial.println(" KB");
   Serial.print(  " FREE RAM:      "); Serial.print(ESP.getFreeHeap() / 1024.0, 2); Serial.println(" KB");
@@ -573,6 +594,7 @@ void showRealSpeed() {
   Serial.flush();
 #endif
 
+#if 0  // duplicate - this info is also printed by getCoreResetReason()
   Serial.println();
   Serial.print("CPU #0 - last reset reason = ");
   my_print_reset_reason(rtc_get_reset_reason(0)); Serial.print("\t => ");
@@ -584,8 +606,9 @@ void showRealSpeed() {
     my_verbose_print_reset_reason(rtc_get_reset_reason(1));
     Serial.println();
   }
+#endif
 
-  Serial.println(F("====================================\n"));
+  for(int aa=0; aa<42; aa++) Serial.print("="); Serial.println("\n");
   Serial.flush();
 }
 

tools/ESP32-Chip_info.hpp

@@ -0,0 +1,7 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+app0,     app,  ota_0,   0x10000, 0x330000,
+app1,     app,  ota_1,   0x340000,0x330000,
+spiffs,   data, spiffs,  0x670000,0x180000,
+coredump, data, coredump,,64K

tools/WLED_ESP32-wrover_4MB.csv

@@ -11,7 +11,7 @@ The Animated Staircase can be controlled by the WLED API. Change settings such a
 speed, on/off time and distance by sending an HTTP request, see below.
 
 ## WLED integration
-To include this usermod in your WLED setup, you have to be able to [compile WLED from source](https://github.com/Aircoookie/WLED/wiki/Compiling-WLED).
+To include this usermod in your WLED setup, you have to be able to [compile WLED from source](https://kno.wled.ge/advanced/compiling-wled/).
 
 Before compiling, you have to make the following modifications: