Explicit JSON flag for loading FX defaults

Disable watchdog by default

Author: Aircoookie

.vscode/extensions.json

@@ -1,7 +1,10 @@
-{
-    // See http://go.microsoft.com/fwlink/?LinkId=827846
-    // for the documentation about the extensions.json format
-    "recommendations": [
-        "platformio.platformio-ide"
-    ]
-}
+{
+    // See http://go.microsoft.com/fwlink/?LinkId=827846
+    // for the documentation about the extensions.json format
+    "recommendations": [
+        "platformio.platformio-ide"
+    ],
+    "unwantedRecommendations": [
+        "ms-vscode.cpptools-extension-pack"
+    ]
+}

platformio.ini

@@ -326,7 +326,7 @@ board = esp32dev
 platform = ${esp32.platform}
 platform_packages = ${esp32.platform_packages}
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags_esp32} -D WLED_RELEASE_NAME=ESP32 -D WLED_WATCHDOG_TIMEOUT=0 #-D WLED_DISABLE_BLYNK #-D WLED_DISABLE_BROWNOUT_DET
+build_flags = ${common.build_flags_esp32} -D WLED_RELEASE_NAME=ESP32 #-D WLED_DISABLE_BLYNK #-D WLED_DISABLE_BROWNOUT_DET
 lib_deps = ${esp32.lib_deps}
 monitor_filters = esp32_exception_decoder
 board_build.partitions = ${esp32.default_partitions}
@@ -336,7 +336,7 @@ board = esp32dev
 platform = ${esp32.platform}
 platform_packages = ${esp32.platform_packages}
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags_esp32} -D WLED_RELEASE_NAME=ESP32 -D WLED_WATCHDOG_TIMEOUT=0 #-D WLED_DISABLE_BLYNK #-D WLED_DISABLE_BROWNOUT_DET
+build_flags = ${common.build_flags_esp32} -D WLED_RELEASE_NAME=ESP32_qio80 #-D WLED_DISABLE_BLYNK #-D WLED_DISABLE_BROWNOUT_DET
 lib_deps = ${esp32.lib_deps}
 monitor_filters = esp32_exception_decoder
 board_build.partitions = ${esp32.default_partitions}
@@ -349,7 +349,7 @@ platform = ${esp32.platform}
 platform_packages = ${esp32.platform_packages}
 upload_speed = 921600
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags_esp32} -D WLED_RELEASE_NAME=ESP32_Ethernet -D RLYPIN=-1 -D WLED_USE_ETHERNET -D BTNPIN=-1 -D WLED_DISABLE_BLYNK -D WLED_WATCHDOG_TIMEOUT=0
+build_flags = ${common.build_flags_esp32} -D WLED_RELEASE_NAME=ESP32_Ethernet -D RLYPIN=-1 -D WLED_USE_ETHERNET -D BTNPIN=-1 -D WLED_DISABLE_BLYNK
 lib_deps = ${esp32.lib_deps}
 board_build.partitions = ${esp32.default_partitions}
 

wled00/data/index.js

@@ -822,7 +822,7 @@ function populateEffects()
 	});
 
 	for (let ef of effects) {
-		// WLEDSR: add slider and color control to setX (used by requestjson)
+		// WLEDSR: add slider and color control to setFX (used by requestjson)
 		let id = ef.id;
 		let nm = ef.name+" ";
 		let fd = "";
@@ -841,7 +841,7 @@ function populateEffects()
 					if (r.substring(0,2)=="fr") nm += "♫"; // frequency effects
 				}
 			}
-			html += generateListItemHtml('fx',id,nm,'setX','',fd);
+			html += generateListItemHtml('fx',id,nm,'setFX','',fd);
 		}
 	}
 
@@ -1388,7 +1388,7 @@ function setEffectParameters(idx)
 		let top = parseInt(getComputedStyle(gId("sliders")).height);
 		top += 5;
 		let sel = d.querySelector('#fxlist .selected');
-		if (sel) sel.style.bottom = top + "px"; // we will need to remove this when unselected (in setX())
+		if (sel) sel.style.bottom = top + "px"; // we will need to remove this when unselected (in setFX())
 	},750);
 	// set html color items on/off
 	var cslLabel = '';
@@ -2069,24 +2069,15 @@ function tglFreeze(s=null)
 	requestJson(obj);
 }
 
-function setX(ind = null)
+function setFX(ind = null)
 {
 	if (ind === null) {
 		ind = parseInt(d.querySelector('#fxlist input[name="fx"]:checked').value);
 	} else {
 		d.querySelector(`#fxlist input[name="fx"][value="${ind}"]`).checked = true;
 	}
-/*
-	// this code also in updateSelectedFx
-	var selElement = d.querySelector('#fxlist .selected');
-	if (selElement) {
-		selElement.classList.remove('selected');
-		selElement.style.bottom = null; // remove element style added in slider handling
-	}
 
-	d.querySelector(`#fxlist .lstI[data-id="${ind}"]`).classList.add('selected');
-*/
-	var obj = {"seg": {"fx": parseInt(ind)}};
+	var obj = {"seg": {"fx": parseInt(ind),"fxdef":1}}; // fxdef sets effect parameters to default values, TODO add client setting
 	requestJson(obj);
 }
 
@@ -2097,13 +2088,7 @@ function setPalette(paletteId = null)
 	} else {
 		d.querySelector(`#pallist input[name="palette"][value="${paletteId}"]`).checked = true;
 	}
-/*
-	var selElement = d.querySelector('#pallist .selected');
-	if (selElement) {
-		selElement.classList.remove('selected')
-	}
-	d.querySelector(`#pallist .lstI[data-id="${paletteId}"]`).classList.add('selected');
-*/
+
 	var obj = {"seg": {"pal": paletteId}};
 	requestJson(obj);
 }

wled00/data/simple.htm

@@ -211,7 +211,7 @@
 						<i class="icons search-icon">&#xe0a1;</i>
 					</div>
 					<div id="fxlist" class="list">
-						<div class="lstI" data-id="0" onClick="setX(0)"><a href="#0" onClick="setX(0)">Solid</a></div>
+						<div class="lstI" data-id="0" onClick="setEffect(0)"><a href="#0" onClick="setEffect(0)">Solid</a></div>
 					</div>
 				</div>
 				<div id="palDropdown" class="dd-content">

wled00/data/simple.js

@@ -1124,7 +1124,7 @@ function setSegBri(s)
 function setEffect(ind = 0)
 {
 	tglFxDropdown();
-	var obj = {"seg": {"fx": parseInt(ind)}};
+	var obj = {"seg": {"fx": parseInt(ind), "fxdef":true}}; // fxdef sets effect parameters to default values, TODO add client setting
 	requestJson(obj);
 }