Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-31 02:23:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revert NFC FeliCa WIP PR (breaks more than adds)

Browse Source
This commit is contained in:
Willy-JL
2023-07-18 20:52:56 +01:00
parent 8d16b0e8f5
commit 1c00a0d119
48 changed files with 153 additions and 2615 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/external/mifare_fuzzer/mifare_fuzzer_worker.c
Vendored
+1 -1
View File
@@ -50,7 +50,7 @@ int32_t mifare_fuzzer_worker_task(void* context) {
furi_hal_nfc_exit_sleep();
while(mifare_fuzzer_worker->state == MifareFuzzerWorkerStateEmulate) {
furi_hal_nfc_listen(
params.uid, params.uid_len, params.a_data.atqa, params.a_data.sak, false, 500);
params.uid, params.uid_len, params.atqa, params.sak, false, 500);
furi_delay_ms(50);
}
furi_hal_nfc_sleep();
applications/external/mifare_fuzzer/scenes/mifare_fuzzer_scene_emulator.c
Vendored
+12 -12
View File
@@ -42,9 +42,9 @@ void mifare_fuzzer_scene_emulator_on_enter(void* context) {
app->emulator_view, emulator->ticks_between_cards);
// init default card data
FuriHalNfcDevData nfc_dev_data;
nfc_dev_data.a_data.atqa[0] = 0x00;
nfc_dev_data.a_data.atqa[1] = 0x00;
nfc_dev_data.a_data.sak = 0x00;
nfc_dev_data.atqa[0] = 0x00;
nfc_dev_data.atqa[1] = 0x00;
nfc_dev_data.sak = 0x00;
if(app->card == MifareCardUltralight) {
nfc_dev_data.uid_len = 0x07;
} else {
@@ -84,19 +84,19 @@ bool mifare_fuzzer_scene_emulator_on_event(void* context, SceneManagerEvent even
// Set card type
// TODO: Move somewhere else, I do not like this to be there
if(app->card == MifareCardClassic1k) {
nfc_dev_data.a_data.atqa[0] = 0x04;
nfc_dev_data.a_data.atqa[1] = 0x00;
nfc_dev_data.a_data.sak = 0x08;
nfc_dev_data.atqa[0] = 0x04;
nfc_dev_data.atqa[1] = 0x00;
nfc_dev_data.sak = 0x08;
nfc_dev_data.uid_len = 0x04;
} else if(app->card == MifareCardClassic4k) {
nfc_dev_data.a_data.atqa[0] = 0x02;
nfc_dev_data.a_data.atqa[1] = 0x00;
nfc_dev_data.a_data.sak = 0x18;
nfc_dev_data.atqa[0] = 0x02;
nfc_dev_data.atqa[1] = 0x00;
nfc_dev_data.sak = 0x18;
nfc_dev_data.uid_len = 0x04;
} else if(app->card == MifareCardUltralight) {
nfc_dev_data.a_data.atqa[0] = 0x44;
nfc_dev_data.a_data.atqa[1] = 0x00;
nfc_dev_data.a_data.sak = 0x00;
nfc_dev_data.atqa[0] = 0x44;
nfc_dev_data.atqa[1] = 0x00;
nfc_dev_data.sak = 0x00;
nfc_dev_data.uid_len = 0x07;
}
applications/external/mifare_nested/mifare_nested_worker.c
Vendored
+6 -10
View File
@@ -708,8 +708,7 @@ void mifare_nested_worker_collect_nonces_static(MifareNestedWorker* mifare_neste
FuriString* folder_path = furi_string_alloc();
FuriHalNfcDevData data = {};
nested_get_data(&data);
MfClassicType type = mifare_nested_worker_get_tag_type(
data.a_data.atqa[0], data.a_data.atqa[1], data.a_data.sak);
MfClassicType type = mifare_nested_worker_get_tag_type(data.atqa[0], data.atqa[1], data.sak);
uint64_t key = 0; // Found key for attack
uint32_t found_key_type = 0;
uint32_t key_block = 0;
@@ -872,8 +871,7 @@ void mifare_nested_worker_collect_nonces_hard(MifareNestedWorker* mifare_nested_
FuriString* folder_path = furi_string_alloc();
FuriHalNfcDevData data = {};
nested_get_data(&data);
MfClassicType type = mifare_nested_worker_get_tag_type(
data.a_data.atqa[0], data.a_data.atqa[1], data.a_data.sak);
MfClassicType type = mifare_nested_worker_get_tag_type(data.atqa[0], data.atqa[1], data.sak);
uint64_t key = 0; // Found key for attack
uint32_t found_key_type = 0;
uint32_t key_block = 0;
@@ -1122,8 +1120,7 @@ void mifare_nested_worker_collect_nonces(MifareNestedWorker* mifare_nested_worke
FuriString* folder_path = furi_string_alloc();
FuriHalNfcDevData data = {};
nested_get_data(&data);
MfClassicType type = mifare_nested_worker_get_tag_type(
data.a_data.atqa[0], data.a_data.atqa[1], data.a_data.sak);
MfClassicType type = mifare_nested_worker_get_tag_type(data.atqa[0], data.atqa[1], data.sak);
uint64_t key = 0; // Found key for attack
uint32_t found_key_type = 0;
uint32_t key_block = 0;
@@ -1257,7 +1254,7 @@ void mifare_nested_worker_collect_nonces(MifareNestedWorker* mifare_nested_worke
MifareNestedWorkerEventNoTagDetected, mifare_nested_worker->context);
while(mifare_nested_worker->state == MifareNestedWorkerStateCollecting &&
lost_tag_data.a_data.cuid != data.a_data.cuid) {
lost_tag_data.cuid != data.cuid) {
furi_delay_ms(250);
nested_get_data(&lost_tag_data);
}
@@ -1497,8 +1494,7 @@ void mifare_nested_worker_check_keys(MifareNestedWorker* mifare_nested_worker) {
FuriString* path = furi_string_alloc();
FuriHalNfcDevData data = {};
nested_get_data(&data);
MfClassicType type = mifare_nested_worker_get_tag_type(
data.a_data.atqa[0], data.a_data.atqa[1], data.a_data.sak);
MfClassicType type = mifare_nested_worker_get_tag_type(data.atqa[0], data.atqa[1], data.sak);
NestedCheckKeyResult result = NestedCheckKeyNoTag;
FuriHalNfcTxRxContext tx_rx = {};
uint32_t key_count = 0;
@@ -1714,4 +1710,4 @@ void mifare_nested_worker_check_keys(MifareNestedWorker* mifare_nested_worker) {
MifareNestedWorkerEventKeysFound, mifare_nested_worker->context);
return;
}
}
applications/external/nfc_magic/nfc_magic_worker.c
Vendored
+5 -5
View File
@@ -186,9 +186,9 @@ void nfc_magic_worker_write(NfcMagicWorker* nfc_magic_worker) {
}
gen4_config[7] = 0x00;
memset(gen4_config + 8, 0, 16);
gen4_config[24] = dev_data->nfc_data.a_data.atqa[0];
gen4_config[25] = dev_data->nfc_data.a_data.atqa[1];
gen4_config[26] = dev_data->nfc_data.a_data.sak;
gen4_config[24] = dev_data->nfc_data.atqa[0];
gen4_config[25] = dev_data->nfc_data.atqa[1];
gen4_config[26] = dev_data->nfc_data.sak;
furi_hal_nfc_sleep();
furi_hal_nfc_activate_nfca(200, &cuid);
@@ -308,7 +308,7 @@ void nfc_magic_worker_check(NfcMagicWorker* nfc_magic_worker) {
}
if(furi_hal_nfc_detect(&nfc_data, 200)) {
magic_dev->cuid = nfc_data.a_data.cuid;
magic_dev->cuid = nfc_data.cuid;
magic_dev->uid_len = nfc_data.uid_len;
} else {
// wrong BCC
@@ -320,7 +320,7 @@ void nfc_magic_worker_check(NfcMagicWorker* nfc_magic_worker) {
magic_deactivate();
magic_activate();
if(furi_hal_nfc_detect(&nfc_data, 200)) {
magic_dev->cuid = nfc_data.a_data.cuid;
magic_dev->cuid = nfc_data.cuid;
magic_dev->uid_len = nfc_data.uid_len;
if(magic_gen4_get_cfg(magic_dev->password, gen4_config)) {
magic_dev->type = MagicTypeGen4;
applications/main/nfc/nfc_cli.c
+9 -25
View File
@@ -34,25 +34,13 @@ static void nfc_cli_detect(Cli* cli, FuriString* args) {
while(!cmd_exit) {
cmd_exit |= cli_cmd_interrupt_received(cli);
if(furi_hal_nfc_detect(&dev_data, 400)) {
if(dev_data.type == FuriHalNfcTypeA) {
printf("UID length: %d, UID:", dev_data.uid_len);
for(size_t i = 0; i < dev_data.uid_len; i++) {
printf("%02X", dev_data.uid[i]);
}
printf("\r\n");
break;
} else if(dev_data.type == FuriHalNfcTypeF) {
printf("IDm:");
for(size_t i = 0; i < 8; i++) {
printf("%02X", dev_data.uid[i]);
}
printf(", PMm:");
for(size_t i = 0; i < 8; i++) {
printf("%02X", dev_data.f_data.pmm[i]);
}
printf("\r\n");
break;
printf("Found: %s ", nfc_get_dev_type(dev_data.type));
printf("UID length: %d, UID:", dev_data.uid_len);
for(size_t i = 0; i < dev_data.uid_len; i++) {
printf("%02X", dev_data.uid[i]);
}
printf("\r\n");
break;
}
furi_hal_nfc_sleep();
furi_delay_ms(50);
@@ -75,17 +63,13 @@ static void nfc_cli_emulate(Cli* cli, FuriString* args) {
FuriHalNfcDevData params = {
.uid = {0x36, 0x9C, 0xe7, 0xb1, 0x0A, 0xC1, 0x34},
.uid_len = 7,
.a_data =
{
.atqa = {0x44, 0x00},
.sak = 0x00,
},
.atqa = {0x44, 0x00},
.sak = 0x00,
.type = FuriHalNfcTypeA,
};
while(!cli_cmd_interrupt_received(cli)) {
if(furi_hal_nfc_listen(
params.uid, params.uid_len, params.a_data.atqa, params.a_data.sak, false, 100)) {
if(furi_hal_nfc_listen(params.uid, params.uid_len, params.atqa, params.sak, false, 100)) {
printf("Reader detected\r\n");
furi_hal_nfc_sleep();
}
applications/main/nfc/nfc_i.h
+1 -12
View File
@@ -39,23 +39,13 @@
#include "rpc/rpc_app.h"
#include <m-list.h>
#include <m-array.h>
ARRAY_DEF(FelicaAreaPath, FelicaArea*, M_PTR_OPLIST)
ARRAY_DEF(MfClassicUserKeys, char*, M_PTR_OPLIST)
ARRAY_DEF(MfClassicUserKeys, char*, M_PTR_OPLIST);
#define NFC_TEXT_STORE_SIZE 128
#define NFC_APP_FOLDER ANY_PATH("nfc")
typedef struct {
FelicaSystem* selected_system;
FelicaAreaPath_t selected_areas;
FelicaService* selected_service;
} FelicaSelectState;
typedef enum {
NfcRpcStateIdle,
NfcRpcStateEmulating,
@@ -75,7 +65,6 @@ struct Nfc {
FuriString* text_box_store;
uint8_t byte_input_store[6];
MfClassicUserKeys_t mfc_key_strs; // Used in MFC key listing
FelicaSelectState felica_select;
void* rpc_ctx;
NfcRpcState rpc_state;
applications/main/nfc/scenes/nfc_scene_config.h
-6
View File
@@ -21,8 +21,6 @@ ADD_SCENE(nfc, nfcv_unlock, NfcVUnlock)
ADD_SCENE(nfc, nfcv_emulate, NfcVEmulate)
ADD_SCENE(nfc, nfcv_sniff, NfcVSniff)
ADD_SCENE(nfc, nfcv_read_success, NfcVReadSuccess)
ADD_SCENE(nfc, nfcf_read_success, NfcfReadSuccess)
ADD_SCENE(nfc, nfcf_menu, NfcfMenu)
ADD_SCENE(nfc, mf_ultralight_read_success, MfUltralightReadSuccess)
ADD_SCENE(nfc, mf_ultralight_data, MfUltralightData)
ADD_SCENE(nfc, mf_ultralight_menu, MfUltralightMenu)
@@ -55,10 +53,6 @@ ADD_SCENE(nfc, mf_classic_update_success, MfClassicUpdateSuccess)
ADD_SCENE(nfc, mf_classic_wrong_card, MfClassicWrongCard)
ADD_SCENE(nfc, emv_read_success, EmvReadSuccess)
ADD_SCENE(nfc, emv_menu, EmvMenu)
ADD_SCENE(nfc, felica_read_success, FelicaReadSuccess)
ADD_SCENE(nfc, felica_menu, FelicaMenu)
ADD_SCENE(nfc, felica_info_select, FelicaInfoSelect)
ADD_SCENE(nfc, felica_service_data, FelicaServiceData)
ADD_SCENE(nfc, emulate_apdu_sequence, EmulateApduSequence)
ADD_SCENE(nfc, device_info, DeviceInfo)
ADD_SCENE(nfc, delete, Delete)
applications/main/nfc/scenes/nfc_scene_delete.c
-2
View File
@@ -44,8 +44,6 @@ void nfc_scene_delete_on_enter(void* context) {
} else if(protocol == NfcDeviceProtocolNfcV) {
furi_string_set(temp_str, "ISO15693 tag");
nfc_type = "NFC-V";
} else if(protocol == NfcDeviceProtocolFelica) {
furi_string_set(temp_str, "FeliCa");
} else {
furi_string_set(temp_str, "Unknown ISO tag");
}
applications/main/nfc/scenes/nfc_scene_felica_info_select.c
-152
View File
@@ -1,152 +0,0 @@
#include "../nfc_i.h"
#include <dolphin/dolphin.h>
void nfc_scene_felica_info_select_submenu_callback(void* context, uint32_t index) {
Nfc* nfc = context;
view_dispatcher_send_custom_event(nfc->view_dispatcher, index);
}
void nfc_scene_felica_info_select_on_enter(void* context) {
Nfc* nfc = context;
Submenu* submenu = nfc->submenu;
FelicaData* data = &nfc->dev->dev_data.felica_data;
FelicaSelectState* state = &nfc->felica_select;
FelicaAreaPath_init(nfc->felica_select.selected_areas);
submenu_add_item(submenu, "[Actions]", 0, nfc_scene_felica_info_select_submenu_callback, nfc);
uint8_t i = 1;
if(state->selected_system == NULL || state->selected_system->code == LITE_SYSTEM_CODE) {
submenu_set_header(submenu, "Systems");
for
M_EACH(current_system, data->systems, FelicaSystemArray_t) {
FuriString* system_name = felica_get_system_name(current_system);
submenu_add_item(
submenu,
furi_string_get_cstr(system_name),
i++,
nfc_scene_felica_info_select_submenu_callback,
nfc);
furi_string_free(system_name);
}
} else {
FelicaSystem* system = state->selected_system;
FuriString* header = furi_string_alloc_printf("%04X/", system->code);
FelicaNode* root = &system->root;
furi_assert(root->type == FelicaNodeTypeArea);
FelicaArea* area = root->area;
if(FelicaAreaPath_size(state->selected_areas) > 0) {
FelicaAreaPath_it_t it;
for(FelicaAreaPath_it(it, state->selected_areas); !FelicaAreaPath_end_p(it);
FelicaAreaPath_next(it)) {
FelicaArea* ancestor = *FelicaAreaPath_ref(it);
furi_string_cat_printf(header, "%d/", ancestor->number);
}
area = *FelicaAreaPath_back(state->selected_areas);
}
furi_string_cat(header, "Areas");
submenu_set_header(submenu, furi_string_get_cstr(header));
furi_string_free(header);
for
M_EACH(node, area->nodes, FelicaNodeArray_t) {
FuriString* node_name = furi_string_alloc();
if(node->type == FelicaNodeTypeArea) {
furi_string_printf(node_name, "Area %d", node->area->number);
submenu_add_item(
submenu,
furi_string_get_cstr(node_name),
i++,
nfc_scene_felica_info_select_submenu_callback,
nfc);
} else {
uint16_t service_code = node->service->number << 6;
furi_string_printf(node_name, "Service %04X", service_code);
submenu_add_item(
submenu,
furi_string_get_cstr(node_name),
i++,
nfc_scene_felica_info_select_submenu_callback,
nfc);
}
furi_string_free(node_name);
}
}
state->selected_service = NULL;
submenu_set_selected_item(
nfc->submenu, scene_manager_get_scene_state(nfc->scene_manager, NfcSceneFelicaInfoSelect));
view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewMenu);
}
bool nfc_scene_felica_info_select_on_event(void* context, SceneManagerEvent event) {
Nfc* nfc = context;
FelicaData* data = &nfc->dev->dev_data.felica_data;
FelicaSelectState* state = &nfc->felica_select;
bool consumed = false;
if(event.type == SceneManagerEventTypeCustom) {
uint8_t index = event.event;
scene_manager_set_scene_state(nfc->scene_manager, NfcSceneMfUltralightMenu, index);
if(index == 0) {
return false;
}
index -= 1;
if(state->selected_system == NULL) {
state->selected_system = FelicaSystemArray_get(data->systems, index);
if(state->selected_system->code == LITE_SYSTEM_CODE) {
scene_manager_next_scene(nfc->scene_manager, NfcSceneFelicaServiceData);
} else {
scene_manager_next_scene(nfc->scene_manager, NfcSceneFelicaInfoSelect);
}
consumed = true;
} else {
FelicaNode* selected_node = NULL;
FelicaNode* root = &(state->selected_system->root);
furi_assert(root->type == FelicaNodeTypeArea);
if(FelicaAreaPath_size(state->selected_areas) == 0) {
selected_node = FelicaNodeArray_get(root->area->nodes, index);
} else {
FelicaArea* current_area = *FelicaAreaPath_back(state->selected_areas);
selected_node = FelicaNodeArray_get(current_area->nodes, index);
}
if(selected_node->type == FelicaNodeTypeArea) {
FelicaAreaPath_push_back(state->selected_areas, selected_node->area);
scene_manager_next_scene(nfc->scene_manager, NfcSceneFelicaInfoSelect);
consumed = true;
} else if(selected_node->type == FelicaNodeTypeService) {
state->selected_service = selected_node->service;
scene_manager_next_scene(nfc->scene_manager, NfcSceneFelicaServiceData);
consumed = true;
}
}
} else if(event.type == SceneManagerEventTypeBack) {
if(FelicaAreaPath_size(state->selected_areas) <= 1) {
FelicaAreaPath_clear(state->selected_areas);
state->selected_system = NULL;
} else {
FelicaAreaPath_pop_back(NULL, state->selected_areas);
}
consumed = scene_manager_previous_scene(nfc->scene_manager);
}
return consumed;
}
void nfc_scene_felica_info_select_on_exit(void* context) {
Nfc* nfc = context;
// Clear view
FelicaAreaPath_clear(nfc->felica_select.selected_areas);
submenu_reset(nfc->submenu);
}
applications/main/nfc/scenes/nfc_scene_felica_menu.c
-87
View File
@@ -1,87 +0,0 @@
#include "../nfc_i.h"
#include <dolphin/dolphin.h>
enum SubmenuIndex {
/*
SubmenuIndexUnlock,
*/
SubmenuIndexSave,
/*
SubmenuIndexEmulate,
*/
SubmenuIndexInfo,
};
void nfc_scene_felica_menu_submenu_callback(void* context, uint32_t index) {
Nfc* nfc = context;
view_dispatcher_send_custom_event(nfc->view_dispatcher, index);
}
void nfc_scene_felica_menu_on_enter(void* context) {
Nfc* nfc = context;
Submenu* submenu = nfc->submenu;
// FelicaData* data = &nfc->dev->dev_data.felica_data;
/*
submenu_add_item(
submenu, "Unlock", SubmenuIndexUnlock, nfc_scene_felica_menu_submenu_callback, nfc);
*/
submenu_add_item(
submenu, "Save", SubmenuIndexSave, nfc_scene_felica_menu_submenu_callback, nfc);
/*
submenu_add_item(
submenu, "Emulate", SubmenuIndexEmulate, nfc_scene_felica_menu_submenu_callback, nfc);
*/
submenu_add_item(
submenu, "Info", SubmenuIndexInfo, nfc_scene_felica_menu_submenu_callback, nfc);
submenu_set_selected_item(
nfc->submenu, scene_manager_get_scene_state(nfc->scene_manager, NfcSceneFelicaMenu));
view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewMenu);
}
bool nfc_scene_felica_menu_on_event(void* context, SceneManagerEvent event) {
Nfc* nfc = context;
bool consumed = false;
if(event.type == SceneManagerEventTypeCustom) {
if(event.event == SubmenuIndexSave) {
nfc->dev->format = NfcDeviceSaveFormatFelica;
// Clear device name
nfc_device_set_name(nfc->dev, "");
scene_manager_next_scene(nfc->scene_manager, NfcSceneSaveName);
consumed = true;
/*
} else if(event.event == SubmenuIndexEmulate) {
scene_manager_next_scene(nfc->scene_manager, NfcSceneFelicaEmulate);
if(scene_manager_has_previous_scene(nfc->scene_manager, NfcSceneSetType)) {
dolphin_deed(DolphinDeedNfcAddEmulate);
} else {
dolphin_deed(DolphinDeedNfcEmulate);
}
consumed = true;
} else if(event.event == SubmenuIndexUnlock) {
scene_manager_next_scene(nfc->scene_manager, NfcSceneFelicaUnlockMenu);
consumed = true;
*/
} else if(event.event == SubmenuIndexInfo) {
scene_manager_next_scene(nfc->scene_manager, NfcSceneFelicaInfoSelect);
consumed = true;
}
scene_manager_set_scene_state(nfc->scene_manager, NfcSceneFelicaMenu, event.event);
} else if(event.type == SceneManagerEventTypeBack) {
consumed = scene_manager_previous_scene(nfc->scene_manager);
}
return consumed;
}
void nfc_scene_felica_menu_on_exit(void* context) {
Nfc* nfc = context;
// Clear view
submenu_reset(nfc->submenu);
}
applications/main/nfc/scenes/nfc_scene_felica_read_success.c
-81
View File
@@ -1,81 +0,0 @@
#include "../nfc_i.h"
void nfc_scene_felica_read_success_widget_callback(
GuiButtonType result,
InputType type,
void* context) {
furi_assert(context);
Nfc* nfc = context;
if(type == InputTypeShort) {
view_dispatcher_send_custom_event(nfc->view_dispatcher, result);
}
}
void nfc_scene_felica_read_success_on_enter(void* context) {
Nfc* nfc = context;
FelicaData* felica_data = &nfc->dev->dev_data.felica_data;
// Setup view
Widget* widget = nfc->widget;
widget_add_button_element(
widget, GuiButtonTypeLeft, "Retry", nfc_scene_felica_read_success_widget_callback, nfc);
widget_add_button_element(
widget, GuiButtonTypeRight, "More", nfc_scene_felica_read_success_widget_callback, nfc);
FuriString* temp_str = NULL;
if(furi_string_size(nfc->dev->dev_data.parsed_data)) {
temp_str = furi_string_alloc_set(nfc->dev->dev_data.parsed_data);
} else {
temp_str = furi_string_alloc_printf("\e#%s", nfc_felica_type(felica_data->type));
for
M_EACH(current_system, felica_data->systems, FelicaSystemArray_t) {
furi_string_cat_printf(
temp_str, "\nSystem %04X (#%d):", current_system->code, current_system->number);
furi_string_cat_printf(temp_str, "\nIDm:\n ");
for(size_t i = 0; i < 8; i++) {
furi_string_cat_printf(temp_str, "%02X", current_system->idm[i]);
}
furi_string_cat_printf(temp_str, "\nPMm:\n ");
for(size_t i = 0; i < 8; i++) {
furi_string_cat_printf(temp_str, "%02X", current_system->pmm[i]);
}
}
}
widget_add_text_scroll_element(widget, 0, 0, 128, 52, furi_string_get_cstr(temp_str));
furi_string_free(temp_str);
notification_message_block(nfc->notifications, &sequence_set_green_255);
view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewWidget);
}
bool nfc_scene_felica_read_success_on_event(void* context, SceneManagerEvent event) {
Nfc* nfc = context;
bool consumed = false;
if(event.type == SceneManagerEventTypeCustom) {
if(event.event == GuiButtonTypeLeft) {
scene_manager_next_scene(nfc->scene_manager, NfcSceneRetryConfirm);
consumed = true;
} else if(event.event == GuiButtonTypeRight) {
scene_manager_next_scene(nfc->scene_manager, NfcSceneFelicaMenu);
consumed = true;
}
} else if(event.type == SceneManagerEventTypeBack) {
scene_manager_next_scene(nfc->scene_manager, NfcSceneExitConfirm);
consumed = true;
}
return consumed;
}
void nfc_scene_felica_read_success_on_exit(void* context) {
Nfc* nfc = context;
notification_message_block(nfc->notifications, &sequence_reset_green);
// Clear view
widget_reset(nfc->widget);
}
applications/main/nfc/scenes/nfc_scene_felica_service_data.c
-104
View File
@@ -1,104 +0,0 @@
#include "../nfc_i.h"
void nfc_scene_felica_service_data_on_enter(void* context) {
Nfc* nfc = context;
FelicaSelectState* select_state = &nfc->felica_select;
FelicaSystem* system = select_state->selected_system;
//FelicaService* service = select_state->selected_service;
TextBox* text_box = nfc->text_box;
if(system->code == LITE_SYSTEM_CODE) {
FelicaLiteInfo* lite_info = &system->lite_info;
uint8_t* data;
text_box_set_font(text_box, TextBoxFontHex);
furi_string_cat_str(nfc->text_box_store, "S_PAD:\n");
for(int i = 0; i < REG_LITE_BLOCK; i++) {
data = lite_info->S_PAD[i];
for(uint16_t i = 0; i < FELICA_BLOCK_SIZE; i += 2) {
if(!(i % 8) && i) {
furi_string_push_back(nfc->text_box_store, '\n');
}
if(data != NULL) {
furi_string_cat_printf(nfc->text_box_store, "%02X%02X ", data[i], data[i + 1]);
} else {
furi_string_cat_printf(nfc->text_box_store, "???? ");
}
}
}
furi_string_cat_str(nfc->text_box_store, "REG:\n");
data = lite_info->REG;
for(uint16_t i = 0; i < FELICA_BLOCK_SIZE; i += 2) {
if(!(i % 8) && i) {
furi_string_push_back(nfc->text_box_store, '\n');
}
if(data != NULL) {
furi_string_cat_printf(nfc->text_box_store, "%02X%02X ", data[i], data[i + 1]);
} else {
furi_string_cat_printf(nfc->text_box_store, "???? ");
}
}
furi_string_cat_str(nfc->text_box_store, "MAC:\n");
data = lite_info->MAC;
for(uint16_t i = 0; i < 8; i += 2) {
if(!(i % 8) && i) {
furi_string_push_back(nfc->text_box_store, '\n');
}
furi_string_cat_printf(nfc->text_box_store, "%02X%02X ", data[i], data[i + 1]);
}
furi_string_cat_printf(nfc->text_box_store, "DFC: %04X\n", lite_info->data_format_code);
furi_string_cat_str(nfc->text_box_store, "ID data:\n");
data = lite_info->ID_value;
for(uint16_t i = 0; i < 6; i += 2) {
furi_string_cat_printf(nfc->text_box_store, "%02X%02X ", data[i], data[i + 1]);
}
furi_string_cat_str(nfc->text_box_store, "\n");
furi_string_cat_printf(nfc->text_box_store, "CKV: %04X\n", lite_info->card_key_version);
furi_string_cat_str(nfc->text_box_store, "MC:\n");
data = lite_info->memory_config;
for(uint16_t i = 0; i < FELICA_BLOCK_SIZE; i += 2) {
if(!(i % 8) && i) {
furi_string_push_back(nfc->text_box_store, '\n');
}
furi_string_cat_printf(nfc->text_box_store, "%02X%02X ", data[i], data[i + 1]);
}
furi_string_cat_printf(nfc->text_box_store, "WCNT: %06lX\n", lite_info->write_count);
furi_string_cat_str(nfc->text_box_store, "MAC_A:\n");
data = lite_info->MAC_A;
for(uint16_t i = 0; i < 8; i += 2) {
if(!(i % 8) && i) {
furi_string_push_back(nfc->text_box_store, '\n');
}
furi_string_cat_printf(nfc->text_box_store, "%02X%02X ", data[i], data[i + 1]);
}
}
text_box_set_text(text_box, furi_string_get_cstr(nfc->text_box_store));
view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewTextBox);
}
bool nfc_scene_felica_service_data_on_event(void* context, SceneManagerEvent event) {
Nfc* nfc = context;
bool consumed = false;
if(event.type == SceneManagerEventTypeBack) {
consumed = scene_manager_previous_scene(nfc->scene_manager);
}
return consumed;
}
void nfc_scene_felica_service_data_on_exit(void* context) {
Nfc* nfc = context;
// Clean view
text_box_reset(nfc->text_box);
furi_string_reset(nfc->text_box_store);
}
applications/main/nfc/scenes/nfc_scene_nfc_data_info.c
+3 -63
View File
@@ -1,5 +1,4 @@
#include "../nfc_i.h"
#include <inttypes.h>
void nfc_scene_nfc_data_info_widget_callback(GuiButtonType result, InputType type, void* context) {
Nfc* nfc = context;
@@ -89,7 +88,6 @@ void nfc_scene_nfc_data_info_on_enter(void* context) {
Nfc* nfc = context;
Widget* widget = nfc->widget;
FuriHalNfcDevData* nfc_data = &nfc->dev->dev_data.nfc_data;
FuriHalNfcType type = nfc_data->type;
NfcDeviceData* dev_data = &nfc->dev->dev_data;
NfcProtocol protocol = dev_data->protocol;
uint8_t text_scroll_height = 0;
@@ -141,8 +139,6 @@ void nfc_scene_nfc_data_info_on_enter(void* context) {
furi_string_cat_printf(temp_str, "\e#ISO15693 (unknown)\n");
break;
}
} else if(protocol == NfcDeviceProtocolFelica) {
furi_string_cat_printf(temp_str, "\e#%s\n", nfc_felica_type(dev_data->felica_data.type));
} else {
furi_string_cat_printf(temp_str, "\e#Unknown ISO tag\n");
}
@@ -200,72 +196,16 @@ void nfc_scene_nfc_data_info_on_enter(void* context) {
furi_string_cat_printf(temp_str, " %s\n", status);
}
} else if(type == FuriHalNfcTypeF) {
// Set NFC-F data
furi_string_cat_printf(temp_str, "ISO 18092 (NFC-F)\n");
furi_string_cat_printf(temp_str, "CIN:");
// NFC-F Card Identification Number (CIN) starts at "UID" byte 2.
for(size_t i = 2; i < nfc_data->uid_len; i++) {
furi_string_cat_printf(temp_str, " %02X", nfc_data->uid[i]);
}
// The first 2 bytes of the "UID" are Manufacturer Code (MC)
furi_string_cat_printf(
temp_str,
"\nMC: %02X %02X ROM: %02X IC: %02X\n\n",
nfc_data->uid[0],
nfc_data->uid[1],
nfc_data->f_data.pmm[0],
nfc_data->f_data.pmm[1]);
furi_string_cat_printf(temp_str, "MRT (1 node/blk):\n");
furi_string_cat_printf(
temp_str,
"- ReqSvc: %" PRIuLEAST32 "us\n",
felica_estimate_timing_us(nfc_data->f_data.pmm[FELICA_PMM_VARIABLE_MRT], 1));
furi_string_cat_printf(
temp_str,
"- Fixed: %" PRIuLEAST32 "us\n",
felica_estimate_timing_us(nfc_data->f_data.pmm[FELICA_PMM_FIXED_MRT], 0));
furi_string_cat_printf(
temp_str,
"- Auth1: %" PRIuLEAST32 "us\n",
felica_estimate_timing_us(nfc_data->f_data.pmm[FELICA_PMM_MUTUAL_AUTH_MRT], 1));
furi_string_cat_printf(
temp_str,
"- Auth2: %" PRIuLEAST32 "us\n",
felica_estimate_timing_us(nfc_data->f_data.pmm[FELICA_PMM_MUTUAL_AUTH_MRT], 0));
furi_string_cat_printf(
temp_str,
"- Read: %" PRIuLEAST32 "us\n",
felica_estimate_timing_us(nfc_data->f_data.pmm[FELICA_PMM_READ_MRT], 1));
furi_string_cat_printf(
temp_str,
"- Write: %" PRIuLEAST32 "us\n",
felica_estimate_timing_us(nfc_data->f_data.pmm[FELICA_PMM_WRITE_MRT], 1));
furi_string_cat_printf(
temp_str,
"- Other: %" PRIuLEAST32 "us\n\n",
felica_estimate_timing_us(nfc_data->f_data.pmm[FELICA_PMM_OTHER_MRT], 0));
furi_string_cat_printf(temp_str, "IDm:");
for(size_t i = 0; i < nfc_data->uid_len; i++) {
furi_string_cat_printf(temp_str, " %02X", nfc_data->uid[i]);
}
furi_string_cat_printf(temp_str, "\nPMm:");
for(size_t i = 0; i < sizeof(nfc_data->f_data.pmm); i++) {
furi_string_cat_printf(temp_str, " %02X", nfc_data->f_data.pmm[i]);
}
} else {
// Set tag general data
char iso_type = FURI_BIT(nfc_data->a_data.sak, 5) ? '4' : '3';
char iso_type = FURI_BIT(nfc_data->sak, 5) ? '4' : '3';
furi_string_cat_printf(temp_str, "ISO 14443-%c (NFC-A)\n", iso_type);
furi_string_cat_printf(temp_str, "UID:");
for(size_t i = 0; i < nfc_data->uid_len; i++) {
furi_string_cat_printf(temp_str, " %02X", nfc_data->uid[i]);
}
furi_string_cat_printf(
temp_str, "\nATQA: %02X %02X ", nfc_data->a_data.atqa[1], nfc_data->a_data.atqa[0]);
furi_string_cat_printf(temp_str, " SAK: %02X", nfc_data->a_data.sak);
temp_str, "\nATQA: %02X %02X ", nfc_data->atqa[1], nfc_data->atqa[0]);
furi_string_cat_printf(temp_str, " SAK: %02X", nfc_data->sak);
}
// Set application specific data
applications/main/nfc/scenes/nfc_scene_nfca_read_success.c
+3 -4
View File
@@ -24,15 +24,14 @@ void nfc_scene_nfca_read_success_on_enter(void* context) {
notification_message_block(nfc->notifications, &sequence_set_green_255);
char iso_type = FURI_BIT(data->a_data.sak, 5) ? '4' : '3';
char iso_type = FURI_BIT(data->sak, 5) ? '4' : '3';
furi_string_cat_printf(temp_str, "ISO 14443-%c (NFC-A)\n", iso_type);
furi_string_cat_printf(temp_str, "UID:");
for(size_t i = 0; i < data->uid_len; i++) {
furi_string_cat_printf(temp_str, " %02X", data->uid[i]);
}
furi_string_cat_printf(
temp_str, "\nATQA: %02X %02X ", data->a_data.atqa[1], data->a_data.atqa[0]);
furi_string_cat_printf(temp_str, " SAK: %02X", data->a_data.sak);
furi_string_cat_printf(temp_str, "\nATQA: %02X %02X ", data->atqa[1], data->atqa[0]);
furi_string_cat_printf(temp_str, " SAK: %02X", data->sak);
widget_add_text_scroll_element(widget, 0, 0, 128, 52, furi_string_get_cstr(temp_str));
furi_string_free(temp_str);
applications/main/nfc/scenes/nfc_scene_nfcf_menu.c
-80
View File
@@ -1,80 +0,0 @@
#include "../nfc_i.h"
#include <dolphin/dolphin.h>
enum SubmenuIndex {
/*
SubmenuIndexSave,
SubmenuIndexEmulate,
*/
SubmenuIndexInfo,
};
void nfc_scene_nfcf_menu_submenu_callback(void* context, uint32_t index) {
Nfc* nfc = context;
view_dispatcher_send_custom_event(nfc->view_dispatcher, index);
}
void nfc_scene_nfcf_menu_on_enter(void* context) {
Nfc* nfc = context;
Submenu* submenu = nfc->submenu;
// FelicaData* data = &nfc->dev->dev_data.felica_data;
/*
submenu_add_item(
submenu, "Save IDm", SubmenuIndexSave, nfc_scene_felica_menu_submenu_callback, nfc);
submenu_add_item(
submenu, "Emulate IDm", SubmenuIndexEmulate, nfc_scene_felica_menu_submenu_callback, nfc);
*/
submenu_add_item(submenu, "Info", SubmenuIndexInfo, nfc_scene_nfcf_menu_submenu_callback, nfc);
submenu_set_selected_item(
nfc->submenu, scene_manager_get_scene_state(nfc->scene_manager, NfcSceneNfcfMenu));
view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewMenu);
}
bool nfc_scene_nfcf_menu_on_event(void* context, SceneManagerEvent event) {
Nfc* nfc = context;
bool consumed = false;
if(event.type == SceneManagerEventTypeCustom) {
/*
if(event.event == SubmenuIndexSave) {
nfc->dev->format = NfcDeviceSaveFormatFelica;
// Clear device name
nfc_device_set_name(nfc->dev, "");
scene_manager_next_scene(nfc->scene_manager, NfcSceneSaveName);
consumed = true;
} else if(event.event == SubmenuIndexEmulate) {
scene_manager_next_scene(nfc->scene_manager, NfcSceneFelicaEmulate);
if(scene_manager_has_previous_scene(nfc->scene_manager, NfcSceneSetType)) {
dolphin_deed(DolphinDeedNfcAddEmulate);
} else {
dolphin_deed(DolphinDeedNfcEmulate);
}
consumed = true;
} else if(event.event == SubmenuIndexUnlock) {
scene_manager_next_scene(nfc->scene_manager, NfcSceneFelicaUnlockMenu);
consumed = true;
} else
*/
if(event.event == SubmenuIndexInfo) {
scene_manager_next_scene(nfc->scene_manager, NfcSceneNfcDataInfo);
consumed = true;
}
scene_manager_set_scene_state(nfc->scene_manager, NfcSceneNfcfMenu, event.event);
} else if(event.type == SceneManagerEventTypeBack) {
consumed = scene_manager_previous_scene(nfc->scene_manager);
}
return consumed;
}
void nfc_scene_nfcf_menu_on_exit(void* context) {
Nfc* nfc = context;
// Clear view
submenu_reset(nfc->submenu);
}
applications/main/nfc/scenes/nfc_scene_nfcf_read_success.c
-88
View File
@@ -1,88 +0,0 @@
#include "../nfc_i.h"
#include "nfc_device.h"
void nfc_scene_nfcf_read_success_widget_callback(
GuiButtonType result,
InputType type,
void* context) {
furi_assert(context);
Nfc* nfc = context;
if(type == InputTypeShort) {
view_dispatcher_send_custom_event(nfc->view_dispatcher, result);
}
}
void nfc_scene_nfcf_read_success_on_enter(void* context) {
Nfc* nfc = context;
FuriHalNfcDevData* data = &nfc->dev->dev_data.nfc_data;
NfcDeviceData* dev_data = &nfc->dev->dev_data;
// Setup view
Widget* widget = nfc->widget;
widget_add_button_element(
widget, GuiButtonTypeLeft, "Retry", nfc_scene_nfcf_read_success_widget_callback, nfc);
widget_add_button_element(
widget, GuiButtonTypeRight, "More", nfc_scene_nfcf_read_success_widget_callback, nfc);
FuriString* temp_str = furi_string_alloc();
if(dev_data->protocol == NfcDeviceProtocolFelica) {
furi_string_cat_printf(temp_str, "\e#%s", nfc_felica_type(dev_data->felica_data.type));
} else {
furi_string_cat_printf(temp_str, "\e#Unknown ISO tag");
}
furi_string_cat_printf(temp_str, "\nISO 18092 (NFC-F)");
furi_string_cat_printf(temp_str, "\nCIN:");
// NFC-F Card Identification Number (CIN) starts at "UID" byte 2.
for(size_t i = 2; i < data->uid_len; i++) {
furi_string_cat_printf(temp_str, " %02X", data->uid[i]);
}
// The first 2 bytes of the "UID" are Manufacturer Code (MC)
furi_string_cat_printf(
temp_str,
"\nMC: %02X %02X ROM: %02X IC: %02X",
data->uid[0],
data->uid[1],
data->f_data.pmm[0],
data->f_data.pmm[1]);
widget_add_text_scroll_element(widget, 0, 0, 128, 52, furi_string_get_cstr(temp_str));
furi_string_free(temp_str);
notification_message_block(nfc->notifications, &sequence_set_green_255);
view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewWidget);
}
bool nfc_scene_nfcf_read_success_on_event(void* context, SceneManagerEvent event) {
Nfc* nfc = context;
bool consumed = false;
if(event.type == SceneManagerEventTypeCustom) {
if(event.event == GuiButtonTypeLeft) {
scene_manager_next_scene(nfc->scene_manager, NfcSceneRetryConfirm);
consumed = true;
} else if(event.event == GuiButtonTypeRight) {
scene_manager_next_scene(nfc->scene_manager, NfcSceneNfcfMenu);
consumed = true;
}
} else if(event.type == SceneManagerEventTypeBack) {
scene_manager_next_scene(nfc->scene_manager, NfcSceneExitConfirm);
consumed = true;
}
return consumed;
}
void nfc_scene_nfcf_read_success_on_exit(void* context) {
Nfc* nfc = context;
notification_message_block(nfc->notifications, &sequence_reset_green);
// Clear view
widget_reset(nfc->widget);
}
applications/main/nfc/scenes/nfc_scene_read.c
+1 -10
View File
@@ -57,6 +57,7 @@ bool nfc_scene_read_on_event(void* context, SceneManagerEvent event) {
if(event.type == SceneManagerEventTypeCustom) {
if((event.event == NfcWorkerEventReadUidNfcB) ||
(event.event == NfcWorkerEventReadUidNfcF) ||
(event.event == NfcWorkerEventReadUidNfcV)) {
notification_message(nfc->notifications, &sequence_success);
scene_manager_next_scene(nfc->scene_manager, NfcSceneReadCardSuccess);
@@ -101,16 +102,6 @@ bool nfc_scene_read_on_event(void* context, SceneManagerEvent event) {
scene_manager_next_scene(nfc->scene_manager, NfcSceneDictNotFound);
}
consumed = true;
} else if(event.event == NfcWorkerEventReadUidNfcF) {
notification_message(nfc->notifications, &sequence_success);
scene_manager_next_scene(nfc->scene_manager, NfcSceneNfcfReadSuccess);
dolphin_deed(DolphinDeedNfcReadSuccess);
consumed = true;
} else if(event.event == NfcWorkerEventReadFelica) {
notification_message(nfc->notifications, &sequence_success);
scene_manager_next_scene(nfc->scene_manager, NfcSceneFelicaReadSuccess);
dolphin_deed(DolphinDeedNfcReadSuccess);
consumed = true;
} else if(event.event == NfcWorkerEventCardDetected) {
nfc_scene_read_set_state(nfc, NfcSceneReadStateReading);
nfc_blink_detect_start(nfc);
applications/main/nfc/scenes/nfc_scene_read_card_type.c
-24
View File
@@ -7,8 +7,6 @@ enum SubmenuIndex {
SubmenuIndexReadMfUltralight,
SubmenuIndexReadEMV,
SubmenuIndexReadNFCA,
SubmenuIndexReadFelica,
SubmenuIndexReadNFCF,
};
void nfc_scene_read_card_type_submenu_callback(void* context, uint32_t index) {
@@ -51,18 +49,6 @@ void nfc_scene_read_card_type_on_enter(void* context) {
SubmenuIndexReadNFCA,
nfc_scene_read_card_type_submenu_callback,
nfc);
submenu_add_item(
submenu,
"Read FeliCa",
SubmenuIndexReadFelica,
nfc_scene_read_card_type_submenu_callback,
nfc);
submenu_add_item(
submenu,
"Read NFC-F data",
SubmenuIndexReadNFCF,
nfc_scene_read_card_type_submenu_callback,
nfc);
uint32_t state = scene_manager_get_scene_state(nfc->scene_manager, NfcSceneReadCardType);
submenu_set_selected_item(submenu, state);
@@ -99,16 +85,6 @@ bool nfc_scene_read_card_type_on_event(void* context, SceneManagerEvent event) {
scene_manager_next_scene(nfc->scene_manager, NfcSceneRead);
consumed = true;
}
if(event.event == SubmenuIndexReadFelica) {
nfc->dev->dev_data.read_mode = NfcReadModeFelica;
scene_manager_next_scene(nfc->scene_manager, NfcSceneRead);
consumed = true;
}
if(event.event == SubmenuIndexReadNFCF) {
nfc->dev->dev_data.read_mode = NfcReadModeNFCF;
scene_manager_next_scene(nfc->scene_manager, NfcSceneRead);
consumed = true;
}
scene_manager_set_scene_state(nfc->scene_manager, NfcSceneReadCardType, event.event);
}
return consumed;
applications/main/nfc/scenes/nfc_scene_set_atqa.c
+1 -1
View File
@@ -17,7 +17,7 @@ void nfc_scene_set_atqa_on_enter(void* context) {
nfc_scene_set_atqa_byte_input_callback,
NULL,
nfc,
nfc->dev->dev_data.nfc_data.a_data.atqa,
nfc->dev->dev_data.nfc_data.atqa,
2);
view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewByteInput);
}
applications/main/nfc/scenes/nfc_scene_set_sak.c
+1 -1
View File
@@ -17,7 +17,7 @@ void nfc_scene_set_sak_on_enter(void* context) {
nfc_scene_set_sak_byte_input_callback,
NULL,
nfc,
&nfc->dev->dev_data.nfc_data.a_data.sak,
&nfc->dev->dev_data.nfc_data.sak,
1);
view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewByteInput);
}