ButtonEnum style order nitpicks

Aligning like-system identifiers for visual congruity. No functional change.
This commit is contained in:
David Madison 2021-03-27 15:05:16 -04:00
parent 33975cfca9
commit 5d89999be8
2 changed files with 9 additions and 10 deletions

View file

@ -44,7 +44,6 @@ const uint8_t XBOXOLD_BUTTONS[] PROGMEM = {
3, // Y 3, // Y
}; };
XBOXOLD::XBOXOLD(USB *p) : XBOXOLD::XBOXOLD(USB *p) :
pUsb(p), // pointer to USB class instance - mandatory pUsb(p), // pointer to USB class instance - mandatory
bAddress(0), // device address - mandatory bAddress(0), // device address - mandatory

View file

@ -191,15 +191,15 @@ inline constexpr int8_t ButtonIndex(ButtonEnum key) {
(key == DOWN || key == GREEN) ? 2 : (key == DOWN || key == GREEN) ? 2 :
(key == LEFT || key == ORANGE) ? 3 : (key == LEFT || key == ORANGE) ? 3 :
(key == SELECT || key == SHARE || key == BACK || key == VIEW || key == BLUE || key == CREATE) ? 4 : (key == SELECT || key == SHARE || key == BACK || key == VIEW || key == BLUE || key == CREATE) ? 4 :
(key == PLUS || key == START || key == OPTIONS || key == MENU) ? 5 : (key == START || key == OPTIONS || key == MENU || key == PLUS) ? 5 :
(key == TWO || key == L3) ? 6 : (key == L3 || key == TWO) ? 6 :
(key == ONE || key == R3) ? 7 : (key == R3 || key == ONE) ? 7 :
(key == MINUS || key == L2 || key == BLACK) ? 8 : (key == L2 || key == MINUS || key == BLACK) ? 8 :
(key == HOME || key == R2 || key == WHITE) ? 9 : (key == R2 || key == HOME || key == WHITE) ? 9 :
(key == Z || key == L1) ? 10 : (key == L1 || key == Z) ? 10 :
(key == C || key == R1) ? 11 : (key == R1 || key == C) ? 11 :
(key == B || key == TRIANGLE) ? 12 : (key == TRIANGLE || key == B) ? 12 :
(key == A || key == CIRCLE) ? 13 : (key == CIRCLE || key == A) ? 13 :
(key == CROSS || key == X) ? 14 : (key == CROSS || key == X) ? 14 :
(key == SQUARE || key == Y) ? 15 : (key == SQUARE || key == Y) ? 15 :
(key == L || key == PS || key == XBOX) ? 16 : (key == L || key == PS || key == XBOX) ? 16 :