Auto create segments setting (#2183)

2021-09-11 01:17:42 +02:00 · 2021-09-11 01:17:42 +02:00 · c24ab1b21d
commit c24ab1b21d
parent 6a01658355
11 changed files with 71 additions and 30 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,6 +2,13 @@

 ### Builds after release 0.12.0

+#### Build 2109100
+
+-   Added an auto create segments per bus setting
+-   Added 15 new palettes from SR branch (PR #2134)
+-   Fixed segment runtime not reset on FX change via HTTP API
+-   Changed AsyncTCP dependency to pbolduc fork v1.2.0
+
 #### Build 2108250

 -   Added Sync groups (PR #2150)
--- a/platformio.ini
+++ b/platformio.ini
@ -210,7 +210,7 @@ build_flags = -g
 lib_deps =
  ${env.lib_deps}
  makuna/NeoPixelBus @ 2.6.7
-  https://github.com/pbolduc/AsyncTCP.git
+  https://github.com/pbolduc/AsyncTCP.git @ 1.2.0

 [esp32s2]
 build_flags = -g
@ -224,7 +224,7 @@ build_flags = -g
 lib_deps =
  ${env.lib_deps}
  makuna/NeoPixelBus @ 2.6.7
-  https://github.com/pbolduc/AsyncTCP.git
+  https://github.com/pbolduc/AsyncTCP.git @ 1.2.0

 # ------------------------------------------------------------------------------
 # WLED BUILDS
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@ -98,24 +98,25 @@ void WS2812FX::finalizeInit(uint16_t countPixels)
  setBrightness(_brightness);

  //TODO make sure segments are only refreshed when bus config actually changed (new settings page)
-  //make one segment per bus
  uint8_t s = 0;
  for (uint8_t i = 0; i < busses.getNumBusses(); i++) {
    Bus* b = busses.getBus(i);

-    segStarts[s] = b->getStart();
-    segStops[s] = segStarts[s] + b->getLength();
+    if (autoSegments) { //make one segment per bus
+      segStarts[s] = b->getStart();
+      segStops[s] = segStarts[s] + b->getLength();

-    //check for overlap with previous segments
-    for (uint8_t j = 0; j < s; j++) {
-      if (segStops[j] > segStarts[s] && segStarts[j] < segStops[s]) {
-        //segments overlap, merge
-        segStarts[j] = min(segStarts[s],segStarts[j]);
-        segStops [j] = max(segStops [s],segStops [j]); segStops[s] = 0;
-        s--;
+      //check for overlap with previous segments
+      for (uint8_t j = 0; j < s; j++) {
+        if (segStops[j] > segStarts[s] && segStarts[j] < segStops[s]) {
+          //segments overlap, merge
+          segStarts[j] = min(segStarts[s],segStarts[j]);
+          segStops [j] = max(segStops [s],segStops [j]); segStops[s] = 0;
+          s--;
+        }
      }
+      s++;
    }
-    s++;

    #ifdef ESP8266
    if ((!IS_DIGITAL(b->getType()) || IS_2PIN(b->getType()))) continue;
@ -126,9 +127,29 @@ void WS2812FX::finalizeInit(uint16_t countPixels)
    #endif
  }

-  for (uint8_t i = 0; i < MAX_NUM_SEGMENTS; i++) {
-    _segments[i].start = segStarts[i];
-    _segments[i].stop  = segStops [i];
+  if (autoSegments) {
+    for (uint8_t i = 0; i < MAX_NUM_SEGMENTS; i++) {
+      _segments[i].start = segStarts[i];
+      _segments[i].stop  = segStops [i];
+    }
+  } else {
+    //expand the main seg to the entire length, but only if there are no other segments
+    uint8_t mainSeg = getMainSegmentId();
+    bool isMultipleSegs = false;
+    for (uint8_t i = 0; i < MAX_NUM_SEGMENTS; i++)
+    {
+      if (i != mainSeg && _segments[i].isActive()) isMultipleSegs = true;
+    }
+    if (!isMultipleSegs) {
+      _segments[mainSeg].start = 0; _segments[mainSeg].stop = _length;
+    } else {
+      //there are multiple segments, leave them, but prune length to total
+      for (uint8_t i = 0; i < MAX_NUM_SEGMENTS; i++)
+      {
+        if (_segments[i].start > _length) _segments[i].stop = 0;
+        if (_segments[i].stop > _length) _segments[i].stop = _length;
+      }
+    }
  }
 }

--- a/wled00/cfg.cpp
+++ b/wled00/cfg.cpp
@ -202,6 +202,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
  JsonObject light = doc[F("light")];
  CJSON(briMultiplier, light[F("scale-bri")]);
  CJSON(strip.paletteBlend, light[F("pal-mode")]);
+  CJSON(autoSegments, light[F("aseg")]);

  float light_gc_bri = light["gc"]["bri"];
  float light_gc_col = light["gc"]["col"]; // 2.8
@ -565,6 +566,7 @@ void serializeConfig() {
  JsonObject light = doc.createNestedObject(F("light"));
  light[F("scale-bri")] = briMultiplier;
  light[F("pal-mode")] = strip.paletteBlend;
+  light[F("aseg")] = autoSegments;

  JsonObject light_gc = light.createNestedObject("gc");
  light_gc["bri"] = (strip.gammaCorrectBri) ? 2.8 : 1.0;
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@ -369,7 +369,9 @@ Reverse (rotated 180°): <input type="checkbox" name="CV${i}">
    <div id="ledwarning" style="color: orange; display: none;">
      &#9888; You might run into stability or lag issues.<br>
      Use less than <span id="wreason">800 LEDs per pin</span> for the best experience!<br>
-    </div><hr style="width:260px">
+    </div>
+    Make a segment for each output: <input type="checkbox" name="MS"> <br>
+    <hr style="width:260px">
    <div id="btns"></div>
    Touch threshold: <input type="number" class="s" min="0" max="100" name="TT" required><br>
    IR pin: <input type="number" class="xs" min="-1" max="40" name="IR" onchange="UI()">&nbsp;<select name="IT" onchange="UI()">
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@ -113,7 +113,8 @@ id="dbar"
 style="display:inline-block;width:100px;height:10px;border-radius:20px"></div>
 <br><div id="ledwarning" style="color:orange;display:none">
 &#9888; You might run into stability or lag issues.<br>Use less than <span 
-id="wreason">800 LEDs per pin</span> for the best experience!<br></div><hr 
+id="wreason">800 LEDs per pin</span> for the best experience!<br></div>
+Make a segment for each output: <input type="checkbox" name="MS"><br><hr 
 style="width:260px"><div id="btns"></div>Touch threshold: <input type="number" 
 class="s" min="0" max="100" name="TT" required><br>IR pin: <input type="number" 
 class="xs" min="-1" max="40" name="IR" onchange="UI()">&nbsp;<select name="IT" 
--- a/wled00/hue.cpp
+++ b/wled00/hue.cpp
@ -119,7 +119,7 @@ void onHueData(void* arg, AsyncClient* client, void *data, size_t len)
      const char* apikey = root[0][F("success")][F("username")];
      if (apikey != nullptr && strlen(apikey) < sizeof(hueApiKey))
      {
-        strcpy(hueApiKey, apikey);
+        strlcpy(hueApiKey, apikey, sizeof(hueApiKey));
        hueAuthRequired = false;
        hueNewKey = true;
      }
--- a/wled00/mqtt.cpp
+++ b/wled00/mqtt.cpp
@ -26,21 +26,21 @@ void onMqttConnect(bool sessionPresent)
  char subuf[38];

  if (mqttDeviceTopic[0] != 0) {
-    strcpy(subuf, mqttDeviceTopic);
+    strlcpy(subuf, mqttDeviceTopic, 33);
    mqtt->subscribe(subuf, 0);
    strcat_P(subuf, PSTR("/col"));
    mqtt->subscribe(subuf, 0);
-    strcpy(subuf, mqttDeviceTopic);
+    strlcpy(subuf, mqttDeviceTopic, 33);
    strcat_P(subuf, PSTR("/api"));
    mqtt->subscribe(subuf, 0);
  }

  if (mqttGroupTopic[0] != 0) {
-    strcpy(subuf, mqttGroupTopic);
+    strlcpy(subuf, mqttGroupTopic, 33);
    mqtt->subscribe(subuf, 0);
    strcat_P(subuf, PSTR("/col"));
    mqtt->subscribe(subuf, 0);
-    strcpy(subuf, mqttGroupTopic);
+    strlcpy(subuf, mqttGroupTopic, 33);
    strcat_P(subuf, PSTR("/api"));
    mqtt->subscribe(subuf, 0);
  }
@ -122,22 +122,22 @@ void publishMqtt()
  char subuf[38];

  sprintf_P(s, PSTR("%u"), bri);
-  strcpy(subuf, mqttDeviceTopic);
+  strlcpy(subuf, mqttDeviceTopic, 33);
  strcat_P(subuf, PSTR("/g"));
  mqtt->publish(subuf, 0, true, s);

  sprintf_P(s, PSTR("#%06X"), (col[3] << 24) | (col[0] << 16) | (col[1] << 8) | (col[2]));
-  strcpy(subuf, mqttDeviceTopic);
+  strlcpy(subuf, mqttDeviceTopic, 33);
  strcat_P(subuf, PSTR("/c"));
  mqtt->publish(subuf, 0, true, s);

-  strcpy(subuf, mqttDeviceTopic);
+  strlcpy(subuf, mqttDeviceTopic, 33);
  strcat_P(subuf, PSTR("/status"));
  mqtt->publish(subuf, 0, true, "online");

  char apires[1024];
  XML_response(nullptr, apires);
-  strcpy(subuf, mqttDeviceTopic);
+  strlcpy(subuf, mqttDeviceTopic, 33);
  strcat_P(subuf, PSTR("/v"));
  mqtt->publish(subuf, 0, false, apires);
 }
@ -167,7 +167,7 @@ bool initMqtt()
  mqtt->setClientId(mqttClientID);
  if (mqttUser[0] && mqttPass[0]) mqtt->setCredentials(mqttUser, mqttPass);

-  strcpy(mqttStatusTopic, mqttDeviceTopic);
+  strlcpy(mqttStatusTopic, mqttDeviceTopic, 33);
  strcat_P(mqttStatusTopic, PSTR("/status"));
  mqtt->setWill(mqttStatusTopic, 0, true, "offline");
  mqtt->setKeepAlive(MQTT_KEEP_ALIVE_TIME);
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@ -95,6 +95,8 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
    uint16_t length, start;
    uint8_t pins[5] = {255, 255, 255, 255, 255};

+    autoSegments = request->hasArg(F("MS"));
+
    for (uint8_t s = 0; s < WLED_MAX_BUSSES; s++) {
      char lp[4] = "L0"; lp[2] = 48+s; lp[3] = 0; //ascii 0-9 //strip data pin
      char lc[4] = "LC"; lc[2] = 48+s; lc[3] = 0; //strip length
@ -327,7 +329,7 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
    analogClockSecondsTrail = request->hasArg(F("OS"));

    #ifndef WLED_DISABLE_CRONIXIE
-    strcpy(cronixieDisplay,request->arg(F("CX")).c_str());
+    strlcpy(cronixieDisplay,request->arg(F("CX")).c_str(),7);
    cronixieBacklight = request->hasArg(F("CB"));
    #endif
    countdownMode = request->hasArg(F("CE"));
--- a/wled00/wled.h
+++ b/wled00/wled.h
@ -8,7 +8,7 @@
 */

 // version code in format yymmddb (b = daily build)
-#define VERSION 2108250
+#define VERSION 2109100

 //uncomment this if you have a "my_config.h" file you'd like to use
 //#define WLED_USE_MY_CONFIG
@ -267,6 +267,11 @@ WLED_GLOBAL uint16_t ledCount _INIT(DEFAULT_LED_COUNT);   // overcurrent prevent
 WLED_GLOBAL bool turnOnAtBoot _INIT(true);                // turn on LEDs at power-up
 WLED_GLOBAL byte bootPreset   _INIT(0);                   // save preset to load after power-up

+//if true, a segment per bus will be created on boot and LED settings save
+//if false, only one segment spanning the total LEDs is created,
+//but not on LED settings save if there is more than one segment currently
+WLED_GLOBAL bool autoSegments _INIT(false);
+
 WLED_GLOBAL byte col[]    _INIT_N(({ 255, 160, 0, 0 }));  // current RGB(W) primary color. col[] should be updated if you want to change the color.
 WLED_GLOBAL byte colSec[] _INIT_N(({ 0, 0, 0, 0 }));      // current RGB(W) secondary color
 WLED_GLOBAL byte briS     _INIT(128);                     // default brightness
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@ -322,6 +322,7 @@ void getSettingsJS(byte subPage, char* dest)
    oappend(";");

    sappend('v',SET_F("LC"),ledCount);
+    sappend('c',SET_F("MS"),autoSegments);

    for (uint8_t s=0; s < busses.getNumBusses(); s++) {
      Bus* bus = busses.getBus(s);