Skip to content

Commit

Permalink
Merge branch 'dev' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
xMasterX committed Jun 22, 2024
2 parents 8f0fdcd + b65741d commit 5a850ad
Show file tree
Hide file tree
Showing 3 changed files with 197 additions and 124 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
## Other changes
* SubGHz: Fix add manually princeton
* SubGHz: Sync signal delete scene with OFW
* SubGHz: Fix incorrect rx key state when opening Read menu
* SubGHz: Fix incorrect state in decode raw exit - causing keys to be not removed from history and showing up in Read menu after exit from decode raw
* Misc: Remove outdated brew sdk install files
* Misc: Revert USB CDC changes to fix usb serial
Expand All @@ -28,6 +29,7 @@
* CLI: Move part of the CLI to microsd to free up space for COMPACT 0 builds (by @Willy-JL)
* NFC: Fix typo in parsers
* Apps: Fix `input_callback` and `timer_callback` usage of non `void` argument as input
* LF RFID: OFW PR 3728: Securakey - Add Support for RKKTH Plain Text Format (by @zinongli)
* OFW: ReadMe: update outdated bits and pieces
* OFW: Debug: backup openocd work area, fix crash after fresh debugger connect and continue
* OFW: ELF, Flipper application: do not crash on "out of memory"
Expand Down
1 change: 1 addition & 0 deletions applications/main/subghz/scenes/subghz_scene_start.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ bool subghz_scene_start_on_event(void* context, SceneManagerEvent event) {
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneReadRAW);
return true;
} else if(event.event == SubmenuIndexRead) {
subghz_rx_key_state_set(subghz, SubGhzRxKeyStateIDLE);
scene_manager_set_scene_state(
subghz->scene_manager, SubGhzSceneStart, SubmenuIndexRead);
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneReceiver);
Expand Down
Loading

0 comments on commit 5a850ad

Please sign in to comment.