From fbb3fa4a13df6860a5ddca5071e07abe1c3fd61a Mon Sep 17 00:00:00 2001 From: "s.aydarov" Date: Sun, 15 Dec 2024 05:49:21 -0800 Subject: [PATCH] Minor code cleaning. --- Defines.h | 6 +++--- DisplayHelper.h | 6 +++--- LEDRunner.h | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Defines.h b/Defines.h index a09125e..9b6b722 100644 --- a/Defines.h +++ b/Defines.h @@ -13,9 +13,9 @@ #define PIN_DISPLAY_CLK 7 #define PIN_DISPLAY_DIO 8 -#define PIN_LED_DATA 5 -#define PIN_LED_LATCH 4 -#define PIN_LED_CLOCK 3 +#define PIN_LED_SHIFT_REGISTER_DATA 5 +#define PIN_LED_SHIFT_REGISTER_LATCH 4 +#define PIN_LED_SHIFT_REGISTER_CLOCK 3 #define REGISTER_SIZE 2 diff --git a/DisplayHelper.h b/DisplayHelper.h index 4624ca6..a88a974 100644 --- a/DisplayHelper.h +++ b/DisplayHelper.h @@ -167,9 +167,9 @@ public: { switch(Settings::getInstance().RunModeState) { - case RunMode::FORWARD: display.setSegments(WORD(F, W, R, D )); break; - case RunMode::BACKWARD: display.setSegments(WORD(B, A, C, K )); break; - case RunMode::BOTH: display.setSegments(WORD(B, O, T, H )); break; + case RunMode::FORWARD: display.setSegments(WORD(F, R, W, D )); break; + case RunMode::BACKWARD: display.setSegments(WORD(B, A, C, D )); break; + case RunMode::BOTH: display.setSegments(WORD(P, I, N, G )); break; case RunMode::RANDOM: display.setSegments(WORD(R, N, D, NONE)); break; } } diff --git a/LEDRunner.h b/LEDRunner.h index a4fe73e..86b2e80 100644 --- a/LEDRunner.h +++ b/LEDRunner.h @@ -20,9 +20,9 @@ public: void setup() { pinMode(PIN_LED_GND_BUS, OUTPUT); - pinMode(PIN_LED_DATA, OUTPUT); - pinMode(PIN_LED_CLOCK, OUTPUT); - pinMode(PIN_LED_LATCH, OUTPUT); + pinMode(PIN_LED_SHIFT_REGISTER_DATA, OUTPUT); + pinMode(PIN_LED_SHIFT_REGISTER_CLOCK, OUTPUT); + pinMode(PIN_LED_SHIFT_REGISTER_LATCH, OUTPUT); } void manualUpdate(RunMode _RunMode, int _NextLEDIndexIncrement) @@ -180,7 +180,7 @@ private: unsigned long m_CurrentTime = 0; int m_CurrentLED = 0; int m_CurrentLEDPingPong = 0; - ShiftRegister74HC595 m_LEDs = ShiftRegister74HC595::ShiftRegister74HC595(PIN_LED_DATA, PIN_LED_CLOCK, PIN_LED_LATCH); + ShiftRegister74HC595 m_LEDs = ShiftRegister74HC595::ShiftRegister74HC595(PIN_LED_SHIFT_REGISTER_DATA, PIN_LED_SHIFT_REGISTER_CLOCK, PIN_LED_SHIFT_REGISTER_LATCH); void nextLED(RunMode _RunMode, int _NextLEDIndexIncrement) {