mirror of
https://github.com/DarkFlippers/unleashed-firmware
synced 2024-12-22 18:53:18 +00:00
a7ab4b9c32
* Added new image DolphinSaved_113x58.png for all "saved" pages * New image DolphinDone_80x58.png added * Replaced dolphins on all scenes accroding to new UI specs * New success dolphin image added * Success scene image replaced * Changed image and text for update initial scene * Image and text adjusted for "Original restored" scene * Removed old DolphinNice_96x59.png image * New image for LFRFID scene * Removed unused image * New UI image added to assets * Replaced warning dolphin on mf_classic write initial fail scene * Removed old image * Changed image on scenes to a new one * New dolphin mafia image * Replaced dolphin mafia image to a new one * Removed DolphinMafia_115x62.png * New check symbol on completed state for detect_reader * Adjusted layout elements position * Removed second switching to popup view in order to achieve control in support callbacks In general now we show generic scene and after that in on_enter callback we can redefine it for particular protocol * CardDetected event now also triggers on_event callback * Now on AuthRequest we throw CardDetected custom event * Added callback for read_on_event * Now we show different screen while reading and unlocking * Fixed missing asstes for some scenes * Update DolphinMafia_119x62.png * Adjusted all the scenes with DolphinMafia image * Scenes with save image adjusted * Removed unnecessary assets DolphinMafia_119x62.png and DolphinSaved_113x58.png * All common dolphins moved to Dolphin folder * Moved DolphinReadingSuccess_59x63.png to Dolphin folder * Set proper led color for detect and read scenes * Added new notification sequence for semi_success results * Use new sequence for semi_success nfc reads * Different events are now throwed depending on read result * Added handling of incomplete event for ultralight cards * Replaced image for iButton scene * Updated API for f18 * Fixed issue with unlock retry sequence * Fix after review * Success notification replaced to semi success in case of incomplete mf classic reading * New text for read scene * New read result sound notification logic for mf classic cards * Change MIFARE name accroding to new requirements * New QR code image for MFKey app * Update nfc_scene_mf_classic_mfkey_complete.c scene according to new UI requirements * Update detect_reader.c and check_big_20x17.png * New nfc save confirm scene added * Implemented new flow for 'Detect Reader button' after partial mf classic read according to new UI * UID for 15693 tags now shown on the new line * Fix nfc unit tests * Revert "Fix nfc unit tests" This reverts commit685ed6bfad. * Rolled back all Mifare renamings in library files * Revert "Change MIFARE name accroding to new requirements" This reverts commitcfb974dc1f. * Now Mifare word is changed only on the app level without changes to lib level Co-authored-by: あく <alleteam@gmail.com> Co-authored-by: gornekich <n.gorbadey@gmail.com>
68 lines
2.2 KiB
C
68 lines
2.2 KiB
C
#include "../nfc_app_i.h"
|
|
|
|
enum SubmenuIndex {
|
|
SubmenuIndexReadCardType,
|
|
SubmenuIndexMfClassicKeys,
|
|
SubmenuIndexMfUltralightUnlock,
|
|
};
|
|
|
|
void nfc_scene_extra_actions_submenu_callback(void* context, uint32_t index) {
|
|
NfcApp* instance = context;
|
|
|
|
view_dispatcher_send_custom_event(instance->view_dispatcher, index);
|
|
}
|
|
|
|
void nfc_scene_extra_actions_on_enter(void* context) {
|
|
NfcApp* instance = context;
|
|
Submenu* submenu = instance->submenu;
|
|
|
|
submenu_add_item(
|
|
submenu,
|
|
"Read Specific Card Type",
|
|
SubmenuIndexReadCardType,
|
|
nfc_scene_extra_actions_submenu_callback,
|
|
instance);
|
|
submenu_add_item(
|
|
submenu,
|
|
"MIFARE Classic Keys",
|
|
SubmenuIndexMfClassicKeys,
|
|
nfc_scene_extra_actions_submenu_callback,
|
|
instance);
|
|
submenu_add_item(
|
|
submenu,
|
|
"Unlock NTAG/Ultralight",
|
|
SubmenuIndexMfUltralightUnlock,
|
|
nfc_scene_extra_actions_submenu_callback,
|
|
instance);
|
|
submenu_set_selected_item(
|
|
submenu, scene_manager_get_scene_state(instance->scene_manager, NfcSceneExtraActions));
|
|
view_dispatcher_switch_to_view(instance->view_dispatcher, NfcViewMenu);
|
|
}
|
|
|
|
bool nfc_scene_extra_actions_on_event(void* context, SceneManagerEvent event) {
|
|
NfcApp* instance = context;
|
|
bool consumed = false;
|
|
|
|
if(event.type == SceneManagerEventTypeCustom) {
|
|
if(event.event == SubmenuIndexMfClassicKeys) {
|
|
scene_manager_next_scene(instance->scene_manager, NfcSceneMfClassicKeys);
|
|
consumed = true;
|
|
} else if(event.event == SubmenuIndexMfUltralightUnlock) {
|
|
mf_ultralight_auth_reset(instance->mf_ul_auth);
|
|
scene_manager_next_scene(instance->scene_manager, NfcSceneMfUltralightUnlockMenu);
|
|
consumed = true;
|
|
} else if(event.event == SubmenuIndexReadCardType) {
|
|
scene_manager_next_scene(instance->scene_manager, NfcSceneSelectProtocol);
|
|
consumed = true;
|
|
}
|
|
scene_manager_set_scene_state(instance->scene_manager, NfcSceneExtraActions, event.event);
|
|
}
|
|
|
|
return consumed;
|
|
}
|
|
|
|
void nfc_scene_extra_actions_on_exit(void* context) {
|
|
NfcApp* instance = context;
|
|
|
|
submenu_reset(instance->submenu);
|
|
}
|