RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-16 01:53:02 +08:00
Code Issues Projects Releases Packages Wiki Activity

Add new UID of Waveshare 1.54" NFC ePaper (probably new HW revision)

Browse source
This commit is contained in:
ah01 2023-02-09 01:22:04 +01:00
parent cb6f3f381d
commit b0dcfdf2c5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
client/src/cmdhfwaveshare.c
View file

@ -712,17 +712,17 @@ static int start_drawing(uint8_t model_nr, uint8_t *black, uint8_t *red) {
return PM3_ESOFT; return PM3_ESOFT;
} }
if ((card.uidlen != 7) || ((memcmp(card.uid, "FSTN10m", 7) != 0) && (memcmp(card.uid, "WSDZ10m", 7) != 0))) { if ((card.uidlen != 7) || ((memcmp(card.uid, "FSTN10m", 7) != 0) && (memcmp(card.uid, "FSTN11m", 7) != 0) && (memcmp(card.uid, "WSDZ10m", 7) != 0))) {
PrintAndLogEx(WARNING, "Card doesn't look like Waveshare tag"); PrintAndLogEx(WARNING, "Card doesn't look like Waveshare tag");
DropField(); DropField();
return PM3_ESOFT; return PM3_ESOFT;
} }
if (((model_nr != M1in54B) && (memcmp(card.uid, "FSTN10m", 7) == 0))) { if (((model_nr != M1in54B) && ((memcmp(card.uid, "FSTN10m", 7) == 0) || (memcmp(card.uid, "FSTN11m", 7) == 0)))) {
PrintAndLogEx(WARNING, "Card is a Waveshare tag 1.54\", not %s", models[model_nr].desc); PrintAndLogEx(WARNING, "Card is a Waveshare tag 1.54\", not %s", models[model_nr].desc);
DropField(); DropField();
return PM3_ESOFT; return PM3_ESOFT;
} }
if (((model_nr == M1in54B) && (memcmp(card.uid, "FSTN10m", 7) != 0))) { if (((model_nr == M1in54B) && (memcmp(card.uid, "FSTN10m", 7) != 0) && (memcmp(card.uid, "FSTN11m", 7) != 0))) {
PrintAndLogEx(WARNING, "Card is not a Waveshare tag 1.54\", check your model number"); PrintAndLogEx(WARNING, "Card is not a Waveshare tag 1.54\", check your model number");
DropField(); DropField();
return PM3_ESOFT; return PM3_ESOFT;