IR: Easy Learn & Learn RAW toggles in Learn screen

Also cleanup some of the text shown during learning
This commit is contained in:
Willy-JL
2025-01-23 01:08:48 +00:00
parent 7713eb88d3
commit 5cd0e72726
6 changed files with 33 additions and 53 deletions

View File

@@ -5,8 +5,6 @@ enum SubmenuIndex {
SubmenuIndexLearnNewRemote,
SubmenuIndexSavedRemotes,
SubmenuIndexGpioSettings,
SubmenuIndexEasyLearn,
SubmenuIndexLearnNewRemoteRaw,
SubmenuIndexDebug
};
@@ -45,30 +43,6 @@ void infrared_scene_start_on_enter(void* context) {
infrared_scene_start_submenu_callback,
infrared);
char easy_learn_text[24];
snprintf(
easy_learn_text,
sizeof(easy_learn_text),
"Easy Learn [%s]",
infrared->app_state.is_easy_mode ? "X" : " ");
submenu_add_item(
submenu,
easy_learn_text,
SubmenuIndexEasyLearn,
infrared_scene_start_submenu_callback,
infrared);
submenu_add_lockable_item(
submenu,
"Learn New Remote RAW",
SubmenuIndexLearnNewRemoteRaw,
infrared_scene_start_submenu_callback,
infrared,
!infrared->app_state.is_debug_enabled,
"Enable\n"
"Settings >\n"
"System >\n"
"Debug");
submenu_add_lockable_item(
submenu,
"Debug RX",
@@ -84,7 +58,7 @@ void infrared_scene_start_on_enter(void* context) {
const uint32_t submenu_index =
scene_manager_get_scene_state(scene_manager, InfraredSceneStart);
submenu_set_selected_item(submenu, submenu_index);
// scene_manager_set_scene_state(scene_manager, InfraredSceneStart, SubmenuIndexUniversalRemotes);
scene_manager_set_scene_state(scene_manager, InfraredSceneStart, SubmenuIndexUniversalRemotes);
view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewSubmenu);
}
@@ -104,13 +78,7 @@ bool infrared_scene_start_on_event(void* context, SceneManagerEvent event) {
// last selected file, feels more intuitive
furi_string_set(infrared->file_path, INFRARED_APP_FOLDER);
scene_manager_next_scene(scene_manager, InfraredSceneUniversal);
} else if(
submenu_index == SubmenuIndexLearnNewRemote ||
submenu_index == SubmenuIndexLearnNewRemoteRaw) {
// enable automatic signal decoding if "Learn New Remote"
// disable automatic signal decoding if "Learn New Remote (RAW)"
infrared_worker_rx_enable_signal_decoding(
infrared->worker, submenu_index == SubmenuIndexLearnNewRemote);
} else if(submenu_index == SubmenuIndexLearnNewRemote) {
infrared->app_state.is_learning_new_remote = true;
infrared->app_state.current_button_index = 0; // Reset index when starting new remote
scene_manager_next_scene(scene_manager, InfraredSceneLearn);
@@ -119,17 +87,6 @@ bool infrared_scene_start_on_event(void* context, SceneManagerEvent event) {
scene_manager_next_scene(scene_manager, InfraredSceneRemoteList);
} else if(submenu_index == SubmenuIndexGpioSettings) {
scene_manager_next_scene(scene_manager, InfraredSceneGpioSettings);
} else if(submenu_index == SubmenuIndexEasyLearn) {
infrared->app_state.is_easy_mode = !infrared->app_state.is_easy_mode;
infrared_save_settings(infrared);
// Update the menu item text without scene transition
char easy_learn_text[24];
snprintf(
easy_learn_text,
sizeof(easy_learn_text),
"Easy Learn [%s]",
infrared->app_state.is_easy_mode ? "X" : " ");
submenu_change_item_label(infrared->submenu, SubmenuIndexEasyLearn, easy_learn_text);
} else if(submenu_index == SubmenuIndexDebug) {
scene_manager_next_scene(scene_manager, InfraredSceneDebug);
}