Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Daniel/core/menu initializer fix #174

Merged
merged 4 commits into from
Dec 22, 2023
Merged

Daniel/core/menu initializer fix #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65ee0ff
minor fix
Unreal-Dan Dec 15, 2023
d9274bf
minor fix
Unreal-Dan Dec 15, 2023
7984b87
Merge branch 'master' into daniel/core/menu_initializer_fix
Unreal-Dan Dec 22, 2023
0512d0d
idk
Unreal-Dan Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions VortexEngine/src/Leds/Leds.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
#include "../../VortexLib/VortexLib.h"
#endif

// array of led color values
RGBColor Leds::m_ledColors[LED_COUNT] = { RGB_OFF };
// global brightness
uint8_t Leds::m_brightness = DEFAULT_BRIGHTNESS;
// array of led color values
RGBColor Leds::m_ledColors[LED_COUNT] = { RGB_OFF };

bool Leds::init()
{
Expand Down
2 changes: 1 addition & 1 deletion VortexEngine/src/Menus/Menus.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

// static members
Menus::MenuState Menus::m_menuState = MENU_STATE_NOT_OPEN;
uint32_t Menus::m_openTime = 0;
uint8_t Menus::m_selection = 0;
uint32_t Menus::m_openTime = 0;
Menu *Menus::m_pCurMenu = nullptr;

// typedef for the menu initialization function
Expand Down