Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-20 04:54:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ul/dev' into mntm-dev --nobuild

Browse Source
This commit is contained in:
Willy-JL
2024-10-08 02:24:17 +01:00
parent a17cae7aec d2226bd383
commit 24869788d2
31 changed files with 3109 additions and 1798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
applications/main/infrared/scenes/infrared_scene_universal.c
View File

@@ -5,10 +5,10 @@ typedef enum {
SubmenuIndexUniversalProjector,
SubmenuIndexUniversalAudio,
SubmenuIndexUniversalAirConditioner,
SubmenuIndexUniversalLEDs,
SubmenuIndexUniversalFan,
SubmenuIndexUniversalMonitor,
SubmenuIndexUniversalDigitalSign,
SubmenuIndexUniversalLED,
} SubmenuIndex;
static void infrared_scene_universal_submenu_callback(void* context, uint32_t index) {
@@ -48,6 +48,13 @@ void infrared_scene_universal_on_enter(void* context) {
infrared_scene_universal_submenu_callback,
context);
submenu_add_item(
submenu,
"LEDs",
SubmenuIndexUniversalLEDs,
infrared_scene_universal_submenu_callback,
context);
submenu_add_item(
submenu,
"Fans",
@@ -69,13 +76,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_set_selected_item(
submenu, scene_manager_get_scene_state(infrared->scene_manager, InfraredSceneUniversal));
@@ -100,6 +100,9 @@ bool infrared_scene_universal_on_event(void* context, SceneManagerEvent event) {
} else if(event.event == SubmenuIndexUniversalAirConditioner) {
scene_manager_next_scene(scene_manager, InfraredSceneUniversalAC);
consumed = true;
} else if(event.event == SubmenuIndexUniversalLEDs) {
scene_manager_next_scene(scene_manager, InfraredSceneUniversalLEDs);
consumed = true;
} else if(event.event == SubmenuIndexUniversalFan) {
scene_manager_next_scene(scene_manager, InfraredSceneUniversalFan);
consumed = true;
@@ -109,9 +112,6 @@ bool infrared_scene_universal_on_event(void* context, SceneManagerEvent event) {
} 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);
}