From 24325e4418f684a5feebc1972a8653659342a883 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Thu, 5 Sep 2024 03:54:16 +0300
Subject: [PATCH 01/15] gangqi add button parsing
---
lib/subghz/protocols/gangqi.c | 34 +++++++++++++++++++++++++++++++---
1 file changed, 31 insertions(+), 3 deletions(-)
diff --git a/lib/subghz/protocols/gangqi.c b/lib/subghz/protocols/gangqi.c
index ff3d8ee76..035011433 100644
--- a/lib/subghz/protocols/gangqi.c
+++ b/lib/subghz/protocols/gangqi.c
@@ -137,6 +137,7 @@ static void subghz_protocol_encoder_gangqi_get_upload(SubGhzProtocolEncoderGangQ
* @param instance Pointer to a SubGhzBlockGeneric* instance
*/
static void subghz_protocol_gangqi_remote_controller(SubGhzBlockGeneric* instance) {
+ instance->btn = (instance->data >> 10) & 0xF;
instance->serial = (instance->data & 0xFFFFF0000) >> 16;
}
@@ -289,6 +290,31 @@ void subghz_protocol_decoder_gangqi_feed(void* context, bool level, volatile uin
}
}
+/**
+ * Get button name.
+ * @param btn Button number, 4 bit
+ */
+static const char* subghz_protocol_gangqi_get_button_name(uint8_t btn) {
+ const char* name_btn[16] = {
+ "Unknown",
+ "Exit settings",
+ "Volume setting",
+ "0x3",
+ "Vibro sens. setting",
+ "Settings mode",
+ "Ringtone setting",
+ "Ring",
+ "0x8",
+ "0x9",
+ "0xA",
+ "Alarm",
+ "0xC",
+ "Arm",
+ "Disarm",
+ "0xF"};
+ return btn <= 0xf ? name_btn[btn] : name_btn[0];
+}
+
uint8_t subghz_protocol_decoder_gangqi_get_hash_data(void* context) {
furi_assert(context);
SubGhzProtocolDecoderGangQi* instance = context;
@@ -324,12 +350,14 @@ void subghz_protocol_decoder_gangqi_get_string(void* context, FuriString* output
output,
"%s %db\r\n"
"Key: 0x%X%08lX\r\n"
- "Serial: 0x%05lX\r\n"
- "Button code: 0x%04lX\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,
- (uint32_t)(instance->generic.data & 0xFFFF));
+ (uint16_t)(instance->generic.data & 0xFF),
+ instance->generic.btn,
+ subghz_protocol_gangqi_get_button_name(instance->generic.btn));
}
From 2683f950a7bb7fe7414f6a37ddfc51f4b44fb246 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Thu, 5 Sep 2024 22:14:40 +0300
Subject: [PATCH 02/15] return back after merge
---
lib/subghz/subghz_file_encoder_worker.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/lib/subghz/subghz_file_encoder_worker.c b/lib/subghz/subghz_file_encoder_worker.c
index af9376db5..1b8d4b667 100644
--- a/lib/subghz/subghz_file_encoder_worker.c
+++ b/lib/subghz/subghz_file_encoder_worker.c
@@ -59,7 +59,16 @@ bool subghz_file_encoder_worker_data_parse(SubGhzFileEncoderWorker* instance, co
// Parse next element
int32_t duration;
while(strint_to_int32(str, &str, &duration, 10) == StrintParseNoError) {
- subghz_file_encoder_worker_add_level_duration(instance, duration);
+ if((duration < -1000000) || (duration > 1000000)) {
+ if(duration > 0) {
+ subghz_file_encoder_worker_add_level_duration(instance, (int32_t)100);
+ } else {
+ subghz_file_encoder_worker_add_level_duration(instance, (int32_t)-100);
+ }
+ //FURI_LOG_I("PARSE", "Number overflow - %d", duration);
+ } else {
+ subghz_file_encoder_worker_add_level_duration(instance, duration);
+ }
if(*str == ',') str++; // could also be `\0`
}
From a4eebd7ad6b6b85f285427766b1ba1126f2c3097 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Fri, 6 Sep 2024 00:46:29 +0300
Subject: [PATCH 03/15] Add hollarm 42bit protocol and more
custom button support and add manually support for new protocols
---
.../main/subghz/helpers/subghz_custom_event.h | 3 +
.../subghz/scenes/subghz_scene_set_type.c | 51 +-
lib/subghz/protocols/gangqi.c | 162 +++++-
lib/subghz/protocols/hollarm.c | 469 ++++++++++++++++++
lib/subghz/protocols/hollarm.h | 109 ++++
lib/subghz/protocols/marantec24.c | 2 +-
lib/subghz/protocols/marantec24.h | 2 +-
lib/subghz/protocols/protocol_items.c | 1 +
lib/subghz/protocols/protocol_items.h | 1 +
9 files changed, 785 insertions(+), 15 deletions(-)
create mode 100644 lib/subghz/protocols/hollarm.c
create mode 100644 lib/subghz/protocols/hollarm.h
diff --git a/applications/main/subghz/helpers/subghz_custom_event.h b/applications/main/subghz/helpers/subghz_custom_event.h
index c84bed3fc..a3cb4a72a 100644
--- a/applications/main/subghz/helpers/subghz_custom_event.h
+++ b/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
diff --git a/applications/main/subghz/scenes/subghz_scene_set_type.c b/applications/main/subghz/scenes/subghz_scene_set_type.c
index 324cc48f0..8b243d7d8 100644
--- a/applications/main/subghz/scenes/subghz_scene_set_type.c
+++ b/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:
diff --git a/lib/subghz/protocols/gangqi.c b/lib/subghz/protocols/gangqi.c
index 035011433..c6d9dd0e8 100644
--- a/lib/subghz/protocols/gangqi.c
+++ b/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",
- "Disarm",
+ "Arm", // A
+ "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));
}
diff --git a/lib/subghz/protocols/hollarm.c b/lib/subghz/protocols/hollarm.c
new file mode 100644
index 000000000..5cf5a6ef8
--- /dev/null
+++ b/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));
+}
diff --git a/lib/subghz/protocols/hollarm.h b/lib/subghz/protocols/hollarm.h
new file mode 100644
index 000000000..8749198a1
--- /dev/null
+++ b/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);
diff --git a/lib/subghz/protocols/marantec24.c b/lib/subghz/protocols/marantec24.c
index 48816c39b..eee009f2d 100644
--- a/lib/subghz/protocols/marantec24.c
+++ b/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,
diff --git a/lib/subghz/protocols/marantec24.h b/lib/subghz/protocols/marantec24.h
index 59880ec3a..862eb7e2a 100644
--- a/lib/subghz/protocols/marantec24.h
+++ b/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;
diff --git a/lib/subghz/protocols/protocol_items.c b/lib/subghz/protocols/protocol_items.c
index fa42f56b4..0d9462dc0 100644
--- a/lib/subghz/protocols/protocol_items.c
+++ b/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 = {
diff --git a/lib/subghz/protocols/protocol_items.h b/lib/subghz/protocols/protocol_items.h
index afd8eacac..8b6765965 100644
--- a/lib/subghz/protocols/protocol_items.h
+++ b/lib/subghz/protocols/protocol_items.h
@@ -50,3 +50,4 @@
#include "dickert_mahs.h"
#include "gangqi.h"
#include "marantec24.h"
+#include "hollarm.h"
From 0ad8c67ab692288756267e1ea42f34517866674a Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Fri, 6 Sep 2024 00:55:29 +0300
Subject: [PATCH 04/15] one byte
---
.../main/subghz/scenes/subghz_scene_set_type.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/applications/main/subghz/scenes/subghz_scene_set_type.c b/applications/main/subghz/scenes/subghz_scene_set_type.c
index 8b243d7d8..554b7cd7e 100644
--- a/applications/main/subghz/scenes/subghz_scene_set_type.c
+++ b/applications/main/subghz/scenes/subghz_scene_set_type.c
@@ -313,11 +313,11 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
.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)) &
+ ((key & 0x00FF00000) | 0x3400B7500 |
+ ((((-0xD7 - (((key & 0x00FF00000) | 0x3400B7500) >> 32)) & 0xFF) -
+ ((((key & 0x00FF00000) | 0x3400B7500) >> 24) & 0xFF) -
+ ((((key & 0x00FF00000) | 0x3400B7500) >> 16) & 0xFF) -
+ ((((key & 0x00FF00000) | 0x3400B7500) >> 8) & 0xFF)) &
0xFF)),
.data.bits = 34,
.data.te = 0};
From 2762ff2deff461a96a4d32b4e62f077175897397 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Fri, 6 Sep 2024 10:11:43 +0300
Subject: [PATCH 05/15] gangqi serial validator and fix add manually
---
.../helpers/subghz_txrx_create_protocol_key.c | 25 +++++++++++++++++++
.../helpers/subghz_txrx_create_protocol_key.h | 7 ++++++
.../subghz/scenes/subghz_scene_set_type.c | 12 ++++-----
lib/subghz/protocols/gangqi.c | 21 +++++++++++-----
4 files changed, 52 insertions(+), 13 deletions(-)
diff --git a/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c b/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c
index a29484902..1ec4a13f0 100644
--- a/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c
+++ b/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c
@@ -382,3 +382,28 @@ bool subghz_txrx_gen_secplus_v1_protocol(
}
return ret;
}
+
+void subghz_txrx_gen_serial_gangqi(uint64_t* result_key) {
+ uint64_t randkey = (uint64_t)rand();
+ uint64_t only_required_bytes = (randkey & 0xFFFFF0000);
+ uint16_t sum_of_3bytes = ((only_required_bytes >> 32) & 0xFF) +
+ ((only_required_bytes >> 24) & 0xFF) +
+ ((only_required_bytes >> 16) & 0xFF);
+
+ while(!((!(sum_of_3bytes & 0x3)) && ((0xb2 < sum_of_3bytes) && (sum_of_3bytes < 0x1ae)))) {
+ randkey = (uint64_t)rand();
+ only_required_bytes = (randkey & 0xFFFFF0000);
+ sum_of_3bytes = ((only_required_bytes >> 32) & 0xFF) +
+ ((only_required_bytes >> 24) & 0xFF) +
+ ((only_required_bytes >> 16) & 0xFF);
+ }
+
+ // Serial 01 button 01
+ uint64_t new_key = only_required_bytes | (0b01 << 14) | (0xD << 10) | (0b01 << 8);
+
+ uint8_t crc = -0xD7 - ((new_key >> 32) & 0xFF) - ((new_key >> 24) & 0xFF) -
+ ((new_key >> 16) & 0xFF) - ((new_key >> 8) & 0xFF);
+
+ // Add crc sum to the end
+ *result_key = (new_key | crc);
+}
diff --git a/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.h b/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.h
index 0b9cfefab..55932bd39 100644
--- a/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.h
+++ b/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.h
@@ -146,3 +146,10 @@ bool subghz_txrx_gen_secplus_v1_protocol(
SubGhzTxRx* instance,
const char* name_preset,
uint32_t frequency);
+
+/**
+ * Generate valid serial number for GangQi protocol
+ *
+ * @return uint64_t if success
+ */
+void subghz_txrx_gen_serial_gangqi(uint64_t* result_key);
diff --git a/applications/main/subghz/scenes/subghz_scene_set_type.c b/applications/main/subghz/scenes/subghz_scene_set_type.c
index 554b7cd7e..43bf05044 100644
--- a/applications/main/subghz/scenes/subghz_scene_set_type.c
+++ b/applications/main/subghz/scenes/subghz_scene_set_type.c
@@ -183,6 +183,10 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
}
uint64_t key = (uint64_t)rand();
+
+ uint64_t gangqi_key;
+ subghz_txrx_gen_serial_gangqi(&gangqi_key);
+
GenInfo gen_info = {0};
switch(event.event) {
case SetTypePricenton433:
@@ -312,13 +316,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
.freq = 433920000,
.data.name =
SUBGHZ_PROTOCOL_GANGQI_NAME, // Add button 0xD arm and crc sum to the end
- .data.key =
- ((key & 0x00FF00000) | 0x3400B7500 |
- ((((-0xD7 - (((key & 0x00FF00000) | 0x3400B7500) >> 32)) & 0xFF) -
- ((((key & 0x00FF00000) | 0x3400B7500) >> 24) & 0xFF) -
- ((((key & 0x00FF00000) | 0x3400B7500) >> 16) & 0xFF) -
- ((((key & 0x00FF00000) | 0x3400B7500) >> 8) & 0xFF)) &
- 0xFF)),
+ .data.key = gangqi_key,
.data.bits = 34,
.data.te = 0};
break;
diff --git a/lib/subghz/protocols/gangqi.c b/lib/subghz/protocols/gangqi.c
index c6d9dd0e8..00e731e21 100644
--- a/lib/subghz/protocols/gangqi.c
+++ b/lib/subghz/protocols/gangqi.c
@@ -233,10 +233,10 @@ static void subghz_protocol_gangqi_remote_controller(SubGhzBlockGeneric* instanc
// 09.2024 - @xMasterX (MMX)
// Thanks @Skorpionm for support!
+ //// 4D=F8=171=229 byte sum should be always the same
// 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
+ //034AAB75BC = 00110100101010101011 01 1101 01 101111 00 // A (0xD)
//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)
@@ -245,8 +245,8 @@ static void subghz_protocol_gangqi_remote_controller(SubGhzBlockGeneric* instanc
//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
+ //
+ // Serial 3 bytes should meet requirements see validation example at subghz_protocol_decoder_gangqi_get_string
//
// Code for finding start byte for crc sum
//
@@ -488,12 +488,17 @@ void subghz_protocol_decoder_gangqi_get_string(void* context, FuriString* output
((instance->generic.data >> 24) & 0xFF) -
((instance->generic.data >> 16) & 0xFF) - ((instance->generic.data >> 8) & 0xFF);
+ uint16_t sum_3bytes_serial = ((instance->generic.serial >> 16) & 0xFF) +
+ ((instance->generic.serial >> 8) & 0xFF) +
+ (instance->generic.serial & 0xFF);
+
furi_string_cat_printf(
output,
"%s %db\r\n"
"Key: 0x%X%08lX\r\n"
"Serial: 0x%05lX CRC: 0x%02X\r\n"
- "Btn: 0x%01X - %s\r\n",
+ "Btn: 0x%01X - %s\r\n"
+ "Serial is %s\r\n",
instance->generic.protocol_name,
instance->generic.data_count_bit,
(uint8_t)(instance->generic.data >> 32),
@@ -501,5 +506,9 @@ void subghz_protocol_decoder_gangqi_get_string(void* context, FuriString* output
instance->generic.serial,
crc,
instance->generic.btn,
- subghz_protocol_gangqi_get_button_name(instance->generic.btn));
+ subghz_protocol_gangqi_get_button_name(instance->generic.btn),
+ ((!(sum_3bytes_serial & 0x3)) &&
+ ((0xb2 < sum_3bytes_serial) && (sum_3bytes_serial < 0x1ae))) ?
+ "valid" :
+ "invalid");
}
From 2e0cebc4f860be625bb90d742adbebbe1b0ef96f Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Fri, 6 Sep 2024 10:12:57 +0300
Subject: [PATCH 06/15] add hay21 dynamic protocol [ci skip]
---
lib/subghz/protocols/hay21.c | 447 ++++++++++++++++++++++++++
lib/subghz/protocols/hay21.h | 109 +++++++
lib/subghz/protocols/protocol_items.c | 1 +
lib/subghz/protocols/protocol_items.h | 1 +
4 files changed, 558 insertions(+)
create mode 100644 lib/subghz/protocols/hay21.c
create mode 100644 lib/subghz/protocols/hay21.h
diff --git a/lib/subghz/protocols/hay21.c b/lib/subghz/protocols/hay21.c
new file mode 100644
index 000000000..3424320dd
--- /dev/null
+++ b/lib/subghz/protocols/hay21.c
@@ -0,0 +1,447 @@
+#include "hay21.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 "SubGhzProtocolHay21"
+
+static const SubGhzBlockConst subghz_protocol_hay21_const = {
+ .te_short = 300,
+ .te_long = 700,
+ .te_delta = 150,
+ .min_count_bit_for_found = 21,
+};
+
+struct SubGhzProtocolDecoderHay21 {
+ SubGhzProtocolDecoderBase base;
+
+ SubGhzBlockDecoder decoder;
+ SubGhzBlockGeneric generic;
+};
+
+struct SubGhzProtocolEncoderHay21 {
+ SubGhzProtocolEncoderBase base;
+
+ SubGhzProtocolBlockEncoder encoder;
+ SubGhzBlockGeneric generic;
+};
+
+typedef enum {
+ Hay21DecoderStepReset = 0,
+ Hay21DecoderStepSaveDuration,
+ Hay21DecoderStepCheckDuration,
+} Hay21DecoderStep;
+
+const SubGhzProtocolDecoder subghz_protocol_hay21_decoder = {
+ .alloc = subghz_protocol_decoder_hay21_alloc,
+ .free = subghz_protocol_decoder_hay21_free,
+
+ .feed = subghz_protocol_decoder_hay21_feed,
+ .reset = subghz_protocol_decoder_hay21_reset,
+
+ .get_hash_data = subghz_protocol_decoder_hay21_get_hash_data,
+ .serialize = subghz_protocol_decoder_hay21_serialize,
+ .deserialize = subghz_protocol_decoder_hay21_deserialize,
+ .get_string = subghz_protocol_decoder_hay21_get_string,
+};
+
+const SubGhzProtocolEncoder subghz_protocol_hay21_encoder = {
+ .alloc = subghz_protocol_encoder_hay21_alloc,
+ .free = subghz_protocol_encoder_hay21_free,
+
+ .deserialize = subghz_protocol_encoder_hay21_deserialize,
+ .stop = subghz_protocol_encoder_hay21_stop,
+ .yield = subghz_protocol_encoder_hay21_yield,
+};
+
+const SubGhzProtocol subghz_protocol_hay21 = {
+ .name = SUBGHZ_PROTOCOL_HAY21_NAME,
+ .type = SubGhzProtocolTypeDynamic,
+ .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable |
+ SubGhzProtocolFlag_Load | SubGhzProtocolFlag_Save | SubGhzProtocolFlag_Send,
+
+ .decoder = &subghz_protocol_hay21_decoder,
+ .encoder = &subghz_protocol_hay21_encoder,
+};
+
+void* subghz_protocol_encoder_hay21_alloc(SubGhzEnvironment* environment) {
+ UNUSED(environment);
+ SubGhzProtocolEncoderHay21* instance = malloc(sizeof(SubGhzProtocolEncoderHay21));
+
+ instance->base.protocol = &subghz_protocol_hay21;
+ 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_hay21_free(void* context) {
+ furi_assert(context);
+ SubGhzProtocolEncoderHay21* instance = context;
+ free(instance->encoder.upload);
+ free(instance);
+}
+
+// Get custom button code
+static uint8_t subghz_protocol_hay21_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 0x5A:
+ btn = 0xC3;
+ break;
+ case 0xC3:
+ btn = 0x5A;
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ return btn;
+}
+
+/**
+ * Generating an upload from data.
+ * @param instance Pointer to a SubGhzProtocolEncoderHay21 instance
+ */
+static void subghz_protocol_encoder_hay21_get_upload(SubGhzProtocolEncoderHay21* instance) {
+ furi_assert(instance);
+
+ // Generate new key using custom or default button
+ instance->generic.btn = subghz_protocol_hay21_get_btn_code();
+
+ // Counter increment
+ if(instance->generic.cnt < 0xF) {
+ if((instance->generic.cnt + 0x1) > 0xF) {
+ instance->generic.cnt = 0;
+ } else {
+ instance->generic.cnt++;
+ }
+ } else if(instance->generic.cnt >= 0xF) {
+ instance->generic.cnt = 0;
+ }
+
+ // Reconstruction of the data
+ instance->generic.data =
+ ((uint64_t)instance->generic.btn << 13 | (uint64_t)instance->generic.serial << 5 |
+ instance->generic.cnt << 1) |
+ 0b1;
+
+ size_t index = 0;
+
+ // 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
+ instance->encoder.upload[index++] =
+ level_duration_make(true, (uint32_t)subghz_protocol_hay21_const.te_long);
+ if(i == 1) {
+ //Send gap if bit was last
+ instance->encoder.upload[index++] =
+ level_duration_make(false, (uint32_t)subghz_protocol_hay21_const.te_long * 6);
+ } else {
+ instance->encoder.upload[index++] =
+ level_duration_make(false, (uint32_t)subghz_protocol_hay21_const.te_short);
+ }
+ } else {
+ // Send bit 0
+ instance->encoder.upload[index++] =
+ level_duration_make(true, (uint32_t)subghz_protocol_hay21_const.te_short);
+ if(i == 1) {
+ //Send gap if bit was last
+ instance->encoder.upload[index++] =
+ level_duration_make(false, (uint32_t)subghz_protocol_hay21_const.te_long * 6);
+ } else {
+ instance->encoder.upload[index++] =
+ level_duration_make(false, (uint32_t)subghz_protocol_hay21_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_hay21_remote_controller(SubGhzBlockGeneric* instance) {
+ instance->btn = (instance->data >> 13) & 0xFF;
+ instance->serial = (instance->data >> 5) & 0xFF;
+ instance->cnt = (instance->data >> 1) & 0xF;
+
+ // 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(1);
+
+ // Hay21 Decoder
+ // 09.2024 - @xMasterX (MMX)
+
+ // Key samples (inverted)
+ // button serial CNT (goes lower since 0/1 are inverted)
+ //14A84A = 000 10100101 01000010 0101 0 (cnt 5)
+ //14A848 = 000 10100101 01000010 0100 0 (cnt 4)
+ //14A846 = 000 10100101 01000010 0011 0 (cnt 3)
+ //14A844 = 000 10100101 01000010 0010 0 (cnt 2)
+ //14A842 = 000 10100101 01000010 0001 0 (cnt 1)
+ //14A840 = 000 10100101 01000010 0000 0 (cnt 0)
+ //14A85E = 000 10100101 01000010 1111 0 (cnt F)
+ //14A85C = 000 10100101 01000010 1110 0 (cnt E)
+ //14A85A = 000 10100101 01000010 1101 0 (cnt D)
+ //14A858 = 000 10100101 01000010 1100 0 (cnt C)
+ //14A856 = 000 10100101 01000010 1011 0 (cnt B)
+ // 0xA5 (Labeled as On/Off on the remote board)
+ // 0x3C (Labeled as Mode on the remote board)
+ // 0x42 (Serial)
+ // BTN Serial CNT
+ //078854 = 000 00111100 01000010 1010 0 (cnt A)
+ //078852 = 000 00111100 01000010 1001 0 (cnt 9)
+ //078850 = 000 00111100 01000010 1000 0 (cnt 8)
+ //07884E = 000 00111100 01000010 0111 0 (cnt 7)
+ // Inverted back
+ //1877B9 = 000 11000011 10111101 1100 1
+ //1877BB = 000 11000011 10111101 1101 1
+ //1877BD = 000 11000011 10111101 1110 1
+ //0B57BF = 000 01011010 10111101 1111 1
+}
+
+SubGhzProtocolStatus
+ subghz_protocol_encoder_hay21_deserialize(void* context, FlipperFormat* flipper_format) {
+ furi_assert(context);
+ SubGhzProtocolEncoderHay21* instance = context;
+ SubGhzProtocolStatus ret = SubGhzProtocolStatusError;
+ do {
+ ret = subghz_block_generic_deserialize_check_count_bit(
+ &instance->generic,
+ flipper_format,
+ subghz_protocol_hay21_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_hay21_remote_controller(&instance->generic);
+ subghz_protocol_encoder_hay21_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_hay21_stop(void* context) {
+ SubGhzProtocolEncoderHay21* instance = context;
+ instance->encoder.is_running = false;
+}
+
+LevelDuration subghz_protocol_encoder_hay21_yield(void* context) {
+ SubGhzProtocolEncoderHay21* 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_hay21_alloc(SubGhzEnvironment* environment) {
+ UNUSED(environment);
+ SubGhzProtocolDecoderHay21* instance = malloc(sizeof(SubGhzProtocolDecoderHay21));
+ instance->base.protocol = &subghz_protocol_hay21;
+ instance->generic.protocol_name = instance->base.protocol->name;
+ return instance;
+}
+
+void subghz_protocol_decoder_hay21_free(void* context) {
+ furi_assert(context);
+ SubGhzProtocolDecoderHay21* instance = context;
+ free(instance);
+}
+
+void subghz_protocol_decoder_hay21_reset(void* context) {
+ furi_assert(context);
+ SubGhzProtocolDecoderHay21* instance = context;
+ instance->decoder.parser_step = Hay21DecoderStepReset;
+}
+
+void subghz_protocol_decoder_hay21_feed(void* context, bool level, volatile uint32_t duration) {
+ furi_assert(context);
+ SubGhzProtocolDecoderHay21* instance = context;
+
+ switch(instance->decoder.parser_step) {
+ case Hay21DecoderStepReset:
+ if((!level) && (DURATION_DIFF(duration, subghz_protocol_hay21_const.te_long * 6) <
+ subghz_protocol_hay21_const.te_delta * 3)) {
+ //Found GAP
+ instance->decoder.decode_data = 0;
+ instance->decoder.decode_count_bit = 0;
+ instance->decoder.parser_step = Hay21DecoderStepSaveDuration;
+ }
+ break;
+ case Hay21DecoderStepSaveDuration:
+ if(level) {
+ instance->decoder.te_last = duration;
+ instance->decoder.parser_step = Hay21DecoderStepCheckDuration;
+ } else {
+ instance->decoder.parser_step = Hay21DecoderStepReset;
+ }
+ break;
+ case Hay21DecoderStepCheckDuration:
+ if(!level) {
+ // Bit 1 is long + short timing
+ if((DURATION_DIFF(instance->decoder.te_last, subghz_protocol_hay21_const.te_long) <
+ subghz_protocol_hay21_const.te_delta) &&
+ (DURATION_DIFF(duration, subghz_protocol_hay21_const.te_short) <
+ subghz_protocol_hay21_const.te_delta)) {
+ subghz_protocol_blocks_add_bit(&instance->decoder, 1);
+ instance->decoder.parser_step = Hay21DecoderStepSaveDuration;
+ // Bit 0 is short + long timing
+ } else if(
+ (DURATION_DIFF(instance->decoder.te_last, subghz_protocol_hay21_const.te_short) <
+ subghz_protocol_hay21_const.te_delta) &&
+ (DURATION_DIFF(duration, subghz_protocol_hay21_const.te_long) <
+ subghz_protocol_hay21_const.te_delta)) {
+ subghz_protocol_blocks_add_bit(&instance->decoder, 0);
+ instance->decoder.parser_step = Hay21DecoderStepSaveDuration;
+ } else if(
+ // End of the key
+ DURATION_DIFF(duration, subghz_protocol_hay21_const.te_long * 6) <
+ subghz_protocol_hay21_const.te_delta * 2) {
+ //Found next GAP and add bit 0 or 1
+ if((DURATION_DIFF(instance->decoder.te_last, subghz_protocol_hay21_const.te_long) <
+ subghz_protocol_hay21_const.te_delta)) {
+ subghz_protocol_blocks_add_bit(&instance->decoder, 1);
+ }
+ if((DURATION_DIFF(instance->decoder.te_last, subghz_protocol_hay21_const.te_short) <
+ subghz_protocol_hay21_const.te_delta)) {
+ subghz_protocol_blocks_add_bit(&instance->decoder, 0);
+ }
+ // If got 21 bits key reading is finished
+ if(instance->decoder.decode_count_bit ==
+ subghz_protocol_hay21_const.min_count_bit_for_found) {
+ instance->generic.data = instance->decoder.decode_data;
+ 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 = Hay21DecoderStepReset;
+ } else {
+ instance->decoder.parser_step = Hay21DecoderStepReset;
+ }
+ } else {
+ instance->decoder.parser_step = Hay21DecoderStepReset;
+ }
+ break;
+ }
+}
+
+/**
+ * Get button name.
+ * @param btn Button number, 4 bit
+ */
+static const char* subghz_protocol_hay21_get_button_name(uint8_t btn) {
+ const char* btn_name;
+ switch(btn) {
+ case 0x5A:
+ btn_name = "On/Off";
+ break;
+ case 0xC3:
+ btn_name = "Mode";
+ break;
+ default:
+ btn_name = "Unknown";
+ break;
+ }
+ return btn_name;
+}
+
+uint8_t subghz_protocol_decoder_hay21_get_hash_data(void* context) {
+ furi_assert(context);
+ SubGhzProtocolDecoderHay21* instance = context;
+ return subghz_protocol_blocks_get_hash_data(
+ &instance->decoder, (instance->decoder.decode_count_bit / 8) + 1);
+}
+
+SubGhzProtocolStatus subghz_protocol_decoder_hay21_serialize(
+ void* context,
+ FlipperFormat* flipper_format,
+ SubGhzRadioPreset* preset) {
+ furi_assert(context);
+ SubGhzProtocolDecoderHay21* instance = context;
+ return subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
+}
+
+SubGhzProtocolStatus
+ subghz_protocol_decoder_hay21_deserialize(void* context, FlipperFormat* flipper_format) {
+ furi_assert(context);
+ SubGhzProtocolDecoderHay21* instance = context;
+ return subghz_block_generic_deserialize_check_count_bit(
+ &instance->generic, flipper_format, subghz_protocol_hay21_const.min_count_bit_for_found);
+}
+
+void subghz_protocol_decoder_hay21_get_string(void* context, FuriString* output) {
+ furi_assert(context);
+ SubGhzProtocolDecoderHay21* instance = context;
+
+ // Parse serial, button, counter
+ subghz_protocol_hay21_remote_controller(&instance->generic);
+
+ furi_string_cat_printf(
+ output,
+ "%s %db\r\n"
+ "Key: 0x%06lX\r\n"
+ "Serial: 0x%02X\r\n"
+ "Btn: 0x%01X - %s\r\n"
+ "Cnt: 0x%01X\r\n",
+ instance->generic.protocol_name,
+ instance->generic.data_count_bit,
+ (uint32_t)(instance->generic.data & 0xFFFFFFFF),
+ (uint8_t)(instance->generic.serial & 0xFF),
+ instance->generic.btn,
+ subghz_protocol_hay21_get_button_name(instance->generic.btn),
+ (uint8_t)(instance->generic.cnt & 0xF));
+}
diff --git a/lib/subghz/protocols/hay21.h b/lib/subghz/protocols/hay21.h
new file mode 100644
index 000000000..4d9d33437
--- /dev/null
+++ b/lib/subghz/protocols/hay21.h
@@ -0,0 +1,109 @@
+#pragma once
+
+#include "base.h"
+
+#define SUBGHZ_PROTOCOL_HAY21_NAME "Hay21"
+
+typedef struct SubGhzProtocolDecoderHay21 SubGhzProtocolDecoderHay21;
+typedef struct SubGhzProtocolEncoderHay21 SubGhzProtocolEncoderHay21;
+
+extern const SubGhzProtocolDecoder subghz_protocol_hay21_decoder;
+extern const SubGhzProtocolEncoder subghz_protocol_hay21_encoder;
+extern const SubGhzProtocol subghz_protocol_hay21;
+
+/**
+ * Allocate SubGhzProtocolEncoderHay21.
+ * @param environment Pointer to a SubGhzEnvironment instance
+ * @return SubGhzProtocolEncoderHay21* pointer to a SubGhzProtocolEncoderHay21 instance
+ */
+void* subghz_protocol_encoder_hay21_alloc(SubGhzEnvironment* environment);
+
+/**
+ * Free SubGhzProtocolEncoderHay21.
+ * @param context Pointer to a SubGhzProtocolEncoderHay21 instance
+ */
+void subghz_protocol_encoder_hay21_free(void* context);
+
+/**
+ * Deserialize and generating an upload to send.
+ * @param context Pointer to a SubGhzProtocolEncoderHay21 instance
+ * @param flipper_format Pointer to a FlipperFormat instance
+ * @return status
+ */
+SubGhzProtocolStatus
+ subghz_protocol_encoder_hay21_deserialize(void* context, FlipperFormat* flipper_format);
+
+/**
+ * Forced transmission stop.
+ * @param context Pointer to a SubGhzProtocolEncoderHay21 instance
+ */
+void subghz_protocol_encoder_hay21_stop(void* context);
+
+/**
+ * Getting the level and duration of the upload to be loaded into DMA.
+ * @param context Pointer to a SubGhzProtocolEncoderHay21 instance
+ * @return LevelDuration
+ */
+LevelDuration subghz_protocol_encoder_hay21_yield(void* context);
+
+/**
+ * Allocate SubGhzProtocolDecoderHay21.
+ * @param environment Pointer to a SubGhzEnvironment instance
+ * @return SubGhzProtocolDecoderHay21* pointer to a SubGhzProtocolDecoderHay21 instance
+ */
+void* subghz_protocol_decoder_hay21_alloc(SubGhzEnvironment* environment);
+
+/**
+ * Free SubGhzProtocolDecoderHay21.
+ * @param context Pointer to a SubGhzProtocolDecoderHay21 instance
+ */
+void subghz_protocol_decoder_hay21_free(void* context);
+
+/**
+ * Reset decoder SubGhzProtocolDecoderHay21.
+ * @param context Pointer to a SubGhzProtocolDecoderHay21 instance
+ */
+void subghz_protocol_decoder_hay21_reset(void* context);
+
+/**
+ * Parse a raw sequence of levels and durations received from the air.
+ * @param context Pointer to a SubGhzProtocolDecoderHay21 instance
+ * @param level Signal level true-high false-low
+ * @param duration Duration of this level in, us
+ */
+void subghz_protocol_decoder_hay21_feed(void* context, bool level, uint32_t duration);
+
+/**
+ * Getting the hash sum of the last randomly received parcel.
+ * @param context Pointer to a SubGhzProtocolDecoderHay21 instance
+ * @return hash Hash sum
+ */
+uint8_t subghz_protocol_decoder_hay21_get_hash_data(void* context);
+
+/**
+ * Serialize data SubGhzProtocolDecoderHay21.
+ * @param context Pointer to a SubGhzProtocolDecoderHay21 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_hay21_serialize(
+ void* context,
+ FlipperFormat* flipper_format,
+ SubGhzRadioPreset* preset);
+
+/**
+ * Deserialize data SubGhzProtocolDecoderHay21.
+ * @param context Pointer to a SubGhzProtocolDecoderHay21 instance
+ * @param flipper_format Pointer to a FlipperFormat instance
+ * @return status
+ */
+SubGhzProtocolStatus
+ subghz_protocol_decoder_hay21_deserialize(void* context, FlipperFormat* flipper_format);
+
+/**
+ * Getting a textual representation of the received data.
+ * @param context Pointer to a SubGhzProtocolDecoderHay21 instance
+ * @param output Resulting text
+ */
+void subghz_protocol_decoder_hay21_get_string(void* context, FuriString* output);
diff --git a/lib/subghz/protocols/protocol_items.c b/lib/subghz/protocols/protocol_items.c
index 0d9462dc0..ff7d29650 100644
--- a/lib/subghz/protocols/protocol_items.c
+++ b/lib/subghz/protocols/protocol_items.c
@@ -50,6 +50,7 @@ const SubGhzProtocol* subghz_protocol_registry_items[] = {
&subghz_protocol_gangqi,
&subghz_protocol_marantec24,
&subghz_protocol_hollarm,
+ &subghz_protocol_hay21,
};
const SubGhzProtocolRegistry subghz_protocol_registry = {
diff --git a/lib/subghz/protocols/protocol_items.h b/lib/subghz/protocols/protocol_items.h
index 8b6765965..9ca7d91ec 100644
--- a/lib/subghz/protocols/protocol_items.h
+++ b/lib/subghz/protocols/protocol_items.h
@@ -51,3 +51,4 @@
#include "gangqi.h"
#include "marantec24.h"
#include "hollarm.h"
+#include "hay21.h"
\ No newline at end of file
From 58a167586ef1275ccd298254332899b3704436a4 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Fri, 6 Sep 2024 11:37:23 +0300
Subject: [PATCH 07/15] upd changelog
---
CHANGELOG.md | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfedb1c9a..2d4841f92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,31 @@
## Main changes
- SubGHz:
- - Add new protocols: Marantec24 (static 24 bit) and GangQi (static 34 bit) (by @xMasterX) (thanks to @mishamyte for captures and testing)
+ - Add new protocols (by @xMasterX) (big thanks to @Skorpionm for help with GangQi and Hollarm protocols!):
+ - Marantec24 (static 24 bit) with add manually support
+ - GangQi (static 34 bit) with button parsing and add manually support (thanks to @mishamyte for captures and testing)
+ - Hollarm (static 42 bit) with button parsing and add manually support (thanks to @mishamyte for captures)
+ - Hay21 (dynamic 21 bit) with button parsing
- 125kHz RFID:
- OFW PR 3869: Fix detection of GProx II cards and false detection of other cards (by @Astrrra)
- OFW PR 3868: Fix Guard GProxII False Positive and 36-bit Parsing (by @zinongli)
- NFC:
- Saflok parser improvements (by @zinongli & @xtruan & @zacharyweiss & @evilmog & @Arkwin)
- OFW PR 3766: Fix crash on Ultralight unlock (by @Astrrra)
+* OFW: Infrared: Universal AC - Add Airwell AW-HKD012-N91
+* OFW: Broken file interaction fixes
+* OFW: Add the Procrastination animation
* Apps: **Check out more Apps updates and fixes by following** [this link](https://github.com/xMasterX/all-the-plugins/commits/dev)
## Other changes
+* OFW: DialogEx: Fix NULL ptr crash
+* OFW: Debug: use proper hook for handle_exit in flipperapps
+* OFW: Clean up of LFS traces
+* OFW: Proper integer parsing
+* OFW: SubGhz: Fix RPC status for ButtonRelease event
+* OFW: CCID: App changes
+* OFW: 5V on GPIO control for ext. modules
+* OFW: Gui: Add up and down button drawing functions to GUI elements
+* OFW: Gui: change dialog_ex text ownership model
* OFW: Publishing T5577 page 1 block count macro
-* OFW: Add the Procrastination animation
#### Known NFC post-refactor regressions list:
- Mifare Mini clones reading is broken (original mini working fine) (OFW)
From 7333c550d2a15dc9701832b1fa8003a64a63421c Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Fri, 6 Sep 2024 11:46:11 +0300
Subject: [PATCH 08/15] hay21 small ui fix
---
lib/subghz/protocols/hay21.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/subghz/protocols/hay21.c b/lib/subghz/protocols/hay21.c
index 3424320dd..5e8d2df98 100644
--- a/lib/subghz/protocols/hay21.c
+++ b/lib/subghz/protocols/hay21.c
@@ -432,7 +432,7 @@ void subghz_protocol_decoder_hay21_get_string(void* context, FuriString* output)
furi_string_cat_printf(
output,
- "%s %db\r\n"
+ "%s - %dbit\r\n"
"Key: 0x%06lX\r\n"
"Serial: 0x%02X\r\n"
"Btn: 0x%01X - %s\r\n"
From 8d731f3b1b6a6e35c92e0ccf98ef012b40710e85 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Fri, 6 Sep 2024 11:52:03 +0300
Subject: [PATCH 09/15] hay21 add 3rd button
---
lib/subghz/protocols/hay21.c | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/lib/subghz/protocols/hay21.c b/lib/subghz/protocols/hay21.c
index 5e8d2df98..c74d9837c 100644
--- a/lib/subghz/protocols/hay21.c
+++ b/lib/subghz/protocols/hay21.c
@@ -107,6 +107,24 @@ static uint8_t subghz_protocol_hay21_get_btn_code(void) {
case 0xC3:
btn = 0x5A;
break;
+ case 0x88:
+ btn = 0x5A;
+ break;
+
+ default:
+ break;
+ }
+ } else if(custom_btn_id == SUBGHZ_CUSTOM_BTN_LEFT) {
+ switch(original_btn_code) {
+ case 0x5A:
+ btn = 0x88;
+ break;
+ case 0xC3:
+ btn = 0x88;
+ break;
+ case 0x88:
+ btn = 0xC3;
+ break;
default:
break;
@@ -191,7 +209,7 @@ static void subghz_protocol_hay21_remote_controller(SubGhzBlockGeneric* instance
if(subghz_custom_btn_get_original() == 0) {
subghz_custom_btn_set_original(instance->btn);
}
- subghz_custom_btn_set_max(1);
+ subghz_custom_btn_set_max(2);
// Hay21 Decoder
// 09.2024 - @xMasterX (MMX)
@@ -392,6 +410,9 @@ static const char* subghz_protocol_hay21_get_button_name(uint8_t btn) {
case 0xC3:
btn_name = "Mode";
break;
+ case 0x88:
+ btn_name = "Hold";
+ break;
default:
btn_name = "Unknown";
break;
From 4d8777d3a0f0b5166a4fe234580eccc33d22911d Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Fri, 6 Sep 2024 12:14:02 +0300
Subject: [PATCH 10/15] deduplicated
per @mishamyte request :))
---
.../subghz/helpers/subghz_txrx_create_protocol_key.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c b/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c
index 1ec4a13f0..e3b9c1103 100644
--- a/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c
+++ b/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c
@@ -384,19 +384,17 @@ bool subghz_txrx_gen_secplus_v1_protocol(
}
void subghz_txrx_gen_serial_gangqi(uint64_t* result_key) {
- uint64_t randkey = (uint64_t)rand();
- uint64_t only_required_bytes = (randkey & 0xFFFFF0000);
- uint16_t sum_of_3bytes = ((only_required_bytes >> 32) & 0xFF) +
- ((only_required_bytes >> 24) & 0xFF) +
- ((only_required_bytes >> 16) & 0xFF);
+ uint64_t randkey;
+ uint64_t only_required_bytes;
+ uint16_t sum_of_3bytes;
- while(!((!(sum_of_3bytes & 0x3)) && ((0xb2 < sum_of_3bytes) && (sum_of_3bytes < 0x1ae)))) {
+ do {
randkey = (uint64_t)rand();
only_required_bytes = (randkey & 0xFFFFF0000);
sum_of_3bytes = ((only_required_bytes >> 32) & 0xFF) +
((only_required_bytes >> 24) & 0xFF) +
((only_required_bytes >> 16) & 0xFF);
- }
+ } while(!((!(sum_of_3bytes & 0x3)) && ((0xb2 < sum_of_3bytes) && (sum_of_3bytes < 0x1ae))));
// Serial 01 button 01
uint64_t new_key = only_required_bytes | (0b01 << 14) | (0xD << 10) | (0b01 << 8);
From 910380559b627aed5c2f9accbc35207e4fbd381c Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Fri, 6 Sep 2024 12:16:34 +0300
Subject: [PATCH 11/15] move logic
---
lib/subghz/protocols/gangqi.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/lib/subghz/protocols/gangqi.c b/lib/subghz/protocols/gangqi.c
index 00e731e21..4873a0506 100644
--- a/lib/subghz/protocols/gangqi.c
+++ b/lib/subghz/protocols/gangqi.c
@@ -488,9 +488,14 @@ void subghz_protocol_decoder_gangqi_get_string(void* context, FuriString* output
((instance->generic.data >> 24) & 0xFF) -
((instance->generic.data >> 16) & 0xFF) - ((instance->generic.data >> 8) & 0xFF);
+ // Get 3 bytes sum
uint16_t sum_3bytes_serial = ((instance->generic.serial >> 16) & 0xFF) +
((instance->generic.serial >> 8) & 0xFF) +
(instance->generic.serial & 0xFF);
+ // Returns true if serial is valid
+ bool serial_is_valid =
+ ((!(sum_3bytes_serial & 0x3)) &&
+ ((0xb2 < sum_3bytes_serial) && (sum_3bytes_serial < 0x1ae)));
furi_string_cat_printf(
output,
@@ -507,8 +512,5 @@ void subghz_protocol_decoder_gangqi_get_string(void* context, FuriString* output
crc,
instance->generic.btn,
subghz_protocol_gangqi_get_button_name(instance->generic.btn),
- ((!(sum_3bytes_serial & 0x3)) &&
- ((0xb2 < sum_3bytes_serial) && (sum_3bytes_serial < 0x1ae))) ?
- "valid" :
- "invalid");
+ serial_is_valid ? "valid" : "invalid");
}
From 5198cd25efa36bdb6ca3c70f3942ae977e52900d Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Fri, 6 Sep 2024 12:40:51 +0300
Subject: [PATCH 12/15] upd changelog
---
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d4841f92..b1ccbecf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
* OFW: Add the Procrastination animation
* Apps: **Check out more Apps updates and fixes by following** [this link](https://github.com/xMasterX/all-the-plugins/commits/dev)
## Other changes
+* OFW: Desktop: Sanity check PIN length for good measure
* OFW: DialogEx: Fix NULL ptr crash
* OFW: Debug: use proper hook for handle_exit in flipperapps
* OFW: Clean up of LFS traces
From 64e231ae8d5f3f45c61e88aaec0e1917d36c3991 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Fri, 6 Sep 2024 12:47:43 +0300
Subject: [PATCH 13/15] fix logic
---
lib/subghz/protocols/hay21.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/subghz/protocols/hay21.c b/lib/subghz/protocols/hay21.c
index c74d9837c..32f9de1de 100644
--- a/lib/subghz/protocols/hay21.c
+++ b/lib/subghz/protocols/hay21.c
@@ -114,7 +114,7 @@ static uint8_t subghz_protocol_hay21_get_btn_code(void) {
default:
break;
}
- } else if(custom_btn_id == SUBGHZ_CUSTOM_BTN_LEFT) {
+ } else if(custom_btn_id == SUBGHZ_CUSTOM_BTN_DOWN) {
switch(original_btn_code) {
case 0x5A:
btn = 0x88;
From ad1c9045af46a8a3ea4afc09ba0f5d67b28f0586 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Fri, 6 Sep 2024 12:56:35 +0300
Subject: [PATCH 14/15] use global counter
---
lib/subghz/protocols/hay21.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/subghz/protocols/hay21.c b/lib/subghz/protocols/hay21.c
index 32f9de1de..21d186df8 100644
--- a/lib/subghz/protocols/hay21.c
+++ b/lib/subghz/protocols/hay21.c
@@ -146,10 +146,10 @@ static void subghz_protocol_encoder_hay21_get_upload(SubGhzProtocolEncoderHay21*
// Counter increment
if(instance->generic.cnt < 0xF) {
- if((instance->generic.cnt + 0x1) > 0xF) {
+ if((instance->generic.cnt + furi_hal_subghz_get_rolling_counter_mult()) > 0xF) {
instance->generic.cnt = 0;
} else {
- instance->generic.cnt++;
+ instance->generic.cnt += furi_hal_subghz_get_rolling_counter_mult();
}
} else if(instance->generic.cnt >= 0xF) {
instance->generic.cnt = 0;
From 6adf4919c7e9425961982e19d3ce4a17876f074a Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Fri, 6 Sep 2024 13:06:05 +0300
Subject: [PATCH 15/15] upd changelog
---
CHANGELOG.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1ccbecf3..4bba18306 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,8 @@
* OFW: Add the Procrastination animation
* Apps: **Check out more Apps updates and fixes by following** [this link](https://github.com/xMasterX/all-the-plugins/commits/dev)
## Other changes
+* OFW: Infrared button operation fails now shows more informative messages
+* OFW: Loader: Warn about missing SD card for main apps
* OFW: Desktop: Sanity check PIN length for good measure
* OFW: DialogEx: Fix NULL ptr crash
* OFW: Debug: use proper hook for handle_exit in flipperapps