post merge fixes p2 [ci skip]

This commit is contained in:
MX
2024-03-25 15:47:34 +03:00
parent 7c0939ad52
commit fda8370255
11 changed files with 226 additions and 123 deletions

View File

@@ -4,7 +4,7 @@ enum SubmenuIndex {
SubmenuIndexUniversalRemotes,
SubmenuIndexLearnNewRemote,
SubmenuIndexSavedRemotes,
SubmenuIndexDebugSettings,
SubmenuIndexGpioSettings,
SubmenuIndexLearnNewRemoteRaw,
SubmenuIndexDebug
};
@@ -40,7 +40,7 @@ void infrared_scene_start_on_enter(void* context) {
submenu_add_item(
submenu,
"GPIO Settings",
SubmenuIndexDebugSettings,
SubmenuIndexGpioSettings,
infrared_scene_start_submenu_callback,
infrared);
@@ -78,7 +78,6 @@ bool infrared_scene_start_on_event(void* context, SceneManagerEvent event) {
scene_manager_set_scene_state(scene_manager, InfraredSceneStart, submenu_index);
if(submenu_index == SubmenuIndexUniversalRemotes) {
scene_manager_next_scene(scene_manager, InfraredSceneUniversal);
consumed = true;
} else if(
submenu_index == SubmenuIndexLearnNewRemote ||
submenu_index == SubmenuIndexLearnNewRemoteRaw) {
@@ -89,18 +88,16 @@ bool infrared_scene_start_on_event(void* context, SceneManagerEvent event) {
infrared->app_state.is_learning_new_remote = true;
scene_manager_next_scene(scene_manager, InfraredSceneLearn);
consumed = true;
} else if(submenu_index == SubmenuIndexSavedRemotes) {
furi_string_set(infrared->file_path, INFRARED_APP_FOLDER);
scene_manager_next_scene(scene_manager, InfraredSceneRemoteList);
consumed = true;
} else if(submenu_index == SubmenuIndexGpioSettings) {
scene_manager_next_scene(scene_manager, InfraredSceneGpioSettings);
} else if(submenu_index == SubmenuIndexDebug) {
scene_manager_next_scene(scene_manager, InfraredSceneDebug);
consumed = true;
} else if(submenu_index == SubmenuIndexDebugSettings) {
scene_manager_next_scene(scene_manager, InfraredSceneDebugSettings);
consumed = true;
}
consumed = true;
}
return consumed;