Merge pull request #55 from FoamyGuy/fix_active3_pinouts

Fix active3 pinouts swapped pins R and B
standard pinout for active3 simpletest
2025-08-19 15:04:30 -04:00 · 2025-08-01 11:04:49 -05:00 · 2025-08-01 11:03:38 -05:00
2 changed files with 20 additions and 20 deletions
--- a/examples/triple_matrix_active3_simpletest.py
+++ b/examples/triple_matrix_active3_simpletest.py
@ -31,7 +31,7 @@ pixelmap = simple_multilane_mapper(width, height, n_addr_lines, n_lanes)
 geometry = piomatter.Geometry(width=width, height=height, n_addr_lines=n_addr_lines, n_planes=10, n_temporal_planes=4, map=pixelmap, n_lanes=n_lanes)
 framebuffer = np.asarray(canvas) + 0  # Make a mutable copy
 matrix = piomatter.PioMatter(colorspace=piomatter.Colorspace.RGB888Packed,
-                             pinout=piomatter.Pinout.Active3BGR,
+                             pinout=piomatter.Pinout.Active3,
                             framebuffer=framebuffer,
                             geometry=geometry)

--- a/src/include/piomatter/pins.h
+++ b/src/include/piomatter/pins.h
@ -41,25 +41,6 @@ struct adafruit_matrix_bonnet_pinout_bgr {
 };

 struct active3_pinout {
-    static constexpr pin_t PIN_RGB[] = {7,  27, 11, 10, 9, 8,  6,  5,  12,
-                                        20, 13, 19, 3,  2, 14, 21, 16, 26};
-    static constexpr pin_t PIN_ADDR[] = {22, 23, 24, 25, 15};
-    static constexpr pin_t PIN_OE = 18;  // /OE: output enable when LOW
-    static constexpr pin_t PIN_CLK = 17; // SRCLK: clocks on RISING edge
-    static constexpr pin_t PIN_LAT = 4;  // RCLK: latches on RISING edge
-
-    static constexpr uint32_t clk_bit = 1u << PIN_CLK;
-    static constexpr uint32_t lat_bit = 1u << PIN_LAT;
-    static constexpr uint32_t oe_bit = 1u << PIN_OE;
-    static constexpr uint32_t oe_active = 0;
-    static constexpr uint32_t oe_inactive = oe_bit;
-
-    static constexpr uint32_t post_oe_delay = 0;
-    static constexpr uint32_t post_latch_delay = 0;
-    static constexpr uint32_t post_addr_delay = 5;
-};
-
-struct active3_pinout_bgr {
    static constexpr pin_t PIN_RGB[] = {11, 27, 7,  8,  9, 10, 12, 5,  6,
                                        19, 13, 20, 14, 2, 3,  26, 16, 21};
    static constexpr pin_t PIN_ADDR[] = {22, 23, 24, 25, 15};
@ -78,4 +59,23 @@ struct active3_pinout_bgr {
    static constexpr uint32_t post_addr_delay = 5;
 };

+struct active3_pinout_bgr {
+    static constexpr pin_t PIN_RGB[] = {7,  27, 11, 10, 9, 8,  6,  5,  12,
+                                        20, 13, 19, 3,  2, 14, 21, 16, 26};
+    static constexpr pin_t PIN_ADDR[] = {22, 23, 24, 25, 15};
+    static constexpr pin_t PIN_OE = 18;  // /OE: output enable when LOW
+    static constexpr pin_t PIN_CLK = 17; // SRCLK: clocks on RISING edge
+    static constexpr pin_t PIN_LAT = 4;  // RCLK: latches on RISING edge
+
+    static constexpr uint32_t clk_bit = 1u << PIN_CLK;
+    static constexpr uint32_t lat_bit = 1u << PIN_LAT;
+    static constexpr uint32_t oe_bit = 1u << PIN_OE;
+    static constexpr uint32_t oe_active = 0;
+    static constexpr uint32_t oe_inactive = oe_bit;
+
+    static constexpr uint32_t post_oe_delay = 0;
+    static constexpr uint32_t post_latch_delay = 0;
+    static constexpr uint32_t post_addr_delay = 5;
+};
+
 } // namespace piomatter
Author	SHA1	Message	Date
Limor "Ladyada" Fried	abd7f18fc5	Merge pull request #55 from FoamyGuy/fix_active3_pinouts Some checks failed Pip / build (ubuntu-24.04-arm, 3.11) (push) Has been cancelled Details Pip / build (ubuntu-24.04-arm, 3.12) (push) Has been cancelled Details Pip / build (ubuntu-24.04-arm, 3.13) (push) Has been cancelled Details pre-commit / pre-commit (push) Has been cancelled Details Wheels / Build SDist (push) Has been cancelled Details Wheels / Wheels on ubuntu-24.04-arm (push) Has been cancelled Details Wheels / Upload release (push) Has been cancelled Details Fix active3 pinouts swapped pins R and B	2025-08-19 15:04:30 -04:00
foamyguy	b057531ef1	standard pinout for active3 simpletest	2025-08-01 11:04:49 -05:00
foamyguy	d5a979df18	correct active3 pinouts	2025-08-01 11:03:38 -05:00