diff --git a/Helios/Helios.cpp b/Helios/Helios.cpp index f01c18b0..2682a483 100644 --- a/Helios/Helios.cpp +++ b/Helios/Helios.cpp @@ -551,7 +551,6 @@ void Helios::handle_state_col_select_slot(ColorSelectOption &out_option) menu_selection = 0; } } - struct ColorsMenuData { uint8_t hues[4]; }; @@ -591,6 +590,7 @@ void Helios::handle_state_col_select_quadrant() case 1: // selected white // adds white, skip hue/sat to brightness selected_sat = 0; + selected_val = 255; menu_selection = 0; cur_state = STATE_COLOR_SELECT_VAL; // RETURN HERE @@ -636,6 +636,24 @@ void Helios::handle_state_col_select_quadrant() cur.blue /= 2; show_selection(RGB_WHITE_BRI_LOW); } + + // Handle hold actions for white option + if (menu_selection == 1) { + if (Button::holdPressing()) { + // flash coral orange to indicate hold action is available (same as hue selection) + Led::strobe(150, 150, RGB_CORAL_ORANGE_BRI_LOW, RGB_WHITE); + } + if (Button::onHoldClick()) { + // add white with current brightness selection directly to the colorset + pat.updateColor(selected_slot, HSVColor(selected_hue, 0, 255)); + save_cur_mode(); + // Return to the slot you were editing + menu_selection = selected_slot; + cur_state = STATE_COLOR_SELECT_SLOT; + return; + } + } + if (Button::onLongClick()) { cur_state = (State)(cur_state + 1); // reset the menu selection diff --git a/tests/tests/0261_Navigate_to_White_Force_Enter_Sleep.test b/tests/tests/0261_Navigate_to_White_Force_Enter_Sleep.test index 33487dc9..83e78ec7 100644 --- a/tests/tests/0261_Navigate_to_White_Force_Enter_Sleep.test +++ b/tests/tests/0261_Navigate_to_White_Force_Enter_Sleep.test @@ -3807,6 +3807,101 @@ FFFFFF 1E1E1E 1E1E1E FFFFFF +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 FFFFFF FFFFFF FFFFFF @@ -3958,6 +4053,155 @@ FFFFFF FFFFFF FFFFFF FFFFFF +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 FFFFFF FFFFFF FFFFFF @@ -4109,6 +4353,155 @@ FFFFFF FFFFFF FFFFFF FFFFFF +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 FFFFFF FFFFFF FFFFFF @@ -4260,548 +4653,155 @@ FFFFFF FFFFFF FFFFFF FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF -FFFFFF +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 +3C0700 FFFFFF FFFFFF FFFFFF