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/nfc | |
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/nfc')
-rwxr-xr-x | applications/nfc/scenes/nfc_scene_delete.c | 7 | ||||
-rwxr-xr-x | applications/nfc/scenes/nfc_scene_device_info.c | 12 | ||||
-rwxr-xr-x | applications/nfc/scenes/nfc_scene_read_emv_data_success.c | 10 |
3 files changed, 19 insertions, 10 deletions
diff --git a/applications/nfc/scenes/nfc_scene_delete.c b/applications/nfc/scenes/nfc_scene_delete.c index 9098759b..5c6fe254 100755 --- a/applications/nfc/scenes/nfc_scene_delete.c +++ b/applications/nfc/scenes/nfc_scene_delete.c @@ -1,9 +1,10 @@ #include "../nfc_i.h" -void nfc_scene_delete_widget_callback(GuiButtonType result, void* context) { +void nfc_scene_delete_widget_callback(GuiButtonType result, InputType type, void* context) { Nfc* nfc = (Nfc*)context; - - view_dispatcher_send_custom_event(nfc->view_dispatcher, result); + if(type == InputTypeShort) { + view_dispatcher_send_custom_event(nfc->view_dispatcher, result); + } } void nfc_scene_delete_on_enter(void* context) { diff --git a/applications/nfc/scenes/nfc_scene_device_info.c b/applications/nfc/scenes/nfc_scene_device_info.c index 032834c5..43082dcf 100755 --- a/applications/nfc/scenes/nfc_scene_device_info.c +++ b/applications/nfc/scenes/nfc_scene_device_info.c @@ -7,9 +7,11 @@ enum { NfcSceneDeviceInfoData, }; -void nfc_scene_device_info_widget_callback(GuiButtonType result, void* context) { +void nfc_scene_device_info_widget_callback(GuiButtonType result, InputType type, void* context) { Nfc* nfc = context; - view_dispatcher_send_custom_event(nfc->view_dispatcher, result); + if(type == InputTypeShort) { + view_dispatcher_send_custom_event(nfc->view_dispatcher, result); + } } void nfc_scene_device_info_dialog_callback(DialogExResult result, void* context) { @@ -22,9 +24,11 @@ void nfc_scene_device_info_text_box_callback(void* context) { view_dispatcher_send_custom_event(nfc->view_dispatcher, NFC_SCENE_DEVICE_INFO_BACK_EVENT); } -void nfc_scene_device_info_bank_card_callback(GuiButtonType result, void* context) { +void nfc_scene_device_info_bank_card_callback(GuiButtonType result, InputType type, void* context) { Nfc* nfc = context; - view_dispatcher_send_custom_event(nfc->view_dispatcher, NFC_SCENE_DEVICE_INFO_BACK_EVENT); + if(type == InputTypeShort) { + view_dispatcher_send_custom_event(nfc->view_dispatcher, NFC_SCENE_DEVICE_INFO_BACK_EVENT); + } } void nfc_scene_device_info_on_enter(void* context) { diff --git a/applications/nfc/scenes/nfc_scene_read_emv_data_success.c b/applications/nfc/scenes/nfc_scene_read_emv_data_success.c index 927adb42..c0b61111 100755 --- a/applications/nfc/scenes/nfc_scene_read_emv_data_success.c +++ b/applications/nfc/scenes/nfc_scene_read_emv_data_success.c @@ -1,10 +1,14 @@ #include "../nfc_i.h" #include "../helpers/nfc_emv_parser.h" -void nfc_scene_read_emv_data_success_widget_callback(GuiButtonType result, void* context) { +void nfc_scene_read_emv_data_success_widget_callback( + GuiButtonType result, + InputType type, + void* context) { Nfc* nfc = (Nfc*)context; - - view_dispatcher_send_custom_event(nfc->view_dispatcher, result); + if(type == InputTypeShort) { + view_dispatcher_send_custom_event(nfc->view_dispatcher, result); + } } void nfc_scene_read_emv_data_success_on_enter(void* context) { |