Merge branch 'ofw_dev' into dev

This commit is contained in:
MX 2023-09-11 18:38:13 +03:00
commit 5949d7be1c
No known key found for this signature in database
GPG key ID: 7CCC66B7DBDD1C83
2 changed files with 6 additions and 4 deletions

View file

@ -182,10 +182,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) {

View file

@ -93,6 +93,7 @@ else:
"FURI_RAM_EXEC",
],
)
env.AppendUnique(CPPDEFINES=["FW_CFG_${FIRMWARE_APP_SET}"])
env.ConfigureForTarget(env.subst("${TARGET_HW}"))