Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-06-29 21:52:03 -07:00
Code Issues Packages Projects Releases Wiki Activity

NFC: Fix incorrect Saflok year formula (#433)

Browse Source 
* Fix incorrect Saflok year formula

* Update changelog

* Format?

---------

Co-authored-by: WillyJL <me@willyjl.dev>
This commit is contained in:
Lucifer
2025-07-20 08:43:45 +07:00
committed by GitHub
parent 2bcb89a550
commit ef17b42a5e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1
View File
@@ -26,6 +26,7 @@
### Fixed:
- Bad KB: Fix modifier keys with HOLD/RELEASE commands (by @WillyJL)
- Desktop: Fix lock screen hang (#438 by @aaronjamt)
- NFC: Fix incorrect Saflok year formula (#433 by @Eltrick)
### Removed:
- Nothing
applications/main/nfc/plugins/supported_cards/saflok.c
+2 -2
View File
@@ -347,8 +347,8 @@ bool saflok_parse(const NfcDevice* device, FuriString* parsed_data) {
uint8_t interval_minute = decodedBA[10] & 0x3F;
// Bytes 11-13: Creation date since 1980 Jan 1st
uint16_t creation_year = (((decodedBA[11] & 0xF0) >> 4) + SAFLOK_YEAR_OFFSET) |
creation_year_bits;
uint16_t creation_year =
(creation_year_bits | ((decodedBA[11] & 0xF0) >> 4)) + SAFLOK_YEAR_OFFSET;
uint8_t creation_month = decodedBA[11] & 0x0F;
uint8_t creation_day = (decodedBA[12] >> 3) & 0x1F;
uint8_t creation_hour = ((decodedBA[12] & 0x07) << 2) | (decodedBA[13] >> 6);