github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

chG: adjust some "." progress dots, that shouldn't use NORMAL..

Browse source
This commit is contained in:
iceman1001 2018-03-01 14:10:52 +01:00
commit 40cc0a402b
6 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
client/cmddata.c
View file

@ -1484,7 +1484,7 @@ int CmdTuneSamples(const char *Cmd) {
UsbCommand resp; UsbCommand resp;
while (!WaitForResponseTimeout(CMD_MEASURED_ANTENNA_TUNING, &resp, 2000)) { while (!WaitForResponseTimeout(CMD_MEASURED_ANTENNA_TUNING, &resp, 2000)) {
timeout++; timeout++;
PrintAndLogEx(NORMAL, "."); fflush(stdout); printf("."); fflush(stdout);
if (timeout > 7) { if (timeout > 7) {
PrintAndLogEx(NORMAL, "\n"); PrintAndLogEx(WARNING, "no response from Proxmark. Aborting..."); PrintAndLogEx(NORMAL, "\n"); PrintAndLogEx(WARNING, "no response from Proxmark. Aborting...");
return 1; return 1;
@ -1533,6 +1533,7 @@ int CmdTuneSamples(const char *Cmd) {
sprintf(judgement, "MARGINAL"); sprintf(judgement, "MARGINAL");
else else
sprintf(judgement, "OK"); sprintf(judgement, "OK");
PrintAndLogEx(NORMAL, "[%c] HF antenna is %s" PrintAndLogEx(NORMAL, "[%c] HF antenna is %s"
, (v_hf < HF_UNUSABLE_V) ? '!' : '+' , (v_hf < HF_UNUSABLE_V) ? '!' : '+'
, judgement , judgement
@ -1546,12 +1547,14 @@ int CmdTuneSamples(const char *Cmd) {
test += resp.d.asBytes[i]; test += resp.d.asBytes[i];
} }
if ( test > 0 ) { if ( test > 0 ) {
PrintAndLogEx(NORMAL, "\n"); PrintAndLogEx(SUCCESS, "Displaying LF tuning graph. Divisor 89 is 134khz, 95 is 125khz.\n\n"); PrintAndLogEx(NORMAL, "\n");
PrintAndLogEx(SUCCESS, " Displaying LF tuning graph. Divisor 89 is 134khz, 95 is 125khz.\n\n");
GraphTraceLen = 256; GraphTraceLen = 256;
ShowGraphWindow(); ShowGraphWindow();
RepaintGraphWindow(); RepaintGraphWindow();
} else { } else {
PrintAndLogEx(NORMAL, "\n[-] Not showing LF tuning graph since all values is zero.\n\n"); PrintAndLogEx(NORMAL, "\n");
PrintAndLogEx(FAILED, "Not showing LF tuning graph since all values is zero.\n\n");
} }
return 0; return 0;
} }

2
client/cmdhffelica.c
View file

@ -363,7 +363,7 @@ int CmdHFFelicaDumpLite(const char *Cmd) {
uint8_t timeout = 0; uint8_t timeout = 0;
while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) { while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
timeout++; timeout++;
PrintAndLogEx(NORMAL, "."); fflush(stdout); printf("."); fflush(stdout);
if (ukbhit()) { if (ukbhit()) {
int gc = getchar(); (void)gc; int gc = getchar(); (void)gc;
PrintAndLogEx(NORMAL, "\n[!] aborted via keyboard!\n"); PrintAndLogEx(NORMAL, "\n[!] aborted via keyboard!\n");

2
client/cmdhficlass.c
View file

@ -1039,7 +1039,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
clearCommandBuffer(); clearCommandBuffer();
SendCommand(&w); SendCommand(&w);
while (true) { while (true) {
PrintAndLogEx(NORMAL, "."); fflush(stdout); printf("."); fflush(stdout);
if (ukbhit()) { if (ukbhit()) {
int gc = getchar(); (void)gc; int gc = getchar(); (void)gc;
PrintAndLogEx(NORMAL, "\n[!] aborted via keyboard!\n"); PrintAndLogEx(NORMAL, "\n[!] aborted via keyboard!\n");

2
client/cmdhflegic.c
View file

@ -1227,7 +1227,7 @@ int CmdLegicWipe(const char *Cmd){
UsbCommand resp; UsbCommand resp;
for(size_t i = 7; i < card.cardsize; i += USB_CMD_DATA_SIZE) { for(size_t i = 7; i < card.cardsize; i += USB_CMD_DATA_SIZE) {
PrintAndLogEx(NORMAL, "."); fflush(stdout); printf("."); fflush(stdout);
len = MIN((card.cardsize - i), USB_CMD_DATA_SIZE); len = MIN((card.cardsize - i), USB_CMD_DATA_SIZE);
c.arg[0] = i; // offset c.arg[0] = i; // offset
c.arg[1] = len; // number of bytes c.arg[1] = len; // number of bytes

2
client/mifarehost.c
View file

@ -37,7 +37,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
// wait cycle // wait cycle
while (true) { while (true) {
PrintAndLogEx(NORMAL, "."); fflush(stdout); printf("."); fflush(stdout);
if (ukbhit()) { if (ukbhit()) {
int gc = getchar(); (void)gc; int gc = getchar(); (void)gc;
return -5; return -5;

2
client/proxguiqt.cpp
View file

@ -236,7 +236,7 @@ void ProxWidget::showEvent(QShowEvent *event) {
//----------- Plotting //----------- Plotting
int Plot::xCoordOf(int i, QRect r ) { int Plot::xCoordOf(int i, QRect r ) {
return r.left() + (int)((i - GraphStart)*GraphPixelsPerPoint); return r.left() + (int)((i - GraphStart) * GraphPixelsPerPoint);
} }
int Plot::yCoordOf(int v, QRect r, int maxVal) { int Plot::yCoordOf(int v, QRect r, int maxVal) {