Merge pull request wled#1771 from Aircoookie/mergedev_210222

Update dev

Author: Aircoookie

package-lock.json

@@ -30,7 +30,7 @@ default_envs = travis_esp8266, travis_esp32
 ; default_envs = d1_mini_5CH_Shojo_PCB
 ; default_envs = wemos_shield_esp32
 ; default_envs = m5atom
-; default_envs = esp32_poe
+; default_envs = esp32_eth
 
 src_dir  = ./wled00
 data_dir = ./wled00/data
@@ -279,12 +279,12 @@ lib_ignore =
   ESPAsyncTCP
   ESPAsyncUDP
 
-[env:esp32_poe]
+[env:esp32_eth]
 board = esp32-poe
 platform = [email protected]
 upload_speed = 921600
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags_esp32} -D RLYPIN=-1 -D WLED_USE_ETHERNET  -D BTNPIN=-1
+build_flags = ${common.build_flags_esp32} -D RLYPIN=-1 -D WLED_USE_ETHERNET -D BTNPIN=-1
 lib_ignore =
   ESPAsyncTCP
   ESPAsyncUDP

platformio.ini

@@ -11,7 +11,7 @@ default_envs = WLED_tasmota_1M
 board = esp01_1m
 platform = ${common.platform_wled_default}
 platform_packages = ${common.platform_packages}
-board_build.ldscript = ${common.ldscript_1m0m}
+board_build.ldscript = ${common.ldscript_1m128k}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp8266}
 ; *********************************************************************

platformio_override.ini.sample

@@ -10,7 +10,10 @@
 // OLED displays to provide a four line display
 // for WLED.
 //
-// This Usermod works best, by far, when coupled with RotaryEncoderUIUsermod.
+// Dependencies
+// * This usermod REQURES the ModeSortUsermod
+// * This Usermod works best, by far, when coupled 
+//   with RotaryEncoderUIUsermod.
 //
 // Make sure to enable NTP and set your time zone in WLED Config | Time.
 //
@@ -124,6 +127,9 @@ class FourLineDisplayUsermod : public Usermod {
 
     char lineBuffer[LINE_BUFFER_SIZE];
 
+    char **modes_qstrings = nullptr;
+    char **palettes_qstrings = nullptr;
+
     // If display does not work or looks corrupted check the
     // constructor reference:
     // https://github.com/olikraus/u8g2/wiki/u8x8setupcpp
@@ -140,6 +146,10 @@ class FourLineDisplayUsermod : public Usermod {
       u8x8.setContrast(10); //Contrast setup will help to preserve OLED lifetime. In case OLED need to be brighter increase number up to 255
       u8x8.setFont(u8x8_font_chroma48medium8_r);
       u8x8.DRAW_STRING(0, 0*LINE_HEIGHT, "Loading...");
+
+      ModeSortUsermod *modeSortUsermod = (ModeSortUsermod*) usermods.lookup(USERMOD_ID_MODE_SORT);
+      modes_qstrings = modeSortUsermod->getModesQStrings();
+      palettes_qstrings = modeSortUsermod->getPalettesQStrings();
     }
 
     // gets called every time WiFi is (re-)connected. Initialize own network
@@ -254,7 +264,7 @@ class FourLineDisplayUsermod : public Usermod {
       }
 
       // Third row with mode name
-      showCurrentEffectOrPalette(JSON_mode_names, 2, knownMode);
+      showCurrentEffectOrPalette(modes_qstrings[knownMode], 2);
 
       switch(lineThreeType) {
         case FLD_LINE_3_BRIGHTNESS:
@@ -270,7 +280,7 @@ class FourLineDisplayUsermod : public Usermod {
           u8x8.DRAW_STRING(1, 3*LINE_HEIGHT, lineBuffer);
           break;
         case FLD_LINE_3_PALETTE:
-          showCurrentEffectOrPalette(JSON_palette_names, 3, knownPalette);
+          showCurrentEffectOrPalette(palettes_qstrings[knownPalette], 3);
           break;
       }
 
@@ -289,35 +299,21 @@ class FourLineDisplayUsermod : public Usermod {
      * TODO: Should we cache the current effect and 
      * TODO: palette name? This seems expensive.
      */
-    void showCurrentEffectOrPalette(const char json[], uint8_t row, uint8_t desiredEntry) {
-      uint8_t qComma = 0;
-      bool insideQuotes = false;
-      // advance past the mark for markLineNum that may exist.
+    void showCurrentEffectOrPalette(char *qstring, uint8_t row) {
       uint8_t printedChars = 1;
       char singleJsonSymbol;
-
-      // Find the mode name in JSON
-      for (size_t i = 0; i < strlen_P(json); i++) {
-        singleJsonSymbol = pgm_read_byte_near(json + i);
-        switch (singleJsonSymbol) {
-        case '"':
-          insideQuotes = !insideQuotes;
-          break;
-        case '[':
-        case ']':
+      int i = 0;
+      while (true) {
+        singleJsonSymbol = pgm_read_byte_near(qstring + i);
+        if (singleJsonSymbol == '"' || singleJsonSymbol == '\0' ) {
           break;
-        case ',':
-          qComma++;
-        default:
-          if (!insideQuotes || (qComma != desiredEntry)) {
-            break;
-          }
-          u8x8.DRAW_GLYPH(printedChars, row * LINE_HEIGHT, singleJsonSymbol);
-          printedChars++;
         }
-        if ((qComma > desiredEntry) || (printedChars > u8x8.getCols() - 2)) {
+        u8x8.DRAW_GLYPH(printedChars, row * LINE_HEIGHT, singleJsonSymbol);
+        printedChars++;
+        if ( (printedChars > u8x8.getCols() - 2)) {
           break;
         }
+        i++;
       }
     }
 

usermods/usermod_v2_four_line_display/usermod_v2_four_line_display.h

@@ -0,0 +1,33 @@
+# Mode Sort
+
+v2 usermod that provides data about modes and
+palettes to other usermods. Notably it provides:
+* A direct method for a mode or palette name
+* Ability to retrieve mode and palette names in 
+  alphabetical order
+
+```char **getModesQStrings()```
+
+Provides an array of char* (pointers) to the names of the
+palettes within JSON_mode_names, in the same order as 
+JSON_mode_names. These strings end in double quote (")
+(or \0 if there is a problem).
+
+```byte *getModesAlphaIndexes()```
+
+An array of byte designating the indexes of names of the
+modes in alphabetical order. "Solid" will always remain 
+at the front of the list.
+
+```char **getPalettesQStrings()```
+
+Provides an array of char* (pointers) to the names of the
+palettes within JSON_palette_names, in the same order as 
+JSON_palette_names. These strings end in double quote (")
+(or \0 if there is a problem).
+
+```byte *getPalettesAlphaIndexes()```
+
+An array of byte designating the indexes of names of the
+palettes in alphabetical order. "Default" and those
+starting with "(" will always remain at the front of the list.