Merge pull request #685 from pimoroni/feature/inky73-dither

Inky 7.3: Support dithering of arbitrary colours.

examples/interstate75/interstate75_rainbow.cpp

@@ -42,13 +42,10 @@ int main() {
 
   uint8_t hue_map[hub75.width][3];
   for(uint i = 0; i < hub75.width; i++) {
-    uint8_t r=0;
+    RGB p = RGB::from_hsv(i / (float) hub75.width, 1.0f, 0.7f);
-    uint8_t g=0;
+    hue_map[i][0] =  p.r;
-    uint8_t b=0;
+    hue_map[i][1] =  p.g;
-    graphics.from_hsv(i / (float) hub75.width, 1.0f, 0.7f, r, g, b);
+    hue_map[i][2] =  p.b;
-    hue_map[i][0] =  r;
-    hue_map[i][1] =  g;
-    hue_map[i][2] =  b;
   }
 
   hub75.start(dma_complete);

examples/pico_display_2/pico_display_2_demo.cpp

@@ -21,26 +21,6 @@ Button button_b(PicoDisplay2::B);
 Button button_x(PicoDisplay2::X);
 Button button_y(PicoDisplay2::Y);
 
-// HSV Conversion expects float inputs in the range of 0.00-1.00 for each channel
-// Outputs are rgb in the range 0-255 for each channel
-void from_hsv(float h, float s, float v, uint8_t &r, uint8_t &g, uint8_t &b) {
-  float i = floor(h * 6.0f);
-  float f = h * 6.0f - i;
-  v *= 255.0f;
-  uint8_t p = v * (1.0f - s);
-  uint8_t q = v * (1.0f - f * s);
-  uint8_t t = v * (1.0f - (1.0f - f) * s);
-
-  switch (int(i) % 6) {
-    case 0: r = v; g = t; b = p; break;
-    case 1: r = q; g = v; b = p; break;
-    case 2: r = p; g = v; b = t; break;
-    case 3: r = p; g = q; b = v; break;
-    case 4: r = t; g = p; b = v; break;
-    case 5: r = v; g = p; b = q; break;
-  }
-}
-
 int main() {
   st7789.set_backlight(255);
 
@@ -107,10 +87,10 @@ int main() {
 
     // Since HSV takes a float from 0.0 to 1.0 indicating hue,
     // then we can divide millis by the number of milliseconds
-    // we want a full colour cycle to take. 5000 = 5 sec.
+    // we want a full colour cycle to take. 5000 = 5 sec
-    uint8_t r = 0, g = 0, b = 0;
+    RGB p = RGB::from_hsv((float)millis() / 5000.0f, 1.0f, 0.5f + sinf(millis() / 100.0f / 3.14159f) * 0.5f);
-    from_hsv((float)millis() / 5000.0f, 1.0f, 0.5f + sinf(millis() / 100.0f / 3.14159f) * 0.5f, r, g, b);
+
-    led.set_rgb(r, g, b);
+    led.set_rgb(p.r, p.g, p.b);
 
 
     graphics.set_pen(WHITE);

examples/pico_enc_explorer/pico_enc_explorer.cpp

@@ -24,32 +24,11 @@ static const uint8_t STEPS_PER_REV = 24;
 BreakoutEncoder enc;
 bool toggle = false;
 
-// HSV Conversion expects float inputs in the range of 0.00-1.00 for each channel
-// Outputs are rgb in the range 0-255 for each channel
-void from_hsv(float h, float s, float v, uint8_t &r, uint8_t &g, uint8_t &b) {
-  float i = floor(h * 6.0f);
-  float f = h * 6.0f - i;
-  v *= 255.0f;
-  uint8_t p = v * (1.0f - s);
-  uint8_t q = v * (1.0f - f * s);
-  uint8_t t = v * (1.0f - (1.0f - f) * s);
-
-  switch (int(i) % 6) {
-    case 0: r = v; g = t; b = p; break;
-    case 1: r = q; g = v; b = p; break;
-    case 2: r = p; g = v; b = t; break;
-    case 3: r = p; g = q; b = v; break;
-    case 4: r = t; g = p; b = v; break;
-    case 5: r = v; g = p; b = q; break;
-  }
-}
-
 void count_changed(int16_t count) {
   printf("Count: %d\n", count);
   float h = (count % STEPS_PER_REV) / (float)STEPS_PER_REV;
-  uint8_t r, g, b;
+  RGB p = RGB::from_hsv(h, 1.0f, 1.0f);
-  from_hsv(h, 1.0f, 1.0f, r, g, b);
+  enc.set_led(p.r, p.g, p.b);
-  enc.set_led(r, g, b);
 
   graphics.set_pen(BLACK);
   graphics.clear();
@@ -58,7 +37,7 @@ void count_changed(int16_t count) {
     graphics.set_pen(RED);
     std::ostringstream ss;
     ss << "R = ";
-    ss << (int)r;
+    ss << (int)(p.r);
     std::string s(ss.str());
     graphics.text(s, Point(10, 10), 220, 6);
   }
@@ -67,7 +46,7 @@ void count_changed(int16_t count) {
     graphics.set_pen(GREEN);
     std::ostringstream ss;
     ss << "G = ";
-    ss << (int)g;
+    ss << (int)(p.g);
     std::string s(ss.str());
     graphics.text(s, Point(10, 70), 220, 6);
   }
@@ -76,7 +55,7 @@ void count_changed(int16_t count) {
     graphics.set_pen(BLUE);
     std::ostringstream ss;
     ss << "B = ";
-    ss << (int)b;
+    ss << (int)(p.b);
     std::string s(ss.str());
     graphics.text(s, Point(10, 130), 220, 6);
   }
@@ -84,12 +63,12 @@ void count_changed(int16_t count) {
   {
     // Shouldn't really use create_pen in-line.
     // In default (RGB332) palette mode this will lookup the nearest 8-bit colour
-    graphics.set_pen(graphics.create_pen(r, g, b));
+    graphics.set_pen(graphics.create_pen(p.r, p.g, p.b));
     std::ostringstream ss;
     ss << "#";
-    ss << std::uppercase << std::hex << std::setfill('0') << std::setw(2) << (int)r;
+    ss << std::uppercase << std::hex << std::setfill('0') << std::setw(2) << (int)(p.r);
-    ss << std::uppercase << std::hex << std::setfill('0') << std::setw(2) << (int)g;
+    ss << std::uppercase << std::hex << std::setfill('0') << std::setw(2) << (int)(p.g);
-    ss << std::uppercase << std::hex << std::setfill('0') << std::setw(2) << (int)b;
+    ss << std::uppercase << std::hex << std::setfill('0') << std::setw(2) << (int)(p.b);
     std::string s(ss.str());
     graphics.text(s, Point(10, 190), 220, 5);
   }

examples/pico_pot_explorer/pico_pot_explorer.cpp

@@ -24,26 +24,6 @@ I2C i2c(PICO_EXPLORER);
 BreakoutPotentiometer pot(&i2c);
 bool toggle = false;
 
-// HSV Conversion expects float inputs in the range of 0.00-1.00 for each channel
-// Outputs are rgb in the range 0-255 for each channel
-void from_hsv(float h, float s, float v, uint8_t &r, uint8_t &g, uint8_t &b) {
-  float i = floor(h * 6.0f);
-  float f = h * 6.0f - i;
-  v *= 255.0f;
-  uint8_t p = v * (1.0f - s);
-  uint8_t q = v * (1.0f - f * s);
-  uint8_t t = v * (1.0f - (1.0f - f) * s);
-
-  switch (int(i) % 6) {
-    case 0: r = v; g = t; b = p; break;
-    case 1: r = q; g = v; b = p; break;
-    case 2: r = p; g = v; b = t; break;
-    case 3: r = p; g = q; b = v; break;
-    case 4: r = t; g = p; b = v; break;
-    case 5: r = v; g = p; b = q; break;
-  }
-}
-
 int main() {
 #ifdef PICO_DEFAULT_LED_PIN
   gpio_init(PICO_DEFAULT_LED_PIN);
@@ -66,9 +46,8 @@ int main() {
       float percent = pot.read();
 
       printf("Percent: %d\n", (int)(percent * 100));
-      uint8_t r = 0, g = 0, b = 0;
+      RGB p = RGB::from_hsv(percent, 1.0f, 1.0f);
-      from_hsv(percent, 1.0f, 1.0f, r, g, b);
+      pot.set_led(p.r, p.g, p.b);
-      pot.set_led(r, g, b);
 
       graphics.set_pen(BLACK);
       graphics.clear();
@@ -77,7 +56,7 @@ int main() {
         graphics.set_pen(RED);
         std::ostringstream ss;
         ss << "R = ";
-        ss << (int)r;
+        ss << (int)(p.r);
         std::string s(ss.str());
         graphics.text(s, Point(10, 10), 220, 6);
       }
@@ -86,7 +65,7 @@ int main() {
         graphics.set_pen(GREEN);
         std::ostringstream ss;
         ss << "G = ";
-        ss << (int)g;
+        ss << (int)(p.g);
         std::string s(ss.str());
         graphics.text(s, Point(10, 70), 220, 6);
       }
@@ -95,7 +74,7 @@ int main() {
         graphics.set_pen(BLUE);
         std::ostringstream ss;
         ss << "B = ";
-        ss << (int)b;
+        ss << (int)(p.b);
         std::string s(ss.str());
         graphics.text(s, Point(10, 130), 220, 6);
       }
@@ -103,12 +82,12 @@ int main() {
       {
         // Shouldn't really use create_pen in-line.
         // In default (RGB332) palette mode this will lookup the nearest 8-bit colour
-        graphics.set_pen(graphics.create_pen(r, g, b));
+        graphics.set_pen(graphics.create_pen(p.r, p.g, p.b));
         std::ostringstream ss;
         ss << "#";
-        ss << std::uppercase << std::hex << std::setfill('0') << std::setw(2) << (int)r;
+        ss << std::uppercase << std::hex << std::setfill('0') << std::setw(2) << (int)(p.r);
-        ss << std::uppercase << std::hex << std::setfill('0') << std::setw(2) << (int)g;
+        ss << std::uppercase << std::hex << std::setfill('0') << std::setw(2) << (int)(p.g);
-        ss << std::uppercase << std::hex << std::setfill('0') << std::setw(2) << (int)b;
+        ss << std::uppercase << std::hex << std::setfill('0') << std::setw(2) << (int)(p.b);
         std::string s(ss.str());
         graphics.text(s, Point(10, 190), 220, 5);
       }

examples/pico_unicorn/demo.cpp

@@ -9,25 +9,6 @@ using namespace pimoroni;
 
 PicoUnicorn pico_unicorn;
 
-void from_hsv(float h, float s, float v, uint8_t &r, uint8_t &g, uint8_t &b) {
-    float i = floor(h * 6.0f);
-    float f = h * 6.0f - i;
-    v *= 255.0f;
-    uint8_t p = v * (1.0f - s);
-    uint8_t q = v * (1.0f - f * s);
-    uint8_t t = v * (1.0f - (1.0f - f) * s);
-
-    switch (int(i) % 6) {
-      case 0: r = v; g = t; b = p; break;
-      case 1: r = q; g = v; b = p; break;
-      case 2: r = p; g = v; b = t; break;
-      case 3: r = p; g = q; b = v; break;
-      case 4: r = t; g = p; b = v; break;
-      case 5: r = v; g = p; b = q; break;
-    }
-  }
-
-
 int main() {
 
   pico_unicorn.init();
@@ -46,21 +27,6 @@ int main() {
     if(pico_unicorn.is_pressed(pico_unicorn.X)) { x_pressed = true; }
     if(pico_unicorn.is_pressed(pico_unicorn.Y)) { y_pressed = true; }
 
-    /*
-    for(uint8_t y = 0; y < 7; y++) {
-      for(uint8_t x = 0; x < 16; x++) {
-        uint8_t r, g, b;
-        float h = float(x) / 63.0f + float(i) / 500.0f;
-        h = h - float(int(h));
-        float s = 1.0f;//(sin(float(i) / 200.0f) * 0.5f) + 0.5f;
-        float v = (float(y) / 8.0f) + 0.05f;
-        from_hsv(h, s, v, r, g, b);
-
-        pico_unicorn.set_pixel(x, y, r, g, b);
-        j = j + 1;
-      }
-    }*/
-
     pico_unicorn.clear();
 
     if(a_pressed & b_pressed & x_pressed & y_pressed) {

examples/tufty2040/tufty2040_drawing.cpp

@@ -43,26 +43,6 @@ uint32_t time() {
   return to_ms_since_boot(t);
 }
 
-// HSV Conversion expects float inputs in the range of 0.00-1.00 for each channel
-// Outputs are rgb in the range 0-255 for each channel
-void from_hsv(float h, float s, float v, uint8_t &r, uint8_t &g, uint8_t &b) {
-  float i = floor(h * 6.0f);
-  float f = h * 6.0f - i;
-  v *= 255.0f;
-  uint8_t p = v * (1.0f - s);
-  uint8_t q = v * (1.0f - f * s);
-  uint8_t t = v * (1.0f - (1.0f - f) * s);
-
-  switch (int(i) % 6) {
-    case 0: r = v; g = t; b = p; break;
-    case 1: r = q; g = v; b = p; break;
-    case 2: r = p; g = v; b = t; break;
-    case 3: r = p; g = q; b = v; break;
-    case 4: r = t; g = p; b = v; break;
-    case 5: r = v; g = p; b = q; break;
-  }
-}
-
 int main() {
   st7789.set_backlight(255);
 

libraries/pico_graphics/pico_graphics.cpp

@@ -4,24 +4,6 @@ namespace pimoroni {
 
   const uint8_t dither16_pattern[16] = {0, 8, 2, 10, 12, 4, 14, 6, 3, 11, 1, 9, 15, 7, 13, 5};
 
-  void PicoGraphics::from_hsv(float h, float s, float v, uint8_t &r, uint8_t &g, uint8_t &b) {
-      float i = floor(h * 6.0f);
-      float f = h * 6.0f - i;
-      v *= 255.0f;
-      uint8_t p = v * (1.0f - s);
-      uint8_t q = v * (1.0f - f * s);
-      uint8_t t = v * (1.0f - (1.0f - f) * s);
-
-      switch (int(i) % 6) {
-        case 0: r = v; g = t; b = p; break;
-        case 1: r = q; g = v; b = p; break;
-        case 2: r = p; g = v; b = t; break;
-        case 3: r = p; g = q; b = v; break;
-        case 4: r = t; g = p; b = v; break;
-        case 5: r = v; g = p; b = q; break;
-      }
-  }
-
   int PicoGraphics::update_pen(uint8_t i, uint8_t r, uint8_t g, uint8_t b) {return -1;};
   int PicoGraphics::reset_pen(uint8_t i) {return -1;};
   int PicoGraphics::create_pen(uint8_t r, uint8_t g, uint8_t b) {return -1;};

libraries/pico_graphics/pico_graphics.hpp

@@ -40,7 +40,30 @@ namespace pimoroni {
       r((__builtin_bswap16(c) & 0b1111100000000000) >> 8),
       g((__builtin_bswap16(c) & 0b0000011111100000) >> 3),
       b((__builtin_bswap16(c) & 0b0000000000011111) << 3) {}
+    constexpr RGB(uint c) :
+      r((c >> 16) & 0xff),
+      g((c >> 8) & 0xff),
+      b(c & 0xff) {}
     constexpr RGB(int16_t r, int16_t g, int16_t b) : r(r), g(g), b(b) {}
+  
+    static RGB from_hsv(float h, float s, float v) {
+      float i = floor(h * 6.0f);
+      float f = h * 6.0f - i;
+      v *= 255.0f;
+      uint8_t p = v * (1.0f - s);
+      uint8_t q = v * (1.0f - f * s);
+      uint8_t t = v * (1.0f - (1.0f - f) * s);
+
+      switch (int(i) % 6) {
+        case 0: return RGB(v, t, p);
+        case 1: return RGB(q, v, p);
+        case 2: return RGB(p, v, t);
+        case 3: return RGB(p, q, v);
+        case 4: return RGB(t, p, v);
+        case 5: return RGB(v, p, q);
+        default: return RGB(0, 0, 0);
+      }
+  }
 
     constexpr RGB  operator+ (const RGB& c) const {return RGB(r + c.r, g + c.g, b + c.b);}
     constexpr RGB& operator+=(const RGB& c) {r += c.r; g += c.g; b += c.b; return *this;}
@@ -267,7 +290,6 @@ namespace pimoroni {
     void polygon(const std::vector<Point> &points);
     void triangle(Point p1, Point p2, Point p3);
     void line(Point p1, Point p2);
-    void from_hsv(float h, float s, float v, uint8_t &r, uint8_t &g, uint8_t &b);
     void thick_line(Point p1, Point p2, uint thickness);
 
   protected:
@@ -312,7 +334,7 @@ namespace pimoroni {
   class PicoGraphics_Pen3Bit : public PicoGraphics {
     public:
       static const uint16_t palette_size = 8;
-      uint8_t color;
+      uint color;
       RGB palette[8] = {
         /*
         {0x2b, 0x2a, 0x37},
@@ -343,10 +365,13 @@ namespace pimoroni {
       void set_pen(uint c) override;
       void set_pen(uint8_t r, uint8_t g, uint8_t b) override;
       void set_thickness(uint t) override {};
+      int create_pen(uint8_t r, uint8_t g, uint8_t b) override;
+      int create_pen_hsv(float h, float s, float v) override;
 
       int get_palette_size() override {return palette_size;};
       RGB* get_palette() override {return palette;};
 
+      void _set_pixel(const Point &p, uint col);
       void set_pixel(const Point &p) override;
       void set_pixel_span(const Point &p, uint l) override;
       void get_dither_candidates(const RGB &col, const RGB *palette, size_t len, std::array<uint8_t, 16> &candidates);
@@ -513,7 +538,7 @@ namespace pimoroni {
 
   class PicoGraphics_PenInky7 : public PicoGraphics {
     public:
-      static const uint16_t palette_size = 8;
+      static const uint16_t palette_size = 7; // Taupe is unpredictable and greenish
       RGB palette[8] = {
         /*
         {0x2b, 0x2a, 0x37},
@@ -539,8 +564,7 @@ namespace pimoroni {
       bool cache_built = false;
       std::array<uint8_t, 16> candidates;
     
-      RGB src_color;
+      uint color;
-      RGB565 color;
       IDirectDisplayDriver<uint8_t> &driver;
 
       PicoGraphics_PenInky7(uint16_t width, uint16_t height, IDirectDisplayDriver<uint8_t> &direct_display_driver);
@@ -548,6 +572,7 @@ namespace pimoroni {
       void set_pen(uint8_t r, uint8_t g, uint8_t b) override;
       void set_thickness(uint t) override {};
       int create_pen(uint8_t r, uint8_t g, uint8_t b) override;
+      int create_pen_hsv(float h, float s, float v) override;
       void set_pixel(const Point &p) override;
       void set_pixel_span(const Point &p, uint l) override;
 

libraries/pico_graphics/pico_graphics_pen_3bit.cpp

@@ -10,12 +10,7 @@ namespace pimoroni {
         }
         cache_built = false;
     }
-    void PicoGraphics_Pen3Bit::set_pen(uint c) {
+    void PicoGraphics_Pen3Bit::_set_pixel(const Point &p, uint col) {
-        color = c & 0xf;
-    }
-    void PicoGraphics_Pen3Bit::set_pen(uint8_t r, uint8_t g, uint8_t b) {
-    }
-    void PicoGraphics_Pen3Bit::set_pixel(const Point &p) {
         uint offset = (bounds.w * bounds.h) / 8;
         uint8_t *buf = (uint8_t *)frame_buffer;
 
@@ -25,27 +20,48 @@ namespace pimoroni {
         uint8_t *bufB = bufA + offset;
         uint8_t *bufC = bufA + offset + offset;
 
-        uint8_t cA = (color & 0b100) >> 2;
+        uint8_t cA = (col & 0b100) >> 2;
         *bufA &= ~(1U << bo);
         *bufA |= (cA << bo);
 
-        uint8_t cB = (color & 0b010) >> 1;
+        uint8_t cB = (col & 0b010) >> 1;
         *bufB &= ~(1U << bo);
         *bufB |= (cB << bo);
 
-        uint8_t cC = (color & 0b001);
+        uint8_t cC = (col & 0b001);
         *bufC &= ~(1U << bo);
         *bufC |= (cC << bo);
     }
-
+    void PicoGraphics_Pen3Bit::set_pen(uint c) {
+        color = c;
+    }
+    void PicoGraphics_Pen3Bit::set_pen(uint8_t r, uint8_t g, uint8_t b) {
+        color = RGB(r, g, b).to_rgb888() | 0x7f000000;
+    }
+    int PicoGraphics_Pen3Bit::create_pen(uint8_t r, uint8_t g, uint8_t b) {
+        return RGB(r, g, b).to_rgb888() | 0x7f000000;
+    }
+    int PicoGraphics_Pen3Bit::create_pen_hsv(float h, float s, float v) {
+        return RGB::from_hsv(h, s, v).to_rgb888() | 0x7f000000;
+    }
+    void PicoGraphics_Pen3Bit::set_pixel(const Point &p) {
+        if ((color & 0x7f000000) == 0x7f000000) {
+            set_pixel_dither(p, RGB(color));
+        } else {
+            _set_pixel(p, color);
+        }
+    }
     void PicoGraphics_Pen3Bit::set_pixel_span(const Point &p, uint l) {
         Point lp = p;
         while(l--) {
-            set_pixel(lp);
+            if ((color & 0x7f000000) == 0x7f000000) {
+                set_pixel_dither(lp, RGB(color));
+            } else {
+                _set_pixel(lp, color);
+            }
             lp.x++;
         }
     }
-
     void PicoGraphics_Pen3Bit::get_dither_candidates(const RGB &col, const RGB *palette, size_t len, std::array<uint8_t, 16> &candidates) {
         RGB error;
         for(size_t i = 0; i < candidates.size(); i++) {
@@ -87,8 +103,7 @@ namespace pimoroni {
 
         // set the pixel
         //color = candidates[pattern[pattern_index]];
-        color = candidate_cache[cache_key][dither16_pattern[pattern_index]];
+        _set_pixel(p, candidate_cache[cache_key][dither16_pattern[pattern_index]]);
-        set_pixel(p);
     }
     void PicoGraphics_Pen3Bit::frame_convert(PenType type, conversion_callback_func callback) {
         if(type == PEN_P4) {

libraries/pico_graphics/pico_graphics_pen_inky7.cpp

@@ -7,17 +7,31 @@ namespace pimoroni {
       this->pen_type = PEN_INKY7;
   }
   void PicoGraphics_PenInky7::set_pen(uint c) {
-    color = c & 0x7;
+    color = c;
   }
   void PicoGraphics_PenInky7::set_pen(uint8_t r, uint8_t g, uint8_t b) {
+    color = RGB(r, g, b).to_rgb888() | 0x7f000000;
   }
   int PicoGraphics_PenInky7::create_pen(uint8_t r, uint8_t g, uint8_t b) {
-    return 0;
+    return RGB(r, g, b).to_rgb888() | 0x7f000000;
+  }
+  int PicoGraphics_PenInky7::create_pen_hsv(float h, float s, float v) {
+    return RGB::from_hsv(h, s, v).to_rgb888() | 0x7f000000;
   }
   void PicoGraphics_PenInky7::set_pixel(const Point &p) {
-    driver.write_pixel(p, color);
+    if ((color & 0x7f000000) == 0x7f000000) {
+      set_pixel_dither(p, RGB(color));
+    } else {
+      driver.write_pixel(p, color & 0x07);
+    }
   }
   void PicoGraphics_PenInky7::set_pixel_span(const Point &p, uint l) {
+    if ((color & 0x7f000000) == 0x7f000000) {
+      for(auto x = 0u; x < l; x++) {
+        set_pixel_dither(p + Point(x, 0), RGB(color));
+      }
+      return;
+    }
     driver.write_pixel_span(p, l, color);
   }
   void PicoGraphics_PenInky7::get_dither_candidates(const RGB &col, const RGB *palette, size_t len, std::array<uint8_t, 16> &candidates) {
@@ -60,8 +74,7 @@ namespace pimoroni {
 
     // set the pixel
     //color = candidates[pattern[pattern_index]];
-    color = candidate_cache[cache_key][dither16_pattern[pattern_index]];
+    driver.write_pixel(p, candidate_cache[cache_key][dither16_pattern[pattern_index]] & 0x07);
-    set_pixel(p);
   }
   void PicoGraphics_PenInky7::frame_convert(PenType type, conversion_callback_func callback) {
     if(type == PEN_INKY7) {

libraries/pico_graphics/pico_graphics_pen_p4.cpp

@@ -45,11 +45,8 @@ namespace pimoroni {
         return -1;
     }
     int PicoGraphics_PenP4::create_pen_hsv(float h, float s, float v) {
-        uint8_t r;
+        RGB p = RGB::from_hsv(h, s, v);
-        uint8_t g;
+        return create_pen(p.r, p.g, p.b);
-        uint8_t b;
-        from_hsv(h, s, v, r, g, b);
-        return create_pen(r, g, b);
     }
     int PicoGraphics_PenP4::reset_pen(uint8_t i) {
         palette[i] = {0, 0, 0};

libraries/pico_graphics/pico_graphics_pen_p8.cpp

@@ -40,11 +40,8 @@ namespace pimoroni {
         return -1;
     }
     int PicoGraphics_PenP8::create_pen_hsv(float h, float s, float v) {
-        uint8_t r;
+        RGB p = RGB::from_hsv(h, s, v);
-        uint8_t g;
+        return create_pen(p.r, p.g, p.b);
-        uint8_t b;
-        from_hsv(h, s, v, r, g, b);
-        return create_pen(r, g, b);
     }
     int PicoGraphics_PenP8::reset_pen(uint8_t i) {
         palette[i] = {0, 0, 0};

libraries/pico_graphics/pico_graphics_pen_rgb332.cpp

@@ -19,11 +19,7 @@ namespace pimoroni {
         return rgb_to_rgb332(r, g, b);
     }
     int PicoGraphics_PenRGB332::create_pen_hsv(float h, float s, float v) {
-        uint8_t r;
+        return RGB::from_hsv(h, s, v).to_rgb332();
-        uint8_t g;
-        uint8_t b;
-        from_hsv(h, s, v, r, g, b);
-        return rgb_to_rgb332(r, g, b);
     }
     void PicoGraphics_PenRGB332::set_pixel(const Point &p) {
         uint8_t *buf = (uint8_t *)frame_buffer;

libraries/pico_graphics/pico_graphics_pen_rgb565.cpp

@@ -19,11 +19,7 @@ namespace pimoroni {
         return RGB(r, g, b).to_rgb565();
     }
     int PicoGraphics_PenRGB565::create_pen_hsv(float h, float s, float v) {
-        uint8_t r;
+        return RGB::from_hsv(h, s, v).to_rgb565();
-        uint8_t g;
-        uint8_t b;
-        from_hsv(h, s, v, r, g, b);
-        return RGB(r, g, b).to_rgb565();
     }
     void PicoGraphics_PenRGB565::set_pixel(const Point &p) {
         uint16_t *buf = (uint16_t *)frame_buffer;

libraries/pico_graphics/pico_graphics_pen_rgb888.cpp

@@ -19,11 +19,7 @@ namespace pimoroni {
         return RGB(r, g, b).to_rgb888();
     }
     int PicoGraphics_PenRGB888::create_pen_hsv(float h, float s, float v) {
-        uint8_t r;
+        return RGB::from_hsv(h, s, v).to_rgb888();
-        uint8_t g;
-        uint8_t b;
-        from_hsv(h, s, v, r, g, b);
-        return RGB(r, g, b).to_rgb888();
     }
     void PicoGraphics_PenRGB888::set_pixel(const Point &p) {
         uint32_t *buf = (uint32_t *)frame_buffer;