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

IR: Easy Learn & Learn RAW toggles in Learn screen

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

29
applications/main/infrared/scenes/infrared_scene_learn.c
View File

@@ -82,7 +82,7 @@ static void infrared_scene_learn_update_button_name(InfraredApp* infrared, bool
// Now we know button_index is valid, use it to get the name
const char* button_name = easy_mode_button_names[button_index];
dialog_ex_set_text(
dialog_ex, "Point remote at IR port\nand press button:", 5, 10, AlignLeft, AlignCenter);
dialog_ex, "Point the remote at IR port\nand press button:", 5, 10, AlignLeft, AlignCenter);
dialog_ex_set_header(dialog_ex, button_name, 78, 11, AlignLeft, AlignTop);
// For existing remotes, check if there are any more buttons to add
@@ -130,22 +130,26 @@ void infrared_scene_learn_on_enter(void* context) {
infrared_worker_rx_start(worker);
infrared_play_notification_message(infrared, InfraredNotificationMessageBlinkStartRead);
dialog_ex_set_icon(dialog_ex, 0, 32, &I_InfraredLearnShort_128x31);
dialog_ex_set_icon(dialog_ex, 0, 22, &I_InfraredLearnShort_128x31);
dialog_ex_set_header(dialog_ex, NULL, 0, 0, AlignCenter, AlignCenter);
if(infrared->app_state.is_easy_mode) {
infrared_scene_learn_update_button_name(infrared, false);
dialog_ex_set_icon(dialog_ex, 0, 22, &I_InfraredLearnShort_128x31);
} else {
dialog_ex_set_text(
dialog_ex,
"Point the remote at IR port\nand push the button",
"Point the remote at IR port\nand press the button",
5,
13,
10,
AlignLeft,
AlignCenter);
}
dialog_ex_set_left_button_text(
dialog_ex, infrared->app_state.is_easy_mode ? "Manual" : "Easy");
dialog_ex_set_right_button_text(
dialog_ex, infrared->app_state.is_decode_enabled ? "RAW" : "Decode");
dialog_ex_set_context(dialog_ex, context);
dialog_ex_set_result_callback(dialog_ex, infrared_scene_learn_dialog_result_callback);
@@ -166,6 +170,21 @@ bool infrared_scene_learn_on_event(void* context, SceneManagerEvent event) {
// Update with increment when skipping
infrared_scene_learn_update_button_name(infrared, true);
consumed = true;
} else if(event.event == DialogExResultLeft) {
// Toggle Easy Learn
infrared->app_state.is_easy_mode = !infrared->app_state.is_easy_mode;
infrared_save_settings(infrared);
scene_manager_previous_scene(infrared->scene_manager);
scene_manager_next_scene(infrared->scene_manager, InfraredSceneLearn);
consumed = true;
} else if(event.event == DialogExResultRight) {
// Toggle signal decoding
infrared->app_state.is_decode_enabled = !infrared->app_state.is_decode_enabled;
infrared_worker_rx_enable_signal_decoding(
infrared->worker, infrared->app_state.is_decode_enabled);
dialog_ex_set_right_button_text(
infrared->dialog_ex, infrared->app_state.is_decode_enabled ? "RAW" : "Decode");
consumed = true;
}
} else if(event.type == SceneManagerEventTypeBack) {
// Reset button indices when exiting learn mode completely

4
applications/main/infrared/scenes/infrared_scene_learn_success.c
View File

@@ -15,9 +15,9 @@ void infrared_scene_learn_success_on_enter(void* context) {
if(infrared_signal_is_raw(signal)) {
const InfraredRawSignal* raw = infrared_signal_get_raw_signal(signal);
dialog_ex_set_header(dialog_ex, "Unknown", 95, 10, AlignCenter, AlignCenter);
dialog_ex_set_header(dialog_ex, "Unknown\n(RAW)", 95, 12, AlignCenter, AlignCenter);
infrared_text_store_set(infrared, 0, "%zu samples", raw->timings_size);
dialog_ex_set_text(dialog_ex, infrared->text_store[0], 75, 23, AlignLeft, AlignTop);
dialog_ex_set_text(dialog_ex, infrared->text_store[0], 75, 32, AlignLeft, AlignTop);
} else {
const InfraredMessage* message = infrared_signal_get_message(signal);

47
applications/main/infrared/scenes/infrared_scene_start.c
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);
}