mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-12 04:34:43 +04:00
Code Issues Activity

More subghz updates and fixes

Browse Source
This commit is contained in:
MX
2023-03-04 00:03:04 +03:00
parent 91e2b466d3
commit fe84e9521c
11 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/main/subghz/helpers/subghz_types.h
View File

@@ -53,7 +53,6 @@ typedef enum {
SubGhzLoadKeyStateUnknown, SubGhzLoadKeyStateUnknown,
SubGhzLoadKeyStateOK, SubGhzLoadKeyStateOK,
SubGhzLoadKeyStateParseErr, SubGhzLoadKeyStateParseErr,
SubGhzLoadKeyStateOnlyRx,
SubGhzLoadKeyStateProtocolDescriptionErr, SubGhzLoadKeyStateProtocolDescriptionErr,
} SubGhzLoadKeyState; } SubGhzLoadKeyState;

11
applications/main/subghz/subghz_i.c
View File

@@ -285,11 +285,6 @@ bool subghz_key_load(SubGhz* subghz, const char* file_path, bool show_dialog) {
break; break;
} }
if(!furi_hal_subghz_is_tx_allowed(temp_data32)) {
FURI_LOG_E(TAG, "This frequency can only be used for RX");
load_key_state = SubGhzLoadKeyStateOnlyRx;
break;
}
subghz->txrx->preset->frequency = temp_data32; subghz->txrx->preset->frequency = temp_data32;
if(!flipper_format_read_string(fff_data_file, "Preset", temp_str)) { if(!flipper_format_read_string(fff_data_file, "Preset", temp_str)) {
@@ -371,12 +366,6 @@ bool subghz_key_load(SubGhz* subghz, const char* file_path, bool show_dialog) {
} }
return false; return false;
case SubGhzLoadKeyStateOnlyRx:
if(show_dialog) {
subghz_dialog_message_show_only_rx(subghz);
}
return false;
case SubGhzLoadKeyStateOK: case SubGhzLoadKeyStateOK:
return true; return true;

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

@@ -507,7 +507,8 @@ SubGhzProtocolStatus subghz_protocol_encoder_alutech_at_4n_deserialize(
SubGhzProtocolEncoderAlutech_at_4n* instance = context; SubGhzProtocolEncoderAlutech_at_4n* instance = context;
SubGhzProtocolStatus res = SubGhzProtocolStatusError; SubGhzProtocolStatus res = SubGhzProtocolStatusError;
do { do {
if(!subghz_block_generic_deserialize(&instance->generic, flipper_format)) { if(SubGhzProtocolStatusOk !=
subghz_block_generic_deserialize(&instance->generic, flipper_format)) {
FURI_LOG_E(TAG, "Deserialize error"); FURI_LOG_E(TAG, "Deserialize error");
break; break;
} }

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

@@ -229,7 +229,8 @@ SubGhzProtocolStatus
SubGhzProtocolEncoderCameAtomo* instance = context; SubGhzProtocolEncoderCameAtomo* instance = context;
SubGhzProtocolStatus res = SubGhzProtocolStatusError; SubGhzProtocolStatus res = SubGhzProtocolStatusError;
do { do {
if(!subghz_block_generic_deserialize(&instance->generic, flipper_format)) { if(SubGhzProtocolStatusOk !=
subghz_block_generic_deserialize(&instance->generic, flipper_format)) {
FURI_LOG_E(TAG, "Deserialize error"); FURI_LOG_E(TAG, "Deserialize error");
break; break;
} }

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

@@ -224,7 +224,8 @@ SubGhzProtocolStatus
SubGhzProtocolEncoderFaacSLH* instance = context; SubGhzProtocolEncoderFaacSLH* instance = context;
SubGhzProtocolStatus res = SubGhzProtocolStatusError; SubGhzProtocolStatus res = SubGhzProtocolStatusError;
do { do {
if(!subghz_block_generic_deserialize(&instance->generic, flipper_format)) { if(SubGhzProtocolStatusOk !=
subghz_block_generic_deserialize(&instance->generic, flipper_format)) {
FURI_LOG_E(TAG, "Deserialize error"); FURI_LOG_E(TAG, "Deserialize error");
break; break;
} }
@@ -458,7 +459,8 @@ SubGhzProtocolStatus
SubGhzProtocolDecoderFaacSLH* instance = context; SubGhzProtocolDecoderFaacSLH* instance = context;
SubGhzProtocolStatus res = SubGhzProtocolStatusError; SubGhzProtocolStatus res = SubGhzProtocolStatusError;
do { do {
if(!subghz_block_generic_deserialize(&instance->generic, flipper_format)) { if(SubGhzProtocolStatusOk !=
subghz_block_generic_deserialize(&instance->generic, flipper_format)) {
FURI_LOG_E(TAG, "Deserialize error"); FURI_LOG_E(TAG, "Deserialize error");
break; break;
} }

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

@@ -1222,7 +1222,8 @@ SubGhzProtocolStatus
SubGhzProtocolDecoderKeeloq* instance = context; SubGhzProtocolDecoderKeeloq* instance = context;
SubGhzProtocolStatus res = SubGhzProtocolStatusError; SubGhzProtocolStatus res = SubGhzProtocolStatusError;
do { do {
if(!subghz_block_generic_deserialize(&instance->generic, flipper_format)) { if(SubGhzProtocolStatusOk !=
subghz_block_generic_deserialize(&instance->generic, flipper_format)) {
FURI_LOG_E(TAG, "Deserialize error"); FURI_LOG_E(TAG, "Deserialize error");
break; break;
} }

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

@@ -270,7 +270,8 @@ SubGhzProtocolStatus subghz_protocol_encoder_kinggates_stylo_4k_deserialize(
SubGhzProtocolEncoderKingGates_stylo_4k* instance = context; SubGhzProtocolEncoderKingGates_stylo_4k* instance = context;
SubGhzProtocolStatus res = SubGhzProtocolStatusError; SubGhzProtocolStatus res = SubGhzProtocolStatusError;
do { do {
if(!subghz_block_generic_deserialize(&instance->generic, flipper_format)) { if(SubGhzProtocolStatusOk !=
subghz_block_generic_deserialize(&instance->generic, flipper_format)) {
FURI_LOG_E(TAG, "Deserialize error"); FURI_LOG_E(TAG, "Deserialize error");
break; break;
} }

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

@@ -312,7 +312,8 @@ SubGhzProtocolStatus
SubGhzProtocolEncoderNiceFlorS* instance = context; SubGhzProtocolEncoderNiceFlorS* instance = context;
SubGhzProtocolStatus res = SubGhzProtocolStatusError; SubGhzProtocolStatus res = SubGhzProtocolStatusError;
do { do {
if(!subghz_block_generic_deserialize(&instance->generic, flipper_format)) { if(SubGhzProtocolStatusOk !=
subghz_block_generic_deserialize(&instance->generic, flipper_format)) {
FURI_LOG_E(TAG, "Deserialize error"); FURI_LOG_E(TAG, "Deserialize error");
break; break;
} }

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

@@ -397,7 +397,8 @@ SubGhzProtocolStatus
SubGhzProtocolEncoderSomfyKeytis* instance = context; SubGhzProtocolEncoderSomfyKeytis* instance = context;
SubGhzProtocolStatus res = SubGhzProtocolStatusError; SubGhzProtocolStatus res = SubGhzProtocolStatusError;
do { do {
if(!subghz_block_generic_deserialize(&instance->generic, flipper_format)) { if(SubGhzProtocolStatusOk !=
subghz_block_generic_deserialize(&instance->generic, flipper_format)) {
FURI_LOG_E(TAG, "Deserialize error"); FURI_LOG_E(TAG, "Deserialize error");
break; break;
} }

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

@@ -397,7 +397,8 @@ SubGhzProtocolStatus
SubGhzProtocolEncoderSomfyTelis* instance = context; SubGhzProtocolEncoderSomfyTelis* instance = context;
SubGhzProtocolStatus res = SubGhzProtocolStatusError; SubGhzProtocolStatus res = SubGhzProtocolStatusError;
do { do {
if(!subghz_block_generic_deserialize(&instance->generic, flipper_format)) { if(SubGhzProtocolStatusOk !=
subghz_block_generic_deserialize(&instance->generic, flipper_format)) {
FURI_LOG_E(TAG, "Deserialize error"); FURI_LOG_E(TAG, "Deserialize error");
break; break;
} }

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

@@ -287,7 +287,8 @@ SubGhzProtocolStatus
SubGhzProtocolEncoderStarLine* instance = context; SubGhzProtocolEncoderStarLine* instance = context;
SubGhzProtocolStatus res = SubGhzProtocolStatusError; SubGhzProtocolStatus res = SubGhzProtocolStatusError;
do { do {
if(!subghz_block_generic_deserialize(&instance->generic, flipper_format)) { if(SubGhzProtocolStatusOk !=
subghz_block_generic_deserialize(&instance->generic, flipper_format)) {
FURI_LOG_E(TAG, "Deserialize error"); FURI_LOG_E(TAG, "Deserialize error");
break; break;
} }
@@ -736,7 +737,8 @@ SubGhzProtocolStatus
SubGhzProtocolDecoderStarLine* instance = context; SubGhzProtocolDecoderStarLine* instance = context;
SubGhzProtocolStatus res = SubGhzProtocolStatusError; SubGhzProtocolStatus res = SubGhzProtocolStatusError;
do { do {
if(!subghz_block_generic_deserialize(&instance->generic, flipper_format)) { if(SubGhzProtocolStatusOk !=
subghz_block_generic_deserialize(&instance->generic, flipper_format)) {
FURI_LOG_E(TAG, "Deserialize error"); FURI_LOG_E(TAG, "Deserialize error");
break; break;
} }