summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
38e4191)
FIX: Fixed a minor bug in "HF SEARCH" where it always found a "14b" tag, making the command never test for other formats afterward the 14b test.
The 14b detection is not good still, conflicting return values is main reason for this bug
PrintAndLog("\nValid ISO15693 Tag Found - Quiting Search\n");
return ans;
}
PrintAndLog("\nValid ISO15693 Tag Found - Quiting Search\n");
return ans;
}
+ ans = CmdHFTopazReader("");
+ if (ans == 0) {
+ PrintAndLog("\nValid Topaz Tag Found - Quiting Search\n");
+ return 1;
+ }
PrintAndLog("\nno known/supported 13.56 MHz tags found\n");
return 0;
}
PrintAndLog("\nno known/supported 13.56 MHz tags found\n");
return 0;
}
+static int rawCloseEx(bool silent){
UsbCommand resp;
UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}};
clearCommandBuffer();
SendCommand(&c);
if (!WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
UsbCommand resp;
UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}};
clearCommandBuffer();
SendCommand(&c);
if (!WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
- PrintAndLog("Command time-out");
- return 1;
+ if ( !silent ) PrintAndLog("Command time-out");
+ return 0;
+ return 1;
+}
+static int rawClose() {
+ return rawCloseEx(false);
}
int HF14BCmdRaw(bool reply, bool *crc, bool power, uint8_t *data, uint8_t *datalen, bool verbose){
}
int HF14BCmdRaw(bool reply, bool *crc, bool power, uint8_t *data, uint8_t *datalen, bool verbose){
topaz_tag.uid[2],
topaz_tag.uid[1],
topaz_tag.uid[0]);
topaz_tag.uid[2],
topaz_tag.uid[1],
topaz_tag.uid[0]);
PrintAndLog(" UID[6] (Manufacturer Byte) = %02x, Manufacturer: %s",
topaz_tag.uid[6],
getTagInfo(topaz_tag.uid[6]));
PrintAndLog(" UID[6] (Manufacturer Byte) = %02x, Manufacturer: %s",
topaz_tag.uid[6],
getTagInfo(topaz_tag.uid[6]));