mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-03-19 11:33:51 +08:00
use PrintAndLogEx() instead of PrintAndLog()
This commit is contained in:
parent
d8518f0b00
commit
14c68d47ec
1 changed files with 23 additions and 23 deletions
|
@ -28,7 +28,7 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
|
|||
char asBuff[120];
|
||||
memset(asBuff, 0, sizeof(asBuff));
|
||||
uint32_t mem_avail = 0;
|
||||
PrintAndLog(" [ Hardware ] ");
|
||||
PrintAndLogEx(NORMAL, " [ Hardware ] ");
|
||||
|
||||
switch(iChipID) {
|
||||
case 0x270B0A40: sprintf(asBuff,"AT91SAM7S512 Rev A"); break;
|
||||
|
@ -50,14 +50,14 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
|
|||
case 0x27050241: sprintf(asBuff,"AT9SAM7S161 Rev A"); break;
|
||||
case 0x27050240: sprintf(asBuff,"AT91SAM7S16 Rev A"); break;
|
||||
}
|
||||
PrintAndLog(" --= uC: %s",asBuff);
|
||||
PrintAndLogEx(NORMAL, " --= uC: %s",asBuff);
|
||||
switch( (iChipID & 0xE0) >> 5) {
|
||||
case 1: sprintf(asBuff,"ARM946ES"); break;
|
||||
case 2: sprintf(asBuff,"ARM7TDMI"); break;
|
||||
case 4: sprintf(asBuff,"ARM920T"); break;
|
||||
case 5: sprintf(asBuff,"ARM926EJS"); break;
|
||||
}
|
||||
PrintAndLog(" --= Embedded Processor: %s",asBuff);
|
||||
PrintAndLogEx(NORMAL, " --= Embedded Processor: %s",asBuff);
|
||||
switch( (iChipID & 0xF00) >> 8) {
|
||||
case 0: mem_avail = 0; break;
|
||||
case 1: mem_avail = 8; break;
|
||||
|
@ -75,7 +75,7 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
|
|||
if ( mem_avail > 0 )
|
||||
mem_left = (mem_avail * 1024) - mem_used;
|
||||
|
||||
PrintAndLog(" --= Nonvolatile Program Memory Size: %uK bytes, Used: %u bytes (%2.0f\%) Free: %u bytes (%2.0f\%)",
|
||||
PrintAndLogEx(NORMAL, " --= Nonvolatile Program Memory Size: %uK bytes, Used: %u bytes (%2.0f\%) Free: %u bytes (%2.0f\%)",
|
||||
mem_avail,
|
||||
mem_used,
|
||||
mem_avail == 0 ? 0.0f : (float)mem_used/(mem_avail*1024)*100,
|
||||
|
@ -95,7 +95,7 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
|
|||
case 12: sprintf(asBuff,"1024K bytes"); break;
|
||||
case 14: sprintf(asBuff,"2048K bytes"); break;
|
||||
}
|
||||
PrintAndLog(" --= Second Nonvolatile Program Memory Size: %s",asBuff);
|
||||
PrintAndLogEx(NORMAL, " --= Second Nonvolatile Program Memory Size: %s",asBuff);
|
||||
switch( (iChipID & 0xF0000) >> 16) {
|
||||
case 1: sprintf(asBuff,"1K bytes"); break;
|
||||
case 2: sprintf(asBuff,"2K bytes"); break;
|
||||
|
@ -113,7 +113,7 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
|
|||
case 14: sprintf(asBuff,"96K bytes"); break;
|
||||
case 15: sprintf(asBuff,"512K bytes");break;
|
||||
}
|
||||
PrintAndLog(" --= Internal SRAM Size: %s",asBuff);
|
||||
PrintAndLogEx(NORMAL, " --= Internal SRAM Size: %s",asBuff);
|
||||
switch( (iChipID & 0xFF00000) >> 20) {
|
||||
case 0x19: sprintf(asBuff,"AT91SAM9xx Series"); break;
|
||||
case 0x29: sprintf(asBuff,"AT91SAM9XExx Series"); break;
|
||||
|
@ -135,7 +135,7 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
|
|||
case 0x92: sprintf(asBuff,"AT91x92 Series"); break;
|
||||
case 0xF0: sprintf(asBuff,"AT75Cxx Series"); break;
|
||||
}
|
||||
PrintAndLog(" --= Architecture Identifier: %s",asBuff);
|
||||
PrintAndLogEx(NORMAL, " --= Architecture Identifier: %s",asBuff);
|
||||
switch( (iChipID & 0x70000000) >> 28 ) {
|
||||
case 0: sprintf(asBuff,"ROM"); break;
|
||||
case 1: sprintf(asBuff,"ROMless or on-chip Flash"); break;
|
||||
|
@ -143,7 +143,7 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
|
|||
case 3: sprintf(asBuff,"ROM and Embedded Flash Memory\nNVPSIZ is ROM size\nNVPSIZ2 is Flash size"); break;
|
||||
case 4: sprintf(asBuff,"SRAM emulating ROM"); break;
|
||||
}
|
||||
PrintAndLog(" --= Nonvolatile Program Memory Type: %s",asBuff);
|
||||
PrintAndLogEx(NORMAL, " --= Nonvolatile Program Memory Type: %s",asBuff);
|
||||
}
|
||||
|
||||
int CmdDetectReader(const char *Cmd) {
|
||||
|
@ -154,7 +154,7 @@ int CmdDetectReader(const char *Cmd) {
|
|||
} else if (*Cmd == 'h') {
|
||||
c.arg[0] = 2;
|
||||
} else if (*Cmd != '\0') {
|
||||
PrintAndLog("use 'detectreader' or 'detectreader l' or 'detectreader h'");
|
||||
PrintAndLogEx(NORMAL, "use 'detectreader' or 'detectreader l' or 'detectreader h'");
|
||||
return 0;
|
||||
}
|
||||
clearCommandBuffer();
|
||||
|
@ -212,13 +212,13 @@ int CmdSetDivisor(const char *Cmd) {
|
|||
UsbCommand c = {CMD_SET_LF_DIVISOR, {strtol(Cmd, NULL, 0), 0, 0}};
|
||||
|
||||
if (c.arg[0] < 19 || c.arg[0] > 255) {
|
||||
PrintAndLog("divisor must be between 19 and 255");
|
||||
PrintAndLogEx(NORMAL, "divisor must be between 19 and 255");
|
||||
return 1;
|
||||
}
|
||||
// 12 000 000 (12Mhz)
|
||||
clearCommandBuffer();
|
||||
SendCommand(&c);
|
||||
PrintAndLog("Divisor set, expected %.1f KHz", ((double)12000 / (c.arg[0]+1)) );
|
||||
PrintAndLogEx(NORMAL, "Divisor set, expected %.1f KHz", ((double)12000 / (c.arg[0]+1)) );
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -251,25 +251,25 @@ int CmdVersion(const char *Cmd) {
|
|||
SendCommand(&c);
|
||||
if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
|
||||
#ifdef __WIN32
|
||||
PrintAndLog("\nProxmark3 RFID instrument\n");
|
||||
PrintAndLogEx(NORMAL, "\nProxmark3 RFID instrument\n");
|
||||
#else
|
||||
PrintAndLog("\n\e[34mProxmark3 RFID instrument\e[0m\n");
|
||||
PrintAndLogEx(NORMAL, "\n\e[34mProxmark3 RFID instrument\e[0m\n");
|
||||
#endif
|
||||
PrintAndLog((char*)resp.d.asBytes);
|
||||
PrintAndLogEx(NORMAL, (char*)resp.d.asBytes);
|
||||
lookupChipID(resp.arg[0], resp.arg[1]);
|
||||
}
|
||||
} else {
|
||||
PrintAndLog("[[[ Cached information ]]]\n");
|
||||
PrintAndLogEx(NORMAL, "[[[ Cached information ]]]\n");
|
||||
#ifdef __WIN32
|
||||
PrintAndLog("\nProxmark3 RFID instrument\n");
|
||||
PrintAndLogEx(NORMAL, "\nProxmark3 RFID instrument\n");
|
||||
#else
|
||||
PrintAndLog("\n\e[33mProxmark3 RFID instrument\e[0m\n");
|
||||
PrintAndLogEx(NORMAL, "\n\e[33mProxmark3 RFID instrument\e[0m\n");
|
||||
#endif
|
||||
PrintAndLog((char*)resp.d.asBytes);
|
||||
PrintAndLogEx(NORMAL, (char*)resp.d.asBytes);
|
||||
lookupChipID(resp.arg[0], resp.arg[1]);
|
||||
PrintAndLog("");
|
||||
PrintAndLogEx(NORMAL, "");
|
||||
}
|
||||
printf("\n");
|
||||
PrintAndLogEx(NORMAL, "\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -280,7 +280,7 @@ int CmdStatus(const char *Cmd) {
|
|||
UsbCommand c = {CMD_STATUS};
|
||||
SendCommand(&c);
|
||||
if (!WaitForResponseTimeout(CMD_ACK, &c, 1900))
|
||||
PrintAndLog("Status command failed. USB Speed Test timed out");
|
||||
PrintAndLogEx(NORMAL, "Status command failed. USB Speed Test timed out");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -290,9 +290,9 @@ int CmdPing(const char *Cmd) {
|
|||
UsbCommand c = {CMD_PING};
|
||||
SendCommand(&c);
|
||||
if (WaitForResponseTimeout(CMD_ACK, &resp, 1000))
|
||||
PrintAndLog("Ping successful");
|
||||
PrintAndLogEx(NORMAL, "Ping successful");
|
||||
else
|
||||
PrintAndLog("Ping failed");
|
||||
PrintAndLogEx(NORMAL, "Ping failed");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue