dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into dav-tmp

Browse Source 
solved merge conflict
This commit is contained in:
tharexde
2020-06-30 01:05:10 +02:00
parent 3f70f1154b d0eeaeeffc
commit da44e0fc96
13 changed files with 330 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/cmdlfem4x.c
View File

@@ -624,8 +624,8 @@ static int CmdEM410xWrite(const char *Cmd) {
// Allowed clock rates: 16, 32, 40 and 64
if ((clock1 != 16) && (clock1 != 32) && (clock1 != 64) && (clock1 != 40)) {
PrintAndLogEx(ERR, "error, clock rate" _RED_("%d")" not valid");
PrintAndLogEx(INFO, "supported clock rates: " _YELLOW_("16, 32, 40, 60") "\n", clock1);
PrintAndLogEx(FAILED, "error, clock rate" _RED_("%d")" not valid", clock1);
PrintAndLogEx(INFO, "supported clock rates: " _YELLOW_("16, 32, 40, 60") "\n");
usage_lf_em410x_write();
return PM3_EINVARG;
}