Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix and update subghz protocols to use new error system

Browse Source
This commit is contained in:
MX
2023-03-03 23:34:43 +03:00
parent b90060e574
commit 91e2b466d3
8 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/subghz/protocols/alutech_at_4n.c
View File

@@ -320,7 +320,8 @@ bool subghz_protocol_alutech_at_4n_create_data(
instance->generic.data_count_bit = 72;
bool res = subghz_protocol_alutech_at_4n_gen_data(instance, btn);
if(res) {
res = subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
return SubGhzProtocolStatusOk ==
subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
}
return res;
}

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

@@ -169,7 +169,8 @@ bool subghz_protocol_faac_slh_create_data(
instance->generic.data_count_bit = 64;
bool res = subghz_protocol_faac_slh_gen_data(instance);
if(res) {
res = subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
return SubGhzProtocolStatusOk ==
subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
}
return res;
}
@@ -430,15 +431,17 @@ SubGhzProtocolStatus subghz_protocol_decoder_faac_slh_serialize(
furi_assert(context);
SubGhzProtocolDecoderFaacSLH* instance = context;
bool res = subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
SubGhzProtocolStatus res =
subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
uint8_t seed_data[sizeof(uint32_t)] = {0};
for(size_t i = 0; i < sizeof(uint32_t); i++) {
seed_data[sizeof(uint32_t) - i - 1] = (instance->generic.seed >> i * 8) & 0xFF;
}
if(res && !flipper_format_write_hex(flipper_format, "Seed", seed_data, sizeof(uint32_t))) {
if((res == SubGhzProtocolStatusOk) &&
!flipper_format_write_hex(flipper_format, "Seed", seed_data, sizeof(uint32_t))) {
FURI_LOG_E(TAG, "Unable to add Seed");
res = false;
res = SubGhzProtocolStatusError;
}
instance->generic.seed = seed_data[0] << 24 | seed_data[1] << 16 | seed_data[2] << 8 |
seed_data[3];
@@ -453,7 +456,7 @@ SubGhzProtocolStatus
subghz_protocol_decoder_faac_slh_deserialize(void* context, FlipperFormat* flipper_format) {
furi_assert(context);
SubGhzProtocolDecoderFaacSLH* instance = context;
bool res = false;
SubGhzProtocolStatus res = SubGhzProtocolStatusError;
do {
if(!subghz_block_generic_deserialize(&instance->generic, flipper_format)) {
FURI_LOG_E(TAG, "Deserialize error");
@@ -480,7 +483,7 @@ SubGhzProtocolStatus
FURI_LOG_E(TAG, "Rewind error");
break;
}
res = true;
res = SubGhzProtocolStatusOk;
} while(false);
return res;

12
lib/subghz/protocols/keeloq.c
View File

@@ -312,7 +312,8 @@ bool subghz_protocol_keeloq_create_data(
instance->generic.data_count_bit = 64;
bool res = subghz_protocol_keeloq_gen_data(instance, btn, false);
if(res) {
res = subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
return SubGhzProtocolStatusOk ==
subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
}
return res;
}
@@ -337,7 +338,8 @@ bool subghz_protocol_keeloq_bft_create_data(
// roguuemaster don't steal.!!!!
bool res = subghz_protocol_keeloq_gen_data(instance, btn, false);
if(res) {
res = subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
return SubGhzProtocolStatusOk ==
subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
}
return res;
}
@@ -1196,7 +1198,8 @@ SubGhzProtocolStatus subghz_protocol_decoder_keeloq_serialize(
for(size_t i = 0; i < sizeof(uint32_t); i++) {
seed_data[sizeof(uint32_t) - i - 1] = (instance->generic.seed >> i * 8) & 0xFF;
}
if(res && !flipper_format_write_hex(flipper_format, "Seed", seed_data, sizeof(uint32_t))) {
if((res == SubGhzProtocolStatusOk) &&
!flipper_format_write_hex(flipper_format, "Seed", seed_data, sizeof(uint32_t))) {
FURI_LOG_E(TAG, "DECODER Serialize: Unable to add Seed");
res = SubGhzProtocolStatusError;
}
@@ -1204,7 +1207,8 @@ SubGhzProtocolStatus subghz_protocol_decoder_keeloq_serialize(
seed_data[3];
}
if(res && !flipper_format_write_string_cstr(
if((res == SubGhzProtocolStatusOk) &&
!flipper_format_write_string_cstr(
flipper_format, "Manufacture", instance->manufacture_name)) {
FURI_LOG_E(TAG, "DECODER Serialize: Unable to add manufacture name");
res = SubGhzProtocolStatusError;

5
lib/subghz/protocols/nice_flor_s.c
View File

@@ -574,9 +574,10 @@ bool subghz_protocol_nice_flor_s_create_data(
}
}
bool res = subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
SubGhzProtocolStatus res =
subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
return res;
return res == SubGhzProtocolStatusOk;
}
void* subghz_protocol_decoder_nice_flor_s_alloc(SubGhzEnvironment* environment) {

9
lib/subghz/protocols/secplus_v2.c
View File

@@ -600,19 +600,20 @@ bool subghz_protocol_secplus_v2_create_data(
instance->generic.data_count_bit =
(uint8_t)subghz_protocol_secplus_v2_const.min_count_bit_for_found;
subghz_protocol_secplus_v2_encode(instance);
bool res = subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
SubGhzProtocolStatus res =
subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
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->secplus_packet_1 >> (i * 8)) & 0xFF;
}
if(res &&
if((res == SubGhzProtocolStatusOk) &&
!flipper_format_write_hex(flipper_format, "Secplus_packet_1", key_data, sizeof(uint64_t))) {
FURI_LOG_E(TAG, "Unable to add Secplus_packet_1");
res = false;
res = SubGhzProtocolStatusError;
}
return res;
return res == SubGhzProtocolStatusOk;
}
void* subghz_protocol_decoder_secplus_v2_alloc(SubGhzEnvironment* environment) {

3
lib/subghz/protocols/somfy_keytis.c
View File

@@ -192,7 +192,8 @@ bool subghz_protocol_somfy_keytis_create_data(
instance->generic.data_count_bit = 80;
bool res = subghz_protocol_somfy_keytis_gen_data(instance, btn);
if(res) {
res = subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
return SubGhzProtocolStatusOk ==
subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
}
return res;
}

3
lib/subghz/protocols/somfy_telis.c
View File

@@ -252,7 +252,8 @@ bool subghz_protocol_somfy_telis_create_data(
instance->generic.data_count_bit = 56;
bool res = subghz_protocol_somfy_telis_gen_data(instance, btn, true);
if(res) {
res = subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
return SubGhzProtocolStatusOk ==
subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
}
return res;
}

7
lib/subghz/protocols/star_line.c
View File

@@ -221,7 +221,8 @@ bool subghz_protocol_star_line_create_data(
instance->generic.data_count_bit = 64;
bool res = subghz_protocol_star_line_gen_data(instance, btn);
if(res) {
res = subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
return SubGhzProtocolStatusOk ==
subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
}
return res;
}
@@ -733,7 +734,7 @@ SubGhzProtocolStatus
subghz_protocol_decoder_star_line_deserialize(void* context, FlipperFormat* flipper_format) {
furi_assert(context);
SubGhzProtocolDecoderStarLine* instance = context;
bool res = false;
SubGhzProtocolStatus res = SubGhzProtocolStatusError;
do {
if(!subghz_block_generic_deserialize(&instance->generic, flipper_format)) {
FURI_LOG_E(TAG, "Deserialize error");
@@ -749,7 +750,7 @@ SubGhzProtocolStatus
FURI_LOG_D(TAG, "DECODER: Missing Manufacture");
}
res = true;
res = SubGhzProtocolStatusOk;
} while(false);
return res;