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/led selection colors #250

Merged
merged 6 commits into from
Aug 20, 2024
Merged

Daniel/core/led selection colors #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3d7cc84
Adjusted led selection color
Unreal-Dan Aug 20, 2024
550de8c
adjusted purple to magenta constant
Unreal-Dan Aug 20, 2024
ee18036
removed duplicate magenta
Unreal-Dan Aug 20, 2024
7eb9a0a
restored purple constant
Unreal-Dan Aug 20, 2024
1749b5d
magneta lmao
Unreal-Dan Aug 20, 2024
3ca7db3
recorded tests
Unreal-Dan Aug 20, 2024
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
20 changes: 10 additions & 10 deletions VortexEngine/src/Colors/ColorConstants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions VortexEngine/src/Menus/Menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions VortexEngine/src/VortexConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Binary file modified VortexEngine/tests/tests_general.tar.gz
View file
Open in desktop
Binary file not shown.
Loading