Correct bit order

README.md

@@ -45,19 +45,19 @@ This project may incorporate, adapt, or build upon **other open-source projects*
 | Manufacturer | Protocol | Frequency | Modulation | Encoder | Decoder | CRC |
 |:---|:---|:---:|:---:|:---:|:---:|:---:|
 | VAG (VW/Audi/Skoda/Seat) | VAG GROUP | 433 MHz | AM | Yes | Yes | No |
-| Porsche | Cayenne | 433/868 MHz | AM | Yes | Yes | No |
+| Porsche | Porsche AG | 433/868 MHz | AM | Yes | Yes | No |
 | PSA (Peugeot/Citroën/DS) | PSA GROUP | 433 MHz | AM/FM | Yes | Yes | Yes |
 | Ford | Ford V0 | 315/433 MHz | AM | Yes | Yes | Yes |
 | Fiat | Fiat SpA | 433 MHz | AM | Yes | Yes | Yes |
-| Fiat | Fiat Marelli/Delphi | 433 MHz | AM | No | Yes | No |
+| Fiat | Marelli/Delphi | 433 MHz | AM | No | Yes | No |
+| Mazda | Siemens (5WK49365D) | 315/433 MHz | AM/FM | Yes | Yes | Yes |
+| Kia/Hyundai | KIA/HYU V0 | 433 MHz | FM | Yes | Yes | Yes |
+| Kia/Hyundai | KIA/HYU V1 | 315/433 MHz | AM | Yes | Yes | Yes |
+| Kia/Hyundai | KIA/HYU V2 | 315/433 MHz | AM/FM | Yes | Yes | Yes |
+| Kia/Hyundai | KIA/HYU V3/V4 | 315/433 MHz | AM/FM | Yes | Yes | Yes |
+| Kia/Hyundai | KIA/HYU V5 | 433 MHz | FM | Yes | Yes | Yes |
+| Kia/Hyundai | KIA/HYU V6 | 433 MHz | FM | Yes | Yes | Yes |
 | Subaru | Subaru | 433 MHz | AM | Yes | Yes | No |
-| Mazda | Siemens (5WK49365D) | 315/433 MHz | FM | Yes | Yes | Yes |
-| Kia/Hyundai | Kia V0 | 433 MHz | FM | Yes | Yes | Yes |
-| Kia/Hyundai | Kia V1 | 315/433 MHz | AM | Yes | Yes | Yes |
-| Kia/Hyundai | Kia V2 | 315/433 MHz | FM | Yes | Yes | Yes |
-| Kia/Hyundai | Kia V3/V4 | 315/433 MHz | AM/FM | Yes | Yes | Yes |
-| Kia/Hyundai | Kia V5 | 433 MHz | FM | Yes | Yes | Yes |
-| Kia/Hyundai | Kia V6 | 433 MHz | FM | Yes | Yes | Yes |
 | Suzuki | Suzuki | 433 MHz | FM | Yes | Yes | Yes |
 | Mitsubishi | Mitsubishi V0 | 868 MHz | FM | Yes | Yes | No |
 
@@ -72,6 +72,8 @@ This project may incorporate, adapt, or build upon **other open-source projects*
 | CAME TWEE | 433 MHz | AM | Yes | Yes | No |
 | CAME Atomo | 433 MHz | AM | Yes | Yes | No |
 | Faac SLH | 433/868 MHz | AM | Yes | Yes | No |
+| Holtek | 433 MHz | AM | Yes | Yes | No |
+| Holtek-Ht12x | 433 MHz | AM | Yes | Yes | No |
 | Somfy Telis | 433 MHz | AM | Yes | Yes | Yes |
 | Somfy Keytis | 433 MHz | AM | Yes | Yes | Yes |
 | Alutech AT-4N | 433 MHz | AM | Yes | Yes | Yes |
@@ -81,7 +83,7 @@ This project may incorporate, adapt, or build upon **other open-source projects*
 | Marantec | 433 MHz | AM | Yes | Yes | Yes |
 | Marantec24 | 433 MHz | AM | Yes | Yes | Yes |
 
-### General Static Protocols
+### General Protocols
 
 | Protocol | Frequency | Modulation | Encoder | Decoder | CRC |
 |:---|:---:|:---:|:---:|:---:|:---:|
@@ -101,8 +103,6 @@ This project may incorporate, adapt, or build upon **other open-source projects*
 | Hay21 | 433 MHz | AM | Yes | Yes | No |
 | Revers RB2 | 433 MHz | AM | Yes | Yes | No |
 | Roger | 433 MHz | AM | Yes | Yes | No |
-| BinRAW | 433/315/868 MHz | AM/FM | Yes | Yes | No |
-| RAW | All | All | Yes | Yes | No |
 
 ---
 
@@ -110,9 +110,14 @@ This project may incorporate, adapt, or build upon **other open-source projects*
 
 Compact release build:
 
+To build:
 ```
 ./fbt COMPACT=1 DEBUG=0 updater_package
 ```
+To flash:
+```
+./fbt COMPACT=1 DEBUG=0 flash_usb_full
+```
 
 ---
 
@@ -125,7 +130,7 @@ Flipper-ARF aims to achieve:
 - Stable encoder/decoder implementations
 - Modular protocol expansion
 
-**Primary focus:** VAG, PSA, Fiat, Ford, Asian platforms, and aftermarket alarm systems.
+**Primary focus:** Automotives/Alarm's keyfob protocols, keeloq, and keyless systems.
 
 > ⚠ This is a protocol-focused research firmware, not a general-purpose firmware.
 
@@ -133,10 +138,9 @@ Flipper-ARF aims to achieve:
 
 ## To Do / Planned Features
 
-- [ ] Add Scher Khan & Starline protocols
 - [ ] Marelli BSI encoder and encryption
 - [ ] Improve RollJam app 
-- [ ] Expand and refine Subaru, Kia, PSA, and other manufacturer protocols
+- [ ] Expand and refine as many manufacturer protocols as possible
 
 ---
 

applications/main/subghz/scenes/subghz_scene_keeloq_bf2.c

@@ -1,5 +1,6 @@
 #include "../subghz_i.h"
 #include <lib/subghz/protocols/keeloq.h>
+#include <lib/subghz/blocks/math.h>
 #include <dialogs/dialogs.h>
 
 enum {
@@ -22,10 +23,13 @@ static bool kl_bf2_extract_key(SubGhz* subghz, uint32_t* out_fix, uint32_t* out_
     flipper_format_rewind(fff);
     uint8_t key_data[8] = {0};
     if(!flipper_format_read_hex(fff, "Key", key_data, 8)) return false;
-    *out_fix = ((uint32_t)key_data[0] << 24) | ((uint32_t)key_data[1] << 16) |
-               ((uint32_t)key_data[2] << 8) | key_data[3];
-    *out_hop = ((uint32_t)key_data[4] << 24) | ((uint32_t)key_data[5] << 16) |
-               ((uint32_t)key_data[6] << 8) | key_data[7];
+    uint64_t raw = 0;
+    for(uint8_t i = 0; i < 8; i++) {
+        raw = (raw << 8) | key_data[i];
+    }
+    uint64_t reversed = subghz_protocol_blocks_reverse_key(raw, 64);
+    *out_fix = (uint32_t)(reversed >> 32);
+    *out_hop = (uint32_t)(reversed & 0xFFFFFFFF);
     return true;
 }
 

applications/main/subghz/scenes/subghz_scene_keeloq_decrypt.c

@@ -2,6 +2,7 @@
 #include "../helpers/subghz_txrx_i.h"
 #include <lib/subghz/protocols/keeloq.h>
 #include <lib/subghz/protocols/keeloq_common.h>
+#include <lib/subghz/blocks/math.h>
 #include <lib/subghz/environment.h>
 #include <lib/subghz/subghz_keystore.h>
 #include <furi.h>
@@ -137,10 +138,13 @@ void subghz_scene_keeloq_decrypt_on_enter(void* context) {
 
     uint8_t key_data[8] = {0};
     if(flipper_format_read_hex(fff, "Key", key_data, 8)) {
-        ctx->fix = ((uint32_t)key_data[0] << 24) | ((uint32_t)key_data[1] << 16) |
-                   ((uint32_t)key_data[2] << 8) | key_data[3];
-        ctx->hop = ((uint32_t)key_data[4] << 24) | ((uint32_t)key_data[5] << 16) |
-                   ((uint32_t)key_data[6] << 8) | key_data[7];
+        uint64_t raw = 0;
+        for(uint8_t i = 0; i < 8; i++) {
+            raw = (raw << 8) | key_data[i];
+        }
+        uint64_t reversed = subghz_protocol_blocks_reverse_key(raw, 64);
+        ctx->fix = (uint32_t)(reversed >> 32);
+        ctx->hop = (uint32_t)(reversed & 0xFFFFFFFF);
     }
 
     ctx->serial = ctx->fix & 0x0FFFFFFF;
@@ -188,7 +192,7 @@ bool subghz_scene_keeloq_decrypt_on_event(void* context, SceneManagerEvent event
             subghz_keeloq_keys_add(
                 subghz->keeloq_keys_manager,
                 ctx->recovered_mfkey,
-                ctx->recovered_type,
+                KEELOQ_LEARNING_SIMPLE,
                 key_name);
             subghz_keeloq_keys_save(subghz->keeloq_keys_manager);
 
@@ -198,7 +202,7 @@ bool subghz_scene_keeloq_decrypt_on_event(void* context, SceneManagerEvent event
             SubGhzKey* entry = SubGhzKeyArray_push_raw(*env_arr);
             entry->name = furi_string_alloc_set(key_name);
             entry->key = ctx->recovered_mfkey;
-            entry->type = ctx->recovered_type;
+            entry->type = KEELOQ_LEARNING_SIMPLE;
             return true;
 
         } else if(event.event == KL_DECRYPT_EVENT_DONE) {
@@ -235,11 +239,22 @@ bool subghz_scene_keeloq_decrypt_on_event(void* context, SceneManagerEvent event
                     flipper_format_insert_or_update_uint32(fff, "Hop2", &ctx->hop2, 1);
                 }
 
+                flipper_format_rewind(fff);
+                subghz_protocol_decoder_base_deserialize(
+                    subghz_txrx_get_decoder(subghz->txrx), fff);
+
+                const char* save_path = NULL;
                 if(subghz_path_is_file(subghz->file_path)) {
+                    save_path = furi_string_get_cstr(subghz->file_path);
+                } else if(subghz_path_is_file(subghz->keeloq_bf2.sig1_path)) {
+                    save_path = furi_string_get_cstr(subghz->keeloq_bf2.sig1_path);
+                }
+                if(save_path) {
                     subghz_save_protocol_to_file(
                         subghz,
                         subghz_txrx_get_fff_data(subghz->txrx),
-                        furi_string_get_cstr(subghz->file_path));
+                        save_path);
+                    furi_string_set_str(subghz->file_path, save_path);
                 }
 
                 subghz_view_keeloq_decrypt_set_result(

lib/subghz/protocols/porsche_cayenne.h

@@ -10,7 +10,7 @@
 #include <lib/subghz/blocks/math.h>
 #include <flipper_format/flipper_format.h>
 
-#define SUBGHZ_PROTOCOL_PORSCHE_CAYENNE_NAME "VW/Porsche/Tuareg"
+#define SUBGHZ_PROTOCOL_PORSCHE_CAYENNE_NAME "Porsche AG"
 
 extern const SubGhzProtocol subghz_protocol_porsche_cayenne;