diff --git a/applications/main/infrared/scenes/infrared_scene_universal.c b/applications/main/infrared/scenes/infrared_scene_universal.c index 6eed1ba93..60d9d058b 100644 --- a/applications/main/infrared/scenes/infrared_scene_universal.c +++ b/applications/main/infrared/scenes/infrared_scene_universal.c @@ -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); }