diff --git a/EyeTrainerMain.h b/EyeTrainerMain.h index 72b1d3b..dc0b24d 100644 --- a/EyeTrainerMain.h +++ b/EyeTrainerMain.h @@ -17,7 +17,7 @@ public: m_LEDRunner.setup(); m_DisplayHelper.setup(); m_InputHelper.setup(); - UpdateModeDisplay(); + updateModeDisplay(); } void loop() @@ -26,17 +26,17 @@ public: if(inputEvent) { - ProcessChangeMode(); - int upDownButtonsShortClickState = m_InputHelper.GetUpDownButtonsShortClicked(); - int upDownButtonsHoldState = m_InputHelper.GetUpDownButtonsHold(); + processChangeMode(); + int upDownButtonsShortClickState = m_InputHelper.getUpDownButtonsShortClicked(); + int upDownButtonsHoldState = m_InputHelper.getUpDownButtonsHold(); switch(m_deviceMode) { - case DeviceMode::RUN: ProcessRun(upDownButtonsShortClickState, upDownButtonsHoldState); break; - case DeviceMode::SETTINGS_MODE: ProcessSettingsRunMode(upDownButtonsShortClickState, upDownButtonsHoldState); break; - case DeviceMode::SETTINGS_TIME_SWITCH: ProcessSwitchTime(upDownButtonsShortClickState, upDownButtonsHoldState); break; - case DeviceMode::SETTINGS_BRIGHTNESS: ProcessBrightness(upDownButtonsShortClickState, upDownButtonsHoldState); break; - case DeviceMode::SETTINGS_TIME_MODE: ProcessTimeMode(upDownButtonsShortClickState, upDownButtonsHoldState); break; - case DeviceMode::TEST: ProcessTest(upDownButtonsShortClickState, upDownButtonsHoldState); break; + case DeviceMode::RUN: processRun(upDownButtonsShortClickState, upDownButtonsHoldState); break; + case DeviceMode::SETTINGS_MODE: processSettingsRunMode(upDownButtonsShortClickState, upDownButtonsHoldState); break; + case DeviceMode::SETTINGS_TIME_SWITCH: processSwitchTime(upDownButtonsShortClickState, upDownButtonsHoldState); break; + case DeviceMode::SETTINGS_BRIGHTNESS: processBrightness(upDownButtonsShortClickState, upDownButtonsHoldState); break; + case DeviceMode::SETTINGS_TIME_MODE: processTimeMode(upDownButtonsShortClickState, upDownButtonsHoldState); break; + case DeviceMode::TEST: processTest(upDownButtonsShortClickState, upDownButtonsHoldState); break; } } unsigned long currentTime = millis(); @@ -59,27 +59,27 @@ private: InputHelper m_InputHelper = InputHelper(); unsigned long m_PrevTime = 0; - void UpdateModeDisplay() + void updateModeDisplay() { m_DisplayHelper.UpdateModeDisplay(m_LEDRunner.getRun(), m_deviceMode); } - void ProcessChangeMode() + void processChangeMode() { - bool mainButtonShortClicked = m_InputHelper.getButtonMain().IsNowShortClicked(); + bool mainButtonShortClicked = m_InputHelper.getButtonMain().isNowShortClicked(); if(!mainButtonShortClicked) return; m_DisplayHelper.setDrawTitle(true); m_deviceMode = static_cast(wrapInt(static_cast(m_deviceMode) + 1, 6)); - UpdateModeDisplay(); + updateModeDisplay(); if(m_deviceMode != DeviceMode::RUN) { m_LEDRunner.setRun(false); } } - void ProcessRun(int upDownButtons, int upDownButtonsHold) + void processRun(int upDownButtons, int upDownButtonsHold) { if(Settings::getInstance().TimeModeState == TimeMode::MANUAL && upDownButtons != BTN_DOWN_UP_NO_SHORT_CLICKED) { @@ -91,52 +91,52 @@ private: { m_DisplayHelper.setDrawTitle(false); m_LEDRunner.setRun(true); - UpdateModeDisplay(); + updateModeDisplay(); } if(upDownButtons == BTN_DOWN_SHORT_CLICKED) { m_DisplayHelper.setDrawTitle(false); m_LEDRunner.setRun(false); - UpdateModeDisplay(); + updateModeDisplay(); } } } - void ProcessSettingsRunMode(int upDownButtons, int upDownButtonsHold) + void processSettingsRunMode(int upDownButtons, int upDownButtonsHold) { if(upDownButtons != BTN_DOWN_UP_NO_SHORT_CLICKED) { m_DisplayHelper.setDrawTitle(false); Settings::getInstance().switchRunMode(upDownButtons); - UpdateModeDisplay(); + updateModeDisplay(); } } - void ProcessSwitchTime(int upDownButtons, int upDownButtonsHold) + void processSwitchTime(int upDownButtons, int upDownButtonsHold) { if(upDownButtons != BTN_DOWN_UP_NO_SHORT_CLICKED) { m_DisplayHelper.setDrawTitle(false); Settings::getInstance().setSwitchTime(Settings::getInstance().SwitchTime + upDownButtons * 50); - UpdateModeDisplay(); + updateModeDisplay(); } if(upDownButtonsHold != BTN_DOWN_UP_NOT_HOLDED) { m_DisplayHelper.setDrawTitle(false); Settings::getInstance().setSwitchTime(Settings::getInstance().SwitchTime + upDownButtonsHold * 50); - UpdateModeDisplay(); + updateModeDisplay(); } } - void ProcessBrightness(int upDownButtons, int upDownButtonsHold) + void processBrightness(int upDownButtons, int upDownButtonsHold) { if(upDownButtons != BTN_DOWN_UP_NO_SHORT_CLICKED) { m_LEDRunner.setAllHigh(); m_DisplayHelper.setDrawTitle(false); Settings::getInstance().setBrightness(Settings::getInstance().Brightness + upDownButtons); - m_LEDRunner.updateBrightness(Settings::getInstance().Brightness); - UpdateModeDisplay(); + m_LEDRunner.setBrightness(Settings::getInstance().Brightness); + updateModeDisplay(); } if(upDownButtonsHold != BTN_DOWN_UP_NOT_HOLDED) @@ -144,22 +144,22 @@ private: m_LEDRunner.setAllHigh(); m_DisplayHelper.setDrawTitle(false); Settings::getInstance().setBrightness(Settings::getInstance().Brightness + upDownButtonsHold); - m_LEDRunner.updateBrightness(Settings::getInstance().Brightness); - UpdateModeDisplay(); + m_LEDRunner.setBrightness(Settings::getInstance().Brightness); + updateModeDisplay(); } } - void ProcessTimeMode(int upDownButtons, int upDownButtonsHold) + void processTimeMode(int upDownButtons, int upDownButtonsHold) { if(upDownButtons != BTN_DOWN_UP_NO_SHORT_CLICKED) { m_DisplayHelper.setDrawTitle(false); Settings::getInstance().switchTimeMode(upDownButtons); - UpdateModeDisplay(); + updateModeDisplay(); } } - void ProcessTest(int upDownButtons, int upDownButtonsHold) + void processTest(int upDownButtons, int upDownButtonsHold) { if(upDownButtons != BTN_DOWN_UP_NO_SHORT_CLICKED) { diff --git a/InputHelper.h b/InputHelper.h index 95ec63e..a8dc02a 100644 --- a/InputHelper.h +++ b/InputHelper.h @@ -42,10 +42,10 @@ public: return m_DownButton; } - int GetUpDownButtonsShortClicked() + int getUpDownButtonsShortClicked() { - bool upButtonShortClicked = m_UpButton.IsNowShortClicked(); - bool downButtonShortClicked = m_DownButton.IsNowShortClicked(); + bool upButtonShortClicked = m_UpButton.isNowShortClicked(); + bool downButtonShortClicked = m_DownButton.isNowShortClicked(); if(upButtonShortClicked) return BTN_UP_SHORT_CLICKED; else if(downButtonShortClicked) @@ -53,10 +53,10 @@ public: return BTN_DOWN_UP_NO_SHORT_CLICKED; } - int GetUpDownButtonsHold() + int getUpDownButtonsHold() { - bool upButtonHold = m_UpButton.IsHolded(); - bool downButtonHold = m_DownButton.IsHolded(); + bool upButtonHold = m_UpButton.isHolded(); + bool downButtonHold = m_DownButton.isHolded(); if(upButtonHold) return BTN_UP_HOLDED; else if(downButtonHold) diff --git a/LEDRunner.h b/LEDRunner.h index db71cd0..a4fe73e 100644 --- a/LEDRunner.h +++ b/LEDRunner.h @@ -25,20 +25,6 @@ public: pinMode(PIN_LED_LATCH, OUTPUT); } - void nextLED(RunMode _RunMode, int _NextLEDIndexIncrement) - { - switch(_RunMode) - { - case RunMode::FORWARD: m_CurrentLED = wrapInt(m_CurrentLED + _NextLEDIndexIncrement, MAX_LED_INDEX + 1); break; - case RunMode::BACKWARD: m_CurrentLED = wrapInt(m_CurrentLED - _NextLEDIndexIncrement, MAX_LED_INDEX + 1); break; - case RunMode::BOTH: - m_CurrentLEDPingPong = wrapInt(m_CurrentLEDPingPong + _NextLEDIndexIncrement, (MAX_LED_INDEX + 1) * 2); - m_CurrentLED = pingPong(m_CurrentLEDPingPong, MAX_LED_INDEX + 1); - break; - case RunMode::RANDOM: m_CurrentLED = random(0, MAX_LED_INDEX + 1); break; - } - } - void manualUpdate(RunMode _RunMode, int _NextLEDIndexIncrement) { nextLED(_RunMode, _NextLEDIndexIncrement); @@ -67,7 +53,7 @@ public: m_Run = _Run; } - void updateBrightness(float _Brightness) + void setBrightness(float _Brightness) { analogWrite(PIN_LED_GND_BUS, (MAX_BRIGHTNESS - _Brightness) / MAX_BRIGHTNESS * 255); } @@ -189,12 +175,26 @@ public: m_LEDs.setAllLow(); } - private: - bool m_Run = false; - 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); +private: + bool m_Run = false; + 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); + + void nextLED(RunMode _RunMode, int _NextLEDIndexIncrement) + { + switch(_RunMode) + { + case RunMode::FORWARD: m_CurrentLED = wrapInt(m_CurrentLED + _NextLEDIndexIncrement, MAX_LED_INDEX + 1); break; + case RunMode::BACKWARD: m_CurrentLED = wrapInt(m_CurrentLED - _NextLEDIndexIncrement, MAX_LED_INDEX + 1); break; + case RunMode::BOTH: + m_CurrentLEDPingPong = wrapInt(m_CurrentLEDPingPong + _NextLEDIndexIncrement, (MAX_LED_INDEX + 1) * 2); + m_CurrentLED = pingPong(m_CurrentLEDPingPong, MAX_LED_INDEX + 1); + break; + case RunMode::RANDOM: m_CurrentLED = random(0, MAX_LED_INDEX + 1); break; + } + } }; #endif \ No newline at end of file diff --git a/SimpleButton.h b/SimpleButton.h index 83df4da..54dba68 100644 --- a/SimpleButton.h +++ b/SimpleButton.h @@ -58,37 +58,37 @@ public: return m_IsNowHolded | (prevState != m_State); } - bool IsNowClicked() + bool isNowClicked() { return m_IsNowClicked; } - bool IsNowPressed() + bool isNowPressed() { return m_IsNowPressed; } - bool IsNowReleased() + bool isNowReleased() { return m_IsNowReleased; } - bool IsHolded() + bool isHolded() { return m_IsNowHolded; } - bool IsNowLongClicked() + bool isNowLongClicked() { return m_IsNowLongClicked; } - bool IsNowShortClicked() + bool isNowShortClicked() { return m_IsNowShortClicked; } - unsigned long GetPressedTime() + unsigned long getPressedTime() { return m_PressedTime; }