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

parsers cleanup for new api

Browse Source
This commit is contained in:
Methodius
2023-12-16 23:57:46 +09:00
parent 510f217cd5
commit ebe1a8f55f
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
applications/main/nfc/plugins/supported_cards/kazan.c
View File

@@ -250,19 +250,18 @@ static bool kazan_parse(const NfcDevice* device, FuriString* parsed_data) {
last_trip.day = block_start_ptr[2]; last_trip.day = block_start_ptr[2];
last_trip.hour = block_start_ptr[3]; last_trip.hour = block_start_ptr[3];
last_trip.minute = block_start_ptr[4]; last_trip.minute = block_start_ptr[4];
bool is_last_trip_valid = (block_start_ptr[0] | block_start_ptr[1] | block_start_ptr[0]) && bool is_last_trip_valid = (block_start_ptr[0] | block_start_ptr[1] | block_start_ptr[2]) &&
(last_trip.day < 32 && last_trip.month < 12 && (last_trip.day < 32 && last_trip.month < 12 &&
last_trip.hour < 24 && last_trip.minute < 60); last_trip.hour < 24 && last_trip.minute < 60);
start_block_num = mf_classic_get_first_block_num_of_sector(balance_sector_number); start_block_num = mf_classic_get_first_block_num_of_sector(balance_sector_number);
block_start_ptr = &data->block[start_block_num].data[0]; block_start_ptr = &data->block[start_block_num].data[0];
const uint32_t trip_counter = (block_start_ptr[3] << 24) | (block_start_ptr[2] << 16) | const uint32_t trip_counter = nfc_util_bytes2num_little_endian(block_start_ptr, 4);
(block_start_ptr[1] << 8) | (block_start_ptr[0]);
size_t uid_len = 0; size_t uid_len = 0;
const uint8_t* uid = mf_classic_get_uid(data, &uid_len); const uint8_t* uid = mf_classic_get_uid(data, &uid_len);
const uint32_t card_number = (uid[3] << 24) | (uid[2] << 16) | (uid[1] << 8) | (uid[0]); const uint32_t card_number = nfc_util_bytes2num_little_endian(uid, 4);
furi_string_cat_printf( furi_string_cat_printf(
parsed_data, "\e#Kazan transport card\nCard number: %lu\n", card_number); parsed_data, "\e#Kazan transport card\nCard number: %lu\n", card_number);

5
applications/main/nfc/plugins/supported_cards/metromoney.c
View File

@@ -148,15 +148,14 @@ static bool metromoney_parse(const NfcDevice* device, FuriString* parsed_data) {
const uint8_t* block_start_ptr = const uint8_t* block_start_ptr =
&data->block[start_block_num + ticket_block_number].data[0]; &data->block[start_block_num + ticket_block_number].data[0];
uint32_t balance = (block_start_ptr[3] << 24) | (block_start_ptr[2] << 16) | uint32_t balance = nfc_util_bytes2num_little_endian(block_start_ptr, 4);
(block_start_ptr[1] << 8) | (block_start_ptr[0]);
uint32_t balance_lari = balance / 100; uint32_t balance_lari = balance / 100;
uint8_t balance_tetri = balance % 100; uint8_t balance_tetri = balance % 100;
size_t uid_len = 0; size_t uid_len = 0;
const uint8_t* uid = mf_classic_get_uid(data, &uid_len); const uint8_t* uid = mf_classic_get_uid(data, &uid_len);
uint32_t card_number = (uid[3] << 24) | (uid[2] << 16) | (uid[1] << 8) | (uid[0]); uint32_t card_number = nfc_util_bytes2num_little_endian(uid, 4);
furi_string_printf( furi_string_printf(
parsed_data, parsed_data,