[P165] Add plugin Display - NeoPixel (7-segment)

src/_P165_7SegNeopixel.ino

@@ -6,6 +6,8 @@
 // #######################################################################################################
 
 /** Changelog:
+ * 2024-09-01 tonhuisman: Fixing some bugs/typos: g-split was enabled for width-pixels > 1, P073 font characters must have 7 bits reverted.
+ *                        7groupcolor wasn't handling arguments correctly. Restoring groupcolor after digitcolor fixed.
  * 2024-08-31 tonhuisman: Apply Device[].PinXDirection feature so only an output-capable GPIO can be selected for the Strip
  * 2024-08-29 tonhuisman: Add Counter-clockwise numbering option pe group. Enable GroupColor and DigitColor features also fog
  *                        LIMIT_BUILD_SIZE builds, as the ESP8266 NeoPixel builds still have enough space available.

src/src/PluginStructs/P073_data_struct.cpp

@@ -134,6 +134,20 @@ void P073_font_selector(const __FlashStringHelper *id, int16_t value) {
 
 # endif // ifdef P073_EXTRA_FONTS
 
+/**
+ * This function reverts the 7 databits/segmentbits so TM1637 and 74HC595 displays work with fonts designed for MAX7219.
+ * Dot/colon bit is still bit 8
+ */
+uint8_t P073_revert7bits(uint8_t character) {
+  uint8_t newCharacter = character & 0x80; // Keep dot-bit if passed in
+
+  for (int b = 0; b < 7; ++b) {
+    if (character & (0x01 << b)) {
+      newCharacter |= (0x40 >> b);
+    }
+  }
+  return newCharacter;
+}
 // FIXME End of part to merge from PR #5091
 
 void P073_data_struct::init(struct EventStruct *event)

src/src/PluginStructs/P073_data_struct.h

@@ -154,6 +154,7 @@ void    P073_display_output_selector(const __FlashStringHelper *id,
 void    P073_font_selector(const __FlashStringHelper *id,
                            int16_t                    value);
 # endif // ifdef P073_EXTRA_FONTS
+uint8_t P073_revert7bits(uint8_t character);
 // FIXME End of part to merge from PR #5091
 
 struct P073_data_struct : public PluginTaskData_base {

src/src/PluginStructs/P165_data_struct.cpp

@@ -1061,7 +1061,7 @@ void P165_data_struct::fillSegmentBitmap(const uint8_t       grp,
   const uint8_t hpx = pixCfg.wpix + (pixCfg.crnr ? 2 : 0); // Overlapping pixels checked on horizontal segments
   const uint8_t vpx = pixCfg.hpix;                         // Vertical pixels = height pixels
   // smap: Determine the segment(part) order
-  const uint8_t smap = (pixCfg.strt ? 2 : 0) + (pixCfg.dend ? 1 : 0) + (pixCfg.wpix > pixCfg.splt ? 4 : 0) + (pixCfg.cclkw ? 8 : 0);
+  const uint8_t smap = (pixCfg.strt ? 2 : 0) + (pixCfg.dend ? 1 : 0) + (pixCfg.splt ? 4 : 0) + (pixCfg.cclkw ? 8 : 0);
   const uint8_t rh   = hpx / 2;                            // Horizontal half part, right
   const uint8_t lh   = hpx - rh;                           // Horizontal half part, left
 
@@ -1416,7 +1416,7 @@ bool P165_data_struct::plugin_write(struct EventStruct *event,
     case p165_commands_e::c7digitcolor: // 7digitcolor,grp,dgt,[-|fg_r,fg_g,fg_b[,fg_w][,bg_r,bg_g,bg_b[,bg_w]]]
     # endif // if P165_FEATURE_DIGITCOLOR
     # if P165_FEATURE_GROUPCOLOR
-    case p165_commands_e::c7groupcolor: // 7digitcolor,grp,[-|fg_r,fg_g,fg_b[,fg_w][,bg_r,bg_g,bg_b[,bg_w]]]
+    case p165_commands_e::c7groupcolor: // 7groupcolor,grp,[-|fg_r,fg_g,fg_b[,fg_w][,bg_r,bg_g,bg_b[,bg_w]]]
     # endif // if P165_FEATURE_GROUPCOLOR
     # if P165_FEATURE_DIGITCOLOR || P165_FEATURE_GROUPCOLOR
     {
@@ -1439,7 +1439,7 @@ bool P165_data_struct::plugin_write(struct EventStruct *event,
         grp = event->Par1;
       }
 
-      if ((grp > 0) && (grpColor || ((event->Par2 > 0) && (event->Par2 <= _pixelGroupCfg[grp - 1].dgts)))) {
+      if ((grp > 0) && !grpColor && ((event->Par2 > 0) && (event->Par2 <= _pixelGroupCfg[grp - 1].dgts))) {
         dgt = event->Par2;
       }
 
@@ -1451,7 +1451,8 @@ bool P165_data_struct::plugin_write(struct EventStruct *event,
       const uint16_t grp200dgt = 0x200 + (grp << 4) + (dgt - 1);
       const uint16_t grp300    = 0x300 + (grp << 4);
       const uint16_t grp400    = 0x400 + (grp << 4);
-      const String   par4      = parseString(string, 4);
+      const uint8_t  parIdx    = grpColor ? 3 : 4;
+      const String   par4      = parseString(string, parIdx);
 
       // Next argument: delete digit/groupcolor?
       if (equals(par4, F("-"))) {                                  // use dash to remove a digit/group color setting
@@ -1467,7 +1468,7 @@ bool P165_data_struct::plugin_write(struct EventStruct *event,
         }
         success = true;
       } else
-      if (parseRGBWColors(parseStringToEnd(string, 4), rgbW, fgColor, bgColor, fgSet, bgSet)) {
+      if (parseRGBWColors(parseStringToEnd(string, parIdx), rgbW, fgColor, bgColor, fgSet, bgSet)) {
         if (fgSet) {
           auto it = digitColors.find(grpColor ? grp300 : grp100dgt);     // fg color
 
@@ -1935,7 +1936,7 @@ void P165_data_struct::writeCharacterToDisplay(uint8_t group, uint8_t digit, uin
     # endif // if P165_FEATURE_P073
     character
     # if P165_FEATURE_P073 // Use P073 7-segment fonts and buffer content when available
-    : P073_getFontChar(character, _fontset)
+    : P073_revert7bits(P073_getFontChar(character, _fontset))
     # endif // if P165_FEATURE_P073
   ;
 
@@ -1969,6 +1970,8 @@ void P165_data_struct::writeBufferToDisplay(uint8_t group) {
   # endif // if P165_DEBUG_DEBUG
 
   for (uint8_t grp = from; grp < to; ++grp) {
+    uint32_t fgColor = AdaGFXrgb565ToRgb888(_fgColor);
+    uint32_t bgColor = AdaGFXrgb565ToRgb888(_bgColor);
     # if P165_FEATURE_GROUPCOLOR
     bool fgColorGrp       = false;
     bool bgColorGrp       = false;
@@ -1977,13 +1980,15 @@ void P165_data_struct::writeBufferToDisplay(uint8_t group) {
     auto itgrp            = digitColors.find(grp300); // fg color
 
     if (itgrp != digitColors.end()) {
-      display[grp]->setColorFont(itgrp->second);
+      fgColor = itgrp->second;
+      display[grp]->setColorFont(fgColor);
       fgColorGrp = true;
     }
     itgrp = digitColors.find(grp400); // bg color
 
     if (itgrp != digitColors.end()) {
-      display[grp]->setColorBack(itgrp->second);
+      bgColor = itgrp->second;
+      display[grp]->setColorBack(bgColor);
       bgColorGrp = true;
     }
     # endif // if P165_FEATURE_GROUPCOLOR
@@ -2022,11 +2027,11 @@ void P165_data_struct::writeBufferToDisplay(uint8_t group) {
 
       // Restore global colors
       if (fgColorSet) {
-        display[grp]->setColorFont(AdaGFXrgb565ToRgb888(_fgColor));
+        display[grp]->setColorFont(fgColor);
       }
 
       if (bgColorSet) {
-        display[grp]->setColorBack(AdaGFXrgb565ToRgb888(_bgColor));
+        display[grp]->setColorBack(bgColor);
       }
       # endif // if P165_FEATURE_DIGITCOLOR
 

static/espeasy.js

@@ -5,9 +5,9 @@
 var commonAtoms = ["And", "Or"];
 var commonKeywords = ["If", "Else", "Elseif", "Endif"];
 var commonCommands = ["AccessInfo", "Background", "Build", "ClearAccessBlock", "ClearRTCam", "Config", "ControllerDisable",
-  "ControllerEnable", "DateTime", "Debug", "Dec", "DeepSleep", "DisablePriorityTask", "DNS", "DST", "EraseSDKWiFi", "ExecuteRules", "Gateway", "I2Cscanner", "Inc",
+  "ControllerEnable", "DateTime", "Debug", "Dec", "DeepSleep", "DisablePriorityTask", "DNS", "DST", "EraseSDKWiFi", "ExecuteRules", "FactoryReset", "Gateway", "I2Cscanner", "Inc",
   "IP", "Let", "Load", "LogEntry", "LogPortStatus", "LoopTimerSet", "LoopTimerSet_ms", "MemInfo", "MemInfoDetail", "Name", "Password", "PostToHTTP", "Publish", "PublishR",
-  "Reboot", "Reset", "Save", "SendTo", "SendToHTTP", "SendToUDP", "Settings", "Subnet", "Subscribe", "TaskClear", "TaskClearAll",
+  "Reboot", "Save", "SendTo", "SendToHTTP", "SendToUDP", "Settings", "Subnet", "Subscribe", "TaskClear", "TaskClearAll",
   "TaskDisable", "TaskEnable", "TaskRun", "TaskValueSet", "TaskValueSetAndRun", "TimerPause", "TimerResume", "TimerSet", "TimerSet_ms", "TimeZone",
   "UdpPort", "UdpTest", "Unit", "UseNTP", "WdConfig", "WdRead", "WiFi", "WiFiAllowAP", "WiFiAPMode", "WiFiConnect", "WiFiDisconnect", "WiFiKey",
   "WiFiKey2", "WiFiMode", "WiFiScan", "WiFiSSID", "WiFiSSID2", "WiFiSTAMode",