Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-06-13 19:43:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Minor improvements

Browse Source
This commit is contained in:
Chris van Marle
2022-10-11 22:12:59 +02:00
parent c82b55575a
commit fc9b37850d
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/nfc/scenes/nfc_scene_nfc_data_info.c
+3 -1
View File
@@ -32,6 +32,8 @@ void nfc_scene_nfc_data_info_on_enter(void* context) {
// Set tag type
if(protocol == NfcDeviceProtocolEMV) {
string_cat_printf(temp_str, "\e#EMV Bank Card\n");
} else if(protocol == NfcDeviceProtocolMRTD) {
string_cat_printf(temp_str, "\e#Passport/ID\n");
} else if(protocol == NfcDeviceProtocolMifareUl) {
string_cat_printf(temp_str, "\e#%s\n", nfc_mf_ul_type(dev_data->mf_ul_data.type, true));
} else if(protocol == NfcDeviceProtocolMifareClassic) {
@@ -130,4 +132,4 @@ void nfc_scene_nfc_data_info_on_exit(void* context) {
Nfc* nfc = context;
widget_reset(nfc->widget);
}
}
applications/nfc/scenes/nfc_scene_passport_menu.c
+9 -11
View File
@@ -1,8 +1,8 @@
#include "../nfc_i.h"
enum SubmenuIndex {
SubmenuIndexBac,
SubmenuIndexPace,
SubmenuIndexSave,
SubmenuIndexInfo,
};
void nfc_scene_passport_menu_submenu_callback(void* context, uint32_t index) {
@@ -15,13 +15,10 @@ void nfc_scene_passport_menu_on_enter(void* context) {
Nfc* nfc = context;
Submenu* submenu = nfc->submenu;
//TODO: enable/disable available methods
submenu_add_item(
submenu, "BAC", SubmenuIndexBac, nfc_scene_passport_menu_submenu_callback, nfc);
submenu, "Save", SubmenuIndexSave, nfc_scene_passport_menu_submenu_callback, nfc);
submenu_add_item(
submenu, "PACE", SubmenuIndexPace, nfc_scene_passport_menu_submenu_callback, nfc);
submenu, "Info", SubmenuIndexInfo, nfc_scene_passport_menu_submenu_callback, nfc);
submenu_set_selected_item(
nfc->submenu, scene_manager_get_scene_state(nfc->scene_manager, NfcScenePassportMenu));
@@ -33,14 +30,15 @@ bool nfc_scene_passport_menu_on_event(void* context, SceneManagerEvent event) {
bool consumed = false;
if(event.type == SceneManagerEventTypeCustom) {
if(event.event == SubmenuIndexBac) {
if(event.event == SubmenuIndexSave) {
//TODO: save more than just UID
nfc->dev->format = NfcDeviceSaveFormatUid;
// Clear device name
nfc_device_set_name(nfc->dev, "");
scene_manager_next_scene(nfc->scene_manager, NfcScenePassportBac);
scene_manager_next_scene(nfc->scene_manager, NfcSceneSaveName);
consumed = true;
} else if(event.event == SubmenuIndexPace) {
//scene_manager_next_scene(nfc->scene_manager, NfcScenePassportPace);
} else if(event.event == SubmenuIndexInfo) {
scene_manager_next_scene(nfc->scene_manager, NfcSceneNfcDataInfo);
consumed = true;
}
scene_manager_set_scene_state(nfc->scene_manager, NfcScenePassportMenu, event.event);
applications/nfc/scenes/nfc_scene_passport_pace_todo.c
+2 -2
View File
@@ -10,8 +10,8 @@ void nfc_scene_passport_pace_todo_on_enter(void* context) {
// Setup view
Popup* popup = nfc->popup;
popup_set_icon(popup, 0, 2, &I_DolphinCommon_56x48);
popup_set_header(popup, "PACE not yet implemented", 0, 19, AlignLeft, AlignBottom);
popup_set_icon(popup, 64, 16, &I_DolphinCommon_56x48);
popup_set_header(popup, "PACE not yet implemented", 4, 4, AlignLeft, AlignTop);
popup_set_timeout(popup, 2000);
popup_set_context(popup, nfc);
popup_set_callback(popup, nfc_scene_passport_pace_todo_popup_callback);