Remove global AWM from configurationa and allow runtime override using "awm" JSON and "AW" HTTP API.

- see wled#5153
- see https://wled.discourse.group/t/should-awm-1-work-in-a-preset-how-to-toggle-away-from-default-handling/15018

Author: blazoncek

wled00/bus_manager.cpp

@@ -933,7 +933,7 @@ bool PolyBus::_useParallelI2S = false;
 // Bus static member definition
 int16_t Bus::_cct = -1;
 uint8_t Bus::_cctBlend = 0;
-uint8_t Bus::_gAWM = 255;
+uint8_t Bus::_gAWM = AW_GLOBAL_DISABLED;
 
 uint16_t BusDigital::_milliAmpsTotal = 0;
 

wled00/cfg.cpp

@@ -176,7 +176,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
   JsonObject hw_led = hw["led"];
 
   CJSON(strip.milliAmpsMax, hw_led[F("maxpwr")]); // milliAmps max for strip ABL, 0 means no ABL or PP-ABL
-  Bus::setGlobalAWMode(hw_led[F("rgbwm")] | AW_GLOBAL_DISABLED);
+  Bus::setGlobalAWMode(hw_led[F("rgbwm")] | AW_GLOBAL_DISABLED);  // legacy global AW mode setting (remove at some point)
   CJSON(strip.correctWB, hw_led["cct"]);
   CJSON(strip.cctFromRgb, hw_led[F("cr")]);
   CJSON(cctICused, hw_led[F("ic")]);
@@ -242,7 +242,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
       bool reversed = elm["rev"];
       bool refresh = elm["ref"] | false;
       uint16_t freqkHz = elm[F("freq")] | 0;  // will be in kHz for DotStar and Hz for PWM
-      uint8_t AWmode = elm[F("rgbwm")] | RGBW_MODE_MANUAL_ONLY;
+      uint8_t AWmode = elm[F("rgbwm")] | (Bus::getGlobalAWMode() == AW_GLOBAL_DISABLED ? RGBW_MODE_MANUAL_ONLY : Bus::getGlobalAWMode());
       uint8_t maPerLed = elm[F("ledma")] | LED_MILLIAMPS_DEFAULT;
       uint16_t maMax = elm[F("maxpwr")] | 0; // maMax > 0 means per bus PP-ABL is enabled (bus has its own maximum allowable current)
       // To disable brightness limiter we either set output max current to 0 or single LED current to 0
@@ -897,7 +897,7 @@ void serializeConfig() {
   hw_led[F("ic")] = cctICused;
   hw_led[F("cb")] = Bus::getCCTBlend();
   hw_led["fps"] = strip.getTargetFps();
-  hw_led[F("rgbwm")] = Bus::getGlobalAWMode(); // global auto white mode override
+  //hw_led[F("rgbwm")] = Bus::getGlobalAWMode(); // global auto white mode override (deprecated and removed from configuration)
   #if defined(ARDUINO_ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32C3)
   hw_led[F("prl")] = BusManager::hasParallelOutput();
   #endif

wled00/data/settings_leds.htm

@@ -197,7 +197,7 @@
 			// display global white channel overrides
 			gId("wc").style.display = (gRGBW) ? 'inline':'none';
 			if (!gRGBW) {
-				d.Sf.AW.selectedIndex = 0;
+				//d.Sf.AW.selectedIndex = 0;
 				d.Sf.CR.checked = false;
 			}
 			// update start indexes, max values, calculate current, etc
@@ -905,6 +905,7 @@ <h3>Timed light</h3>
 		<h3>White management</h3>
 		White Balance correction: <input type="checkbox" name="CCT"><br>
 		<div id="wc">
+			<!--
 			Global override for Auto-calculate white:<br>
 			<select name="AW">
 				<option value=255>Disabled</option>
@@ -915,6 +916,7 @@ <h3>White management</h3>
 				<option value=4>Max</option>
 			</select>
 			<br>
+			-->
 			Calculate CCT from RGB: <input type="checkbox" name="CR"><br>
 			CCT IC used (Athom 15W): <input type="checkbox" name="IC"><br>
 			CCT additive blending: <input type="number" class="s" min="0" max="100" name="CB" onchange="UI()" required> %<br>

wled00/json.cpp

@@ -421,6 +421,9 @@ bool deserializeState(JsonObject root, byte callMode, byte presetId)
     strip.setTransition(tr * 100);
   }
 
+  // global AWM override
+  Bus::setGlobalAWMode(root[F("awm")] | Bus::getGlobalAWMode());  // override AW mode setting
+
   tr = root[F("tb")] | -1;
   if (tr >= 0) strip.timebase = (unsigned long)tr - millis();
 

wled00/set.cpp

@@ -159,7 +159,7 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
     cctICused = request->hasArg(F("IC"));
     uint8_t cctBlending = request->arg(F("CB")).toInt();
     Bus::setCCTBlend(cctBlending);
-    Bus::setGlobalAWMode(request->arg(F("AW")).toInt());
+    //Bus::setGlobalAWMode(request->arg(F("AW")).toInt());
     strip.setTargetFps(request->arg(F("FR")).toInt());
     #if defined(ARDUINO_ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32C3)
     useParallelI2S = request->hasArg(F("PR"));
@@ -1091,6 +1091,10 @@ bool handleSet(AsyncWebServerRequest *request, const String& req, bool apply)
     if (check3Changed)    seg.check3    = (bool)check3In;
   }
 
+  // set global AWM override
+  pos = req.indexOf(F("AW="));
+  if (pos > 0) Bus::setGlobalAWMode(getNumVal(req, pos));
+
   //set advanced overlay
   pos = req.indexOf(F("OL="));
   if (pos > 0) {

wled00/xml.cpp

@@ -314,7 +314,7 @@ void getSettingsJS(byte subPage, Print& settingsScript)
     printSetFormCheckbox(settingsScript,PSTR("CR"),strip.cctFromRgb);
     printSetFormValue(settingsScript,PSTR("CB"),Bus::getCCTBlend());
     printSetFormValue(settingsScript,PSTR("FR"),strip.getTargetFps());
-    printSetFormValue(settingsScript,PSTR("AW"),Bus::getGlobalAWMode());
+    //printSetFormValue(settingsScript,PSTR("AW"),Bus::getGlobalAWMode());
     printSetFormCheckbox(settingsScript,PSTR("PR"),BusManager::hasParallelOutput());  // get it from bus manager not global variable
 
     unsigned sumMa = 0;