Add hollarm 42bit protocol and more

custom button support and add manually support for new protocols

applications/main/subghz/helpers/subghz_custom_event.h

@@ -117,6 +117,9 @@ typedef enum {
     SetTypePricenton315,
     SetTypePricenton433,
     SetTypeBETT_433,
+    SetTypeGangQi_433,
+    SetTypeHollarm_433,
+    SetTypeMarantec24_868,
     SetTypeLinear_300_00,
     // SetTypeNeroSketch, //Deleted in OFW
     // SetTypeNeroRadio, //Deleted in OFW

applications/main/subghz/scenes/subghz_scene_set_type.c

@@ -63,6 +63,9 @@ static const char* submenu_names[SetTypeMAX] = {
     [SetTypeCAMESpace] = "KL: CAME Space 433MHz",
     [SetTypePricenton315] = "Princeton 315MHz",
     [SetTypePricenton433] = "Princeton 433MHz",
+    [SetTypeGangQi_433] = "GangQi 433MHz",
+    [SetTypeHollarm_433] = "Hollarm 433MHz",
+    [SetTypeMarantec24_868] = "Marantec24 868MHz",
     [SetTypeBETT_433] = "BETT 433MHz",
     [SetTypeLinear_300_00] = "Linear 300MHz",
     // [SetTypeNeroSketch] = "Nero Sketch", // Deleted in OFW
@@ -111,7 +114,7 @@ typedef struct {
     union {
         struct {
             const char* name;
-            uint32_t key;
+            uint64_t key;
             uint8_t bits;
             uint16_t te;
         } data;
@@ -179,7 +182,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
             return true;
         }
 
-        uint32_t key = (uint32_t)rand();
+        uint64_t key = (uint64_t)rand();
         GenInfo gen_info = {0};
         switch(event.event) {
         case SetTypePricenton433:
@@ -302,6 +305,48 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
                 .data.bits = 24,
                 .data.te = 0};
             break;
+        case SetTypeGangQi_433:
+            gen_info = (GenInfo){
+                .type = GenData,
+                .mod = "AM650",
+                .freq = 433920000,
+                .data.name =
+                    SUBGHZ_PROTOCOL_GANGQI_NAME, // Add button 0xD arm and crc sum to the end
+                .data.key =
+                    ((key & 0x00F000000) | 0x340AB7500 |
+                     ((((-0xD7 - (((key & 0x00F000000) | 0x340AB7500) >> 32)) & 0xFF) -
+                       ((((key & 0x00F000000) | 0x340AB7500) >> 24) & 0xFF) -
+                       ((((key & 0x00F000000) | 0x340AB7500) >> 16) & 0xFF) -
+                       ((((key & 0x00F000000) | 0x340AB7500) >> 8) & 0xFF)) &
+                      0xFF)),
+                .data.bits = 34,
+                .data.te = 0};
+            break;
+        case SetTypeHollarm_433:
+            gen_info = (GenInfo){
+                .type = GenData,
+                .mod = "AM650",
+                .freq = 433920000,
+                .data.name = SUBGHZ_PROTOCOL_HOLLARM_NAME, // Add button 0x2 and crc sum to the end
+                .data.key = (key & 0x000FFF0000) | 0xF0B0002200 |
+                            ((((((key & 0x000FFF0000) | 0xF0B0002200) >> 32) & 0xFF) +
+                              ((((key & 0x000FFF0000) | 0xF0B0002200) >> 24) & 0xFF) +
+                              ((((key & 0x000FFF0000) | 0xF0B0002200) >> 16) & 0xFF) +
+                              ((((key & 0x000FFF0000) | 0xF0B0002200) >> 8) & 0xFF)) &
+                             0xFF),
+                .data.bits = 42,
+                .data.te = 0};
+            break;
+        case SetTypeMarantec24_868:
+            gen_info = (GenInfo){
+                .type = GenData,
+                .mod = "AM650",
+                .freq = 868350000,
+                .data.name = SUBGHZ_PROTOCOL_MARANTEC24_NAME, // Add button code 0x8 to the end
+                .data.key = (key & 0xFFFFF0) | 0x000008,
+                .data.bits = 24,
+                .data.te = 0};
+            break;
         case SetTypeFaacSLH_433:
             gen_info = (GenInfo){
                 .type = GenFaacSLH,
@@ -321,7 +366,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
                 .faac_slh.serial = ((key & 0x00FFFFF0) | 0xA0000006) >> 4,
                 .faac_slh.btn = 0x06,
                 .faac_slh.cnt = 0x02,
-                .faac_slh.seed = key,
+                .faac_slh.seed = (key & 0x0FFFFFFF),
                 .faac_slh.manuf = "FAAC_SLH"};
             break;
         case SetTypeBeninca433:

lib/subghz/protocols/gangqi.c

@@ -5,6 +5,8 @@
 #include "../blocks/generic.h"
 #include "../blocks/math.h"
 
+#include "../blocks/custom_btn_i.h"
+
 #define TAG "SubGhzProtocolGangQi"
 
 static const SubGhzBlockConst subghz_protocol_gangqi_const = {
@@ -87,15 +89,96 @@ void subghz_protocol_encoder_gangqi_free(void* context) {
     free(instance);
 }
 
+// Get custom button code
+static uint8_t subghz_protocol_gangqi_get_btn_code(void) {
+    uint8_t custom_btn_id = subghz_custom_btn_get();
+    uint8_t original_btn_code = subghz_custom_btn_get_original();
+    uint8_t btn = original_btn_code;
+
+    // Set custom button
+    if((custom_btn_id == SUBGHZ_CUSTOM_BTN_OK) && (original_btn_code != 0)) {
+        // Restore original button code
+        btn = original_btn_code;
+    } else if(custom_btn_id == SUBGHZ_CUSTOM_BTN_UP) {
+        switch(original_btn_code) {
+        case 0xD:
+            btn = 0xE;
+            break;
+        case 0xE:
+            btn = 0xD;
+            break;
+        case 0xB:
+            btn = 0xD;
+            break;
+        case 0x7:
+            btn = 0xD;
+            break;
+
+        default:
+            break;
+        }
+    } else if(custom_btn_id == SUBGHZ_CUSTOM_BTN_DOWN) {
+        switch(original_btn_code) {
+        case 0xD:
+            btn = 0xB;
+            break;
+        case 0xE:
+            btn = 0xB;
+            break;
+        case 0xB:
+            btn = 0xE;
+            break;
+        case 0x7:
+            btn = 0xE;
+            break;
+
+        default:
+            break;
+        }
+    } else if(custom_btn_id == SUBGHZ_CUSTOM_BTN_LEFT) {
+        switch(original_btn_code) {
+        case 0xD:
+            btn = 0x7;
+            break;
+        case 0xE:
+            btn = 0x7;
+            break;
+        case 0xB:
+            btn = 0x7;
+            break;
+        case 0x7:
+            btn = 0xB;
+            break;
+
+        default:
+            break;
+        }
+    }
+
+    return btn;
+}
+
 /**
  * Generating an upload from data.
  * @param instance Pointer to a SubGhzProtocolEncoderGangQi instance
  */
 static void subghz_protocol_encoder_gangqi_get_upload(SubGhzProtocolEncoderGangQi* instance) {
     furi_assert(instance);
+
+    // Generate new key using custom or default button
+    instance->generic.btn = subghz_protocol_gangqi_get_btn_code();
+
+    uint64_t new_key = (instance->generic.data >> 14) << 14 | (instance->generic.btn << 10) |
+                       (0b01 << 8);
+
+    uint8_t crc = -0xD7 - ((new_key >> 32) & 0xFF) - ((new_key >> 24) & 0xFF) -
+                  ((new_key >> 16) & 0xFF) - ((new_key >> 8) & 0xFF);
+
+    instance->generic.data = (new_key | crc);
+
     size_t index = 0;
 
-    // Send key and GAP
+    // Send key and GAP between parcels
     for(uint8_t i = instance->generic.data_count_bit; i > 0; i--) {
         if(bit_read(instance->generic.data, i - 1)) {
             // Send bit 1
@@ -139,6 +222,49 @@ static void subghz_protocol_encoder_gangqi_get_upload(SubGhzProtocolEncoderGangQ
 static void subghz_protocol_gangqi_remote_controller(SubGhzBlockGeneric* instance) {
     instance->btn = (instance->data >> 10) & 0xF;
     instance->serial = (instance->data & 0xFFFFF0000) >> 16;
+
+    // Save original button for later use
+    if(subghz_custom_btn_get_original() == 0) {
+        subghz_custom_btn_set_original(instance->btn);
+    }
+    subghz_custom_btn_set_max(3);
+
+    // GangQi Decoder
+    // 09.2024 - @xMasterX (MMX)
+    // Thanks @Skorpionm for support!
+
+    //                                    Button
+    //            Serial               || BBBB ||  CRC (byte sum) with overflow and starting point 0xD7
+    //34AAB75BC = 00110100101010101011 01 1101 01 101111 00 // A (0xD)
+    // 4D=F8=171=229 byte sum
+    //034AAB79B8 = 00110100101010101011 01 1110 01 101110 00 // B (0xE)
+    //034AAB6DC4 = 00110100101010101011 01 1011 01 110001 00 // C (0xB)
+    //034AAB5DD4 = 00110100101010101011 01 0111 01 110101 00 // D (0x7)
+    //034AAB55DC = 00110100101010101011 01 0101 01 110111 00 // Settings (0x5)
+    //034AAB51E0 = 00110100101010101011 01 0100 01 111000 00 // A (0x4)
+    //034AAB49E8 = 00110100101010101011 01 0010 01 111010 00 // C (0x2)
+    //034AAB59D8 = 00110100101010101011 01 0110 01 110110 00 // D (0x6)
+    //034AAB45EC = 00110100101010101011 01 0001 01 111011 00 // Settings exit (0x1)
+    //0348557514 = 00110100100001010101 01 1101 01 000101 00
+    //03427B75F4 = 00110100001001111011 01 1101 01 111101 00
+    //
+    // Code for finding start byte for crc sum
+    //
+    //uint64_t test = 0x034AAB79B8; //B8
+    //for(size_t byte = 0; byte < 0xFF; ++byte) {
+    //    uint8_t crc_res = -byte - ((test >> 32) & 0xFF) - ((test >> 24) & 0xFF) -
+    //                      ((test >> 16) & 0xFF) - ((test >> 8) & 0xFF);
+    //   if(crc_res == 0xB8) {
+    //       uint64_t test2 = 0x034AAB6DC4; //C4
+    //       uint8_t crc_res2 = -byte - ((test2 >> 32) & 0xFF) - ((test2 >> 24) & 0xFF) -
+    //                          ((test2 >> 16) & 0xFF) - ((test2 >> 8) & 0xFF);
+    //       if(crc_res2 == 0xC4) {
+    //           printf("Start byte for CRC = %02lX / CRC = %02X \n", byte, crc_res);
+    //
+    //           printf("Testing second parcel CRC = %02X", crc_res2);
+    //       }
+    //   }
+    //  }
 }
 
 SubGhzProtocolStatus
@@ -160,6 +286,20 @@ SubGhzProtocolStatus
 
         subghz_protocol_gangqi_remote_controller(&instance->generic);
         subghz_protocol_encoder_gangqi_get_upload(instance);
+
+        if(!flipper_format_rewind(flipper_format)) {
+            FURI_LOG_E(TAG, "Rewind error");
+            break;
+        }
+        uint8_t key_data[sizeof(uint64_t)] = {0};
+        for(size_t i = 0; i < sizeof(uint64_t); i++) {
+            key_data[sizeof(uint64_t) - i - 1] = (instance->generic.data >> i * 8) & 0xFF;
+        }
+        if(!flipper_format_update_hex(flipper_format, "Key", key_data, sizeof(uint64_t))) {
+            FURI_LOG_E(TAG, "Unable to add Key");
+            break;
+        }
+
         instance->encoder.is_running = true;
     } while(false);
 
@@ -213,9 +353,6 @@ void subghz_protocol_decoder_gangqi_feed(void* context, bool level, volatile uin
     furi_assert(context);
     SubGhzProtocolDecoderGangQi* instance = context;
 
-    // Key example
-    // 00 10011010111101001101110101011101 00
-
     switch(instance->decoder.parser_step) {
     case GangQiDecoderStepReset:
         if((!level) && (DURATION_DIFF(duration, subghz_protocol_gangqi_const.te_long * 2) <
@@ -303,14 +440,14 @@ static const char* subghz_protocol_gangqi_get_button_name(uint8_t btn) {
         "Vibro sens. setting",
         "Settings mode",
         "Ringtone setting",
-        "Ring",
+        "Ring", // D
         "0x8",
         "0x9",
         "0xA",
-        "Alarm",
+        "Alarm", // C
         "0xC",
-        "Arm",
+        "Arm", // A
-        "Disarm",
+        "Disarm", // B
         "0xF"};
     return btn <= 0xf ? name_btn[btn] : name_btn[0];
 }
@@ -346,18 +483,23 @@ void subghz_protocol_decoder_gangqi_get_string(void* context, FuriString* output
     // Parse serial
     subghz_protocol_gangqi_remote_controller(&instance->generic);
 
+    // Get CRC
+    uint8_t crc = -0xD7 - ((instance->generic.data >> 32) & 0xFF) -
+                  ((instance->generic.data >> 24) & 0xFF) -
+                  ((instance->generic.data >> 16) & 0xFF) - ((instance->generic.data >> 8) & 0xFF);
+
     furi_string_cat_printf(
         output,
         "%s %db\r\n"
         "Key: 0x%X%08lX\r\n"
-        "Serial: 0x%05lX  CRC?: 0x%02X\r\n"
+        "Serial: 0x%05lX  CRC: 0x%02X\r\n"
         "Btn: 0x%01X - %s\r\n",
         instance->generic.protocol_name,
         instance->generic.data_count_bit,
         (uint8_t)(instance->generic.data >> 32),
         (uint32_t)(instance->generic.data & 0xFFFFFFFF),
         instance->generic.serial,
-        (uint16_t)(instance->generic.data & 0xFF),
+        crc,
         instance->generic.btn,
         subghz_protocol_gangqi_get_button_name(instance->generic.btn));
 }

lib/subghz/protocols/hollarm.c

@@ -0,0 +1,469 @@
+#include "hollarm.h"
+#include "../blocks/const.h"
+#include "../blocks/decoder.h"
+#include "../blocks/encoder.h"
+#include "../blocks/generic.h"
+#include "../blocks/math.h"
+
+#include "../blocks/custom_btn_i.h"
+
+#define TAG "SubGhzProtocolHollarm"
+
+static const SubGhzBlockConst subghz_protocol_hollarm_const = {
+    .te_short = 200,
+    .te_long = 1000,
+    .te_delta = 200,
+    .min_count_bit_for_found = 42,
+};
+
+struct SubGhzProtocolDecoderHollarm {
+    SubGhzProtocolDecoderBase base;
+
+    SubGhzBlockDecoder decoder;
+    SubGhzBlockGeneric generic;
+};
+
+struct SubGhzProtocolEncoderHollarm {
+    SubGhzProtocolEncoderBase base;
+
+    SubGhzProtocolBlockEncoder encoder;
+    SubGhzBlockGeneric generic;
+};
+
+typedef enum {
+    HollarmDecoderStepReset = 0,
+    HollarmDecoderStepSaveDuration,
+    HollarmDecoderStepCheckDuration,
+} HollarmDecoderStep;
+
+const SubGhzProtocolDecoder subghz_protocol_hollarm_decoder = {
+    .alloc = subghz_protocol_decoder_hollarm_alloc,
+    .free = subghz_protocol_decoder_hollarm_free,
+
+    .feed = subghz_protocol_decoder_hollarm_feed,
+    .reset = subghz_protocol_decoder_hollarm_reset,
+
+    .get_hash_data = subghz_protocol_decoder_hollarm_get_hash_data,
+    .serialize = subghz_protocol_decoder_hollarm_serialize,
+    .deserialize = subghz_protocol_decoder_hollarm_deserialize,
+    .get_string = subghz_protocol_decoder_hollarm_get_string,
+};
+
+const SubGhzProtocolEncoder subghz_protocol_hollarm_encoder = {
+    .alloc = subghz_protocol_encoder_hollarm_alloc,
+    .free = subghz_protocol_encoder_hollarm_free,
+
+    .deserialize = subghz_protocol_encoder_hollarm_deserialize,
+    .stop = subghz_protocol_encoder_hollarm_stop,
+    .yield = subghz_protocol_encoder_hollarm_yield,
+};
+
+const SubGhzProtocol subghz_protocol_hollarm = {
+    .name = SUBGHZ_PROTOCOL_HOLLARM_NAME,
+    .type = SubGhzProtocolTypeStatic,
+    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable |
+            SubGhzProtocolFlag_Load | SubGhzProtocolFlag_Save | SubGhzProtocolFlag_Send,
+
+    .decoder = &subghz_protocol_hollarm_decoder,
+    .encoder = &subghz_protocol_hollarm_encoder,
+};
+
+void* subghz_protocol_encoder_hollarm_alloc(SubGhzEnvironment* environment) {
+    UNUSED(environment);
+    SubGhzProtocolEncoderHollarm* instance = malloc(sizeof(SubGhzProtocolEncoderHollarm));
+
+    instance->base.protocol = &subghz_protocol_hollarm;
+    instance->generic.protocol_name = instance->base.protocol->name;
+
+    instance->encoder.repeat = 10;
+    instance->encoder.size_upload = 256;
+    instance->encoder.upload = malloc(instance->encoder.size_upload * sizeof(LevelDuration));
+    instance->encoder.is_running = false;
+    return instance;
+}
+
+void subghz_protocol_encoder_hollarm_free(void* context) {
+    furi_assert(context);
+    SubGhzProtocolEncoderHollarm* instance = context;
+    free(instance->encoder.upload);
+    free(instance);
+}
+
+// Get custom button code
+static uint8_t subghz_protocol_hollarm_get_btn_code(void) {
+    uint8_t custom_btn_id = subghz_custom_btn_get();
+    uint8_t original_btn_code = subghz_custom_btn_get_original();
+    uint8_t btn = original_btn_code;
+
+    // Set custom button
+    if((custom_btn_id == SUBGHZ_CUSTOM_BTN_OK) && (original_btn_code != 0)) {
+        // Restore original button code
+        btn = original_btn_code;
+    } else if(custom_btn_id == SUBGHZ_CUSTOM_BTN_UP) {
+        switch(original_btn_code) {
+        case 0x1:
+            btn = 0x2;
+            break;
+        case 0x2:
+            btn = 0x1;
+            break;
+        case 0x4:
+            btn = 0x1;
+            break;
+        case 0x8:
+            btn = 0x1;
+            break;
+
+        default:
+            break;
+        }
+    } else if(custom_btn_id == SUBGHZ_CUSTOM_BTN_DOWN) {
+        switch(original_btn_code) {
+        case 0x1:
+            btn = 0x4;
+            break;
+        case 0x2:
+            btn = 0x4;
+            break;
+        case 0x4:
+            btn = 0x2;
+            break;
+        case 0x8:
+            btn = 0x4;
+
+        default:
+            break;
+        }
+    } else if(custom_btn_id == SUBGHZ_CUSTOM_BTN_LEFT) {
+        switch(original_btn_code) {
+        case 0x1:
+            btn = 0x8;
+            break;
+        case 0x2:
+            btn = 0x8;
+            break;
+        case 0x4:
+            btn = 0x8;
+            break;
+        case 0x8:
+            btn = 0x2;
+            break;
+
+        default:
+            break;
+        }
+    }
+
+    return btn;
+}
+
+/**
+ * Generating an upload from data.
+ * @param instance Pointer to a SubGhzProtocolEncoderHollarm instance
+ */
+static void subghz_protocol_encoder_hollarm_get_upload(SubGhzProtocolEncoderHollarm* instance) {
+    furi_assert(instance);
+
+    // Generate new key using custom or default button
+    instance->generic.btn = subghz_protocol_hollarm_get_btn_code();
+
+    uint64_t new_key = (instance->generic.data >> 12) << 12 | (instance->generic.btn << 8);
+
+    uint8_t crc = ((new_key >> 32) & 0xFF) + ((new_key >> 24) & 0xFF) + ((new_key >> 16) & 0xFF) +
+                  ((new_key >> 8) & 0xFF);
+
+    instance->generic.data = (new_key | crc);
+
+    size_t index = 0;
+
+    // Send key and GAP between parcels
+    for(uint8_t i = instance->generic.data_count_bit; i > 0; i--) {
+        // Read and prepare levels with 2 bit (was saved for better parsing) to the left offset to fit with the original remote transmission
+        if(bit_read((instance->generic.data << 2), i - 1)) {
+            // Send bit 1
+            instance->encoder.upload[index++] =
+                level_duration_make(true, (uint32_t)subghz_protocol_hollarm_const.te_short);
+            if(i == 1) {
+                //Send gap if bit was last
+                instance->encoder.upload[index++] = level_duration_make(
+                    false, (uint32_t)subghz_protocol_hollarm_const.te_short * 12);
+            } else {
+                instance->encoder.upload[index++] = level_duration_make(
+                    false, (uint32_t)subghz_protocol_hollarm_const.te_short * 8);
+            }
+        } else {
+            // Send bit 0
+            instance->encoder.upload[index++] =
+                level_duration_make(true, (uint32_t)subghz_protocol_hollarm_const.te_short);
+            if(i == 1) {
+                //Send gap if bit was last
+                instance->encoder.upload[index++] = level_duration_make(
+                    false, (uint32_t)subghz_protocol_hollarm_const.te_short * 12);
+            } else {
+                instance->encoder.upload[index++] =
+                    level_duration_make(false, (uint32_t)subghz_protocol_hollarm_const.te_long);
+            }
+        }
+    }
+
+    instance->encoder.size_upload = index;
+    return;
+}
+
+/** 
+ * Analysis of received data and parsing serial number
+ * @param instance Pointer to a SubGhzBlockGeneric* instance
+ */
+static void subghz_protocol_hollarm_remote_controller(SubGhzBlockGeneric* instance) {
+    instance->btn = (instance->data >> 8) & 0xF;
+    instance->serial = (instance->data & 0xFFFFFFF0000) >> 16;
+
+    // Save original button for later use
+    if(subghz_custom_btn_get_original() == 0) {
+        subghz_custom_btn_set_original(instance->btn);
+    }
+    subghz_custom_btn_set_max(3);
+
+    // Hollarm Decoder
+    // 09.2024 - @xMasterX (MMX)
+    // Thanks @Skorpionm for support!
+
+    // F0B93422FF = FF 8bit Sum
+    // F0B93421FE = FE 8bit Sum
+    // F0B9342401 = 01 8bit Sum
+    // F0B9342805 = 05 8bit Sum
+
+    // Serial (moved 2bit to right)    | Btn | 8b CRC (previous 4 bytes sum)
+    // 00001111000010111001001101000010 0010  11111111 btn = (0x2)
+    // 00001111000010111001001101000010 0001  11111110 btn = (0x1)
+    // 00001111000010111001001101000010 0100  00000001 btn = (0x4)
+    // 00001111000010111001001101000010 1000  00000101 btn = (0x8)
+}
+
+SubGhzProtocolStatus
+    subghz_protocol_encoder_hollarm_deserialize(void* context, FlipperFormat* flipper_format) {
+    furi_assert(context);
+    SubGhzProtocolEncoderHollarm* instance = context;
+    SubGhzProtocolStatus ret = SubGhzProtocolStatusError;
+    do {
+        ret = subghz_block_generic_deserialize_check_count_bit(
+            &instance->generic,
+            flipper_format,
+            subghz_protocol_hollarm_const.min_count_bit_for_found);
+        if(ret != SubGhzProtocolStatusOk) {
+            break;
+        }
+        //optional parameter parameter
+        flipper_format_read_uint32(
+            flipper_format, "Repeat", (uint32_t*)&instance->encoder.repeat, 1);
+
+        subghz_protocol_hollarm_remote_controller(&instance->generic);
+        subghz_protocol_encoder_hollarm_get_upload(instance);
+
+        if(!flipper_format_rewind(flipper_format)) {
+            FURI_LOG_E(TAG, "Rewind error");
+            break;
+        }
+        uint8_t key_data[sizeof(uint64_t)] = {0};
+        for(size_t i = 0; i < sizeof(uint64_t); i++) {
+            key_data[sizeof(uint64_t) - i - 1] = (instance->generic.data >> i * 8) & 0xFF;
+        }
+        if(!flipper_format_update_hex(flipper_format, "Key", key_data, sizeof(uint64_t))) {
+            FURI_LOG_E(TAG, "Unable to add Key");
+            break;
+        }
+
+        instance->encoder.is_running = true;
+    } while(false);
+
+    return ret;
+}
+
+void subghz_protocol_encoder_hollarm_stop(void* context) {
+    SubGhzProtocolEncoderHollarm* instance = context;
+    instance->encoder.is_running = false;
+}
+
+LevelDuration subghz_protocol_encoder_hollarm_yield(void* context) {
+    SubGhzProtocolEncoderHollarm* instance = context;
+
+    if(instance->encoder.repeat == 0 || !instance->encoder.is_running) {
+        instance->encoder.is_running = false;
+        return level_duration_reset();
+    }
+
+    LevelDuration ret = instance->encoder.upload[instance->encoder.front];
+
+    if(++instance->encoder.front == instance->encoder.size_upload) {
+        instance->encoder.repeat--;
+        instance->encoder.front = 0;
+    }
+
+    return ret;
+}
+
+void* subghz_protocol_decoder_hollarm_alloc(SubGhzEnvironment* environment) {
+    UNUSED(environment);
+    SubGhzProtocolDecoderHollarm* instance = malloc(sizeof(SubGhzProtocolDecoderHollarm));
+    instance->base.protocol = &subghz_protocol_hollarm;
+    instance->generic.protocol_name = instance->base.protocol->name;
+    return instance;
+}
+
+void subghz_protocol_decoder_hollarm_free(void* context) {
+    furi_assert(context);
+    SubGhzProtocolDecoderHollarm* instance = context;
+    free(instance);
+}
+
+void subghz_protocol_decoder_hollarm_reset(void* context) {
+    furi_assert(context);
+    SubGhzProtocolDecoderHollarm* instance = context;
+    instance->decoder.parser_step = HollarmDecoderStepReset;
+}
+
+void subghz_protocol_decoder_hollarm_feed(void* context, bool level, volatile uint32_t duration) {
+    furi_assert(context);
+    SubGhzProtocolDecoderHollarm* instance = context;
+
+    switch(instance->decoder.parser_step) {
+    case HollarmDecoderStepReset:
+        if((!level) && (DURATION_DIFF(duration, subghz_protocol_hollarm_const.te_short * 12) <
+                        subghz_protocol_hollarm_const.te_delta * 2)) {
+            //Found GAP between parcels
+            instance->decoder.decode_data = 0;
+            instance->decoder.decode_count_bit = 0;
+            instance->decoder.parser_step = HollarmDecoderStepSaveDuration;
+        }
+        break;
+    case HollarmDecoderStepSaveDuration:
+        // Save HIGH level timing for next step
+        if(level) {
+            instance->decoder.te_last = duration;
+            instance->decoder.parser_step = HollarmDecoderStepCheckDuration;
+        } else {
+            instance->decoder.parser_step = HollarmDecoderStepReset;
+        }
+        break;
+    case HollarmDecoderStepCheckDuration:
+        if(!level) {
+            // Bit 0 is short 200us HIGH + long 1000us LOW timing
+            if((DURATION_DIFF(instance->decoder.te_last, subghz_protocol_hollarm_const.te_short) <
+                subghz_protocol_hollarm_const.te_delta) &&
+               (DURATION_DIFF(duration, subghz_protocol_hollarm_const.te_long) <
+                subghz_protocol_hollarm_const.te_delta)) {
+                subghz_protocol_blocks_add_bit(&instance->decoder, 0);
+                instance->decoder.parser_step = HollarmDecoderStepSaveDuration;
+                // Bit 1 is short 200us HIGH + short x8 = 1600us LOW timing
+            } else if(
+                (DURATION_DIFF(instance->decoder.te_last, subghz_protocol_hollarm_const.te_short) <
+                 subghz_protocol_hollarm_const.te_delta) &&
+                (DURATION_DIFF(duration, subghz_protocol_hollarm_const.te_short * 8) <
+                 subghz_protocol_hollarm_const.te_delta)) {
+                subghz_protocol_blocks_add_bit(&instance->decoder, 1);
+                instance->decoder.parser_step = HollarmDecoderStepSaveDuration;
+            } else if(
+                // End of the key
+                DURATION_DIFF(duration, subghz_protocol_hollarm_const.te_short * 12) <
+                subghz_protocol_hollarm_const.te_delta) {
+                // When next GAP is found add bit 0 and do check for read finish
+                // (we have 42 high level pulses, last or first one may be a stop/start bit but we will parse it as zero)
+                subghz_protocol_blocks_add_bit(&instance->decoder, 0);
+
+                // If got 42 bits key reading is finished
+                if(instance->decoder.decode_count_bit ==
+                   subghz_protocol_hollarm_const.min_count_bit_for_found) {
+                    // Saving with 2bit to the right offset for proper parsing
+                    instance->generic.data = (instance->decoder.decode_data >> 2);
+                    instance->generic.data_count_bit = instance->decoder.decode_count_bit;
+                    if(instance->base.callback)
+                        instance->base.callback(&instance->base, instance->base.context);
+                }
+                instance->decoder.decode_data = 0;
+                instance->decoder.decode_count_bit = 0;
+                instance->decoder.parser_step = HollarmDecoderStepReset;
+            } else {
+                instance->decoder.parser_step = HollarmDecoderStepReset;
+            }
+        } else {
+            instance->decoder.parser_step = HollarmDecoderStepReset;
+        }
+        break;
+    }
+}
+
+/** 
+ * Get button name.
+ * @param btn Button number, 4 bit
+ */
+static const char* subghz_protocol_hollarm_get_button_name(uint8_t btn) {
+    const char* name_btn[16] = {
+        "Unknown",
+        "Disarm", // B (2)
+        "Arm", // A (1)
+        "0x3",
+        "Alarm", // C (3)
+        "0x5",
+        "0x6",
+        "0x7",
+        "Ring", // D (4)
+        "0x9",
+        "0xA",
+        "0xB",
+        "0xC",
+        "0xD",
+        "0xE",
+        "0xF"};
+    return btn <= 0xf ? name_btn[btn] : name_btn[0];
+}
+
+uint8_t subghz_protocol_decoder_hollarm_get_hash_data(void* context) {
+    furi_assert(context);
+    SubGhzProtocolDecoderHollarm* instance = context;
+    return subghz_protocol_blocks_get_hash_data(
+        &instance->decoder, (instance->decoder.decode_count_bit / 8) + 1);
+}
+
+SubGhzProtocolStatus subghz_protocol_decoder_hollarm_serialize(
+    void* context,
+    FlipperFormat* flipper_format,
+    SubGhzRadioPreset* preset) {
+    furi_assert(context);
+    SubGhzProtocolDecoderHollarm* instance = context;
+    return subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
+}
+
+SubGhzProtocolStatus
+    subghz_protocol_decoder_hollarm_deserialize(void* context, FlipperFormat* flipper_format) {
+    furi_assert(context);
+    SubGhzProtocolDecoderHollarm* instance = context;
+    return subghz_block_generic_deserialize_check_count_bit(
+        &instance->generic, flipper_format, subghz_protocol_hollarm_const.min_count_bit_for_found);
+}
+
+void subghz_protocol_decoder_hollarm_get_string(void* context, FuriString* output) {
+    furi_assert(context);
+    SubGhzProtocolDecoderHollarm* instance = context;
+
+    // Parse serial
+    subghz_protocol_hollarm_remote_controller(&instance->generic);
+    // Get CRC
+    uint8_t crc = ((instance->generic.data >> 32) & 0xFF) +
+                  ((instance->generic.data >> 24) & 0xFF) +
+                  ((instance->generic.data >> 16) & 0xFF) + ((instance->generic.data >> 8) & 0xFF);
+
+    furi_string_cat_printf(
+        output,
+        "%s %db\r\n"
+        "Key: 0x%02lX%08lX\r\n"
+        "Serial: 0x%06lX  CRC: %02X\r\n"
+        "Btn: 0x%01X - %s\r\n",
+        instance->generic.protocol_name,
+        instance->generic.data_count_bit,
+        (uint32_t)(instance->generic.data >> 32),
+        (uint32_t)instance->generic.data,
+        instance->generic.serial,
+        crc,
+        instance->generic.btn,
+        subghz_protocol_hollarm_get_button_name(instance->generic.btn));
+}

lib/subghz/protocols/hollarm.h

@@ -0,0 +1,109 @@
+#pragma once
+
+#include "base.h"
+
+#define SUBGHZ_PROTOCOL_HOLLARM_NAME "Hollarm"
+
+typedef struct SubGhzProtocolDecoderHollarm SubGhzProtocolDecoderHollarm;
+typedef struct SubGhzProtocolEncoderHollarm SubGhzProtocolEncoderHollarm;
+
+extern const SubGhzProtocolDecoder subghz_protocol_hollarm_decoder;
+extern const SubGhzProtocolEncoder subghz_protocol_hollarm_encoder;
+extern const SubGhzProtocol subghz_protocol_hollarm;
+
+/**
+ * Allocate SubGhzProtocolEncoderHollarm.
+ * @param environment Pointer to a SubGhzEnvironment instance
+ * @return SubGhzProtocolEncoderHollarm* pointer to a SubGhzProtocolEncoderHollarm instance
+ */
+void* subghz_protocol_encoder_hollarm_alloc(SubGhzEnvironment* environment);
+
+/**
+ * Free SubGhzProtocolEncoderHollarm.
+ * @param context Pointer to a SubGhzProtocolEncoderHollarm instance
+ */
+void subghz_protocol_encoder_hollarm_free(void* context);
+
+/**
+ * Deserialize and generating an upload to send.
+ * @param context Pointer to a SubGhzProtocolEncoderHollarm instance
+ * @param flipper_format Pointer to a FlipperFormat instance
+ * @return status
+ */
+SubGhzProtocolStatus
+    subghz_protocol_encoder_hollarm_deserialize(void* context, FlipperFormat* flipper_format);
+
+/**
+ * Forced transmission stop.
+ * @param context Pointer to a SubGhzProtocolEncoderHollarm instance
+ */
+void subghz_protocol_encoder_hollarm_stop(void* context);
+
+/**
+ * Getting the level and duration of the upload to be loaded into DMA.
+ * @param context Pointer to a SubGhzProtocolEncoderHollarm instance
+ * @return LevelDuration 
+ */
+LevelDuration subghz_protocol_encoder_hollarm_yield(void* context);
+
+/**
+ * Allocate SubGhzProtocolDecoderHollarm.
+ * @param environment Pointer to a SubGhzEnvironment instance
+ * @return SubGhzProtocolDecoderHollarm* pointer to a SubGhzProtocolDecoderHollarm instance
+ */
+void* subghz_protocol_decoder_hollarm_alloc(SubGhzEnvironment* environment);
+
+/**
+ * Free SubGhzProtocolDecoderHollarm.
+ * @param context Pointer to a SubGhzProtocolDecoderHollarm instance
+ */
+void subghz_protocol_decoder_hollarm_free(void* context);
+
+/**
+ * Reset decoder SubGhzProtocolDecoderHollarm.
+ * @param context Pointer to a SubGhzProtocolDecoderHollarm instance
+ */
+void subghz_protocol_decoder_hollarm_reset(void* context);
+
+/**
+ * Parse a raw sequence of levels and durations received from the air.
+ * @param context Pointer to a SubGhzProtocolDecoderHollarm instance
+ * @param level Signal level true-high false-low
+ * @param duration Duration of this level in, us
+ */
+void subghz_protocol_decoder_hollarm_feed(void* context, bool level, uint32_t duration);
+
+/**
+ * Getting the hash sum of the last randomly received parcel.
+ * @param context Pointer to a SubGhzProtocolDecoderHollarm instance
+ * @return hash Hash sum
+ */
+uint8_t subghz_protocol_decoder_hollarm_get_hash_data(void* context);
+
+/**
+ * Serialize data SubGhzProtocolDecoderHollarm.
+ * @param context Pointer to a SubGhzProtocolDecoderHollarm instance
+ * @param flipper_format Pointer to a FlipperFormat instance
+ * @param preset The modulation on which the signal was received, SubGhzRadioPreset
+ * @return status
+ */
+SubGhzProtocolStatus subghz_protocol_decoder_hollarm_serialize(
+    void* context,
+    FlipperFormat* flipper_format,
+    SubGhzRadioPreset* preset);
+
+/**
+ * Deserialize data SubGhzProtocolDecoderHollarm.
+ * @param context Pointer to a SubGhzProtocolDecoderHollarm instance
+ * @param flipper_format Pointer to a FlipperFormat instance
+ * @return status
+ */
+SubGhzProtocolStatus
+    subghz_protocol_decoder_hollarm_deserialize(void* context, FlipperFormat* flipper_format);
+
+/**
+ * Getting a textual representation of the received data.
+ * @param context Pointer to a SubGhzProtocolDecoderHollarm instance
+ * @param output Resulting text
+ */
+void subghz_protocol_decoder_hollarm_get_string(void* context, FuriString* output);

lib/subghz/protocols/marantec24.c

@@ -57,7 +57,7 @@ const SubGhzProtocolEncoder subghz_protocol_marantec24_encoder = {
 };
 
 const SubGhzProtocol subghz_protocol_marantec24 = {
-    .name = SUBGHZ_PROTOCOL_MARA24_NAME,
+    .name = SUBGHZ_PROTOCOL_MARANTEC24_NAME,
     .type = SubGhzProtocolTypeStatic,
     .flag = SubGhzProtocolFlag_868 | SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable |
             SubGhzProtocolFlag_Load | SubGhzProtocolFlag_Save | SubGhzProtocolFlag_Send,

lib/subghz/protocols/marantec24.h

@@ -2,7 +2,7 @@
 
 #include "base.h"
 
-#define SUBGHZ_PROTOCOL_MARA24_NAME "Marantec24"
+#define SUBGHZ_PROTOCOL_MARANTEC24_NAME "Marantec24"
 
 typedef struct SubGhzProtocolDecoderMarantec24 SubGhzProtocolDecoderMarantec24;
 typedef struct SubGhzProtocolEncoderMarantec24 SubGhzProtocolEncoderMarantec24;

lib/subghz/protocols/protocol_items.c

@@ -49,6 +49,7 @@ const SubGhzProtocol* subghz_protocol_registry_items[] = {
     &subghz_protocol_dickert_mahs,
     &subghz_protocol_gangqi,
     &subghz_protocol_marantec24,
+    &subghz_protocol_hollarm,
 };
 
 const SubGhzProtocolRegistry subghz_protocol_registry = {

lib/subghz/protocols/protocol_items.h

@@ -50,3 +50,4 @@
 #include "dickert_mahs.h"
 #include "gangqi.h"
 #include "marantec24.h"
+#include "hollarm.h"