Check HWMajorVersion like NXP commands \o/

See: https://www.nxp.com/docs/en/application-note/AN10833.pdf
This commit is contained in:
Willy-JL
2025-03-22 09:30:26 +00:00
parent 11af323f4f
commit 49127b199b
3 changed files with 3 additions and 3 deletions

View File

@@ -54,7 +54,7 @@ bool mf_desfire_version_parse(MfDesfireVersion* data, const BitBuffer* buf) {
bit_buffer_write_bytes(buf, data, sizeof(MfDesfireVersion)); bit_buffer_write_bytes(buf, data, sizeof(MfDesfireVersion));
} }
return can_parse; return can_parse && (data->hw_type & 0x0F) == 0x01;
} }
bool mf_desfire_free_memory_parse(MfDesfireFreeMemory* data, const BitBuffer* buf) { bool mf_desfire_free_memory_parse(MfDesfireFreeMemory* data, const BitBuffer* buf) {

View File

@@ -27,7 +27,7 @@ MfPlusError mf_plus_get_type_from_version(
MfPlusError error = MfPlusErrorProtocol; MfPlusError error = MfPlusErrorProtocol;
if(mf_plus_data->version.hw_type == 0x02 || mf_plus_data->version.hw_type == 0x82) { if((mf_plus_data->version.hw_type & 0x0F) == 0x02) {
error = MfPlusErrorNone; error = MfPlusErrorNone;
// Mifare Plus EV1/EV2 // Mifare Plus EV1/EV2

View File

@@ -44,7 +44,7 @@ bool ntag4xx_version_parse(Ntag4xxVersion* data, const BitBuffer* buf) {
} }
} }
return can_parse && data->hw_type == 0x04; return can_parse && (data->hw_type & 0x0F) == 0x04;
} }
bool ntag4xx_version_load(Ntag4xxVersion* data, FlipperFormat* ff) { bool ntag4xx_version_load(Ntag4xxVersion* data, FlipperFormat* ff) {