diff options
| author | Skorpionm <85568270+Skorpionm@users.noreply.github.com> | 2022-07-26 15:58:07 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-26 15:58:07 +0300 |
| commit | ed7db336c1ce537ee86af5df6b9512299e323db8 (patch) | |
| tree | 5f4508318cf288d0e1837b287cd890a0f3ae201e | |
| parent | 3fa5e18c5a2c17fc666c2b767d90187bb5f30c3a (diff) | |
[FL-2684, FL-2685] bugfix subghz (#1446)
* [FL-2684] SubGhz: fix incorrect CAME TWICE protocol definition
* [FL-2685] SubGhz: fix the recorded RAW signal is deleted when trying to transmit on a prohibited frequency
Co-authored-by: あく <alleteam@gmail.com>
| -rw-r--r-- | applications/subghz/scenes/subghz_scene_read_raw.c | 1 | ||||
| -rw-r--r-- | lib/subghz/protocols/came_twee.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/applications/subghz/scenes/subghz_scene_read_raw.c b/applications/subghz/scenes/subghz_scene_read_raw.c index 598f235e..3552d044 100644 --- a/applications/subghz/scenes/subghz_scene_read_raw.c +++ b/applications/subghz/scenes/subghz_scene_read_raw.c @@ -202,6 +202,7 @@ bool subghz_scene_read_raw_on_event(void* context, SceneManagerEvent event) { if((subghz->txrx->txrx_state == SubGhzTxRxStateIDLE) || (subghz->txrx->txrx_state == SubGhzTxRxStateSleep)) { if(!subghz_tx_start(subghz, subghz->txrx->fff_data)) { + subghz->txrx->rx_key_state = SubGhzRxKeyStateBack; scene_manager_next_scene(subghz->scene_manager, SubGhzSceneShowOnlyRx); } else { DOLPHIN_DEED(DolphinDeedSubGhzSend); diff --git a/lib/subghz/protocols/came_twee.c b/lib/subghz/protocols/came_twee.c index 1b60e111..fa538c54 100644 --- a/lib/subghz/protocols/came_twee.c +++ b/lib/subghz/protocols/came_twee.c @@ -354,7 +354,7 @@ void subghz_protocol_decoder_came_twee_feed(void* context, bool level, uint32_t } else if( duration >= ((uint32_t)subghz_protocol_came_twee_const.te_long * 2 + subghz_protocol_came_twee_const.te_delta)) { - if(instance->decoder.decode_count_bit >= + if(instance->decoder.decode_count_bit == subghz_protocol_came_twee_const.min_count_bit_for_found) { instance->generic.data = instance->decoder.decode_data; instance->generic.data_count_bit = instance->decoder.decode_count_bit; |