Hd108 (#798)

src/internal/features/DotStarL4ByteFeature.h

@@ -1,5 +1,5 @@
 /*-------------------------------------------------------------------------
-DotStarL4Feature provides feature base class to describe color order for
+DotStarL4ByteFeature provides feature base class to describe color order for
   3 color but 4 byte features when used with DotStars, exposing Luminance as W
 
 Written by Michael C. Miller.
@@ -27,7 +27,7 @@ License along with NeoPixel.  If not, see
 #pragma once
 
 template <uint8_t V_IC_1, uint8_t V_IC_2, uint8_t V_IC_3>
-class DotStarL4Feature :
+class DotStarL4ByteFeature :
     public NeoByteElements<4, RgbwColor, uint32_t>
 {
 public:

src/internal/features/DotStarL4WordFeature.h

@@ -0,0 +1,89 @@
+/*-------------------------------------------------------------------------
+DotStarL4WordFeature provides feature base class to describe color order for
+  3 color but 4 byte features when used with DotStars, exposing Luminance as W
+
+Written by Michael C. Miller.
+
+I invest time and resources providing this open source code,
+please support me by dontating (see https://github.com/Makuna/NeoPixelBus)
+
+-------------------------------------------------------------------------
+This file is part of the Makuna/NeoPixelBus library.
+
+NeoPixelBus is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation, either version 3 of
+the License, or (at your option) any later version.
+
+NeoPixelBus is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with NeoPixel.  If not, see
+<http://www.gnu.org/licenses/>.
+-------------------------------------------------------------------------*/
+#pragma once
+
+template <uint8_t V_IC_1, uint8_t V_IC_2, uint8_t V_IC_3>
+class DotStarL4WordFeature :
+    public NeoWordElements<8, Rgbw64Color, uint32_t>
+{
+public:
+    static void applyPixelColor(uint8_t* pPixels, uint16_t indexPixel, ColorObject color)
+    {
+        uint8_t* p = getPixelAddress(pPixels, indexPixel);
+
+        uint8_t brightness = (color.W < 31 ? color.W : 31);
+
+        // upper bit is always 1 and three 5 bit brightness
+        // {1}{5}{5}{5}
+        // 1rrr rrgg gggb bbbb
+        *p++ = 0x80 | (brightness << 2) | (brightness > 3);  
+        *p++ = (brightness << 5) | (brightness);
+
+        // due to endianness the byte order must be copied to output
+        *p++ = color[V_IC_1] >> 8;
+        *p++ = color[V_IC_1] & 0xff;
+        *p++ = color[V_IC_2] >> 8;
+        *p++ = color[V_IC_2] & 0xff;
+        *p++ = color[V_IC_3] >> 8;
+        *p = color[V_IC_3] & 0xff;
+    }
+
+    static ColorObject retrievePixelColor(const uint8_t* pPixels, uint16_t indexPixel)
+    {
+        ColorObject color;
+        const uint8_t* p = getPixelAddress(pPixels, indexPixel);
+
+        p++; // ignore the first byte
+        color.W = (*p++) & 0x1F; // mask out all but lower five bits
+
+        // due to endianness the byte order must be copied to output
+        color[V_IC_1] = (static_cast<uint16_t>(*p++) << 8);
+        color[V_IC_1] |= *p++;
+        color[V_IC_2] = (static_cast<uint16_t>(*p++) << 8);
+        color[V_IC_2] |= *p++;
+        color[V_IC_3] = (static_cast<uint16_t>(*p++) << 8);
+        color[V_IC_3] |= *p;
+
+        return color;
+    }
+
+    static ColorObject retrievePixelColor_P(PGM_VOID_P pPixels, uint16_t indexPixel)
+    {
+        ColorObject color;
+        const uint16_t* p = reinterpret_cast<const uint16_t*>(getPixelAddress(reinterpret_cast<const uint8_t*>(pPixels), indexPixel));
+
+        // PROGMEM unit of storage expected to be the same size as color element
+        //    so no endianness issues to worry about
+        color.W = pgm_read_word(p++) & 0x001F; // mask out all but lower five bits
+        color[V_IC_1] = pgm_read_word(p++);
+        color[V_IC_2] = pgm_read_word(p++);
+        color[V_IC_3] = pgm_read_word(p);
+
+        return color;
+    }
+
+};

src/internal/features/DotStarLrgbFeatures.h

@@ -26,40 +26,51 @@ License along with NeoPixel.  If not, see
 -------------------------------------------------------------------------*/
 #pragma once
 
+// Byte features
 class DotStarLrgbFeature : 
-    public DotStarL4Feature<ColorIndexR, ColorIndexG, ColorIndexB>,
+    public DotStarL4ByteFeature<ColorIndexR, ColorIndexG, ColorIndexB>,
     public NeoElementsNoSettings
 {
 };
 
 class DotStarLrbgFeature :
-    public DotStarL4Feature<ColorIndexR, ColorIndexB, ColorIndexG>,
+    public DotStarL4ByteFeature<ColorIndexR, ColorIndexB, ColorIndexG>,
     public NeoElementsNoSettings
 {
 };
 
 
 class DotStarLgrbFeature :
-    public DotStarL4Feature<ColorIndexG, ColorIndexR, ColorIndexB>,
+    public DotStarL4ByteFeature<ColorIndexG, ColorIndexR, ColorIndexB>,
     public NeoElementsNoSettings
 {
 };
 
 class DotStarLgbrFeature :
-    public DotStarL4Feature<ColorIndexG, ColorIndexB, ColorIndexR>,
+    public DotStarL4ByteFeature<ColorIndexG, ColorIndexB, ColorIndexR>,
     public NeoElementsNoSettings
 {
 };
 
 
 class DotStarLbrgFeature :
-    public DotStarL4Feature<ColorIndexB, ColorIndexR, ColorIndexG>,
+    public DotStarL4ByteFeature<ColorIndexB, ColorIndexR, ColorIndexG>,
     public NeoElementsNoSettings
 {
 };
 
 class DotStarLbgrFeature :
-    public DotStarL4Feature<ColorIndexB, ColorIndexG, ColorIndexR>,
+    public DotStarL4ByteFeature<ColorIndexB, ColorIndexG, ColorIndexR>,
     public NeoElementsNoSettings
 {
-};
+};
+
+// Word features
+
+class DotStarLbgr64Feature :
+    public DotStarL4WordFeature<ColorIndexB, ColorIndexG, ColorIndexR>,
+    public NeoElementsNoSettings
+{
+};
+
+typedef DotStarLbgr64Feature Hd108LbgrFeature;

src/internal/features/DotStarRgbFeatures.h

@@ -26,40 +26,52 @@ License along with NeoPixel.  If not, see
 -------------------------------------------------------------------------*/
 #pragma once
 
+// Byte features
+
 class DotStarRgbFeature :
-    public DotStarX4Feature<ColorIndexR, ColorIndexG, ColorIndexB>,
+    public DotStarX4ByteFeature<ColorIndexR, ColorIndexG, ColorIndexB>,
     public NeoElementsNoSettings
 {
 };
 
 class DotStarRbgFeature :
-    public DotStarX4Feature<ColorIndexR, ColorIndexB, ColorIndexG>,
+    public DotStarX4ByteFeature<ColorIndexR, ColorIndexB, ColorIndexG>,
     public NeoElementsNoSettings
 {
 };
 
 
 class DotStarGbrFeature :
-    public DotStarX4Feature<ColorIndexG, ColorIndexB, ColorIndexR>,
+    public DotStarX4ByteFeature<ColorIndexG, ColorIndexB, ColorIndexR>,
     public NeoElementsNoSettings
 {
 };
 
 class DotStarGrbFeature :
-    public DotStarX4Feature<ColorIndexG, ColorIndexR, ColorIndexB>,
+    public DotStarX4ByteFeature<ColorIndexG, ColorIndexR, ColorIndexB>,
     public NeoElementsNoSettings
 {
 };
 
 
 class DotStarBrgFeature :
-    public DotStarX4Feature<ColorIndexB, ColorIndexR, ColorIndexG>,
+    public DotStarX4ByteFeature<ColorIndexB, ColorIndexR, ColorIndexG>,
     public NeoElementsNoSettings
 {
 };
 
 class DotStarBgrFeature :
-    public DotStarX4Feature<ColorIndexB, ColorIndexG, ColorIndexR>,
+    public DotStarX4ByteFeature<ColorIndexB, ColorIndexG, ColorIndexR>,
     public NeoElementsNoSettings
 {
 };
+
+// Word features
+
+class DotStarBgr48Feature :
+    public DotStarX4WordFeature<ColorIndexB, ColorIndexG, ColorIndexR>,
+    public NeoElementsNoSettings
+{
+};
+
+typedef DotStarBgr48Feature Hd108BgrFeature;

src/internal/features/DotStarX4ByteFeature.h

@@ -1,5 +1,5 @@
 /*-------------------------------------------------------------------------
-DotStarX4Feature provides feature base class to describe color order for
+DotStarX4ByteFeature provides feature base class to describe color order for
   3 color but 4 byte features when used with DotStars
 
 Written by Michael C. Miller.
@@ -27,7 +27,7 @@ License along with NeoPixel.  If not, see
 #pragma once
 
 template <uint8_t V_IC_1, uint8_t V_IC_2, uint8_t V_IC_3>
-class DotStarX4Feature :
+class DotStarX4ByteFeature :
     public NeoByteElements<4, RgbColor, uint32_t>
 {
 public:

src/internal/features/DotStarX4WordFeature.h

@@ -0,0 +1,83 @@
+/*-------------------------------------------------------------------------
+DotStarX4WordFeature provides feature base class to describe color order for
+  3 color but 4 byte features when used with DotStars
+
+Written by Michael C. Miller.
+
+I invest time and resources providing this open source code,
+please support me by dontating (see https://github.com/Makuna/NeoPixelBus)
+
+-------------------------------------------------------------------------
+This file is part of the Makuna/NeoPixelBus library.
+
+NeoPixelBus is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation, either version 3 of
+the License, or (at your option) any later version.
+
+NeoPixelBus is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with NeoPixel.  If not, see
+<http://www.gnu.org/licenses/>.
+-------------------------------------------------------------------------*/
+#pragma once
+
+template <uint8_t V_IC_1, uint8_t V_IC_2, uint8_t V_IC_3>
+class DotStarX4WordFeature :
+    public NeoWordElements<8, Rgb48Color, uint32_t>
+{
+public:
+    static void applyPixelColor(uint8_t* pPixels, uint16_t indexPixel, ColorObject color)
+    {
+        uint8_t* p = getPixelAddress(pPixels, indexPixel);
+
+        *p++ = 0xff; // upper bit is always 1 and three 5 bit brightness at max
+        *p++ = 0xff; // {1}{5}{5}{5}
+        // due to endianness the byte order must be copied to output
+        *p++ = color[V_IC_1] >> 8;
+        *p++ = color[V_IC_1] & 0xff;
+        *p++ = color[V_IC_2] >> 8;
+        *p++ = color[V_IC_2] & 0xff;
+        *p++ = color[V_IC_3] >> 8;
+        *p = color[V_IC_3] & 0xff;
+    }
+
+    static ColorObject retrievePixelColor(const uint8_t* pPixels, uint16_t indexPixel)
+    {
+        ColorObject color;
+        const uint8_t* p = getPixelAddress(pPixels, indexPixel);
+
+        p++; // ignore the first two bytes
+        p++;
+
+        // due to endianness the byte order must be copied to output
+        color[V_IC_1] = (static_cast<uint16_t>(*p++) << 8);
+        color[V_IC_1] |= *p++;
+        color[V_IC_2] = (static_cast<uint16_t>(*p++) << 8);
+        color[V_IC_2] |= *p++;
+        color[V_IC_3] = (static_cast<uint16_t>(*p++) << 8);
+        color[V_IC_3] |= *p;
+
+        return color;
+    }
+
+    static ColorObject retrievePixelColor_P(PGM_VOID_P pPixels, uint16_t indexPixel)
+    {
+        ColorObject color;
+        const uint16_t* p = reinterpret_cast<const uint16_t*>(getPixelAddress(reinterpret_cast<const uint8_t*>(pPixels), indexPixel));
+
+        // PROGMEM unit of storage expected to be the same size as color element
+        //    so no endianness issues to worry about
+        p++; // ignore the first word
+        color[V_IC_1] = pgm_read_word(p++);
+        color[V_IC_2] = pgm_read_word(p++);
+        color[V_IC_3] = pgm_read_word(p);
+
+        return color;
+    }
+
+};