Tendokyu/artemis
1
0
Fork 0
mirror of synced 2025-02-12 08:32:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'Fix: AimeDB Felica LookupEx rename package parameter' (#188) from SoulGateKey/artemis:lookup_fix into develop

Browse Source 
Reviewed-on: https://gitea.tendokyu.moe/Hay1tsme/artemis/pulls/188
This commit is contained in:
Hay1tsme 2024-12-19 06:41:02 +00:00
commit e93fcfd706
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/adb_handlers/felica.py
View File

@ -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)

2
core/aimedb.py
View File

@ -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)