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

FAAC SLH/Spa 20-bits counter

Browse Source
This commit is contained in:
Eng1n33r
2022-07-17 08:05:09 +03:00
parent 4074aa7d38
commit 420af35f89
5 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/subghz/protocols/faac_slh.c
+6 -8
View File
@@ -123,11 +123,9 @@ static bool subghz_protocol_faac_slh_gen_data(SubGhzProtocolEncoderFaacSLH* inst
fixx[i] = (fix >> (shiftby -= 4)) & 0xF;
}
if((instance->generic.cnt % 2) == 0) {
decrypt = fixx[6] << 28 | fixx[7] << 24 | fixx[5] << 20 | fixx[1] << 16 |
instance->generic.cnt;
decrypt = fixx[6] << 28 | fixx[7] << 24 | fixx[5] << 20 | (instance->generic.cnt & 0xFFFFF);
} else {
decrypt = fixx[2] << 28 | fixx[3] << 24 | fixx[4] << 20 | fixx[1] << 16 |
instance->generic.cnt;
decrypt = fixx[2] << 28 | fixx[3] << 24 | fixx[4] << 20 | (instance->generic.cnt & 0xFFFFF);
}
for
M_EACH(manufacture_code, *subghz_keystore_get_data(instance->keystore), SubGhzKeyArray_t) {
@@ -155,7 +153,7 @@ bool subghz_protocol_faac_slh_create_data(
FlipperFormat* flipper_format,
uint32_t serial,
uint8_t btn,
uint16_t cnt,
uint32_t cnt,
uint32_t seed,
const char* manufacture_name,
uint32_t frequency,
@@ -164,7 +162,7 @@ bool subghz_protocol_faac_slh_create_data(
SubGhzProtocolEncoderFaacSLH* instance = context;
instance->generic.serial = serial;
instance->generic.btn = btn;
instance->generic.cnt = cnt;
instance->generic.cnt = (cnt & 0xFFFFF);
instance->generic.seed = seed;
instance->manufacture_name = manufacture_name;
instance->generic.data_count_bit = 64;
@@ -414,7 +412,7 @@ static void subghz_protocol_faac_slh_check_remote_controller(
break;
}
}
instance->cnt = decrypt & 0xFFFF;
instance->cnt = decrypt & 0xFFFFF;
}
uint8_t subghz_protocol_decoder_faac_slh_get_hash_data(void* context) {
@@ -493,7 +491,7 @@ void subghz_protocol_decoder_faac_slh_get_string(void* context, string_t output)
output,
"%s %dbit\r\n"
"Key:%lX%08lX\r\n"
"Fix:%08lX Cnt:%04X\r\n"
"Fix:%08lX Cnt:%05X\r\n"
"Hop:%08lX Btn:%lX\r\n"
"Sn:%07lX Sd:%8X",
instance->generic.protocol_name,
lib/subghz/protocols/faac_slh.h
+1 -1
View File
@@ -42,7 +42,7 @@ bool subghz_protocol_faac_slh_create_data(
FlipperFormat* flipper_format,
uint32_t serial,
uint8_t btn,
uint16_t cnt,
uint32_t cnt,
uint32_t seed,
const char* manufacture_name,
uint32_t frequency,