Reorder ir universals menu

This commit is contained in:
Willy-JL
2023-08-28 05:01:17 +02:00
parent ba9364b444
commit c9db246515

View File

@@ -2,13 +2,13 @@
typedef enum { typedef enum {
SubmenuIndexUniversalTV, SubmenuIndexUniversalTV,
SubmenuIndexUniversalMonitor,
SubmenuIndexUniversalDigitalSign,
SubmenuIndexUniversalProjector, SubmenuIndexUniversalProjector,
SubmenuIndexUniversalAudio, SubmenuIndexUniversalAudio,
SubmenuIndexUniversalLED,
SubmenuIndexUniversalAirConditioner, SubmenuIndexUniversalAirConditioner,
SubmenuIndexUniversalFan, SubmenuIndexUniversalFan,
SubmenuIndexUniversalMonitor,
SubmenuIndexUniversalDigitalSign,
SubmenuIndexUniversalLED,
} SubmenuIndex; } SubmenuIndex;
static void infrared_scene_universal_submenu_callback(void* context, uint32_t index) { static void infrared_scene_universal_submenu_callback(void* context, uint32_t index) {
@@ -27,20 +27,6 @@ void infrared_scene_universal_on_enter(void* context) {
infrared_scene_universal_submenu_callback, infrared_scene_universal_submenu_callback,
context); context);
submenu_add_item(
submenu,
"Monitors",
SubmenuIndexUniversalMonitor,
infrared_scene_universal_submenu_callback,
context);
submenu_add_item(
submenu,
"Digital Signs",
SubmenuIndexUniversalDigitalSign,
infrared_scene_universal_submenu_callback,
context);
submenu_add_item( submenu_add_item(
submenu, submenu,
"Projectors", "Projectors",
@@ -55,13 +41,6 @@ void infrared_scene_universal_on_enter(void* context) {
infrared_scene_universal_submenu_callback, infrared_scene_universal_submenu_callback,
context); context);
submenu_add_item(
submenu,
"LEDs",
SubmenuIndexUniversalLED,
infrared_scene_universal_submenu_callback,
context);
submenu_add_item( submenu_add_item(
submenu, submenu,
"ACs", "ACs",
@@ -76,6 +55,27 @@ void infrared_scene_universal_on_enter(void* context) {
infrared_scene_universal_submenu_callback, infrared_scene_universal_submenu_callback,
context); context);
submenu_add_item(
submenu,
"Monitors",
SubmenuIndexUniversalMonitor,
infrared_scene_universal_submenu_callback,
context);
submenu_add_item(
submenu,
"Digital Signs",
SubmenuIndexUniversalDigitalSign,
infrared_scene_universal_submenu_callback,
context);
submenu_add_item(
submenu,
"LEDs",
SubmenuIndexUniversalLED,
infrared_scene_universal_submenu_callback,
context);
submenu_set_selected_item( submenu_set_selected_item(
submenu, scene_manager_get_scene_state(infrared->scene_manager, InfraredSceneUniversal)); submenu, scene_manager_get_scene_state(infrared->scene_manager, InfraredSceneUniversal));
@@ -91,27 +91,27 @@ bool infrared_scene_universal_on_event(void* context, SceneManagerEvent event) {
if(event.event == SubmenuIndexUniversalTV) { if(event.event == SubmenuIndexUniversalTV) {
scene_manager_next_scene(scene_manager, InfraredSceneUniversalTV); scene_manager_next_scene(scene_manager, InfraredSceneUniversalTV);
consumed = true; consumed = true;
} else if(event.event == SubmenuIndexUniversalMonitor) {
scene_manager_next_scene(scene_manager, InfraredSceneUniversalMonitor);
consumed = true;
} else if(event.event == SubmenuIndexUniversalDigitalSign) {
scene_manager_next_scene(scene_manager, InfraredSceneUniversalDigitalSign);
consumed = true;
} else if(event.event == SubmenuIndexUniversalProjector) { } else if(event.event == SubmenuIndexUniversalProjector) {
scene_manager_next_scene(scene_manager, InfraredSceneUniversalProjector); scene_manager_next_scene(scene_manager, InfraredSceneUniversalProjector);
consumed = true; consumed = true;
} else if(event.event == SubmenuIndexUniversalAudio) { } else if(event.event == SubmenuIndexUniversalAudio) {
scene_manager_next_scene(scene_manager, InfraredSceneUniversalAudio); scene_manager_next_scene(scene_manager, InfraredSceneUniversalAudio);
consumed = true; consumed = true;
} else if(event.event == SubmenuIndexUniversalLED) {
scene_manager_next_scene(scene_manager, InfraredSceneUniversalLED);
consumed = true;
} else if(event.event == SubmenuIndexUniversalAirConditioner) { } else if(event.event == SubmenuIndexUniversalAirConditioner) {
scene_manager_next_scene(scene_manager, InfraredSceneUniversalAC); scene_manager_next_scene(scene_manager, InfraredSceneUniversalAC);
consumed = true; consumed = true;
} else if(event.event == SubmenuIndexUniversalFan) { } else if(event.event == SubmenuIndexUniversalFan) {
scene_manager_next_scene(scene_manager, InfraredSceneUniversalFan); scene_manager_next_scene(scene_manager, InfraredSceneUniversalFan);
consumed = true; consumed = true;
} else if(event.event == SubmenuIndexUniversalMonitor) {
scene_manager_next_scene(scene_manager, InfraredSceneUniversalMonitor);
consumed = true;
} else if(event.event == SubmenuIndexUniversalDigitalSign) {
scene_manager_next_scene(scene_manager, InfraredSceneUniversalDigitalSign);
consumed = true;
} else if(event.event == SubmenuIndexUniversalLED) {
scene_manager_next_scene(scene_manager, InfraredSceneUniversalLED);
consumed = true;
} }
scene_manager_set_scene_state(scene_manager, InfraredSceneUniversal, event.event); scene_manager_set_scene_state(scene_manager, InfraredSceneUniversal, event.event);
} }