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 subghz crash on tx attempt with non tx proto (#492)

Browse Source
This commit is contained in:
Willy-JL
2023-12-16 01:12:28 +00:00
parent 5653ae52c3
commit 3a3e62b24d
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/main/subghz/helpers/subghz_txrx.c
View File

@@ -305,7 +305,7 @@ SubGhzTxRxStartTxState subghz_txrx_tx_start(SubGhzTxRx* instance, FlipperFormat*
ret = SubGhzTxRxStartTxStateErrorParserOthers; ret = SubGhzTxRxStartTxStateErrorParserOthers;
} }
if(ret != SubGhzTxRxStartTxStateOk) { if(ret != SubGhzTxRxStartTxStateOk) {
subghz_transmitter_free(instance->transmitter); if(instance->transmitter) subghz_transmitter_free(instance->transmitter);
if(instance->txrx_state != SubGhzTxRxStateIDLE) { if(instance->txrx_state != SubGhzTxRxStateIDLE) {
subghz_txrx_idle(instance); subghz_txrx_idle(instance);
} }

9
applications/main/subghz/scenes/subghz_scene_receiver.c
View File

@@ -370,7 +370,7 @@ bool subghz_scene_receiver_on_event(void* context, SceneManagerEvent event) {
FURI_LOG_E(TAG, "Missing TE"); FURI_LOG_E(TAG, "Missing TE");
} }
if(!subghz_tx_start(subghz, key_repeat_data)) { if(subghz_txrx_tx_start(subghz->txrx, key_repeat_data) != SubGhzTxRxStartTxStateOk) {
view_dispatcher_send_custom_event( view_dispatcher_send_custom_event(
subghz->view_dispatcher, SubGhzCustomEventViewRepeaterStop); subghz->view_dispatcher, SubGhzCustomEventViewRepeaterStop);
} else { } else {
@@ -399,11 +399,12 @@ bool subghz_scene_receiver_on_event(void* context, SceneManagerEvent event) {
case SubGhzCustomEventViewReceiverOKLong: case SubGhzCustomEventViewReceiverOKLong:
subghz_txrx_stop(subghz->txrx); subghz_txrx_stop(subghz->txrx);
subghz_txrx_hopper_pause(subghz->txrx); subghz_txrx_hopper_pause(subghz->txrx);
if(!subghz_tx_start( if(subghz_txrx_tx_start(
subghz, subghz->txrx,
subghz_history_get_raw_data( subghz_history_get_raw_data(
subghz->history, subghz->history,
subghz_view_receiver_get_idx_menu(subghz->subghz_receiver)))) { subghz_view_receiver_get_idx_menu(subghz->subghz_receiver))) !=
SubGhzTxRxStartTxStateOk) {
view_dispatcher_send_custom_event( view_dispatcher_send_custom_event(
subghz->view_dispatcher, SubGhzCustomEventViewReceiverOKRelease); subghz->view_dispatcher, SubGhzCustomEventViewReceiverOKRelease);
} else { } else {