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

Update faac_slh.c

Browse Source 
simplify a little
This commit is contained in:
r3df0xx
2022-04-26 12:38:21 +03:00
parent 6bc0e05178
commit 814e338cfe
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/subghz/protocols/faac_slh.c
+7 -14
View File
@@ -88,8 +88,7 @@ const SubGhzProtocol subghz_protocol_faac_slh = {
static void subghz_protocol_faac_slh_check_remote_controller
(SubGhzBlockGeneric* instance,
SubGhzKeystore* keystore,
const char** manufacture_name,
uint32_t seed);
const char** manufacture_name);
void* subghz_protocol_encoder_faac_slh_alloc(SubGhzEnvironment* environment) {
SubGhzProtocolEncoderFaacSLH* instance = malloc(sizeof(SubGhzProtocolEncoderFaacSLH));
@@ -112,9 +111,8 @@ void subghz_protocol_encoder_faac_slh_free(void* context) {
free(instance);
}
static bool subghz_protocol_faac_slh_gen_data(SubGhzProtocolEncoderFaacSLH* instance, uint32_t seed) {
static bool subghz_protocol_faac_slh_gen_data(SubGhzProtocolEncoderFaacSLH* instance) {
instance->generic.cnt++;
instance->generic.seed = seed;
FURI_LOG_I(TAG, "SEED (gen_data): %8X\n", instance->generic.seed);
uint32_t fix = instance->generic.serial << 4 | instance->generic.btn;
uint32_t hop = 0;
@@ -181,10 +179,9 @@ bool subghz_protocol_faac_slh_create_data(
instance->generic.seed = seed;
instance->manufacture_name = manufacture_name;
instance->generic.data_count_bit = 64;
bool res = subghz_protocol_faac_slh_gen_data(instance, instance->generic.seed);
bool res = subghz_protocol_faac_slh_gen_data(instance);
FURI_LOG_I(TAG, "SEED (create_data): %8X\n", instance->generic.seed);
if(res) {
subghz_protocol_faac_slh_check_remote_controller(&instance->generic, instance->keystore, &instance->manufacture_name, instance->generic.seed);
res = subghz_block_generic_serialize(&instance->generic, flipper_format, frequency, preset);
}
return res;
@@ -199,7 +196,7 @@ static bool
subghz_protocol_encoder_faac_slh_get_upload(SubGhzProtocolEncoderFaacSLH* instance) {
furi_assert(instance);
subghz_protocol_faac_slh_gen_data(instance, instance->generic.seed);
subghz_protocol_faac_slh_gen_data(instance);
size_t index = 0;
size_t size_upload = 2 + (instance->generic.data_count_bit * 2);
if(size_upload > instance->encoder.size_upload) {
@@ -249,7 +246,7 @@ bool subghz_protocol_encoder_faac_slh_deserialize(void* context, FlipperFormat*
}
subghz_protocol_faac_slh_check_remote_controller(
&instance->generic, instance->keystore, &instance->manufacture_name, instance->generic.seed);
&instance->generic, instance->keystore, &instance->manufacture_name);
//optional parameter parameter
flipper_format_read_uint32(
@@ -400,11 +397,7 @@ void subghz_protocol_decoder_faac_slh_feed(void* context, bool level, uint32_t d
static void subghz_protocol_faac_slh_check_remote_controller
(SubGhzBlockGeneric* instance,
SubGhzKeystore* keystore,
const char** manufacture_name,
uint32_t seed) {
//uint64_t code_found_reverse =
//subghz_protocol_blocks_reverse_key(instance->data, instance->data_count_bit);
instance->seed = seed;
const char** manufacture_name) {
FURI_LOG_I(TAG, "SEED (decrypt init): %8X\n", instance->seed);
uint32_t code_fix = instance->data >> 32;
uint32_t code_hop = instance->data & 0xFFFFFFFF;
@@ -467,7 +460,7 @@ bool subghz_protocol_decoder_faac_slh_deserialize(void* context, FlipperFormat*
void subghz_protocol_decoder_faac_slh_get_string(void* context, string_t output) {
furi_assert(context);
SubGhzProtocolDecoderFaacSLH* instance = context;
subghz_protocol_faac_slh_check_remote_controller(&instance->generic, instance->keystore, &instance->manufacture_name, instance->generic.seed);
subghz_protocol_faac_slh_check_remote_controller(&instance->generic, instance->keystore, &instance->manufacture_name);
//uint64_t code_found_reverse = subghz_protocol_blocks_reverse_key(
//instance->generic.data, instance->generic.data_count_bit);
uint32_t code_fix = instance->generic.data >> 32;