make pico_scanvideo better a little better at handling non RGB555

src/common/pico_scanvideo/include/pico/scanvideo/scanvideo_base.h

@@ -82,7 +82,7 @@ extern "C" {
 #endif
 
 #ifndef PICO_SCANVIDEO_COLOR_PIN_BASE
-#define PICO_SCANVIDEO_COLOR_PIN_BASE 1
+#define PICO_SCANVIDEO_COLOR_PIN_BASE 0
 #endif
 
 #ifndef PICO_SCANVIDEO_COLOR_PIN_COUNT
@@ -326,12 +326,28 @@ extern void scanvideo_default_configure_pio(pio_hw_t *pio, uint sm, uint offset,
 #define PICO_SPINLOCK_ID_VIDEO_IN_USE_LOCK 5
 #endif
 
+// note this is not necessarily an absolute gpio pin mask, it is still shifted by PICO_SCANVIDEO_COLOR_PIN_BASE
 #define PICO_SCANVIDEO_ALPHA_MASK (1u << PICO_SCANVIDEO_ALPHA_PIN)
+
+#ifndef PICO_SCANVIDEO_PIXEL_FROM_RGB8
 #define PICO_SCANVIDEO_PIXEL_FROM_RGB8(r, g, b) ((((b)>>3u)<<PICO_SCANVIDEO_PIXEL_BSHIFT)|(((g)>>3u)<<PICO_SCANVIDEO_PIXEL_GSHIFT)|(((r)>>3u)<<PICO_SCANVIDEO_PIXEL_RSHIFT))
+#endif
+
+#ifndef PICO_SCANVIDEO_PIXEL_FROM_RGB5
 #define PICO_SCANVIDEO_PIXEL_FROM_RGB5(r, g, b) (((b)<<PICO_SCANVIDEO_PIXEL_BSHIFT)|((g)<<PICO_SCANVIDEO_PIXEL_GSHIFT)|((r)<<PICO_SCANVIDEO_PIXEL_RSHIFT))
+#endif
+
+#ifndef PICO_SCANVIDEO_R5_FROM_PIXEL
 #define PICO_SCANVIDEO_R5_FROM_PIXEL(p) (((p)>>PICO_SCANVIDEO_PIXEL_RSHIFT)&0x1f)
+#endif
+
+#ifndef PICO_SCANVIDEO_G5_FROM_PIXEL
 #define PICO_SCANVIDEO_G5_FROM_PIXEL(p) (((p)>>PICO_SCANVIDEO_PIXEL_GSHIFT)&0x1f)
+#endif
+
+#ifndef PICO_SCANVIDEO_B5_FROM_PIXEL
 #define PICO_SCANVIDEO_B5_FROM_PIXEL(p) (((p)>>PICO_SCANVIDEO_PIXEL_BSHIFT)&0x1f)
+#endif
 
 #ifdef __cplusplus
 }

src/rp2_common/pico_scanvideo_dpi/include/pico/scanvideo.h

@@ -33,6 +33,18 @@
 #define PICO_SCANVIDEO_DPI_PIXEL_BSHIFT 11u
 #endif
 
+#ifndef PICO_SCANVIDEO_DPI_PIXEL_RCOUNT
+#define PICO_SCANVIDEO_DPI_PIXEL_RCOUNT 5
+#endif
+
+#ifndef PICO_SCANVIDEO_DPI_PIXEL_GCOUNT
+#define PICO_SCANVIDEO_DPI_PIXEL_GCOUNT 5
+#endif
+
+#ifndef PICO_SCANVIDEO_DPI_PIXEL_BCOUNT
+#define PICO_SCANVIDEO_DPI_PIXEL_BCOUNT 5
+#endif
+
 #ifndef PICO_SCANVIDEO_ALPHA_PIN
 #define PICO_SCANVIDEO_ALPHA_PIN PICO_SCANVIDEO_DPI_ALPHA_PIN
 #endif
@@ -49,6 +61,19 @@
 #define PICO_SCANVIDEO_PIXEL_BSHIFT PICO_SCANVIDEO_DPI_PIXEL_BSHIFT
 #endif
 
+#ifndef PICO_SCANVIDEO_PIXEL_RCOUNT
+#define PICO_SCANVIDEO_PIXEL_RCOUNT PICO_SCANVIDEO_DPI_PIXEL_RCOUNT
+#endif
+
+#ifndef PICO_SCANVIDEO_PIXEL_GCOUNT
+#define PICO_SCANVIDEO_PIXEL_GCOUNT PICO_SCANVIDEO_DPI_PIXEL_GCOUNT
+#endif
+
+#ifndef PICO_SCANVIDEO_PIXEL_BCOUNT
+#define PICO_SCANVIDEO_PIXEL_BCOUNT PICO_SCANVIDEO_DPI_PIXEL_BCOUNT
+#endif
+
+
 /** \file scanvideo.h
  *  \defgroup pico_scanvideo_dpi pico_scanvideo_dpi
  *

src/rp2_common/pico_scanvideo_dpi/scanvideo.c

@@ -1328,12 +1328,18 @@ bool scanvideo_setup_with_timing(const scanvideo_mode_t *mode, const scanvideo_t
     bi_decl_if_func_used(bi_1pin_with_name(PICO_SCANVIDEO_SYNC_PIN_BASE + 3, "Pixel Clock"));
     pin_mask |= 8u << PICO_SCANVIDEO_SYNC_PIN_BASE;
 #endif
-    pin_mask |= 0x1f << (PICO_SCANVIDEO_COLOR_PIN_BASE + PICO_SCANVIDEO_DPI_PIXEL_RSHIFT);
-    pin_mask |= 0x1f << (PICO_SCANVIDEO_COLOR_PIN_BASE + PICO_SCANVIDEO_DPI_PIXEL_GSHIFT);
-    pin_mask |= 0x1f << (PICO_SCANVIDEO_COLOR_PIN_BASE + PICO_SCANVIDEO_DPI_PIXEL_BSHIFT);
-    bi_decl_if_func_used(bi_pin_mask_with_name(0x1f << (PICO_SCANVIDEO_COLOR_PIN_BASE + PICO_SCANVIDEO_DPI_PIXEL_RSHIFT), "Red 0-4"));
-    bi_decl_if_func_used(bi_pin_mask_with_name(0x1f << (PICO_SCANVIDEO_COLOR_PIN_BASE + PICO_SCANVIDEO_DPI_PIXEL_GSHIFT), "Green 0-4"));
-    bi_decl_if_func_used(bi_pin_mask_with_name(0x1f << (PICO_SCANVIDEO_COLOR_PIN_BASE + PICO_SCANVIDEO_DPI_PIXEL_BSHIFT), "Blue 0-4"));
+    static_assert(PICO_SCANVIDEO_PIXEL_RSHIFT + PICO_SCANVIDEO_PIXEL_RCOUNT <= PICO_SCANVIDEO_COLOR_PIN_COUNT, "red bits do not fit in color pins");
+    static_assert(PICO_SCANVIDEO_PIXEL_GSHIFT + PICO_SCANVIDEO_PIXEL_GCOUNT <= PICO_SCANVIDEO_COLOR_PIN_COUNT, "green bits do not fit in color pins");
+    static_assert(PICO_SCANVIDEO_PIXEL_BSHIFT + PICO_SCANVIDEO_PIXEL_BCOUNT <= PICO_SCANVIDEO_COLOR_PIN_COUNT, "blue bits do not fit in color pins");
+#define RMASK ((1u << PICO_SCANVIDEO_PIXEL_RCOUNT) - 1u)
+#define GMASK ((1u << PICO_SCANVIDEO_PIXEL_GCOUNT) - 1u)
+#define BMASK ((1u << PICO_SCANVIDEO_PIXEL_BCOUNT) - 1u)
+    pin_mask |= RMASK << (PICO_SCANVIDEO_COLOR_PIN_BASE + PICO_SCANVIDEO_PIXEL_RSHIFT);
+    pin_mask |= GMASK << (PICO_SCANVIDEO_COLOR_PIN_BASE + PICO_SCANVIDEO_PIXEL_GSHIFT);
+    pin_mask |= BMASK << (PICO_SCANVIDEO_COLOR_PIN_BASE + PICO_SCANVIDEO_PIXEL_BSHIFT);
+    bi_decl_if_func_used(bi_pin_mask_with_name(RMASK << (PICO_SCANVIDEO_COLOR_PIN_BASE + PICO_SCANVIDEO_PIXEL_RSHIFT), RMASK == 1 ? "Red" : ("Red 0-" __XSTRING(PICO_SCANVIDEO_PIXEL_GCOUNT))));
+    bi_decl_if_func_used(bi_pin_mask_with_name(GMASK << (PICO_SCANVIDEO_COLOR_PIN_BASE + PICO_SCANVIDEO_PIXEL_GSHIFT), GMASK == 1 ? "Green" : ("Green 0-" __XSTRING(PICO_SCANVIDEO_PIXEL_GCOUNT))));
+    bi_decl_if_func_used(bi_pin_mask_with_name(BMASK << (PICO_SCANVIDEO_COLOR_PIN_BASE + PICO_SCANVIDEO_PIXEL_BSHIFT), BMASK == 1 ? "Blue" : ("Blue 0-" __XSTRING(PICO_SCANVIDEO_PIXEL_BCOUNT))));
 
     for(uint8_t i = 0; pin_mask; i++, pin_mask>>=1u) {
         if (pin_mask & 1) gpio_set_function(i, GPIO_FUNC_PIO0);