From 5ecc7984c7bee3c05ba2d4b7762b18e253588672 Mon Sep 17 00:00:00 2001 From: SoulGateKey Date: Sun, 8 Dec 2024 08:44:32 +0800 Subject: [PATCH] Fix: AimeDB Felica LookupEx rename package parameter --- core/adb_handlers/felica.py | 4 ++-- core/aimedb.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/adb_handlers/felica.py b/core/adb_handlers/felica.py index b7fdc2e..a037bbe 100644 --- a/core/adb_handlers/felica.py +++ b/core/adb_handlers/felica.py @@ -39,10 +39,10 @@ class ADBFelicaLookupExRequest(ADBBaseRequest): def __init__(self, data: bytes) -> None: super().__init__(data) self.random = struct.unpack_from("<16s", data, 0x20)[0] - idm, pmm = struct.unpack_from(">QQ", data, 0x30) + idm, dfc = struct.unpack_from(">QQ", data, 0x30) self.card_key_ver, self.write_ct, self.maca, company, fw_ver, self.dfc = struct.unpack_from("<16s16sQccH", data, 0x40) self.idm = hex(idm)[2:].upper() - self.pmm = hex(pmm)[2:].upper() + self.dfc = hex(dfc)[2:].upper() self.company = CompanyCodes(int.from_bytes(company, 'little')) self.fw_ver = ReaderFwVer.from_byte(fw_ver) diff --git a/core/aimedb.py b/core/aimedb.py index 6d5bd57..35b4a1f 100644 --- a/core/aimedb.py +++ b/core/aimedb.py @@ -344,7 +344,7 @@ class AimedbServlette(): user_id = -1 self.logger.info( - f"idm {idm} ipm {req.pmm} -> access_code {access_code} user_id {user_id}" + f"idm {idm} dfc {req.dfc} -> access_code {access_code} user_id {user_id}" ) resp = ADBFelicaLookupExResponse.from_req(req.head, user_id, access_code)