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

fbt format

Browse Source
This commit is contained in:
RogueMaster
2022-10-19 18:15:55 -04:00
parent 6fd9d6ccee
commit d676282b55
13 changed files with 241 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
applications/main/nfc/scenes/nfc_scene_passport_auth.c
View File

@@ -48,7 +48,10 @@ void nfc_scene_passport_auth_on_enter(void* context) {
const size_t temp_str_size = 15;
char temp_str[temp_str_size];
snprintf(temp_str, temp_str_size, "%02u%02u%02u",
snprintf(
temp_str,
temp_str_size,
"%02u%02u%02u",
mrtd_data->auth.birth_date.year,
mrtd_data->auth.birth_date.month,
mrtd_data->auth.birth_date.day);
@@ -56,7 +59,10 @@ void nfc_scene_passport_auth_on_enter(void* context) {
item = variable_item_list_add(variable_item_list, "Birth Date", 1, NULL, NULL);
variable_item_set_current_value_text(item, temp_str);
snprintf(temp_str, temp_str_size, "%02u%02u%02u",
snprintf(
temp_str,
temp_str_size,
"%02u%02u%02u",
mrtd_data->auth.expiry_date.year,
mrtd_data->auth.expiry_date.month,
mrtd_data->auth.expiry_date.day);
@@ -74,9 +80,7 @@ void nfc_scene_passport_auth_on_enter(void* context) {
temp_str[10] = '.';
temp_str[11] = '\x00';
}
variable_item_set_current_value_text(
item,
temp_str);
variable_item_set_current_value_text(item, temp_str);
item = variable_item_list_add(
variable_item_list,

8
applications/main/nfc/scenes/nfc_scene_passport_date.c
View File

@@ -44,13 +44,7 @@ void nfc_scene_passport_date_on_enter(void* context) {
date_empty = true;
} else {
char temp_str[10];
snprintf(
temp_str,
10,
"%02u%02u%02u",
date_value.year,
date_value.month,
date_value.day);
snprintf(temp_str, 10, "%02u%02u%02u", date_value.year, date_value.month, date_value.day);
memcpy(nfc->text_store, temp_str, DATE_LENGTH);
nfc->text_store[DATE_LENGTH] = '\x00';

34
applications/main/nfc/scenes/nfc_scene_passport_read_auth.c
View File

@@ -17,7 +17,10 @@ const char months[13][4] = {
"DEC",
};
void nfc_scene_passport_read_auth_widget_callback(GuiButtonType result, InputType type, void* context) {
void nfc_scene_passport_read_auth_widget_callback(
GuiButtonType result,
InputType type,
void* context) {
Nfc* nfc = context;
if(type == InputTypeShort) {
view_dispatcher_send_custom_event(nfc->view_dispatcher, result);
@@ -38,13 +41,18 @@ void nfc_scene_passport_read_auth_on_enter(void* context) {
// TODO: indicate BAC / PACE used
uint16_t lds_version = mrtd_data->files.EF_COM.lds_version;
furi_string_cat_printf(temp_str, "LDS version: %d.%d\n", lds_version/100, lds_version%100);
furi_string_cat_printf(temp_str, "LDS version: %d.%d\n", lds_version / 100, lds_version % 100);
uint32_t unicode_version = mrtd_data->files.EF_COM.unicode_version;
furi_string_cat_printf(temp_str, "Unicode version: %d.%d.%d\n", (uint8_t)(unicode_version/10000), (uint8_t)(unicode_version/100%100), (uint8_t)(unicode_version%100));
furi_string_cat_printf(
temp_str,
"Unicode version: %d.%d.%d\n",
(uint8_t)(unicode_version / 10000),
(uint8_t)(unicode_version / 100 % 100),
(uint8_t)(unicode_version % 100));
furi_string_cat_printf(temp_str, "Avail.files: ");
for(size_t i=0; i<MAX_EFCOM_TAGS; ++i) {
for(size_t i = 0; i < MAX_EFCOM_TAGS; ++i) {
uint8_t tag = mrtd_data->files.EF_COM.tag_list[i];
const EFFile* file = mrtd_tag_to_file(tag);
if(file->tag) {
@@ -57,8 +65,8 @@ void nfc_scene_passport_read_auth_on_enter(void* context) {
EF_DIR_contents* EF_DIR = &mrtd_data->files.EF_DIR;
if(EF_DIR->applications_count > 0) {
furi_string_cat_printf(temp_str, "Apps:\n");
for(uint8_t i=0; i<EF_DIR->applications_count; ++i) {
for(uint8_t n=0; n<sizeof(AIDValue); ++n) {
for(uint8_t i = 0; i < EF_DIR->applications_count; ++i) {
for(uint8_t n = 0; n < sizeof(AIDValue); ++n) {
furi_string_cat_printf(temp_str, "%02X ", EF_DIR->applications[i][n]);
}
furi_string_cat_printf(temp_str, "\n");
@@ -72,9 +80,19 @@ void nfc_scene_passport_read_auth_on_enter(void* context) {
furi_string_cat_printf(temp_str, "Name: %s\n", DG1->name);
furi_string_cat_printf(temp_str, "DocNr: %s\n", DG1->docnr);
furi_string_cat_printf(temp_str, "Nationality: %s\n", DG1->nationality);
furi_string_cat_printf(temp_str, "Birth Date: %02d %s %02d\n", DG1->birth_date.day, months[DG1->birth_date.month], DG1->birth_date.year);
furi_string_cat_printf(
temp_str,
"Birth Date: %02d %s %02d\n",
DG1->birth_date.day,
months[DG1->birth_date.month],
DG1->birth_date.year);
furi_string_cat_printf(temp_str, "Sex: %s\n", DG1->sex);
furi_string_cat_printf(temp_str, "Expiry Date: %02d %s %02d\n", DG1->expiry_date.day, months[DG1->expiry_date.month], DG1->expiry_date.year);
furi_string_cat_printf(
temp_str,
"Expiry Date: %02d %s %02d\n",
DG1->expiry_date.day,
months[DG1->expiry_date.month],
DG1->expiry_date.year);
widget_add_text_scroll_element(widget, 0, 0, 128, 52, furi_string_get_cstr(temp_str));
furi_string_free(temp_str);

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

@@ -89,7 +89,7 @@ bool nfc_scene_read_on_event(void* context, SceneManagerEvent event) {
notification_message(nfc->notifications, &sequence_success);
if(nfc->dev->dev_data.mrtd_data.auth_success) {
scene_manager_next_scene(nfc->scene_manager, NfcScenePassportReadAuthSuccess);
//TODO: } else if(nfc->dev->dev_data.mrtd_data.auth.method != MrtdAuthMethodNone) {
//TODO: } else if(nfc->dev->dev_data.mrtd_data.auth.method != MrtdAuthMethodNone) {
//scene_manager_next_scene(nfc->scene_manager, NfcScenePassportReadAuthFailed);
} else {
scene_manager_next_scene(nfc->scene_manager, NfcScenePassportReadSuccess);