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

[FL-3800, FL-3801] Fixed plugins and UI (#3543)

Browse Source 
* Fixed some UI mismatches in plugin and nfc app
* Fixed nameing mismatches in mosgortrans_util
* Fix ultralight naming display

Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
RebornedBrain
2024-03-29 05:45:01 +03:00
committed by GitHub
parent 538422e2a9
commit c353182353
5 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -464,21 +464,21 @@ void parse_transport_type(BlockData* data_block, FuriString* transport) {
bool mosgortrans_parse_transport_block(const MfClassicBlock* block, FuriString* result) {
BlockData data_block = {};
const uint16_t valid_departments[] = {0x106, 0x108, 0x10A, 0x10E, 0x110, 0x117};
uint16_t transport_departament = bit_lib_get_bits_16(block->data, 0, 10);
uint16_t transport_department = bit_lib_get_bits_16(block->data, 0, 10);
if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) {
furi_string_cat_printf(result, "Transport departament: %x\n", transport_departament);
furi_string_cat_printf(result, "Transport department: %x\n", transport_department);
}
bool departament_valid = false;
bool department_valid = false;
for(uint8_t i = 0; i < 6; i++) {
if(transport_departament == valid_departments[i]) {
departament_valid = true;
if(transport_department == valid_departments[i]) {
department_valid = true;
break;
}
}
if(!departament_valid) {
if(!department_valid) {
return false;
}
FURI_LOG_D(TAG, "Transport departament: %x", transport_departament);
FURI_LOG_D(TAG, "Transport department: %x", transport_department);
uint16_t layout_type = bit_lib_get_bits_16(block->data, 52, 4);
if(layout_type == 0xE) {
layout_type = bit_lib_get_bits_16(block->data, 52, 9);