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

Merge remote-tracking branch 'upstream/dev' into feat/subghz-save-hopping-state

Browse Source 
# Conflicts:
#	applications/main/subghz/scenes/subghz_scene_receiver.c
This commit is contained in:
DerSkythe
2023-09-09 22:41:08 +04:00
parent 7b4d66f0f4 a90ebd7b53
commit 53fffffd1b
181 changed files with 1557 additions and 4123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,7 +199,6 @@ void subghz_scene_receiver_on_enter(void* context) {
subghz_txrx_hopper_set_state(subghz->txrx, SubGhzHopperStateOFF);
}
subghz_scene_receiver_update_statusbar(subghz);
subghz_txrx_rx_start(subghz->txrx);
subghz_view_receiver_set_idx_menu(subghz->subghz_receiver, subghz->idx_menu_chosen);
@@ -207,6 +206,8 @@ void subghz_scene_receiver_on_enter(void* context) {
furi_check(
subghz_txrx_load_decoder_by_name_protocol(subghz->txrx, SUBGHZ_PROTOCOL_BIN_RAW_NAME));
subghz_scene_receiver_update_statusbar(subghz);
view_dispatcher_switch_to_view(subghz->view_dispatcher, SubGhzViewIdReceiver);
}