Mirrors/unleashed-firmware
2
0
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware synced 2025-02-17 05:48:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Umarsh parser: kopecks support added

Browse source
This commit is contained in:
Methodius 2023-11-21 13:18:18 +09:00
parent 1a21f0e3c9
commit b6ad07b47c
No known key found for this signature in database
GPG key ID: 122FA99A00B41679
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
applications/main/nfc/plugins/supported_cards/umarsh.c
View file

@ -64,7 +64,7 @@ static bool umarsh_parse(const NfcDevice* device, FuriString* parsed_data) {
// Data parsing from block 1 // Data parsing from block 1
block_start_ptr = &data->block[ticket_sector_start_block_number + 1].data[0]; block_start_ptr = &data->block[ticket_sector_start_block_number + 1].data[0];
uint8_t region_number = (((block_start_ptr[8] >> 5) & 0x07) << 4) | uint8_t region_number = (((block_start_ptr[8] >> 5) & 0x07) << 4) |
(block_start_ptr[12] & 0x0f); (block_start_ptr[12] & 0x0F);
uint32_t card_number = (block_start_ptr[8] << 24 | block_start_ptr[9] << 16 | uint32_t card_number = (block_start_ptr[8] << 24 | block_start_ptr[9] << 16 |
block_start_ptr[10] << 8 | block_start_ptr[11]) & block_start_ptr[10] << 8 | block_start_ptr[11]) &
0x3FFFFFFF; 0x3FFFFFFF;
@ -78,7 +78,8 @@ static bool umarsh_parse(const NfcDevice* device, FuriString* parsed_data) {
uint32_t terminal_number = uint32_t terminal_number =
(block_start_ptr[3] << 16 | block_start_ptr[4] << 8 | block_start_ptr[5]); (block_start_ptr[3] << 16 | block_start_ptr[4] << 8 | block_start_ptr[5]);
uint16_t last_refill_date = (block_start_ptr[6] << 8 | block_start_ptr[7]); uint16_t last_refill_date = (block_start_ptr[6] << 8 | block_start_ptr[7]);
uint16_t balance = (block_start_ptr[8] << 8 | block_start_ptr[9]) & 0x7FFF; uint16_t balance_rub = (block_start_ptr[8] << 8 | block_start_ptr[9]) & 0x7FFF;
uint8_t balance_kop = block_start_ptr[10] & 0x7F;
FuriHalRtcDateTime expiry_datetime; FuriHalRtcDateTime expiry_datetime;
expiry_datetime.year = 2000 + (expiry_date >> 9); expiry_datetime.year = 2000 + (expiry_date >> 9);
@ -92,10 +93,11 @@ static bool umarsh_parse(const NfcDevice* device, FuriString* parsed_data) {
furi_string_printf( furi_string_printf(
parsed_data, parsed_data,
"\e#Umarsh\nCard number: %lu\nRegion: %02u\nBalance: %u RUR\nTerminal number: %lu\nRefill counter: %u\nLast refill: %02u.%02u.%u\nExpires: %02u.%02u.%u", "\e#Umarsh\nCard number: %lu\nRegion: %02u\nBalance: %u.%u RUR\nTerminal number: %lu\nRefill counter: %u\nLast refill: %02u.%02u.%u\nExpires: %02u.%02u.%u",
card_number, card_number,
region_number, region_number,
balance, balance_rub,
balance_kop,
terminal_number, terminal_number,
refill_counter, refill_counter,
last_refill_datetime.day, last_refill_datetime.day,