Correct counter work. FAAC SLH bugfix.

applications/main/subghz/scenes/subghz_scene_config.h

@@ -24,3 +24,4 @@ ADD_SCENE(subghz, decode_raw, DecodeRAW)
 ADD_SCENE(subghz, delete_raw, DeleteRAW)
 ADD_SCENE(subghz, need_saving, NeedSaving)
 ADD_SCENE(subghz, rpc, Rpc)
+ADD_SCENE(subghz, edit_cnt, EditCnt)

applications/main/subghz/scenes/subghz_scene_edit_cnt.c

@@ -0,0 +1,57 @@
+#include "../subghz_i.h"
+#include <lib/subghz/protocols/keeloq.h>
+
+#define TAG "SubGhzEditCnt"
+
+void subghz_scene_edit_cnt_byte_input_callback(void* context) {
+    SubGhz* subghz = context;
+
+    view_dispatcher_send_custom_event(subghz->view_dispatcher, SubGhzCustomEventByteInputDone);
+}
+
+void subghz_scene_edit_cnt_on_enter(void* context) {
+    SubGhz* subghz = context;
+
+    // Setup view
+    ByteInput* byte_input = subghz->byte_input;
+
+        byte_input_set_header_text(byte_input, "Enter COUNTER in hex");
+        byte_input_set_result_callback(
+            byte_input,
+            subghz_scene_edit_cnt_byte_input_callback,
+            NULL,
+            subghz,
+            subghz->secure_data->cnt,
+            4);
+    view_dispatcher_switch_to_view(subghz->view_dispatcher, SubGhzViewIdByteInput);
+}
+
+bool subghz_scene_edit_cnt_on_event(void* context, SceneManagerEvent event) {
+    SubGhz* subghz = context;
+    bool consumed = false;
+    uint32_t cnt;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == SubGhzCustomEventByteInputDone) {
+            cnt = subghz->secure_data->cnt[0] << 24 | subghz->secure_data->cnt[1] << 16 |
+                           subghz->secure_data->cnt[2] << 8 | subghz->secure_data->cnt[3];
+            FURI_LOG_I(TAG, "cnt = %08lX", cnt);
+            if(subghz_protocol_keeloq_edit_cnt(subghz->txrx, cnt)) {
+                FURI_LOG_I(TAG, "Hook func from scene to protocol OK");
+            };
+            
+            scene_manager_next_scene(subghz->scene_manager, SubGhzSceneTransmitter);
+            consumed = true;
+        }
+        memset(subghz->secure_data->cnt, 0, sizeof(subghz->secure_data->cnt));
+    }
+    return consumed;
+}
+
+void subghz_scene_edit_cnt_on_exit(void* context) {
+    SubGhz* subghz = context;
+
+    // Clear view
+    byte_input_set_result_callback(subghz->byte_input, NULL, NULL, NULL, NULL, 0);
+    byte_input_set_header_text(subghz->byte_input, "");
+}

applications/main/subghz/scenes/subghz_scene_saved_menu.c

@@ -4,6 +4,7 @@ enum SubmenuIndex {
     SubmenuIndexEmulate,
     SubmenuIndexEdit,
     SubmenuIndexDelete,
+    SubmenuIndesEditCnt,
 };
 
 void subghz_scene_saved_menu_submenu_callback(void* context, uint32_t index) {
@@ -19,6 +20,13 @@ void subghz_scene_saved_menu_on_enter(void* context) {
         SubmenuIndexEmulate,
         subghz_scene_saved_menu_submenu_callback,
         subghz);
+    
+    submenu_add_item(
+        subghz->submenu,
+        "Edit counter",
+        SubmenuIndexEditCnt,
+        subghz_scene_saved_menu_submenu_callback,
+        subghz);
 
     submenu_add_item(
         subghz->submenu,
@@ -60,6 +68,11 @@ bool subghz_scene_saved_menu_on_event(void* context, SceneManagerEvent event) {
                 subghz->scene_manager, SubGhzSceneSavedMenu, SubmenuIndexEdit);
             scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSaveName);
             return true;
+        } else if(event.event == SubmenuIndexEditCnt) {
+            scene_manager_set_scene_state(
+                subghz->scene_manager, SubGhzSceneSavedMenu, SubmenuIndexEditCnt);
+            scene_manager_next_scene(subghz->scene_manager, SubGhzSceneEditCnt);
+            return true;
         }
     }
     return false;

applications/main/subghz/scenes/subghz_scene_set_cnt.c

@@ -29,7 +29,7 @@ void subghz_scene_set_cnt_on_enter(void* context) {
         break;
     case SubmenuIndexFaacSLH_433:
     case SubmenuIndexFaacSLH_868:
-        byte_input_set_header_text(byte_input, "Enter COUNTER in hex, 20bits");
+        byte_input_set_header_text(byte_input, "Enter COUNTER in hex");
         byte_input_set_result_callback(
             byte_input,
             subghz_scene_set_cnt_byte_input_callback,

applications/main/subghz/subghz_i.h

@@ -45,7 +45,7 @@
 
 typedef struct {
     uint8_t fix[4];
-    uint8_t cnt[3];
+    uint8_t cnt[4];
     uint8_t seed[4];
 } SecureData;