Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-12 18:18:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

NFC: bump API version and format FeliCa scene code

Browse Source
This commit is contained in:
nullableVoidPtr
2022-12-28 17:24:48 +08:00
parent 94558df627
commit 8fecca3575
6 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/main/nfc/scenes/nfc_scene_felica_menu.c
View File

@@ -63,7 +63,7 @@ bool nfc_scene_felica_menu_on_event(void* context, SceneManagerEvent event) {
consumed = true;
} else
*/
if(event.event == SubmenuIndexInfo) {
if(event.event == SubmenuIndexInfo) {
scene_manager_next_scene(nfc->scene_manager, NfcSceneFelicaInfoSelect);
consumed = true;
}

3
applications/main/nfc/scenes/nfc_scene_felica_read_success.c
View File

@@ -30,7 +30,8 @@ void nfc_scene_felica_read_success_on_enter(void* context) {
temp_str = furi_string_alloc_printf("\e#%s", nfc_felica_type(felica_data->type));
FelicaSystemList_it_t it;
for(FelicaSystemList_it(it, felica_data->systems); !FelicaSystemList_end_p(it); FelicaSystemList_next(it)) {
for(FelicaSystemList_it(it, felica_data->systems); !FelicaSystemList_end_p(it);
FelicaSystemList_next(it)) {
FelicaSystem* current_system = *FelicaSystemList_ref(it);
furi_string_cat_printf(
temp_str, "\nSystem %04X (#%d):", current_system->code, current_system->number);

33
applications/main/nfc/scenes/nfc_scene_felica_service_data.c
View File

@@ -17,7 +17,8 @@ void nfc_scene_felica_service_data_on_enter(void* context) {
furi_string_push_back(nfc->text_box_store, '\n');
}
if(block != NULL) {
furi_string_cat_printf(nfc->text_box_store, "%02X%02X ", block->data[i], block->data[i + 1]);
furi_string_cat_printf(
nfc->text_box_store, "%02X%02X ", block->data[i], block->data[i + 1]);
} else {
furi_string_cat_printf(nfc->text_box_store, "???? ");
}
@@ -31,7 +32,8 @@ void nfc_scene_felica_service_data_on_enter(void* context) {
furi_string_push_back(nfc->text_box_store, '\n');
}
if(block != NULL) {
furi_string_cat_printf(nfc->text_box_store, "%02X%02X ", block->data[i], block->data[i + 1]);
furi_string_cat_printf(
nfc->text_box_store, "%02X%02X ", block->data[i], block->data[i + 1]);
} else {
furi_string_cat_printf(nfc->text_box_store, "???? ");
}
@@ -43,7 +45,8 @@ void nfc_scene_felica_service_data_on_enter(void* context) {
if(!(i % 8) && i) {
furi_string_push_back(nfc->text_box_store, '\n');
}
furi_string_cat_printf(nfc->text_box_store, "%02X%02X ", block->data[i], block->data[i + 1]);
furi_string_cat_printf(
nfc->text_box_store, "%02X%02X ", block->data[i], block->data[i + 1]);
}
furi_string_cat_str(nfc->text_box_store, "MAC:\n");
@@ -52,7 +55,8 @@ void nfc_scene_felica_service_data_on_enter(void* context) {
if(!(i % 8) && i) {
furi_string_push_back(nfc->text_box_store, '\n');
}
furi_string_cat_printf(nfc->text_box_store, "%02X%02X ", block->data[i], block->data[i + 1]);
furi_string_cat_printf(
nfc->text_box_store, "%02X%02X ", block->data[i], block->data[i + 1]);
}
furi_string_cat_str(nfc->text_box_store, "ID:\n");
@@ -61,7 +65,8 @@ void nfc_scene_felica_service_data_on_enter(void* context) {
if(!(i % 8) && i) {
furi_string_push_back(nfc->text_box_store, '\n');
}
furi_string_cat_printf(nfc->text_box_store, "%02X%02X ", block->data[i], block->data[i + 1]);
furi_string_cat_printf(
nfc->text_box_store, "%02X%02X ", block->data[i], block->data[i + 1]);
}
furi_string_cat_str(nfc->text_box_store, "D_ID:\n");
@@ -70,7 +75,8 @@ void nfc_scene_felica_service_data_on_enter(void* context) {
if(!(i % 8) && i) {
furi_string_push_back(nfc->text_box_store, '\n');
}
furi_string_cat_printf(nfc->text_box_store, "%02X%02X ", block->data[i], block->data[i + 1]);
furi_string_cat_printf(
nfc->text_box_store, "%02X%02X ", block->data[i], block->data[i + 1]);
}
furi_string_cat_str(nfc->text_box_store, "CKV:\n");
@@ -79,7 +85,8 @@ void nfc_scene_felica_service_data_on_enter(void* context) {
if(!(i % 8) && i) {
furi_string_push_back(nfc->text_box_store, '\n');
}
furi_string_cat_printf(nfc->text_box_store, "%02X%02X ", block->data[i], block->data[i + 1]);
furi_string_cat_printf(
nfc->text_box_store, "%02X%02X ", block->data[i], block->data[i + 1]);
}
furi_string_cat_str(nfc->text_box_store, "MC:\n");
@@ -88,7 +95,8 @@ void nfc_scene_felica_service_data_on_enter(void* context) {
if(!(i % 8) && i) {
furi_string_push_back(nfc->text_box_store, '\n');
}
furi_string_cat_printf(nfc->text_box_store, "%02X%02X ", block->data[i], block->data[i + 1]);
furi_string_cat_printf(
nfc->text_box_store, "%02X%02X ", block->data[i], block->data[i + 1]);
}
furi_string_cat_str(nfc->text_box_store, "WCNT:\n");
@@ -97,7 +105,8 @@ void nfc_scene_felica_service_data_on_enter(void* context) {
if(!(i % 8) && i) {
furi_string_push_back(nfc->text_box_store, '\n');
}
furi_string_cat_printf(nfc->text_box_store, "%02X%02X ", block->data[i], block->data[i + 1]);
furi_string_cat_printf(
nfc->text_box_store, "%02X%02X ", block->data[i], block->data[i + 1]);
}
furi_string_cat_str(nfc->text_box_store, "MAC_A:\n");
@@ -106,7 +115,8 @@ void nfc_scene_felica_service_data_on_enter(void* context) {
if(!(i % 8) && i) {
furi_string_push_back(nfc->text_box_store, '\n');
}
furi_string_cat_printf(nfc->text_box_store, "%02X%02X ", block->data[i], block->data[i + 1]);
furi_string_cat_printf(
nfc->text_box_store, "%02X%02X ", block->data[i], block->data[i + 1]);
}
furi_string_cat_str(nfc->text_box_store, "CRC_CHECK:\n");
@@ -115,7 +125,8 @@ void nfc_scene_felica_service_data_on_enter(void* context) {
if(!(i % 8) && i) {
furi_string_push_back(nfc->text_box_store, '\n');
}
furi_string_cat_printf(nfc->text_box_store, "%02X%02X ", block->data[i], block->data[i + 1]);
furi_string_cat_printf(
nfc->text_box_store, "%02X%02X ", block->data[i], block->data[i + 1]);
}
}
text_box_set_text(text_box, furi_string_get_cstr(nfc->text_box_store));