From 40cc0a402b1073e12d03dfa831eeecf97b359f2f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 1 Mar 2018 14:10:52 +0100
Subject: [PATCH] chG:  adjust some "." progress dots, that shouldn't use
 NORMAL..

---
 client/cmddata.c     | 11 +++++++----
 client/cmdhffelica.c |  2 +-
 client/cmdhficlass.c |  2 +-
 client/cmdhflegic.c  |  2 +-
 client/mifarehost.c  |  2 +-
 client/proxguiqt.cpp |  2 +-
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index c921f60bd..25735682c 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1484,7 +1484,7 @@ int CmdTuneSamples(const char *Cmd) {
 	UsbCommand resp;
 	while (!WaitForResponseTimeout(CMD_MEASURED_ANTENNA_TUNING, &resp, 2000)) {
 		timeout++;
-		PrintAndLogEx(NORMAL, "."); fflush(stdout);
+		printf("."); fflush(stdout);
 		if (timeout > 7) {
 			PrintAndLogEx(NORMAL, "\n"); PrintAndLogEx(WARNING, "no response from Proxmark. Aborting...");
 			return 1;
@@ -1532,7 +1532,8 @@ int CmdTuneSamples(const char *Cmd) {
 	else if (v_hf < HF_MARGINAL_V)
 		sprintf(judgement, "MARGINAL");
 	else
-		sprintf(judgement, "OK");	
+		sprintf(judgement, "OK");
+	
 	PrintAndLogEx(NORMAL, "[%c] HF antenna is %s"
 			, (v_hf < HF_UNUSABLE_V) ? '!' : '+'
 			, judgement
@@ -1546,12 +1547,14 @@ int CmdTuneSamples(const char *Cmd) {
 		test += resp.d.asBytes[i];
 	}
 	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;
 		ShowGraphWindow();
 		RepaintGraphWindow();
 	} 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;
 }
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index a313849d4..38c9d3f53 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -363,7 +363,7 @@ int CmdHFFelicaDumpLite(const char *Cmd) {
 	uint8_t timeout = 0;
 	while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
 		timeout++;
-		PrintAndLogEx(NORMAL, "."); fflush(stdout);
+		printf("."); fflush(stdout);
 		if (ukbhit()) {
 			int gc = getchar(); (void)gc;
 			PrintAndLogEx(NORMAL, "\n[!] aborted via keyboard!\n");
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 0160eb20e..c76fa7103 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -1039,7 +1039,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 	clearCommandBuffer();
 	SendCommand(&w);
 	while (true) {
-		PrintAndLogEx(NORMAL, "."); fflush(stdout);
+		printf("."); fflush(stdout);
 		if (ukbhit()) {
 			int gc = getchar(); (void)gc;
 			PrintAndLogEx(NORMAL, "\n[!] aborted via keyboard!\n");
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index f5349756d..96701f784 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -1227,7 +1227,7 @@ int CmdLegicWipe(const char *Cmd){
 	UsbCommand resp;
 	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);		
 		c.arg[0] = i; // offset
 		c.arg[1] = len; // number of bytes
diff --git a/client/mifarehost.c b/client/mifarehost.c
index 1ddaf9b02..75d9d099a 100644
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -37,7 +37,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
 		
 		// wait cycle
 		while (true) {
-			PrintAndLogEx(NORMAL, "."); fflush(stdout);
+			printf("."); fflush(stdout);
 			if (ukbhit()) {
 				int gc = getchar(); (void)gc;
 				return -5;
diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index 4a1536a30..eb169bdbc 100644
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -236,7 +236,7 @@ void ProxWidget::showEvent(QShowEvent *event) {
 //----------- Plotting
 
 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) {