mirror of
https://github.com/DarkFlippers/unleashed-firmware
synced 2024-11-26 22:40:25 +00:00
Merge branch 'ofw_dev' into dev
This commit is contained in:
commit
5949d7be1c
2 changed files with 6 additions and 4 deletions
|
@ -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) {
|
||||
|
|
|
@ -93,6 +93,7 @@ else:
|
|||
"FURI_RAM_EXEC",
|
||||
],
|
||||
)
|
||||
env.AppendUnique(CPPDEFINES=["FW_CFG_${FIRMWARE_APP_SET}"])
|
||||
|
||||
env.ConfigureForTarget(env.subst("${TARGET_HW}"))
|
||||
|
||||
|
|
Loading…
Reference in a new issue