Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-25 01:38:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into dev --nobuild

Browse Source
This commit is contained in:
Willy-JL
2023-12-05 08:52:33 +00:00
parent fd5fc5338e c416041379
commit 399f35dc8a
4 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/subghz/protocols/keeloq.c
+11 -15
View File
@@ -987,7 +987,7 @@ static void subghz_protocol_keeloq_check_remote_controller(
}
// Case when we have no mf name means that we are checking for the first time and we have to check all conditions
if((strlen(keystore->mfname) < 1) && strlen(*manufacture_name) < 1) {
if(strlen(keystore->mfname) < 1) {
// Check key AN-Motors
if((key_hop >> 24) == ((key_hop >> 16) & 0x00ff) &&
(key_fix >> 28) == ((key_hop >> 12) & 0x0f) && (key_hop & 0xFFF) == 0x404) {
@@ -1004,20 +1004,16 @@ static void subghz_protocol_keeloq_check_remote_controller(
}
} else {
// If we have mfname and its one of AN-Motors or HCS101 we should preform only check for this system
if((strcmp(keystore->mfname, "AN-Motors") == 0) ||
(strcmp(keystore->mfname, "HCS101") == 0)) {
// Check key AN-Motors
if((key_hop >> 24) == ((key_hop >> 16) & 0x00ff) &&
(key_fix >> 28) == ((key_hop >> 12) & 0x0f) && (key_hop & 0xFFF) == 0x404) {
*manufacture_name = "AN-Motors";
keystore->mfname = *manufacture_name;
instance->cnt = key_hop >> 16;
} else if(
(key_hop & 0xFFF) == (0x000) && (key_fix >> 28) == ((key_hop >> 12) & 0x0f)) {
*manufacture_name = "HCS101";
keystore->mfname = *manufacture_name;
instance->cnt = key_hop >> 16;
}
if(strcmp(keystore->mfname, "AN-Motors") == 0) {
// Force key to AN-Motors
*manufacture_name = "AN-Motors";
keystore->mfname = *manufacture_name;
instance->cnt = key_hop >> 16;
} else if(strcmp(keystore->mfname, "HCS101") == 0) {
// Force key to HCS101
*manufacture_name = "HCS101";
keystore->mfname = *manufacture_name;
instance->cnt = key_hop >> 16;
} else {
// Else we have mfname that is not AN-Motors or HCS101 we should check it via default selector
subghz_protocol_keeloq_check_remote_controller_selector(
lib/subghz/protocols/secplus_v1.c
+3 -3
View File
@@ -563,7 +563,7 @@ void subghz_protocol_decoder_secplus_v1_get_string(void* context, FuriString* ou
furi_string_cat_printf(
output,
"%s %db\r\n"
"Key:0x%lX%08lX\r\n"
"Key:%lX%08lX\r\n"
"id1:%d id0:%d",
instance->generic.protocol_name,
instance->generic.data_count_bit,
@@ -600,7 +600,7 @@ void subghz_protocol_decoder_secplus_v1_get_string(void* context, FuriString* ou
output,
"Sn:0x%08lX\r\n"
"Cnt:0x%03lX "
"Sw_id:0x%X\r\n",
"SwID:0x%X\r\n",
instance->generic.serial,
instance->generic.cnt,
instance->generic.btn);
@@ -619,7 +619,7 @@ void subghz_protocol_decoder_secplus_v1_get_string(void* context, FuriString* ou
output,
"Sn:0x%08lX\r\n"
"Cnt:0x%03lX "
"Sw_id:0x%X\r\n",
"SwID:0x%X\r\n",
instance->generic.serial,
instance->generic.cnt,
instance->generic.btn);