DarkFlippers/unleashed-firmware
1
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-01-03 18:59:43 +03:00
Code Issues Projects Releases Wiki Activity

Seed param concept

Browse Source
This commit is contained in:
r3df0xx 2022-04-09 16:33:11 +03:00
parent 85079f79c9
commit 5455bd5337
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/subghz/protocols/faac_slh.c
View File

@ -26,6 +26,8 @@ struct SubGhzProtocolDecoderFaacSLH {
SubGhzKeystore* keystore;
const char* manufacture_name;
uint32_t seed;
};
struct SubGhzProtocolEncoderFaacSLH {
@ -36,6 +38,8 @@ struct SubGhzProtocolEncoderFaacSLH {
SubGhzKeystore* keystore;
const char* manufacture_name;
uint32_t seed;
};
typedef enum {
@ -116,7 +120,7 @@ static bool subghz_protocol_faac_slh_gen_data(SubGhzProtocolEncoderFaacSLH* inst
uint32_t hop = 0;
uint32_t decrypt = 0;
uint64_t man = 0;
uint32_t seed = 0x77ED7698;
instance->seed = 0x77ED7698;
int res = 0;
char fixx[8] = {};
int shiftby = 32;
@ -139,7 +143,7 @@ static bool subghz_protocol_faac_slh_gen_data(SubGhzProtocolEncoderFaacSLH* inst
case KEELOQ_LEARNING_FAAC:
//FAAC Learning
man =
subghz_protocol_keeloq_common_faac_learning(seed, manufacture_code->key);
subghz_protocol_keeloq_common_faac_learning(instance->seed, manufacture_code->key);
uint32_t hi = manufacture_code->key >> 32;
uint32_t lo = manufacture_code->key & 0xFFFFFFFF;
FURI_LOG_I(TAG, "mfkey: %08lX%08lX mf: %s\n", hi, lo, manufacture_code->name);
@ -165,6 +169,7 @@ bool subghz_protocol_faac_slh_create_data(
uint32_t serial,
uint8_t btn,
uint16_t cnt,
uint32_t seed,
const char* manufacture_name,
uint32_t frequency,
FuriHalSubGhzPreset preset) {
@ -172,6 +177,8 @@ bool subghz_protocol_faac_slh_create_data(
SubGhzProtocolEncoderFaacSLH* instance = context;
instance->generic.serial = serial;
instance->generic.cnt = cnt;
instance->generic.btn = btn;
instance->seed = seed;
instance->manufacture_name = manufacture_name;
instance->generic.data_count_bit = 64;
bool res = subghz_protocol_faac_slh_gen_data(instance);
@ -243,6 +250,10 @@ bool subghz_protocol_encoder_faac_slh_deserialize(void* context, FlipperFormat*
FURI_LOG_E(TAG, "Deserialize error");
break;
}
if(!flipper_format_read_uint32(flipper_format, "SEED", (uint32_t*)&instance->seed, 1)) {
FURI_LOG_E(TAG, "Missing SEED");
break;
}
subghz_protocol_faac_slh_check_remote_controller(
&instance->generic, instance->keystore, &instance->manufacture_name);
@ -441,7 +452,12 @@ bool subghz_protocol_decoder_faac_slh_serialize(
FuriHalSubGhzPreset preset) {
furi_assert(context);
SubGhzProtocolDecoderFaacSLH* instance = context;
return subghz_block_generic_serialize(&instance->generic, flipper_format, frequency, preset);
bool res = subghz_block_generic_serialize(&instance->generic, flipper_format, frequency, preset);
if(res && !flipper_format_write_uint32(flipper_format, "SEED", &instance->seed, 1)) {
FURI_LOG_E(TAG, "Unable to add SEED");
res = false;
}
return res;
}
bool subghz_protocol_decoder_faac_slh_deserialize(void* context, FlipperFormat* flipper_format) {
@ -465,7 +481,7 @@ void subghz_protocol_decoder_faac_slh_get_string(void* context, string_t output)
"Key:%lX%08lX\r\n"
"Fix:%08lX Cnt:%04X\r\n"
"Hop:%08lX Btn:%lX\r\n"
"Sn:%07lX \r\n",
"Sn:%07lX Seed:%8X\r\n",
instance->generic.protocol_name,
instance->generic.data_count_bit,
(uint32_t)(instance->generic.data >> 32),
@ -474,5 +490,6 @@ void subghz_protocol_decoder_faac_slh_get_string(void* context, string_t output)
instance->generic.cnt,
code_hop,
instance->generic.btn,
instance->generic.serial);
instance->generic.serial,
instance->seed);
}

1
lib/subghz/protocols/faac_slh.h
View File

@ -42,6 +42,7 @@ bool subghz_protocol_faac_slh_create_data(
uint32_t serial,
uint8_t btn,
uint16_t cnt,
uint32_t seed,
const char* manufacture_name,
uint32_t frequency,
FuriHalSubGhzPreset preset);