Merge branch 'master' of github.com:RfidResearchGroup/proxmark3

This commit is contained in:
iceman1001 2022-03-24 14:24:51 +01:00
commit 2cfe69d92c

View file

@ -1681,13 +1681,13 @@ int CmdEM4x05Unlock(const char *Cmd) {
if (tries >= 5 && n == 0 && soon != late) { if (tries >= 5 && n == 0 && soon != late) {
if (soon > late) { if (soon > late) {
PrintAndLogEx(INFO, "Tried %d times, soon:%i late:%i => " _CYAN_("adjust +1 us >> %.0lf us"), tries, soon, late, start);
start++; start++;
end++; end++;
PrintAndLogEx(INFO, "Tried %d times, soon:%i late:%i => " _CYAN_("adjust +1 us >> %.0lf us"), tries, soon, late, start);
} else { } else {
PrintAndLogEx(INFO, "Tried %d times, soon:%i late:%i => " _CYAN_("adjust -1 us >> %.0lf us"), tries, soon, late, start);
start--; start--;
end--; end--;
PrintAndLogEx(INFO, "Tried %d times, soon:%i late:%i => " _CYAN_("adjust -1 us >> %.0lf us"), tries, soon, late, start);
} }
tries = 0; tries = 0;
soon = 0; soon = 0;
@ -1739,7 +1739,7 @@ int CmdEM4x05Unlock(const char *Cmd) {
if (my_auto) { if (my_auto) {
start += n; start += n;
PrintAndLogEx(INFO, " => " _CYAN_("adjust +%.0lf us >> %.0lf us"), n, start); PrintAndLogEx(INFO, " => " _CYAN_("adjust +%.0lf us >> %.0lf us"), n, start);
n /= 2; n = (int)(n / 2);
} else { } else {
soon++; soon++;
} }
@ -1793,7 +1793,7 @@ int CmdEM4x05Unlock(const char *Cmd) {
end = start; end = start;
start -= n; start -= n;
PrintAndLogEx(INFO, " => " _CYAN_("adjust -%.0lf us >> %.0lf us"), n, start); PrintAndLogEx(INFO, " => " _CYAN_("adjust -%.0lf us >> %.0lf us"), n, start);
n /= 2; n = (int)(n / 2);
} else { } else {
late++; late++;
} }