Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev

applications/main/infrared/infrared_i.h

@@ -61,6 +61,8 @@ typedef enum {
     InfraredEditModeNone,
     InfraredEditModeRename,
     InfraredEditModeDelete,
+    InfraredEditModeMove,
+    InfraredEditModeMoveSelectDest
 } InfraredEditMode;
 
 typedef struct {
@@ -70,6 +72,7 @@ typedef struct {
     InfraredEditTarget edit_target : 8;
     InfraredEditMode edit_mode : 8;
     int32_t current_button_index;
+    int32_t current_button_index_move_orig;
     uint32_t last_transmit_time;
 } InfraredAppState;
 

applications/main/infrared/infrared_remote.c

@@ -108,6 +108,21 @@ bool infrared_remote_delete_button(InfraredRemote* remote, size_t index) {
     return infrared_remote_store(remote);
 }
 
+bool infrared_remote_move_button(InfraredRemote* remote, size_t index_orig, size_t index_dest) {
+    furi_assert(index_orig < InfraredButtonArray_size(remote->buttons));
+    furi_assert(index_dest <= InfraredButtonArray_size(remote->buttons));
+    if(index_orig == index_dest) {
+        return true;
+    }
+    InfraredRemoteButton* button;
+    InfraredButtonArray_pop_at(&button, remote->buttons, index_orig);
+    if(index_orig > index_dest)
+        InfraredButtonArray_push_at(remote->buttons, index_dest, button);
+    else
+        InfraredButtonArray_push_at(remote->buttons, index_dest - 1, button);
+    return infrared_remote_store(remote);
+}
+
 bool infrared_remote_store(InfraredRemote* remote) {
     Storage* storage = furi_record_open(RECORD_STORAGE);
     FlipperFormat* ff = flipper_format_file_alloc(storage);

applications/main/infrared/infrared_remote.h

@@ -23,6 +23,7 @@ bool infrared_remote_find_button_by_name(InfraredRemote* remote, const char* nam
 bool infrared_remote_add_button(InfraredRemote* remote, const char* name, InfraredSignal* signal);
 bool infrared_remote_rename_button(InfraredRemote* remote, const char* new_name, size_t index);
 bool infrared_remote_delete_button(InfraredRemote* remote, size_t index);
+bool infrared_remote_move_button(InfraredRemote* remote, size_t index_orig, size_t index_dest);
 
 bool infrared_remote_store(InfraredRemote* remote);
 bool infrared_remote_load(InfraredRemote* remote, FuriString* path);

applications/main/infrared/scenes/infrared_scene_config.h

@@ -7,6 +7,8 @@ ADD_SCENE(infrared, edit_delete_done, EditDeleteDone)
 ADD_SCENE(infrared, edit_button_select, EditButtonSelect)
 ADD_SCENE(infrared, edit_rename, EditRename)
 ADD_SCENE(infrared, edit_rename_done, EditRenameDone)
+ADD_SCENE(infrared, edit_move, EditMove)
+ADD_SCENE(infrared, edit_move_done, EditMoveDone)
 ADD_SCENE(infrared, learn, Learn)
 ADD_SCENE(infrared, learn_done, LearnDone)
 ADD_SCENE(infrared, learn_enter_name, LearnEnterName)

applications/main/infrared/scenes/infrared_scene_edit.c

@@ -3,6 +3,7 @@
 typedef enum {
     SubmenuIndexAddButton,
     SubmenuIndexRenameButton,
+    SubmenuIndexMoveButton,
     SubmenuIndexDeleteButton,
     SubmenuIndexRenameRemote,
     SubmenuIndexDeleteRemote,
@@ -30,6 +31,12 @@ void infrared_scene_edit_on_enter(void* context) {
         SubmenuIndexRenameButton,
         infrared_scene_edit_submenu_callback,
         context);
+    submenu_add_item(
+        submenu,
+        "Move Button",
+        SubmenuIndexMoveButton,
+        infrared_scene_edit_submenu_callback,
+        context);
     submenu_add_item(
         submenu,
         "Delete Button",
@@ -74,6 +81,11 @@ bool infrared_scene_edit_on_event(void* context, SceneManagerEvent event) {
             infrared->app_state.edit_mode = InfraredEditModeRename;
             scene_manager_next_scene(scene_manager, InfraredSceneEditButtonSelect);
             consumed = true;
+        } else if(submenu_index == SubmenuIndexMoveButton) {
+            infrared->app_state.edit_target = InfraredEditTargetButton;
+            infrared->app_state.edit_mode = InfraredEditModeMove;
+            scene_manager_next_scene(scene_manager, InfraredSceneEditButtonSelect);
+            consumed = true;
         } else if(submenu_index == SubmenuIndexDeleteButton) {
             infrared->app_state.edit_target = InfraredEditTargetButton;
             infrared->app_state.edit_mode = InfraredEditModeDelete;

applications/main/infrared/scenes/infrared_scene_edit_button_select.c

@@ -11,9 +11,23 @@ void infrared_scene_edit_button_select_on_enter(void* context) {
     InfraredRemote* remote = infrared->remote;
     InfraredAppState* app_state = &infrared->app_state;
 
-    const char* header = infrared->app_state.edit_mode == InfraredEditModeRename ?
-                             "Rename Button:" :
-                             "Delete Button:";
+    const char* header = NULL;
+    switch(infrared->app_state.edit_mode) {
+    case InfraredEditModeRename:
+        header = "Rename Button:";
+        break;
+    case InfraredEditModeDelete:
+        header = "Delete Button:";
+        break;
+    case InfraredEditModeMove:
+        header = "Select Button to Move:";
+        break;
+    case InfraredEditModeMoveSelectDest:
+    case InfraredEditModeNone:
+    default:
+        header = "Move Button Before:";
+        break;
+    }
     submenu_set_header(submenu, header);
 
     const size_t button_count = infrared_remote_get_button_count(remote);
@@ -26,7 +40,14 @@ void infrared_scene_edit_button_select_on_enter(void* context) {
             infrared_scene_edit_button_select_submenu_callback,
             context);
     }
-
+    if(infrared->app_state.edit_mode == InfraredEditModeMoveSelectDest) {
+        submenu_add_item(
+            submenu,
+            "-- Move to the end --",
+            button_count,
+            infrared_scene_edit_button_select_submenu_callback,
+            context);
+    }
     if(button_count && app_state->current_button_index != InfraredButtonIndexNone) {
         submenu_set_selected_item(submenu, app_state->current_button_index);
         app_state->current_button_index = InfraredButtonIndexNone;
@@ -48,6 +69,12 @@ bool infrared_scene_edit_button_select_on_event(void* context, SceneManagerEvent
             scene_manager_next_scene(scene_manager, InfraredSceneEditRename);
         } else if(edit_mode == InfraredEditModeDelete) {
             scene_manager_next_scene(scene_manager, InfraredSceneEditDelete);
+        } else if(edit_mode == InfraredEditModeMove) {
+            app_state->current_button_index_move_orig = event.event;
+            app_state->edit_mode = InfraredEditModeMoveSelectDest;
+            scene_manager_next_scene(scene_manager, InfraredSceneEditButtonSelect);
+        } else if(edit_mode == InfraredEditModeMoveSelectDest) {
+            scene_manager_next_scene(scene_manager, InfraredSceneEditMove);
         } else {
             furi_assert(0);
         }

applications/main/infrared/scenes/infrared_scene_edit_move.c

@@ -0,0 +1,103 @@
+#include "../infrared_i.h"
+
+static void infrared_scene_edit_move_dialog_result_callback(DialogExResult result, void* context) {
+    Infrared* infrared = context;
+    view_dispatcher_send_custom_event(infrared->view_dispatcher, result);
+}
+
+void infrared_scene_edit_move_on_enter(void* context) {
+    Infrared* infrared = context;
+    DialogEx* dialog_ex = infrared->dialog_ex;
+    InfraredRemote* remote = infrared->remote;
+
+    const InfraredEditTarget edit_target = infrared->app_state.edit_target;
+    if(edit_target == InfraredEditTargetButton) {
+        int32_t current_button_index = infrared->app_state.current_button_index_move_orig;
+        furi_assert(current_button_index != InfraredButtonIndexNone);
+
+        dialog_ex_set_header(dialog_ex, "Move Button?", 64, 0, AlignCenter, AlignTop);
+        InfraredRemoteButton* current_button =
+            infrared_remote_get_button(remote, current_button_index);
+        InfraredSignal* signal = infrared_remote_button_get_signal(current_button);
+
+        if(infrared_signal_is_raw(signal)) {
+            const InfraredRawSignal* raw = infrared_signal_get_raw_signal(signal);
+            infrared_text_store_set(
+                infrared,
+                0,
+                "%s\nRAW\n%ld samples",
+                infrared_remote_button_get_name(current_button),
+                raw->timings_size);
+
+        } else {
+            const InfraredMessage* message = infrared_signal_get_message(signal);
+            infrared_text_store_set(
+                infrared,
+                0,
+                "%s\n%s\nA=0x%0*lX C=0x%0*lX",
+                infrared_remote_button_get_name(current_button),
+                infrared_get_protocol_name(message->protocol),
+                ROUND_UP_TO(infrared_get_protocol_address_length(message->protocol), 4),
+                message->address,
+                ROUND_UP_TO(infrared_get_protocol_command_length(message->protocol), 4),
+                message->command);
+        }
+    } else {
+        furi_assert(0);
+    }
+
+    dialog_ex_set_text(dialog_ex, infrared->text_store[0], 64, 31, AlignCenter, AlignCenter);
+    dialog_ex_set_icon(dialog_ex, 0, 0, NULL);
+    dialog_ex_set_left_button_text(dialog_ex, "Cancel");
+    dialog_ex_set_right_button_text(dialog_ex, "Move");
+    dialog_ex_set_result_callback(dialog_ex, infrared_scene_edit_move_dialog_result_callback);
+    dialog_ex_set_context(dialog_ex, context);
+
+    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewDialogEx);
+}
+
+bool infrared_scene_edit_move_on_event(void* context, SceneManagerEvent event) {
+    Infrared* infrared = context;
+    SceneManager* scene_manager = infrared->scene_manager;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == DialogExResultLeft) {
+            scene_manager_previous_scene(scene_manager);
+            consumed = true;
+        } else if(event.event == DialogExResultRight) {
+            bool success = false;
+            InfraredRemote* remote = infrared->remote;
+            InfraredAppState* app_state = &infrared->app_state;
+            const InfraredEditTarget edit_target = app_state->edit_target;
+
+            if(edit_target == InfraredEditTargetButton) {
+                furi_assert(app_state->current_button_index != InfraredButtonIndexNone);
+                success = infrared_remote_move_button(
+                    remote,
+                    app_state->current_button_index_move_orig,
+                    app_state->current_button_index);
+                app_state->current_button_index_move_orig = InfraredButtonIndexNone;
+                app_state->current_button_index = InfraredButtonIndexNone;
+            } else {
+                furi_assert(0);
+            }
+
+            if(success) {
+                scene_manager_next_scene(scene_manager, InfraredSceneEditMoveDone);
+            } else {
+                const uint32_t possible_scenes[] = {InfraredSceneRemoteList, InfraredSceneStart};
+                scene_manager_search_and_switch_to_previous_scene_one_of(
+                    scene_manager, possible_scenes, COUNT_OF(possible_scenes));
+            }
+            consumed = true;
+        }
+    }
+
+    return consumed;
+}
+
+void infrared_scene_edit_move_on_exit(void* context) {
+    Infrared* infrared = context;
+    UNUSED(infrared);
+}

applications/main/infrared/scenes/infrared_scene_edit_move_done.c

@@ -0,0 +1,48 @@
+#include "../infrared_i.h"
+
+void infrared_scene_edit_move_done_on_enter(void* context) {
+    Infrared* infrared = context;
+    Popup* popup = infrared->popup;
+
+    popup_set_icon(popup, 0, 2, &I_DolphinMafia_115x62);
+    popup_set_header(popup, "Moved", 83, 19, AlignLeft, AlignBottom);
+
+    popup_set_callback(popup, infrared_popup_closed_callback);
+    popup_set_context(popup, context);
+    popup_set_timeout(popup, 1500);
+    popup_enable_timeout(popup);
+
+    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewPopup);
+}
+
+bool infrared_scene_edit_move_done_on_event(void* context, SceneManagerEvent event) {
+    Infrared* infrared = context;
+    SceneManager* scene_manager = infrared->scene_manager;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == InfraredCustomEventTypePopupClosed) {
+            const InfraredEditTarget edit_target = infrared->app_state.edit_target;
+            if(edit_target == InfraredEditTargetButton) {
+                scene_manager_search_and_switch_to_previous_scene(
+                    scene_manager, InfraredSceneRemote);
+            } else if(edit_target == InfraredEditTargetRemote) {
+                const uint32_t possible_scenes[] = {InfraredSceneStart, InfraredSceneRemoteList};
+                if(!scene_manager_search_and_switch_to_previous_scene_one_of(
+                       scene_manager, possible_scenes, COUNT_OF(possible_scenes))) {
+                    view_dispatcher_stop(infrared->view_dispatcher);
+                }
+            } else {
+                furi_assert(0);
+            }
+            consumed = true;
+        }
+    }
+
+    return consumed;
+}
+
+void infrared_scene_edit_move_done_on_exit(void* context) {
+    Infrared* infrared = context;
+    UNUSED(infrared);
+}

applications/main/nfc/nfc_cli.c

@@ -146,7 +146,7 @@ static void nfc_cli_apdu(Cli* cli, FuriString* args) {
             resp_size = (tx_rx.rx_bits / 8) * 2;
             if(!resp_size) {
                 printf("No response\r\n");
-                break;
+                continue;
             }
             resp_buffer = malloc(resp_size);
             uint8_to_hex_chars(tx_rx.rx_data, resp_buffer, resp_size);

applications/main/subghz/scenes/subghz_scene_radio_settings.c

@@ -41,6 +41,14 @@ const char* const debug_counter_text[DEBUG_COUNTER_COUNT] = {
     "+5",
     "+10",
 };
+const uint32_t debug_counter_val[DEBUG_COUNTER_COUNT] = {
+    1,
+    2,
+    3,
+    4,
+    5,
+    10,
+};
 
 static void subghz_scene_radio_settings_set_device(VariableItem* item) {
     SubGhz* subghz = variable_item_get_context(item);
@@ -69,48 +77,9 @@ static void subghz_scene_receiver_config_set_debug_counter(VariableItem* item) {
     uint8_t index = variable_item_get_current_value_index(item);
 
     variable_item_set_current_value_text(item, debug_counter_text[index]);
-
-    switch(index) {
-    case 0:
-        furi_hal_subghz_set_rolling_counter_mult(1);
-        break;
-    case 1:
-        furi_hal_subghz_set_rolling_counter_mult(2);
-        break;
-    case 2:
-        furi_hal_subghz_set_rolling_counter_mult(3);
-        break;
-    case 3:
-        furi_hal_subghz_set_rolling_counter_mult(4);
-        break;
-    case 4:
-        furi_hal_subghz_set_rolling_counter_mult(5);
-        break;
-    case 5:
-        furi_hal_subghz_set_rolling_counter_mult(10);
-        break;
-    default:
-        break;
-    }
+    furi_hal_subghz_set_rolling_counter_mult(debug_counter_val[index]);
 }
 
-// static void subghz_scene_receiver_config_set_ext_mod_power(VariableItem* item) {
-//     SubGhz* subghz = variable_item_get_context(item);
-//     uint8_t index = variable_item_get_current_value_index(item);
-
-//     variable_item_set_current_value_text(item, ext_mod_power_text[index]);
-
-//     furi_hal_subghz_set_external_power_disable(index == 1);
-//     if(index == 1) {
-//         furi_hal_subghz_disable_ext_power();
-//     } else {
-//         furi_hal_subghz_enable_ext_power();
-//     }
-
-//     subghz->last_settings->external_module_power_5v_disable = index == 1;
-//     subghz_last_settings_save(subghz->last_settings);
-// }
-
 static void subghz_scene_reciever_config_set_ext_mod_power_amp_text(VariableItem* item) {
     SubGhz* subghz = variable_item_get_context(item);
     uint8_t index = variable_item_get_current_value_index(item);
@@ -184,59 +153,18 @@ void subghz_scene_radio_settings_on_enter(void* context) {
     variable_item_set_current_value_index(item, value_index);
     variable_item_set_current_value_text(item, timestamp_names_text[value_index]);
 
-    if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) {
-        item = variable_item_list_add(
-            variable_item_list,
-            "Counter Incr.",
-            DEBUG_COUNTER_COUNT,
-            subghz_scene_receiver_config_set_debug_counter,
-            subghz);
-        switch(furi_hal_subghz_get_rolling_counter_mult()) {
-        case 1:
-            value_index = 0;
-            break;
-        case 2:
-            value_index = 1;
-            break;
-        case 3:
-            value_index = 2;
-            break;
-        case 4:
-            value_index = 3;
-            break;
-        case 5:
-            value_index = 4;
-            break;
-        case 10:
-            value_index = 5;
-            break;
-        default:
-            break;
-        }
-    } else {
-        item = variable_item_list_add(
-            variable_item_list,
-            "Counter Incr.",
-            3,
-            subghz_scene_receiver_config_set_debug_counter,
-            subghz);
-        switch(furi_hal_subghz_get_rolling_counter_mult()) {
-        case 1:
-            value_index = 0;
-            break;
-        case 2:
-            value_index = 1;
-            break;
-        case 3:
-            value_index = 2;
-            break;
-        default:
-            // Reset to default value
-            value_index = 0;
-            furi_hal_subghz_set_rolling_counter_mult(1);
-            break;
-        }
-    }
+    item = variable_item_list_add(
+        variable_item_list,
+        "Counter Incr.",
+        furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug) ? DEBUG_COUNTER_COUNT : 3,
+        subghz_scene_receiver_config_set_debug_counter,
+        subghz);
+    value_index = value_index_uint32(
+        furi_hal_subghz_get_rolling_counter_mult(),
+        debug_counter_val,
+        furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug) ? DEBUG_COUNTER_COUNT : 3);
+    furi_hal_subghz_set_rolling_counter_mult(debug_counter_val[value_index]);
+
     variable_item_set_current_value_index(item, value_index);
     variable_item_set_current_value_text(item, debug_counter_text[value_index]);