Merge branch 'master' into chromadeck

StoneOrbits · Dec 22, 2023 · 0f50d6e · 0f50d6e
2 parents 51a9803 + a9d0483
commit 0f50d6e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/VortexEngine/src/Leds/Leds.cpp b/VortexEngine/src/Leds/Leds.cpp
@@ -19,10 +19,10 @@
 #define MOSFET_PIN  18
 #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()
 {

diff --git a/VortexEngine/src/Menus/Menus.cpp b/VortexEngine/src/Menus/Menus.cpp
@@ -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