mirrors/flipperzero-firmware
1
Fork 0
mirror of https://github.com/flipperdevices/flipperzero-firmware.git synced 2025-12-12 12:51:22 +04:00
Code Issues Activity

[Fl-3809] Troika parser visual fixes (#3614)

Browse Source 
Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
Astra
2024-04-24 21:47:40 +09:00
committed by GitHub
parent 34abaa7e27
commit 1559ee6293
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/main/nfc/api/mosgortrans/mosgortrans_util.c
View File

@@ -506,7 +506,7 @@ bool mosgortrans_parse_transport_block(const MfClassicBlock* block, FuriString*
if(data_block.valid_from_date == 0 || data_block.valid_to_date == 0) { if(data_block.valid_from_date == 0 || data_block.valid_to_date == 0) {
furi_string_cat(result, "\e#No ticket"); furi_string_cat(result, "\e#No ticket");
return true; return false;
} }
//remaining_trips //remaining_trips
furi_string_cat_printf(result, "Trips: %d\n", data_block.total_trips); furi_string_cat_printf(result, "Trips: %d\n", data_block.total_trips);

31
applications/main/nfc/plugins/supported_cards/troika.c
View File

@@ -83,6 +83,20 @@ static const MfClassicKeyPair troika_4k_keys[] = {
{.a = 0xBB52F8CCE07F, .b = 0x6B6119752C70}, //40 {.a = 0xBB52F8CCE07F, .b = 0x6B6119752C70}, //40
}; };
static void troika_render_section_header(
FuriString* str,
const char* name,
uint8_t prefix_separator_cnt,
uint8_t suffix_separator_cnt) {
for(uint8_t i = 0; i < prefix_separator_cnt; i++) {
furi_string_cat_printf(str, ":");
}
furi_string_cat_printf(str, "[ %s ]", name);
for(uint8_t i = 0; i < suffix_separator_cnt; i++) {
furi_string_cat_printf(str, ":");
}
}
static bool troika_get_card_config(TroikaCardConfig* config, MfClassicType type) { static bool troika_get_card_config(TroikaCardConfig* config, MfClassicType type) {
bool success = true; bool success = true;
@@ -204,18 +218,19 @@ static bool troika_parse(const NfcDevice* device, FuriString* parsed_data) {
bool result3 = mosgortrans_parse_transport_block(&data->block[16], tat_result); bool result3 = mosgortrans_parse_transport_block(&data->block[16], tat_result);
furi_string_cat_printf(parsed_data, "\e#Troyka card\n"); furi_string_cat_printf(parsed_data, "\e#Troyka card\n");
if(result1) { if(result1 && !furi_string_empty(metro_result)) {
furi_string_cat_printf( troika_render_section_header(parsed_data, "Metro", 22, 21);
parsed_data, "\e#Metro\n%s\n", furi_string_get_cstr(metro_result)); furi_string_cat_printf(parsed_data, "%s\n", furi_string_get_cstr(metro_result));
} }
if(result2) { if(result2 && !furi_string_empty(ground_result)) {
furi_string_cat_printf( troika_render_section_header(parsed_data, "Ediny", 22, 22);
parsed_data, "\n\e#Ediniy\n%s\n", furi_string_get_cstr(ground_result)); furi_string_cat_printf(parsed_data, "%s\n", furi_string_get_cstr(ground_result));
} }
if(result3) { if(result3 && !furi_string_empty(tat_result)) {
furi_string_cat_printf(parsed_data, "\n\e#TAT\n%s", furi_string_get_cstr(tat_result)); troika_render_section_header(parsed_data, "TAT", 24, 23);
furi_string_cat_printf(parsed_data, "%s\n", furi_string_get_cstr(tat_result));
} }
furi_string_free(tat_result); furi_string_free(tat_result);