merging

DarkFlippers · Nov 23, 2022 · ae27cfd · ae27cfd
1 parent 7b65217
commit ae27cfd
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 3 deletions.
diff --git a/application.fam b/application.fam
@@ -7,7 +7,7 @@ App(
     requires=["gui","dialogs"],
     stack_size=2 * 1024,
     order=11,
-    fap_icon="subbrute_10px.png",
+    fap_icon="images/subbrute_10px.png",
     fap_category="Tools",
     fap_icon_assets="images",
 )
diff --git a/subbrute_10px.png → images/subbrute_10px.png b/subbrute_10px.png → images/subbrute_10px.png
diff --git a/scenes/subbrute_scene_load_file.c b/scenes/subbrute_scene_load_file.c
@@ -17,8 +17,14 @@ void subbrute_scene_load_file_on_enter(void* context) {
     dialog_file_browser_set_basic_options(&browser_options, SUBBRUTE_FILE_EXT, &I_sub1_10px);
 
     SubBruteFileResult load_result = SubBruteFileResultUnknown;
+    // TODO: DELETE IT
+#ifdef FURI_DEBUG
+    bool res = true;
+    furi_string_printf(load_path, "%s", "/ext/subghz/princeton.sub");
+#else
     bool res =
         dialog_file_browser_show(instance->dialogs, load_path, app_folder, &browser_options);
+#endif
 #ifdef FURI_DEBUG
     FURI_LOG_D(
         TAG,

diff --git a/scenes/subbrute_scene_load_select.c b/scenes/subbrute_scene_load_select.c
@@ -38,6 +38,10 @@ bool subbrute_scene_load_select_on_event(void* context, SceneManagerEvent event)
 
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == SubBruteCustomEventTypeIndexSelected) {
+#ifdef FURI_DEBUG
+            view_dispatcher_stop(instance->view_dispatcher);
+            consumed = true;
+#else
             instance->device->load_index = subbrute_main_view_get_index(instance->view_main);
             uint8_t extra_repeats = subbrute_main_view_get_extra_repeats(instance->view_main);
 
@@ -51,6 +55,7 @@ bool subbrute_scene_load_select_on_event(void* context, SceneManagerEvent event)
                 furi_crash("Invalid attack set!");
             }
             scene_manager_next_scene(instance->scene_manager, SubBruteSceneSetupAttack);
+#endif
             consumed = true;
         }
     } else if(event.type == SceneManagerEventTypeBack) {

diff --git a/scenes/subbrute_scene_start.c b/scenes/subbrute_scene_start.c
@@ -26,6 +26,11 @@ void subbrute_scene_start_on_enter(void* context) {
     subbrute_main_view_set_index(view, instance->device->attack, false, NULL);
 
     view_dispatcher_switch_to_view(instance->view_dispatcher, instance->current_view);
+
+    // TODO: DELETE IT
+#ifdef FURI_DEBUG
+    scene_manager_next_scene(instance->scene_manager, SubBruteSceneLoadFile);
+#endif
 }
 
 void subbrute_scene_start_on_exit(void* context) {

diff --git a/subbrute_device.c b/subbrute_device.c
@@ -25,7 +25,7 @@ SubBruteDevice* subbrute_device_alloc() {
 #ifdef FURI_DEBUG
     subbrute_device_attack_set_default_values(instance, SubBruteAttackCAME12bit433);
 #else
-    subbrute_device_attack_set_default_values(instance, SubBruteAttackCAME12bit433);
+    subbrute_device_attack_set_default_values(instance, SubBruteAttackLoadFile);
 #endif
     return instance;
 }
@@ -340,6 +340,52 @@ uint8_t subbrute_device_load_from_file(SubBruteDevice* instance, const char* fil
 #endif
         }
 
+        flipper_format_rewind(fff_data_file);
+
+        uint8_t key_data[sizeof(uint64_t)] = {0};
+        if(!flipper_format_read_hex(fff_data_file, "Key", key_data, sizeof(uint64_t))) {
+            FURI_LOG_E(TAG, "Missing Key");
+            result = SubBruteFileResultMissingOrIncorrectKey;
+            break;
+        }
+        uint64_t data = 0;
+        for(uint8_t i = 0; i < sizeof(uint64_t); i++) {
+            data = (data << 8) | key_data[i];
+        }
+        instance->key_from_file = data;
+
+        uint16_t add_value = 0x0001;
+        uint8_t bit_index = 7;
+        bool two_bytes = true;
+
+        uint8_t p[8];
+        for(int i = 0; i < 8; i++) {
+            p[i] = (uint8_t)(instance->key_from_file >> 8 * (7 - i)) & 0xFF;
+        }
+        uint16_t num = two_bytes ? (p[bit_index - 1] << 8) | p[bit_index] : p[bit_index];
+        FURI_LOG_D(TAG, "num: 0x%04X", num);
+        num += add_value;
+        FURI_LOG_D(TAG, "num added: 0x%04X", num);
+        uint8_t low_byte = num & (0xff);
+        uint8_t high_byte = (num >> 8) & 0xff;
+
+        data = 0;
+        for(uint8_t i = 0; i < sizeof(uint64_t); i++) {
+            if(i == bit_index - 1 && two_bytes) {
+                data = (data << 8) | high_byte;
+                data = (data << 8) | low_byte;
+                i++;
+            } else if(i == bit_index) {
+                data = (data << 8) | low_byte;
+            } else {
+                data = (data << 8) | p[i];
+            }
+        }
+
+        furi_string_printf(temp_str, "Key: %lX", (uint32_t)(data & 0xFFFFFFFF));
+        FURI_LOG_D(
+            TAG, "H: 0x%02X, L: 0x%02X, %s", high_byte, low_byte, furi_string_get_cstr(temp_str));
+
         // TE
         if(!flipper_format_read_uint32(fff_data_file, "TE", &temp_data32, 1)) {
             FURI_LOG_E(TAG, "Missing or incorrect TE");

diff --git a/subbrute_device.h b/subbrute_device.h
@@ -53,6 +53,8 @@ typedef struct {
     // Loaded info for attack type
     char current_key[SUBBRUTE_PAYLOAD_SIZE];
     char file_key[SUBBRUTE_MAX_LEN_NAME];
+    uint64_t key_from_file;
+    uint64_t current_key_from_file;
 } SubBruteDevice;
 
 SubBruteDevice* subbrute_device_alloc();

diff --git a/subbrute_protocols.c b/subbrute_protocols.c
@@ -481,7 +481,8 @@ void subbrute_protocol_file_generate_file(
     uint8_t te,
     uint8_t repeat,
     uint8_t load_index,
-    const char* file_key) {
+    bool two_bytes,
+    uint64_t file_key) {
     FuriString* candidate = furi_string_alloc();
     char subbrute_payload_byte[8];
     furi_string_set_str(candidate, file_key);