Merge remote-tracking branch 'upstream/master' into felica_support_request_service

# Conflicts:
#	client/cmdhffelica.c
This commit is contained in:
Thomas Sutter 2019-10-24 08:53:41 +02:00
commit 94cc2c0473
2 changed files with 4 additions and 5 deletions

View file

@ -622,7 +622,7 @@ static int CmdHFFelicaDumpLite(const char *Cmd) {
return PM3_ETIMEOUT;
}
PrintAndLogEx(SUCCESS, "Recorded Activity (trace len = %"PRIu64" bytes)", tracelen);
PrintAndLogEx(SUCCESS, "Recorded Activity (trace len = %"PRIu32" bytes)", tracelen);
print_hex_break(trace, tracelen, 32);
printSep();