Merge branch 'mdev' into audio_fastpath

platformio.ini

@@ -836,6 +836,8 @@ build_flags_M =
   -D USERMOD_WEATHER ; WLEDMM usermod
   -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_BATTERY ;; enable Battery usermod
+  -D USERMOD_BATTERY_USE_LIPO ;; use new "decharging curve" for LiPo cells
   ; -D USERMOD_FASTLED ; WLEDMM usermod: CC BY-NC 3.0 licensed effects by Stefan Petrick, include this usermod only if you accept the terms!
   ;WLEDMM: only setting WLED_DEBUG_HOST is enough, ip and port can be defined in sync settings as well
   -D WLED_DEBUG_HOST='"192.168.x.x"' ;; to send debug messages over network to host 192.168.x.y - FQDN is also possible
@@ -854,8 +856,6 @@ lib_deps_V4_M =
   ElectronicCats/MPU6050 @ 0.6.0 ; used for USERMOD_MPU6050_IMU
 
 build_flags_XL = 
-  -D USERMOD_BATTERY ;; enable Battery usermod
-  -D USERMOD_BATTERY_USE_LIPO ;; use new "decharging curve" for LiPo cells
   -D USERMOD_BH1750
   -D USERMOD_ANIMATED_STAIRCASE
   -D USERMOD_RTC ;; experimental
@@ -897,6 +897,7 @@ lib_deps = ${esp32.lib_deps} ${common_mm.lib_deps_S}
 board_build.partitions = ${esp32.default_partitions}
 board_build.f_flash = 80000000L ; use full 80MHz speed for flash (default = 40Mhz) 
 board_build.flash_mode = dio ; (dio = dual i/o; more compatible than qio = quad i/o)
+monitor_filters = esp32_exception_decoder
 
 ;common default for all max environments
 [esp32_4MB_M_base]
@@ -1363,7 +1364,6 @@ build_flags = ${esp32_4MB_V4_M_base.build_flags}
   ; -D SR_DEBUG
   ; -D MIC_LOGGER
 ;lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
-;monitor_filters = esp32_exception_decoder
 ;; RAM:   [==        ]  24.9% (used 81484 bytes from 327680 bytes)
 ;; Flash: [========  ]  84.6% (used 1607857 bytes from 1900544 bytes)
 
@@ -1565,7 +1565,6 @@ lib_ignore =
   ;IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
   OneWire         ; not needed as we don't include USERMOD_DALLASTEMPERATURE
   U8g2            ; not needed as we don't include USERMOD_FOUR_LINE_DISPLAY
-;monitor_filters = esp32_exception_decoder
 ; RAM:   [==        ]  23.1% (used 75636 bytes from 327680 bytes)
 ; Flash: [==========]  96.0% (used 1510452 bytes from 1572864 bytes)
 

wled00/data/index.htm

@@ -89,7 +89,7 @@
 
 <div class ="container">
 	<div id="Colors" class="tabcontent">
-		<div id="colorGFX" hidden="true"> <!--WLEDMM-->
+		<div id="colorGFX">
 			<br> <!--WLEDMM: instead of padding-top:18 in css-->
 			<div id="picker" class="noslide"></div>
 			<div id="hwrap" class="slider">

wled00/data/index.js

@@ -675,7 +675,7 @@ ${urows}
 ${urows===""?'':'<tr><td colspan=2><hr style="height:1px;border-width:0;color:SeaGreen;background-color:Seagreen"></td></tr>'}
 ${i.opt&0x100?inforow("Net Print ☾","<button class=\"btn btn-xs\" onclick=\"requestJson({'netDebug':"+(i.opt&0x0080?"false":"true")+"});\"><i class=\"icons "+(i.opt&0x0080?"on":"off")+"\">&#xe08f;</i></button>"):''}
 ${i.serialOnline?inforow(i.serialOnline,"TX="+i.sTX,"; RX="+i.sRX):""}
-${i.opt&0x100?'<tr><td colspan=2><hr style="height:1px;border-width:0;color:GoldenRod;background-color:GoldenRod"></td></tr>':''}
+${i.opt&0x100?'<tr><td colspan=2><hr style="height:1px;border-width:0;color:SeaGreen;background-color:SeaGreen"></td></tr>':''}
 ${inforow("Build",i.vid)}
 ${inforow("Estimated current",pwru)}
 ${inforow("Average FPS",i.leds.fps)}
@@ -1939,7 +1939,7 @@ function toggleLiveview()
 	if (isM) {
 		//WLEDMM adding liveview2D support on main ui
 		isLv = !isLv;
-		gId("colorGFX").style.display = isLv? "inline":"none";
+		gId("colorGFX").style.display = isLv? "inline":"none"; //WLEDMM: set off if explicitly gfx pushed
 		gId("effectGFX").style.display = isLv? "inline":"none";
 		gId("segGFX").style.display = isLv? "inline":"none";
 

wled00/wled.h

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