From 30c2676d60ec6d55f61e7d1d05d1c07a72152c2e Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Sun, 28 Jul 2024 19:46:35 +0300
Subject: [PATCH 1/2] subghz fix crash and wrong states
---
.../main/subghz/scenes/subghz_scene_frequency_analyzer.c | 5 +++--
applications/main/subghz/scenes/subghz_scene_receiver.c | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/applications/main/subghz/scenes/subghz_scene_frequency_analyzer.c b/applications/main/subghz/scenes/subghz_scene_frequency_analyzer.c
index 2a0b5e498a..9e5289c548 100644
--- a/applications/main/subghz/scenes/subghz_scene_frequency_analyzer.c
+++ b/applications/main/subghz/scenes/subghz_scene_frequency_analyzer.c
@@ -69,8 +69,9 @@ bool subghz_scene_frequency_analyzer_on_event(void* context, SceneManagerEvent e
return true;
} else if(event.event == SubGhzCustomEventViewFreqAnalOkLong) {
- // Don't need to save, we already saved on short event
- //scene_manager_set_scene_state(subghz->scene_manager, SubGhzSceneStart, 10);
+ // Don't need to save, we already saved on short event (and on exit event too)
+ subghz_rx_key_state_set(subghz, SubGhzRxKeyStateIDLE);
+ scene_manager_set_scene_state(subghz->scene_manager, SubGhzSceneStart, 10);
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneReceiver);
return true;
}
diff --git a/applications/main/subghz/scenes/subghz_scene_receiver.c b/applications/main/subghz/scenes/subghz_scene_receiver.c
index 01b46d2486..1a00634180 100644
--- a/applications/main/subghz/scenes/subghz_scene_receiver.c
+++ b/applications/main/subghz/scenes/subghz_scene_receiver.c
@@ -146,11 +146,11 @@ static void subghz_scene_add_to_history_callback(
if(subghz_history_get_text_space_left(subghz->history, NULL)) {
notification_message(subghz->notifications, &sequence_error);
}
+ subghz_rx_key_state_set(subghz, SubGhzRxKeyStateAddKey);
}
subghz_receiver_reset(receiver);
furi_string_free(item_name);
furi_string_free(item_time);
- subghz_rx_key_state_set(subghz, SubGhzRxKeyStateAddKey);
} else {
FURI_LOG_D(TAG, "%s protocol ignored", decoder_base->protocol->name);
}
From b2305ce5c7a6ab36babc30243a589eccfa9edcb6 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Sun, 28 Jul 2024 19:55:18 +0300
Subject: [PATCH 2/2] upd changelog
---
CHANGELOG.md | 63 +++++-----------------------------------------------
1 file changed, 6 insertions(+), 57 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 777f87c7a6..ddb64ba574 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,64 +1,13 @@
## Main changes
- SubGHz:
- - **Novoferm** remotes full support
- - Fix Decode scene in RAW files
- - Add manually -> Add Sommer FM238 option for cases when default option doesn't work (named as Sommer fm2)
- - Remove broken preset modulation
- - Normstahl, Sommer, MHouse, Aprimatic -> Fixes for button codes and more in Add manually
- - Custom button improvements for MHouse, Novoferm, Nice Smilo
- - Hormann EcoStar -> Add manually support, and custom button support
- - Hormann HSM 44bit static -> Button code decoding fix
- - Choose RSSI threshold for Hopping mode (by @Willy-JL)
-- NFC:
- - OFW: Ultralight C authentication with des key
- - EMV Transactions less nested, hide if unavailable (by @Willy-JL | PR #771)
- - Update Mifare Classic default keys dict with new keys from proxmark3 repo and UberGuidoZ repo
-- LF RFID:
- - Update T5577 password list (by @korden32 | PR #774)
- - Add DEZ 8 display form for EM4100 (by @korden32 | PR #776 & (#777 by @mishamyte))
-- JS:
- - Refactor widget and keyboard modules, fix crash (by @Willy-JL | PR #770)
- - SubGHz module fixes and improvements (by @Willy-JL)
-* OFW: Infrared: check for negative timings
-* OFW: Fix iButton/LFRFID Add Manually results being discarded
-* OFW: Event Loop Timers
-* OFW: Updater: resource compression
+ - Fix rare crash when opening Read mode via Frequency analyzer
+ - Refactor frequency analyzer code for better readability (by @derskythe | PR #782)
+* Docs: Remove not printable symbols and update docs (by @derskythe | PR #783)
* Apps: **Check out more Apps updates and fixes by following** [this link](https://github.com/xMasterX/all-the-plugins/commits/dev)
## Other changes
-* OFW: HID/BLE Keyboard UI refactoring
-* OFW: CCID: Add CCIDWorker
-* OFW: Disabled ISR runtime stats collection for updater builds
-* OFW: VSCode fixes: .gitignore & clangd
-* OFW: ufbt: synced .clang-format rules with main
-* OFW: Code formatting update
-* OFW: scripts: runfap: fixed starting apps with spaces in path
-* OFW: toolchain: v38. clangd as default language server
-* OFW: NFC: ISO15693 Render Typo Fix
-* OFW: tar archive: fix double free
-* OFW: ufbt: added ARGS to commandline parser
-* OFW: lib: sconscript todo cleanup
-* OFW: Intruder animation
-* OFW: Desktop: allow to close blocking bad sd animation
-* OFW: Updater: reset various debug flags on production build flash (was done in same way in UL before)
-* OFW: Fix PVS Warnings
-* OFW: CCID: Improve request and response data handling
-* OFW: Furi: count ISR time. Cli: show ISR time in top.
-* OFW: toolchain: v37
-* OFW: NFC: Cache plugin name not full path, saves some RAM (by @Willy-JL)
-* OFW: copro: bumped to 1.20.0
-* OFW: input_srv: Put input state data on the stack of the service
-* OFW: Coalesce some allocations
-* OFW: updater: slightly smaller image
-* OFW: Updater: Fix double dir cleanup
-* OFW: cli: storage: minor subcommand lookup refactor
-* OFW: LFRFID Securakey: Add Support for RKKTH Plain Text Format
-* OFW: NFC: Add mf_classic_set_sector_trailer_read function
-* OFW: Separate editing and renaming in iButton and LFRFID
-* OFW: New js modules documentation added
-* OFW: Update link to mfkey32
-* OFW: NFC: Desfire Renderer Minor Debug
-* OFW: RPC: Fix input lockup on disconnect
-* OFW: Thread Signals
+* Misc: Fix typo in comment in QueueTools.py (by @eltociear | PR #785)
+* OFW: Reordered VS-Code Tasks to follow the `Release` > `Debug` schema
+* OFW: Remove unused entries from .editorconfig
#### Known NFC post-refactor regressions list:
- Mifare Mini clones reading is broken (original mini working fine) (OFW)