Fix pinout, add missing LedControl init

MG-5 · Nov 28, 2022 · 8e42f42 · 8e42f42
1 parent feca53f
commit 8e42f42
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/images/pinout.jpg b/images/pinout.jpg
diff --git a/main/dfi/Dfi.cxx b/main/dfi/Dfi.cxx
@@ -25,6 +25,7 @@ void Dfi::taskMain(void *)
     currentStation = &AmbrosiusplatzRtgStadt;
 
     initDisplayInterface();
+    ledControl.init();
 
     sync::waitForAll(sync::ConnectedToWifi);
     sync::waitForAll(sync::TimeIsSynchronized);

diff --git a/main/led/LedControl.hpp b/main/led/LedControl.hpp
@@ -22,7 +22,9 @@ class LedControl : public IRenderTarget
 protected:
     void submitImage(const uint8_t *image, size_t length) override;
 
-private:
+public:
+    static constexpr auto PrintTag = "[LedControl]";
+
     Gpio MultiplexerOut1{GPIO_NUM_4};
     Gpio MultiplexerOut2{GPIO_NUM_13};
     Gpio ControlShiftInput{GPIO_NUM_12};
@@ -32,8 +34,8 @@ class LedControl : public IRenderTarget
     Gpio RegisterClock{GPIO_NUM_25}; // RCK
     Gpio ShiftDataIn2{GPIO_NUM_33};  // DI for rows 3, 4, 7 and 8
     Gpio ShiftDataIn1{GPIO_NUM_32};  // DI for rows 1, 2, 5 and 6
-    Gpio ShiftClock2{GPIO_NUM_35};   // SRCK for rows 3, 4, 7 and 8
-    Gpio ShiftClock1{GPIO_NUM_34};   // SRCK for rows 1, 2, 5 and 6
+    Gpio ShiftClock2{GPIO_NUM_18};   // SRCK for rows 3, 4, 7 and 8
+    Gpio ShiftClock1{GPIO_NUM_19};   // SRCK for rows 1, 2, 5 and 6
 
     static constexpr auto PwmPin1 = GPIO_NUM_2;
     static constexpr auto PwmPin2 = GPIO_NUM_15;