Skip to content

Commit ad39298

Browse files
committed
Change status text.
1 parent d593726 commit ad39298

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ const std::vector<OfficialJoyconColors>& OFFICIAL_JOYCON_COLORS(){
7171

7272
{"Neon Red / Neon Blue", 0xFF3C28, 0x1E0A0A, 0x0AB9E6, 0x001E1E},
7373
{"Blue / Neon Yellow", 0x4655F5, 0x00000A, 0xE6FF00, 0x142800},
74+
{"Neon Pink / Green Pink", 0xFF3278, 0x28001E, 0x1EDC00, 0x002800},
7475
{"Neon Green / Neon Pink", 0x1EDC00, 0x002800, 0xFF3278, 0x28001E},
7576
{"Neon Purple / Neon Orange", 0xB400E6, 0x140014, 0xFAA005, 0x0F0A00},
7677
{"Pastel Pink / Pastel Pink", 0xFFAFAF, 0x372D2D, 0xFFAFAF, 0x372D2D},

SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessController.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,15 +214,15 @@ void SerialPABotBase_WirelessController::status_thread(){
214214
last_ack.store(current_time(), std::memory_order_relaxed);
215215

216216
uint32_t status = response.data;
217-
bool status_connected = status & 1;
218-
bool status_paired = status & 2;
217+
bool status_connected = status & 1;
218+
bool status_ready = status & 2;
219219

220220
std::string str;
221221
str += "Connected: " + (status_connected
222222
? html_color_text("Yes", theme_friendly_darkblue())
223223
: html_color_text("No", COLOR_RED)
224224
);
225-
str += " - Paired: " + (status_paired
225+
str += " - Ready: " + (status_ready
226226
? html_color_text("Yes", theme_friendly_darkblue())
227227
: html_color_text("No", COLOR_RED)
228228
);

0 commit comments

Comments
 (0)