From 15894235a9c84cf41d32c857b1489855f24efac5 Mon Sep 17 00:00:00 2001 From: hedger Date: Mon, 11 Sep 2023 16:34:41 +0300 Subject: [PATCH 1/2] [FL-3596] fbt: added FW_CFG_ with build configuration (#3062) --- firmware.scons | 1 + 1 file changed, 1 insertion(+) diff --git a/firmware.scons b/firmware.scons index 2a82db371..657822700 100644 --- a/firmware.scons +++ b/firmware.scons @@ -93,6 +93,7 @@ else: "FURI_RAM_EXEC", ], ) +env.AppendUnique(CPPDEFINES=["FW_CFG_${FIRMWARE_APP_SET}"]) env.ConfigureForTarget(env.subst("${TARGET_HW}")) From ac3bd337a1db4228303e8ff3b945157ffbd7c0d2 Mon Sep 17 00:00:00 2001 From: Skorpionm <85568270+Skorpionm@users.noreply.github.com> Date: Mon, 11 Sep 2023 19:30:16 +0400 Subject: [PATCH 2/2] [FL-3589] Sub-GHz: incorrect key parsing crash (#3066) --- applications/main/subghz/helpers/subghz_txrx.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/applications/main/subghz/helpers/subghz_txrx.c b/applications/main/subghz/helpers/subghz_txrx.c index 747ed7327..e3e066951 100644 --- a/applications/main/subghz/helpers/subghz_txrx.c +++ b/applications/main/subghz/helpers/subghz_txrx.c @@ -185,10 +185,11 @@ static uint32_t subghz_txrx_rx(SubGhzTxRx* instance, uint32_t frequency) { static void subghz_txrx_idle(SubGhzTxRx* instance) { furi_assert(instance); - furi_assert(instance->txrx_state != SubGhzTxRxStateSleep); - subghz_devices_idle(instance->radio_device); - subghz_txrx_speaker_off(instance); - instance->txrx_state = SubGhzTxRxStateIDLE; + if(instance->txrx_state != SubGhzTxRxStateSleep) { + subghz_devices_idle(instance->radio_device); + subghz_txrx_speaker_off(instance); + instance->txrx_state = SubGhzTxRxStateIDLE; + } } static void subghz_txrx_rx_end(SubGhzTxRx* instance) {