Merge branch 'heap-optimize'

Author: ewowi

.coderabbit.yaml

@@ -1,9 +1,9 @@
-language: auto
+language: "en-US"
 
 review:
   enable_review: true
   enable_fix_suggestions: true
   enable_tests_generation: false
 
-  context:
-    timeout_ms: 900000   # 15 minutes max
+context:
+  timeout_ms: 900000   # 15 minutes max

docs/develop/modules.md

@@ -38,7 +38,7 @@ ModuleDemo(PsychicHttpServer *server
     * Initialy create the module data
 
 ```cpp
-void setupDefinition(JsonArray root) override{
+void setupDefinition(const JsonArray& root) override{
     JsonObject control; // state.data has one or more properties
     JsonArray details; // if a control is an array, this is the details of the array
     JsonArray values; // if a control is a select, this is the values of the select
@@ -61,10 +61,10 @@ void setupDefinition(JsonArray root) override{
 
 * Implement function **onUpdate** to define what happens if data changes
     * struct UpdatedItem defines the update (parent control (including index in case of multiple records), name of control and value)
-    * This runs in the httpd / webserver task. To run it in another task (application task) use runInAppTask - see [ModuleLightsControl](https://github.com/MoonModules/MoonLight/blob/main/src/MoonLight/ModuleLightsControl.h)
+    * UpdatedItems are created in the httpd / webserver task and via the loop() function sent to onUpdate running in the Sveltekit task. e.g. see [ModuleLightsControl](https://github.com/MoonModules/MoonLight/blob/main/src/MoonLight/ModuleLightsControl.h)
 
 ```cpp
-    void onUpdate(UpdatedItem &updatedItem) override
+    void onUpdate(const UpdatedItem &updatedItem) override
     {
         if (updatedItem.name == "lightsOn" || updatedItem.name == "brightness") {
             EXT_LOGD(MB_TAG, "handle %s = %s -> %s", updatedItem.name, updatedItem.oldValue.c_str(), updatedItem.value.as<String>().c_str());
@@ -76,7 +76,7 @@ void setupDefinition(JsonArray root) override{
             if (updatedItem.value.as<String>().length())
                 compileAndRun(updatedItem.value);
         } else
-            EXT_LOGD(MB_TAG, "no handle for %s.%s[%d] = %s -> %s", updatedItem.parent[0], updatedItem.name, updatedItem.index[0], updatedItem.oldValue.c_str(), updatedItem.value.as<String>().c_str());
+            EXT_LOGD(MB_TAG, "no handle for %s.%s[%d] = %s -> %s", updatedItem.parent[0].c_str(), updatedItem.name.c_str(), updatedItem.index[0], updatedItem.oldValue.c_str(), updatedItem.value.as<String>().c_str());
     }
 ```
 

factory_settings.ini

@@ -16,7 +16,7 @@ build_flags =
   -D FACTORY_AP_PROVISION_MODE=AP_MODE_DISCONNECTED
   -D FACTORY_AP_SSID=\"ML-#{unique_id}\" ; 1-64 characters, supports placeholders
   -D FACTORY_AP_PASSWORD=\"\" ; 8-64 characters  ; 🌙 empty no password needed
-  -D FACTORY_AP_CHANNEL=1
+  -D FACTORY_AP_CHANNEL=6 ; // 🌙: See https://github.com/wled/WLED/commit/fc7993f4a7241739d1878df25fd4600100abc506
   -D FACTORY_AP_SSID_HIDDEN=false
   -D FACTORY_AP_MAX_CLIENTS=4
   -D FACTORY_AP_LOCAL_IP=\"4.3.2.1\" ; 🌙

firmware/esp32-d0.ini

@@ -86,6 +86,7 @@ board_build.partitions = boards/ESP32_4MB_NO_OTA.csv
 ; board_build.partitions = min_spiffs.csv
 build_flags = ${env.build_flags}
   -D CONFIG_IDF_TARGET_ESP32=1
+  -D HTTPD_STACK_SIZE=6144 ; a bit more as there are no app tasks atm
   -D LOLIN_WIFI_FIX  ; some boards have wifi issues if this is not defined, this sets WIFI_POWER_8_5dBm
   ; -D LED_BUILTIN=2
   ; -D KEY_BUILTIN=0
@@ -103,6 +104,7 @@ board_build.partitions = boards/ESP32_4MB_NO_OTA.csv
 ; board_build.partitions = min_spiffs.csv
 build_flags = ${env.build_flags}
   -D CONFIG_IDF_TARGET_ESP32=1
+  -D HTTPD_STACK_SIZE=6144 ; a bit more as there are no app tasks atm
   -D LOLIN_WIFI_FIX  ; some boards have wifi issues if this is not defined, this sets WIFI_POWER_8_5dBm
   -D ARDUINO_USB_CDC_ON_BOOT=0 ; Make sure that the right HardwareSerial driver is picked in arduino-esp32 (needed on "classic ESP32")
   -DBOARD_HAS_PSRAM

firmware/esp32-p4.ini

@@ -86,119 +86,3 @@ lib_deps = ${esp32-p4-base.lib_deps}
 ; E (3783) H_SDIO_DRV: sdio card init failed
 
 ; FreeRTOS: FreeRTOS Task "sdio_read" should not return, Aborting now!
-
-
-; [env:esp32-p4-8MB_troyhacks_personal]
-; ;; THIS IS PIOARDUINO NOW, NOT PLATFORMIO!
-; ; build_src_filter =      +<**/*.c>
-; ;                         +<**/*.cpp>
-; ;                         +<**/*.S>
-; ;                         -<**/dmx*>
-; ;                         -<**/async-mqtt-client/**>
-; ;                         -<**/methods/Esp32_i2s*>
-; ;                         -<**/espalexa/**>
-; ;                         -<**/DS1307RTC*>
-; ;                         -<**/dependencies/dmx>
-; ; platform                = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.30-2/platform-espressif32.zip ;; https://github.com/troyhacks/platform-espressif32#Arduino/IDF5
-; ; platform_packages       = framework-arduinoespressif32 @ https://github.com/troyhacks/arduino-esp32#feature/esp32p4
-; ;                           framework-arduinoespressif32-libs @ https://github.com/troyhacks/esp32-arduino-libs#main
-;                           ; toolchain-riscv32-esp @ https://github.com/espressif/crosstool-NG/releases/download/esp-14.2.0_20241119/riscv32-esp-elf-14.2.0_20241119-x86_64-w64-mingw32.zip
-; board_build.arduino.upstream_packages = no
-; board                   = esp32-p4-evboard
-; board_build.mcu         = esp32p4
-; board_build.f_cpu       = 360000000L
-; board_build.f_flash     = 80000000L
-; ; board_build.arduino.memory_type  =  qio_opi
-; build_unflags           = -O2
-; build_flags = ${esp32-p4-base.build_flags}
-;                           -Ofast
-;                           -ffast-math
-;                           -mstrict-align
-;                           -fipa-pta
-;                           -freorder-blocks
-;                           -fno-jump-tables 
-;                           -fno-tree-switch-conversion
-;                           -Wwrite-strings 
-;                           -fstrict-volatile-bitfields
-;                           -D WLEDMM_FASTPATH
-;                           -D WLEDMM_REMAP_AT_OUTPUT
-;                           -D PARLIO
-;                           ; -D WLED_DISABLE_LOGGING
-;                           ; -D PARLIO_TIMER
-;                           ; -D PARLIO_AUTO_OVERCLOCK
-;                           -D WLED_DANGEROUS_OPTIMIZATIONS
-;                           -D ARDUINO_EVENT_RUNNING_CORE=0
-;                           -D CONFIG_ASYNC_TCP_RUNNING_CORE=0
-;                           ; If you don't set PARLIO_PINS it's OK, it just sets all pins to disabled. Still "outputs" tho.
-;                           -D PARLIO_PINS=2,3,4,5,6,20,21,22,23,26,27,32,33,36,47,48 ;; GPIOs beyond 36 require some special ESP32-P4 LDO code or 47,48 don't work- added to WLED::setup()!
-;                           -D IMAGECACHE_BG_PRIORITY=1 ;; 1 is the lowst real priority, least run. 5 slows other things down.
-;                           -D CORE_DEBUG_LEVEL=0 ;; ESP_LOG_VERBOSE ;; ESP_LOG_VERBOSE == 5
-;                           -D WLED_USE_ETHERNET ;; Coexistence is slower but both work now. Ethernet is preferred automatically.
-;                           -D WLED_USE_ETHERNET_ONLY ;; Disable WiFi for performance reasons - on the P4 it needs high priority background tasks to talk to the C6
-;                           ; -D WLED_DEBUG                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         
-;                           -D NDEBUG ;; comment this out if REALLY debugging for things like Parallel IO, PPA, etc
-;                           -D ARTNET_TIMER
-;                           -D MAX_LEDS=65535 ;; 18432
-;                           -D MAX_LEDS_PER_BUS=65535 ;; 18432
-;                           -D MAX_LED_MEMORY=64000000 ;; times ONE HUNDRED
-;                           -D DEFAULT_LED_TYPE=TYPE_NET_ARTNET_RGB
-;                           -D LEDPIN=192 ;; at least get 192.x.x.x set properly for Art-Net
-;                           -D BTNPIN=46 ;; Boot button is on GPIO 35 and works as a "button", but polling it messes up Ethernet.
-;                           -D CONFIG_ASYNC_TCP_TASK_STACK_SIZE=30000
-;                           -D BOARD_HAS_PSRAM
-;                           -D WLED_USE_PSRAM
-;                           ; -D WLED_USE_PSRAM_JSON
-;                           ; -D ALL_JSON_TO_PSRAM
-;                           -Wno-deprecated-declarations
-;                           -Wno-attributes
-;                           -D ESP_PLATFORM=1
-;                           -D WLED_USE_MY_CONFIG
-;                           -g
-;                           -D FASTLED_NO_FASTLED
-;                           -D WLED_RELEASE_NAME=ESP32-P4_16MB
-;                           -D WLED_WATCHDOG_TIMEOUT=100 ;; Setting >0 will make the watchdog not panic. Workaround for now.
-;                           -D USERMOD_AUDIOREACTIVE
-;                           -D USERMOD_AUTO_PLAYLIST
-;                           -D UM_AUDIOREACTIVE_USE_ESPDSP_FFT
-;                           -D SR_DMTYPE=9 ;; 9 = ES8311 (new) which is the codec chip on the ESP32-P4 EV board
-;                           -D SR_ENABLE_DEFAULT
-;                           ; -D TROYHACKS_FAILSAFE_BUSSES ;; in case you have a bus type causing resets during testing, turn this on, upload, busses will be removed at boot. Then reflash without this flag.
-;                           -D WLED_DISABLE_INFRARED
-;                           -D WLED_DISABLE_ESPNOW ;; not working yet due to API changes in v5.3
-;                           -D WLED_DISABLE_ALEXA
-;                           -D WLED_DISABLE_HUESYNC
-;                           -D WLED_DISABLE_MQTT
-;                           -D WLED_DISABLE_LOXONE
-;                           -D WLED_DISABLE_ADALIGHT ;; this no longer disables serial receive
-;                           -D CONFIG_ADC_SUPPRESS_DEPRECATE_WARN
-;                           -D CONFIG_I2S_SUPPRESS_DEPRECATE_WARN
-;                           -D WLED_DISABLE_IMPROV_WIFISCAN
-;                           -D USERMOD_ANIMARTRIX         # needs to be changed from int to uint32_t in the base class:  virtual void setPixelColor(uint32_t index, rgb pixel) = 0;  
-;                           ; -D WLEDMM_NO_MAP_RESET
-;                           ; -D WLED_DEBUG_MAPS
-;                           ; -D ES8311_ADDR=0x18
-; lib_deps = ${esp32-p4-base.lib_deps}
-;                           ; https://github.com/Makuna/NeoPixelBus#CORE3 ;; https://github.com/troyhacks/NeoPixelBus#CORE3
-;                           ; https://github.com/softhack007/FastLED.git#ESP32-C6
-;                           ; https://github.com/troyhacks/ESPAsyncWebServer ;; #v2.3.0 ;; https://github.com/softhack007/ESPAsyncWebServer.git#ESP32-C6
-;                           ; https://github.com/netmindz/animartrix.git#e6b7509b391cab97b59b8eb19580e67d4203ae7d # needs to be changed from int to uint32_t in the base class:  virtual void setPixelColor(uint32_t index, rgb pixel) = 0;  
-; lib_ignore              = IRremoteESP8266
-;                           ; WebServer
-;                           SD
-;                           SD_MMC
-; board_build.partitions  = boards/TROYP4_ESP32_8MB_1500KB_FS.csv ;; WLED_ESP32_8MB.csv
-; board_build.flash_mode  = qio
-; ; monitor_filters         = esp32_exception_decoder, colorize
-; ; monitor_speed           = 115200
-; upload_speed            = 921600
-; ; framework               = arduino
-; ; lib_compat_mode         = strict
-; ; extra_scripts           = 
-;                           ; pre:pio-scripts/set_version.py
-;                           ; pre:pio-scripts/build-html.py
-;                           ; post:pio-scripts/output_bins.py
-;                           ; post:pio-scripts/strip-floats.py
-;                           ; pre:pio-scripts/user_config_copy.py
-;                           ; pre:pio-scripts/load_usermods.py
-;                           ; pre:pio-scripts/build_ui.py
-;                           ; post:pio-scripts/validate_modules.py  ;; double-check the build output usermods

firmware/esp32-s3.ini

@@ -85,17 +85,6 @@ lib_deps = ${esp32-s3-base.lib_deps}
 ; Flash: [=======   ]  71.4% (used 2245914 bytes from 3145728 bytes)
 
 
-; [env:esp32-s3-devkitc-1-n16r8vVD]
-; extends = env:esp32-s3-devkitc-1-n16r8v
-; build_flags = 
-;   ${env:esp32-s3-devkitc-1-n16r8v.build_flags}
-;   ${HP_VIRTUAL_DRIVER.build_flags}
-;   ; -D ML_LIVE_MAPPING
-; lib_deps = 
-;   ${env:esp32-s3-devkitc-1-n16r8v.lib_deps}
-;   ${HP_VIRTUAL_DRIVER.lib_deps}
-
-
 [env:esp32-s3-zero-n4r2]
 ; board = esp32-s3-zero-n4r2
 board_build.psram = enabled

interface/src/lib/types/models.ts

@@ -40,18 +40,6 @@ export type NetworkItem = {
 	encryption_type: number;
 };
 
-export type EthernetStatus = {
-	status: number;
-	ip_address: string;
-	mac_address: string;
-};
-
-export type EthernetSettings = {
-	local_ip: string;
-	gateway_ip: string;
-	subnet_mask: string;
-};
-
 export type ApStatus = {
 	status: number;
 	ip_address: string;
@@ -152,6 +140,8 @@ export type StaticSystemInformation = {
 	flash_chip_size: number;
 	flash_chip_speed: number;
 	cpu_reset_reason: string;
+	heap_info_app: string;
+	heap_info_dma: string;
 };
 
 export type SystemInformation = Analytics & StaticSystemInformation;