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 {
SubmenuIndexUniversalTV,
SubmenuIndexUniversalMonitor,
SubmenuIndexUniversalDigitalSign,
SubmenuIndexUniversalProjector,
SubmenuIndexUniversalAudio,
SubmenuIndexUniversalLED,
SubmenuIndexUniversalAirConditioner,
SubmenuIndexUniversalFan,
SubmenuIndexUniversalMonitor,
SubmenuIndexUniversalDigitalSign,
SubmenuIndexUniversalLED,
} SubmenuIndex;
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,
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,
"Projectors",
@@ -55,13 +41,6 @@ void infrared_scene_universal_on_enter(void* context) {
infrared_scene_universal_submenu_callback,
context);
submenu_add_item(
submenu,
"LEDs",
SubmenuIndexUniversalLED,
infrared_scene_universal_submenu_callback,
context);
submenu_add_item(
submenu,
"ACs",
@@ -76,6 +55,27 @@ void infrared_scene_universal_on_enter(void* context) {
infrared_scene_universal_submenu_callback,
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, 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) {
scene_manager_next_scene(scene_manager, InfraredSceneUniversalTV);
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) {
scene_manager_next_scene(scene_manager, InfraredSceneUniversalProjector);
consumed = true;
} else if(event.event == SubmenuIndexUniversalAudio) {
scene_manager_next_scene(scene_manager, InfraredSceneUniversalAudio);
consumed = true;
} else if(event.event == SubmenuIndexUniversalLED) {
scene_manager_next_scene(scene_manager, InfraredSceneUniversalLED);
consumed = true;
} else if(event.event == SubmenuIndexUniversalAirConditioner) {
scene_manager_next_scene(scene_manager, InfraredSceneUniversalAC);
consumed = true;
} else if(event.event == SubmenuIndexUniversalFan) {
scene_manager_next_scene(scene_manager, InfraredSceneUniversalFan);
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);
}