diff --git a/VortexEngine/src/Colors/ColorConstants.h b/VortexEngine/src/Colors/ColorConstants.h index 920c85882b..a33f6c3a80 100644 --- a/VortexEngine/src/Colors/ColorConstants.h +++ b/VortexEngine/src/Colors/ColorConstants.h @@ -117,16 +117,16 @@ #define RGB_CYAN8 (uint32_t)0x00E0E0 // 0 224 224 #define RGB_CYAN9 (uint32_t)0x00FCFC // 0 252 252 -#define RGB_PURPLE0 (uint32_t)0x090310 // 9 3 16 -#define RGB_PURPLE1 (uint32_t)0x1C001C // 28 0 28 -#define RGB_PURPLE2 (uint32_t)0x380038 // 56 0 56 -#define RGB_PURPLE3 (uint32_t)0x540054 // 84 0 84 -#define RGB_PURPLE4 (uint32_t)0x700070 // 112 0 112 -#define RGB_PURPLE5 (uint32_t)0x8C008C // 140 0 140 -#define RGB_PURPLE6 (uint32_t)0xA800A8 // 168 0 168 -#define RGB_PURPLE7 (uint32_t)0xC400C4 // 196 0 196 -#define RGB_PURPLE8 (uint32_t)0xE000E0 // 224 0 224 -#define RGB_PURPLE9 (uint32_t)0xFC00FC // 252 0 252 +#define RGB_MAGENTA0 (uint32_t)0x100010 // 16 0 16 +#define RGB_MAGENTA1 (uint32_t)0x1C001C // 28 0 28 +#define RGB_MAGENTA2 (uint32_t)0x380038 // 56 0 56 +#define RGB_MAGENTA3 (uint32_t)0x540054 // 84 0 84 +#define RGB_MAGENTA4 (uint32_t)0x700070 // 112 0 112 +#define RGB_MAGENTA5 (uint32_t)0x8C008C // 140 0 140 +#define RGB_MAGENTA6 (uint32_t)0xA800A8 // 168 0 168 +#define RGB_MAGENTA7 (uint32_t)0xC400C4 // 196 0 196 +#define RGB_MAGENTA8 (uint32_t)0xE000E0 // 224 0 224 +#define RGB_MAGENTA9 (uint32_t)0xFC00FC // 252 0 252 #define RGB_ORANGE0 (uint32_t)0x100800 // 16 8 0 #define RGB_ORANGE1 (uint32_t)0x1C0E00 // 28 14 0 diff --git a/VortexEngine/src/Menus/Menu.cpp b/VortexEngine/src/Menus/Menu.cpp index 662fe5177d..1063cb10c4 100644 --- a/VortexEngine/src/Menus/Menu.cpp +++ b/VortexEngine/src/Menus/Menu.cpp @@ -101,14 +101,12 @@ void Menu::showBulbSelection() Leds::clearAll(); if (m_targetLeds == MAP_LED(LED_MULTI)) { LedPos pos = (LedPos)((Time::getCurtime() / 30) % LED_COUNT); - Leds::blinkIndexOffset(pos, pos * 10, 50, 500, m_menuColor); + Leds::blinkIndexOffset(pos, pos * 10, 50, 500, RGB_MAGENTA1); } else { - Leds::blinkMap(m_targetLeds, BULB_SELECT_OFF_MS, BULB_SELECT_ON_MS, m_menuColor); + Leds::blinkMap(m_targetLeds, BULB_SELECT_OFF_MS, BULB_SELECT_ON_MS, RGB_MAGENTA1); } // blink when selecting - Menus::showSelection(RGBColor(m_menuColor.red << 3, - m_menuColor.green << 3, - m_menuColor.blue << 3)); + Menus::showSelection(RGB_MAGENTA1); } void Menu::showExit() diff --git a/VortexEngine/src/VortexConfig.h b/VortexEngine/src/VortexConfig.h index 320df14f6e..000b4ea1ac 100644 --- a/VortexEngine/src/VortexConfig.h +++ b/VortexEngine/src/VortexConfig.h @@ -408,7 +408,7 @@ #define RGB_MENU_MODE_SHARING RGB_CYAN1 // Editor Connection Menu Color -#define RGB_MENU_EDITOR_CONNECTION RGB_PURPLE1 +#define RGB_MENU_EDITOR_CONNECTION RGB_MAGENTA1 // Color Select Menu Color #define RGB_MENU_COLOR_SELECT RGB_GREEN1 @@ -527,7 +527,7 @@ #undef RGB_MENU_FACTORY_RESET #define RGB_MENU_RANDOMIZER RGB_WHITE4 #define RGB_MENU_MODE_SHARING RGB_CYAN4 -#define RGB_MENU_EDITOR_CONNECTION RGB_PURPLE4 +#define RGB_MENU_EDITOR_CONNECTION RGB_MAGENTA4 #define RGB_MENU_COLOR_SELECT RGB_GREEN4 #define RGB_MENU_PATTERN_SELECT RGB_BLUE4 #define RGB_MENU_BRIGHTNESS_SELECT RGB_YELLOW4 diff --git a/VortexEngine/tests/tests_general.tar.gz b/VortexEngine/tests/tests_general.tar.gz index 79f89321f8..b164f09dba 100644 Binary files a/VortexEngine/tests/tests_general.tar.gz and b/VortexEngine/tests/tests_general.tar.gz differ