glitchrain/eye_trainer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stylistic clean ups.

Browse Source
This commit is contained in:
Author glitchrain
2024-12-15 03:41:42 -08:00
committed by s.aydarov
parent 2bbfeb8940
commit 0ff9bdd0d2
4 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
EyeTrainerMain.h
View File

@@ -17,7 +17,7 @@ public:
m_LEDRunner.setup(); m_LEDRunner.setup();
m_DisplayHelper.setup(); m_DisplayHelper.setup();
m_InputHelper.setup(); m_InputHelper.setup();
UpdateModeDisplay(); updateModeDisplay();
} }
void loop() void loop()
@@ -26,17 +26,17 @@ public:
if(inputEvent) if(inputEvent)
{ {
ProcessChangeMode(); processChangeMode();
int upDownButtonsShortClickState = m_InputHelper.GetUpDownButtonsShortClicked(); int upDownButtonsShortClickState = m_InputHelper.getUpDownButtonsShortClicked();
int upDownButtonsHoldState = m_InputHelper.GetUpDownButtonsHold(); int upDownButtonsHoldState = m_InputHelper.getUpDownButtonsHold();
switch(m_deviceMode) switch(m_deviceMode)
{ {
case DeviceMode::RUN: ProcessRun(upDownButtonsShortClickState, upDownButtonsHoldState); break; case DeviceMode::RUN: processRun(upDownButtonsShortClickState, upDownButtonsHoldState); break;
case DeviceMode::SETTINGS_MODE: ProcessSettingsRunMode(upDownButtonsShortClickState, upDownButtonsHoldState); break; case DeviceMode::SETTINGS_MODE: processSettingsRunMode(upDownButtonsShortClickState, upDownButtonsHoldState); break;
case DeviceMode::SETTINGS_TIME_SWITCH: ProcessSwitchTime(upDownButtonsShortClickState, upDownButtonsHoldState); break; case DeviceMode::SETTINGS_TIME_SWITCH: processSwitchTime(upDownButtonsShortClickState, upDownButtonsHoldState); break;
case DeviceMode::SETTINGS_BRIGHTNESS: ProcessBrightness(upDownButtonsShortClickState, upDownButtonsHoldState); break; case DeviceMode::SETTINGS_BRIGHTNESS: processBrightness(upDownButtonsShortClickState, upDownButtonsHoldState); break;
case DeviceMode::SETTINGS_TIME_MODE: ProcessTimeMode(upDownButtonsShortClickState, upDownButtonsHoldState); break; case DeviceMode::SETTINGS_TIME_MODE: processTimeMode(upDownButtonsShortClickState, upDownButtonsHoldState); break;
case DeviceMode::TEST: ProcessTest(upDownButtonsShortClickState, upDownButtonsHoldState); break; case DeviceMode::TEST: processTest(upDownButtonsShortClickState, upDownButtonsHoldState); break;
} }
} }
unsigned long currentTime = millis(); unsigned long currentTime = millis();
@@ -59,27 +59,27 @@ private:
InputHelper m_InputHelper = InputHelper(); InputHelper m_InputHelper = InputHelper();
unsigned long m_PrevTime = 0; unsigned long m_PrevTime = 0;
void UpdateModeDisplay() void updateModeDisplay()
{ {
m_DisplayHelper.UpdateModeDisplay(m_LEDRunner.getRun(), m_deviceMode); 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) if(!mainButtonShortClicked)
return; return;
m_DisplayHelper.setDrawTitle(true); m_DisplayHelper.setDrawTitle(true);
m_deviceMode = static_cast<DeviceMode>(wrapInt(static_cast<int>(m_deviceMode) + 1, 6)); m_deviceMode = static_cast<DeviceMode>(wrapInt(static_cast<int>(m_deviceMode) + 1, 6));
UpdateModeDisplay(); updateModeDisplay();
if(m_deviceMode != DeviceMode::RUN) if(m_deviceMode != DeviceMode::RUN)
{ {
m_LEDRunner.setRun(false); 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) if(Settings::getInstance().TimeModeState == TimeMode::MANUAL && upDownButtons != BTN_DOWN_UP_NO_SHORT_CLICKED)
{ {
@@ -91,52 +91,52 @@ private:
{ {
m_DisplayHelper.setDrawTitle(false); m_DisplayHelper.setDrawTitle(false);
m_LEDRunner.setRun(true); m_LEDRunner.setRun(true);
UpdateModeDisplay(); updateModeDisplay();
} }
if(upDownButtons == BTN_DOWN_SHORT_CLICKED) if(upDownButtons == BTN_DOWN_SHORT_CLICKED)
{ {
m_DisplayHelper.setDrawTitle(false); m_DisplayHelper.setDrawTitle(false);
m_LEDRunner.setRun(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) if(upDownButtons != BTN_DOWN_UP_NO_SHORT_CLICKED)
{ {
m_DisplayHelper.setDrawTitle(false); m_DisplayHelper.setDrawTitle(false);
Settings::getInstance().switchRunMode(upDownButtons); 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) if(upDownButtons != BTN_DOWN_UP_NO_SHORT_CLICKED)
{ {
m_DisplayHelper.setDrawTitle(false); m_DisplayHelper.setDrawTitle(false);
Settings::getInstance().setSwitchTime(Settings::getInstance().SwitchTime + upDownButtons * 50); Settings::getInstance().setSwitchTime(Settings::getInstance().SwitchTime + upDownButtons * 50);
UpdateModeDisplay(); updateModeDisplay();
} }
if(upDownButtonsHold != BTN_DOWN_UP_NOT_HOLDED) if(upDownButtonsHold != BTN_DOWN_UP_NOT_HOLDED)
{ {
m_DisplayHelper.setDrawTitle(false); m_DisplayHelper.setDrawTitle(false);
Settings::getInstance().setSwitchTime(Settings::getInstance().SwitchTime + upDownButtonsHold * 50); 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) if(upDownButtons != BTN_DOWN_UP_NO_SHORT_CLICKED)
{ {
m_LEDRunner.setAllHigh(); m_LEDRunner.setAllHigh();
m_DisplayHelper.setDrawTitle(false); m_DisplayHelper.setDrawTitle(false);
Settings::getInstance().setBrightness(Settings::getInstance().Brightness + upDownButtons); Settings::getInstance().setBrightness(Settings::getInstance().Brightness + upDownButtons);
m_LEDRunner.updateBrightness(Settings::getInstance().Brightness); m_LEDRunner.setBrightness(Settings::getInstance().Brightness);
UpdateModeDisplay(); updateModeDisplay();
} }
if(upDownButtonsHold != BTN_DOWN_UP_NOT_HOLDED) if(upDownButtonsHold != BTN_DOWN_UP_NOT_HOLDED)
@@ -144,22 +144,22 @@ private:
m_LEDRunner.setAllHigh(); m_LEDRunner.setAllHigh();
m_DisplayHelper.setDrawTitle(false); m_DisplayHelper.setDrawTitle(false);
Settings::getInstance().setBrightness(Settings::getInstance().Brightness + upDownButtonsHold); Settings::getInstance().setBrightness(Settings::getInstance().Brightness + upDownButtonsHold);
m_LEDRunner.updateBrightness(Settings::getInstance().Brightness); m_LEDRunner.setBrightness(Settings::getInstance().Brightness);
UpdateModeDisplay(); updateModeDisplay();
} }
} }
void ProcessTimeMode(int upDownButtons, int upDownButtonsHold) void processTimeMode(int upDownButtons, int upDownButtonsHold)
{ {
if(upDownButtons != BTN_DOWN_UP_NO_SHORT_CLICKED) if(upDownButtons != BTN_DOWN_UP_NO_SHORT_CLICKED)
{ {
m_DisplayHelper.setDrawTitle(false); m_DisplayHelper.setDrawTitle(false);
Settings::getInstance().switchTimeMode(upDownButtons); 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) if(upDownButtons != BTN_DOWN_UP_NO_SHORT_CLICKED)
{ {

12
InputHelper.h
View File

@@ -42,10 +42,10 @@ public:
return m_DownButton; return m_DownButton;
} }
int GetUpDownButtonsShortClicked() int getUpDownButtonsShortClicked()
{ {
bool upButtonShortClicked = m_UpButton.IsNowShortClicked(); bool upButtonShortClicked = m_UpButton.isNowShortClicked();
bool downButtonShortClicked = m_DownButton.IsNowShortClicked(); bool downButtonShortClicked = m_DownButton.isNowShortClicked();
if(upButtonShortClicked) if(upButtonShortClicked)
return BTN_UP_SHORT_CLICKED; return BTN_UP_SHORT_CLICKED;
else if(downButtonShortClicked) else if(downButtonShortClicked)
@@ -53,10 +53,10 @@ public:
return BTN_DOWN_UP_NO_SHORT_CLICKED; return BTN_DOWN_UP_NO_SHORT_CLICKED;
} }
int GetUpDownButtonsHold() int getUpDownButtonsHold()
{ {
bool upButtonHold = m_UpButton.IsHolded(); bool upButtonHold = m_UpButton.isHolded();
bool downButtonHold = m_DownButton.IsHolded(); bool downButtonHold = m_DownButton.isHolded();
if(upButtonHold) if(upButtonHold)
return BTN_UP_HOLDED; return BTN_UP_HOLDED;
else if(downButtonHold) else if(downButtonHold)

42
LEDRunner.h
View File

@@ -25,20 +25,6 @@ public:
pinMode(PIN_LED_LATCH, OUTPUT); 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) void manualUpdate(RunMode _RunMode, int _NextLEDIndexIncrement)
{ {
nextLED(_RunMode, _NextLEDIndexIncrement); nextLED(_RunMode, _NextLEDIndexIncrement);
@@ -67,7 +53,7 @@ public:
m_Run = _Run; m_Run = _Run;
} }
void updateBrightness(float _Brightness) void setBrightness(float _Brightness)
{ {
analogWrite(PIN_LED_GND_BUS, (MAX_BRIGHTNESS - _Brightness) / MAX_BRIGHTNESS * 255); analogWrite(PIN_LED_GND_BUS, (MAX_BRIGHTNESS - _Brightness) / MAX_BRIGHTNESS * 255);
} }
@@ -189,12 +175,26 @@ public:
m_LEDs.setAllLow(); m_LEDs.setAllLow();
} }
private: private:
bool m_Run = false; bool m_Run = false;
unsigned long m_CurrentTime = 0; unsigned long m_CurrentTime = 0;
int m_CurrentLED = 0; int m_CurrentLED = 0;
int m_CurrentLEDPingPong = 0; int m_CurrentLEDPingPong = 0;
ShiftRegister74HC595<REGISTER_SIZE> m_LEDs = ShiftRegister74HC595<REGISTER_SIZE>::ShiftRegister74HC595(PIN_LED_DATA, PIN_LED_CLOCK, PIN_LED_LATCH); ShiftRegister74HC595<REGISTER_SIZE> m_LEDs = ShiftRegister74HC595<REGISTER_SIZE>::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 #endif

14
SimpleButton.h
View File

@@ -58,37 +58,37 @@ public:
return m_IsNowHolded | (prevState != m_State); return m_IsNowHolded | (prevState != m_State);
} }
bool IsNowClicked() bool isNowClicked()
{ {
return m_IsNowClicked; return m_IsNowClicked;
} }
bool IsNowPressed() bool isNowPressed()
{ {
return m_IsNowPressed; return m_IsNowPressed;
} }
bool IsNowReleased() bool isNowReleased()
{ {
return m_IsNowReleased; return m_IsNowReleased;
} }
bool IsHolded() bool isHolded()
{ {
return m_IsNowHolded; return m_IsNowHolded;
} }
bool IsNowLongClicked() bool isNowLongClicked()
{ {
return m_IsNowLongClicked; return m_IsNowLongClicked;
} }
bool IsNowShortClicked() bool isNowShortClicked()
{ {
return m_IsNowShortClicked; return m_IsNowShortClicked;
} }
unsigned long GetPressedTime() unsigned long getPressedTime()
{ {
return m_PressedTime; return m_PressedTime;
} }