Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

esp8266_4MB_M: usermods maches max usermods, add net print,set flashsize

Browse Source
This commit is contained in:
Ewoud
2023-04-07 16:40:24 +02:00
parent a6e2cf0b26
commit 212126b0ad
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platformio.ini
View File

@@ -1068,20 +1068,24 @@ upload_speed = 460800 ;115200
board_build.f_cpu = 160000000L ;; we want 160Mhz (default = 80Mhz) board_build.f_cpu = 160000000L ;; we want 160Mhz (default = 80Mhz)
build_flags = ${common.build_flags_esp8266} build_flags = ${common.build_flags_esp8266}
-D WLED_RELEASE_NAME=esp8266_4MB_M -D WLED_RELEASE_NAME=esp8266_4MB_M
-D WLED_MAX_USERMODS=5 ; default only 4-6
-D WLED_DISABLE_ALEXA -D WLED_DISABLE_ALEXA
-D WLED_DISABLE_HUESYNC -D WLED_DISABLE_HUESYNC
-D WLED_DISABLE_LOXONE -D WLED_DISABLE_LOXONE
; -D USERMOD_AUDIOREACTIVE ; -D USERMOD_AUDIOREACTIVE
; -UWLED_USE_MY_CONFIG ; -UWLED_USE_MY_CONFIG
-D USERMOD_PIRSWITCH ; -D USERMOD_PIRSWITCH
-D USERMOD_DALLASTEMPERATURE ;; disabled because it hangs during usermod setup on -S3 (autodetect broken?) ; -D USERMOD_DALLASTEMPERATURE ;; disabled because it hangs during usermod setup on -S3 (autodetect broken?)
-D USERMOD_MULTI_RELAY ; -D USERMOD_MULTI_RELAY
-D USE_ALT_DISPLAY ; new versions of USERMOD_FOUR_LINE_DISPLAY and USERMOD_ROTARY_ENCODER_UI -D USE_ALT_DISPLAY ; new versions of USERMOD_FOUR_LINE_DISPLAY and USERMOD_ROTARY_ENCODER_UI
-D WLED_MAX_USERMODS=5 ; default only 4 on ESP8266
-D USERMOD_FOUR_LINE_DISPLAY -D USERMOD_FOUR_LINE_DISPLAY
-D USERMOD_MPU6050_IMU ; gyro/accelero for USERMOD_GAMES (ONLY WORKS IF USERMOD_FOUR_LINE_DISPLAY NOT INCLUDED - I2C SHARING BUG) -D USERMOD_MPU6050_IMU ; gyro/accelero for USERMOD_GAMES (ONLY WORKS IF USERMOD_FOUR_LINE_DISPLAY NOT INCLUDED - I2C SHARING BUG)
-D USERMOD_GAMES ; WLEDMM usermod -D USERMOD_GAMES ; WLEDMM usermod
-D USERMOD_ARTIFX -D USERMOD_ARTIFX
-D USERMOD_BATTERY ;; enable Battery usermod
-D USERMOD_BATTERY_USE_LIPO ;; use new "decharging curve" for LiPo cells
-D WLED_DEBUG_HOST='"192.168.x.x"' ;; to send debug messages over network to host 192.168.x.y - FQDN is also possible
-D WLED_DEBUG_PORT=1768 ;; port for network debugging. default = 7868
; -D WLED_DEBUG ; -D WLED_DEBUG
monitor_filters = esp8266_exception_decoder monitor_filters = esp8266_exception_decoder
lib_deps = ${esp8266.lib_deps} lib_deps = ${esp8266.lib_deps}

2
wled00/json.cpp
View File

@@ -898,7 +898,6 @@ void serializeInfo(JsonObject root)
#endif #endif
root[F("lwip")] = 0; //deprecated root[F("lwip")] = 0; //deprecated
root[F("totalheap")] = ESP.getHeapSize(); //WLEDMM root[F("totalheap")] = ESP.getHeapSize(); //WLEDMM
root[F("getflash")] = ESP.getFlashChipSize(); //WLEDMM and Athom
#else #else
root[F("arch")] = "esp8266"; root[F("arch")] = "esp8266";
root[F("core")] = ESP.getCoreVersion(); root[F("core")] = ESP.getCoreVersion();
@@ -908,6 +907,7 @@ void serializeInfo(JsonObject root)
#endif #endif
root[F("lwip")] = LWIP_VERSION_MAJOR; root[F("lwip")] = LWIP_VERSION_MAJOR;
#endif #endif
root[F("getflash")] = ESP.getFlashChipSize(); //WLEDMM and Athom, works for both ESP32 and ESP8266
root[F("freeheap")] = ESP.getFreeHeap(); root[F("freeheap")] = ESP.getFreeHeap();
//WLEDMM: conditional on esp32 //WLEDMM: conditional on esp32

2
wled00/wled.h
View File

@@ -8,7 +8,7 @@
*/ */
// version code in format yymmddb (b = daily build) // version code in format yymmddb (b = daily build)
#define VERSION 2304071 #define VERSION 2304072
//uncomment this if you have a "my_config.h" file you'd like to use //uncomment this if you have a "my_config.h" file you'd like to use
//#define WLED_USE_MY_CONFIG //#define WLED_USE_MY_CONFIG