diff options
| author | Skorpionm <85568270+Skorpionm@users.noreply.github.com> | 2021-09-15 18:24:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-15 18:24:19 +0300 |
| commit | 8fd411097ec3cd96c5f744008d71529661eea732 (patch) | |
| tree | ec84a27b360a5a1b372ed1c2ae941e143364e62b /applications/subghz/views | |
| parent | 72ca76097a9752cc539c22cb8961ee481939eac4 (diff) | |
[FL-1758, FL-1790] SubGhz refactoring part 2, fix generation of a new GateTX serial (#696)
* WidGet: fix name Multiline String Element
* SubGhz: rename SubGhzProtocol to SubGhzParser and bring it up
* SubGhz: a new way to navigate in receiver views
* SubGhz: fix syntax
* WedGet: add forwarding input type to wedget button callback, fix using a callback in an application
* SubGhz: add assertions and status checks
* SubGhz: fix syntax
* [FL-1790] SubGhz: fix GateTX
* SubGhz: add 434.42 MHz frequency support
* SubGhz: rename type protocol, add decoder stage names
* SubGhz: fix navigation through received signals when changing scenes
* SubGhz: fix 2-fsk config
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
Diffstat (limited to 'applications/subghz/views')
| -rw-r--r-- | applications/subghz/views/subghz_receiver.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/applications/subghz/views/subghz_receiver.c b/applications/subghz/views/subghz_receiver.c index 4abf8225..26aec5e7 100644 --- a/applications/subghz/views/subghz_receiver.c +++ b/applications/subghz/views/subghz_receiver.c @@ -29,9 +29,9 @@ struct SubGhzReceiverHistory { typedef struct SubGhzReceiverHistory SubGhzReceiverHistory; static const Icon* ReceiverItemIcons[] = { - [TYPE_PROTOCOL_UNKNOWN] = &I_Quest_7x8, - [TYPE_PROTOCOL_STATIC] = &I_Unlock_7x8, - [TYPE_PROTOCOL_DYNAMIC] = &I_Lock_7x8, + [SubGhzProtocolCommonTypeUnknown] = &I_Quest_7x8, + [SubGhzProtocolCommonTypeStatic] = &I_Unlock_7x8, + [SubGhzProtocolCommonTypeDynamic] = &I_Lock_7x8, }; struct SubghzReceiver { @@ -90,7 +90,13 @@ void subghz_receiver_add_item_to_menu( SubGhzReceiverMenuItemArray_push_raw(model->history->data); string_init_set_str(item_menu->item_str, name); item_menu->type = type; - model->history_item++; + if((model->idx == model->history_item - 1)) { + model->history_item++; + model->idx++; + } else { + model->history_item++; + } + return true; }); subghz_receiver_update_offset(subghz_receiver); |