|
@@ -1,8 +1,8 @@
|
|
|
#include "../nfc_magic_app_i.h"
|
|
#include "../nfc_magic_app_i.h"
|
|
|
|
|
|
|
|
enum {
|
|
enum {
|
|
|
- NfcMagicSceneGen4GetCFGStateCardSearch,
|
|
|
|
|
- NfcMagicSceneGen4GetCFGStateCardFound,
|
|
|
|
|
|
|
+ NfcMagicSceneGen4GetCfgStateCardSearch,
|
|
|
|
|
+ NfcMagicSceneGen4GetCfgStateCardFound,
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
NfcCommand nfc_mafic_scene_gen4_get_cfg_poller_callback(Gen4PollerEvent event, void* context) {
|
|
NfcCommand nfc_mafic_scene_gen4_get_cfg_poller_callback(Gen4PollerEvent event, void* context) {
|
|
@@ -41,7 +41,7 @@ static void nfc_magic_scene_gen4_get_cfg_setup_view(NfcMagicApp* instance) {
|
|
|
uint32_t state =
|
|
uint32_t state =
|
|
|
scene_manager_get_scene_state(instance->scene_manager, NfcMagicSceneGen4GetCfg);
|
|
scene_manager_get_scene_state(instance->scene_manager, NfcMagicSceneGen4GetCfg);
|
|
|
|
|
|
|
|
- if(state == NfcMagicSceneGen4GetCFGStateCardSearch) {
|
|
|
|
|
|
|
+ if(state == NfcMagicSceneGen4GetCfgStateCardSearch) {
|
|
|
popup_set_icon(instance->popup, 0, 8, &I_NFC_manual_60x50);
|
|
popup_set_icon(instance->popup, 0, 8, &I_NFC_manual_60x50);
|
|
|
popup_set_text(
|
|
popup_set_text(
|
|
|
instance->popup, "Apply the\ncard\nto the back", 128, 32, AlignRight, AlignCenter);
|
|
instance->popup, "Apply the\ncard\nto the back", 128, 32, AlignRight, AlignCenter);
|
|
@@ -57,7 +57,7 @@ void nfc_magic_scene_gen4_get_cfg_on_enter(void* context) {
|
|
|
NfcMagicApp* instance = context;
|
|
NfcMagicApp* instance = context;
|
|
|
|
|
|
|
|
scene_manager_set_scene_state(
|
|
scene_manager_set_scene_state(
|
|
|
- instance->scene_manager, NfcMagicSceneGen4GetCfg, NfcMagicSceneGen4GetCFGStateCardSearch);
|
|
|
|
|
|
|
+ instance->scene_manager, NfcMagicSceneGen4GetCfg, NfcMagicSceneGen4GetCfgStateCardSearch);
|
|
|
nfc_magic_scene_gen4_get_cfg_setup_view(instance);
|
|
nfc_magic_scene_gen4_get_cfg_setup_view(instance);
|
|
|
|
|
|
|
|
nfc_magic_app_blink_start(instance);
|
|
nfc_magic_app_blink_start(instance);
|
|
@@ -77,14 +77,14 @@ bool nfc_magic_scene_gen4_get_cfg_on_event(void* context, SceneManagerEvent even
|
|
|
scene_manager_set_scene_state(
|
|
scene_manager_set_scene_state(
|
|
|
instance->scene_manager,
|
|
instance->scene_manager,
|
|
|
NfcMagicSceneGen4GetCfg,
|
|
NfcMagicSceneGen4GetCfg,
|
|
|
- NfcMagicSceneGen4GetCFGStateCardFound);
|
|
|
|
|
|
|
+ NfcMagicSceneGen4GetCfgStateCardFound);
|
|
|
nfc_magic_scene_gen4_get_cfg_setup_view(instance);
|
|
nfc_magic_scene_gen4_get_cfg_setup_view(instance);
|
|
|
consumed = true;
|
|
consumed = true;
|
|
|
} else if(event.event == NfcMagicCustomEventCardLost) {
|
|
} else if(event.event == NfcMagicCustomEventCardLost) {
|
|
|
scene_manager_set_scene_state(
|
|
scene_manager_set_scene_state(
|
|
|
instance->scene_manager,
|
|
instance->scene_manager,
|
|
|
NfcMagicSceneGen4GetCfg,
|
|
NfcMagicSceneGen4GetCfg,
|
|
|
- NfcMagicSceneGen4GetCFGStateCardSearch);
|
|
|
|
|
|
|
+ NfcMagicSceneGen4GetCfgStateCardSearch);
|
|
|
nfc_magic_scene_gen4_get_cfg_setup_view(instance);
|
|
nfc_magic_scene_gen4_get_cfg_setup_view(instance);
|
|
|
consumed = true;
|
|
consumed = true;
|
|
|
} else if(event.event == NfcMagicCustomEventWorkerSuccess) {
|
|
} else if(event.event == NfcMagicCustomEventWorkerSuccess) {
|
|
@@ -105,7 +105,7 @@ void nfc_magic_scene_gen4_get_cfg_on_exit(void* context) {
|
|
|
gen4_poller_stop(instance->gen4_poller);
|
|
gen4_poller_stop(instance->gen4_poller);
|
|
|
gen4_poller_free(instance->gen4_poller);
|
|
gen4_poller_free(instance->gen4_poller);
|
|
|
scene_manager_set_scene_state(
|
|
scene_manager_set_scene_state(
|
|
|
- instance->scene_manager, NfcMagicSceneGen4GetCfg, NfcMagicSceneGen4GetCFGStateCardSearch);
|
|
|
|
|
|
|
+ instance->scene_manager, NfcMagicSceneGen4GetCfg, NfcMagicSceneGen4GetCfgStateCardSearch);
|
|
|
// Clear view
|
|
// Clear view
|
|
|
popup_reset(instance->popup);
|
|
popup_reset(instance->popup);
|
|
|
|
|
|