From 8fecca357533418b7d19c22ebfb1d90d8497cefc Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Wed, 28 Dec 2022 17:24:48 +0800 Subject: [PATCH] NFC: bump API version and format FeliCa scene code --- applications/main/nfc/nfc_i.h | 1 - .../main/nfc/scenes/nfc_scene_felica_menu.c | 2 +- .../scenes/nfc_scene_felica_read_success.c | 3 +- .../scenes/nfc_scene_felica_service_data.c | 33 ++++++++++++------- firmware/targets/f7/api_symbols.csv | 2 +- lib/nfc/protocols/felica.c | 11 ++++--- 6 files changed, 32 insertions(+), 20 deletions(-) diff --git a/applications/main/nfc/nfc_i.h b/applications/main/nfc/nfc_i.h index 06a02bee4..21a3d4333 100644 --- a/applications/main/nfc/nfc_i.h +++ b/applications/main/nfc/nfc_i.h @@ -48,7 +48,6 @@ ARRAY_DEF(MfClassicUserKeys, char*, M_PTR_OPLIST); #define NFC_TEXT_STORE_SIZE 128 #define NFC_APP_FOLDER ANY_PATH("nfc") - typedef struct { FuriStringStack_t strings; diff --git a/applications/main/nfc/scenes/nfc_scene_felica_menu.c b/applications/main/nfc/scenes/nfc_scene_felica_menu.c index 669bfd4ee..b989047d6 100644 --- a/applications/main/nfc/scenes/nfc_scene_felica_menu.c +++ b/applications/main/nfc/scenes/nfc_scene_felica_menu.c @@ -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; } diff --git a/applications/main/nfc/scenes/nfc_scene_felica_read_success.c b/applications/main/nfc/scenes/nfc_scene_felica_read_success.c index 81777a0f7..52bba0ee3 100644 --- a/applications/main/nfc/scenes/nfc_scene_felica_read_success.c +++ b/applications/main/nfc/scenes/nfc_scene_felica_read_success.c @@ -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); diff --git a/applications/main/nfc/scenes/nfc_scene_felica_service_data.c b/applications/main/nfc/scenes/nfc_scene_felica_service_data.c index 7cb2ba591..68cd71a4f 100644 --- a/applications/main/nfc/scenes/nfc_scene_felica_service_data.c +++ b/applications/main/nfc/scenes/nfc_scene_felica_service_data.c @@ -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)); diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv index 6d1d295c0..60b5864bc 100644 --- a/firmware/targets/f7/api_symbols.csv +++ b/firmware/targets/f7/api_symbols.csv @@ -1,5 +1,5 @@ entry,status,name,type,params -Version,+,11.3,, +Version,+,11.4,, Header,+,applications/services/bt/bt_service/bt.h,, Header,+,applications/services/cli/cli.h,, Header,+,applications/services/cli/cli_vcp.h,, diff --git a/lib/nfc/protocols/felica.c b/lib/nfc/protocols/felica.c index 8387674df..e6f585437 100644 --- a/lib/nfc/protocols/felica.c +++ b/lib/nfc/protocols/felica.c @@ -418,8 +418,7 @@ bool felica_read_lite_system( area->end_service_code = 0x000f; FelicaNodeList_init(area->nodes); FelicaNode* node = malloc(sizeof(node)); - node->type = FelicaNodeTypeService, - node->ptr.service = service; + node->type = FelicaNodeTypeService, node->ptr.service = service; FelicaNodeList_push_back(area->nodes, node); service->number = 0; @@ -575,7 +574,8 @@ bool felica_read_card( void felica_service_clear(FelicaService* service) { FelicaBlockList_it_t it; - for(FelicaBlockList_it(it, service->blocks); !FelicaBlockList_end_p(it); FelicaBlockList_next(it)) { + for(FelicaBlockList_it(it, service->blocks); !FelicaBlockList_end_p(it); + FelicaBlockList_next(it)) { FelicaBlock* block = *FelicaBlockList_ref(it); free(block); } @@ -586,7 +586,7 @@ void felica_area_clear(FelicaArea* area) { FelicaNodeList_it_t it; for(FelicaNodeList_it(it, area->nodes); !FelicaNodeList_end_p(it); FelicaNodeList_next(it)) { FelicaNode* node = *FelicaNodeList_ref(it); - if (node->type == FelicaNodeTypeArea) { + if(node->type == FelicaNodeTypeArea) { felica_area_clear(node->ptr.area); } else if(node->type == FelicaNodeTypeService) { felica_service_clear(node->ptr.service); @@ -598,7 +598,8 @@ void felica_area_clear(FelicaArea* area) { void felica_clear(FelicaData* data) { FelicaSystemList_it_t it; - for(FelicaSystemList_it(it, data->systems); !FelicaSystemList_end_p(it); FelicaSystemList_next(it)) { + for(FelicaSystemList_it(it, data->systems); !FelicaSystemList_end_p(it); + FelicaSystemList_next(it)) { FelicaSystem* system = *FelicaSystemList_ref(it); felica_area_clear(&system->root_area); }