From 2bc2194a3caa0c961e0273f44cf942287bb893c8 Mon Sep 17 00:00:00 2001
From: henyxia <henyxia@live.fr>
Date: Fri, 6 Mar 2015 16:21:46 +0100
Subject: [PATCH] Revert "Fixed some printx"

---
 .gitignore |  1 -
 bus.c      | 21 +++++++--------------
 hvc.c      |  3 ---
 printx.c   |  5 +----
 4 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9fc43b0..3fef16f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,3 @@
 *.o
 tweekd
 *.log
-*.csv
diff --git a/bus.c b/bus.c
index e7d4877..322a9f4 100644
--- a/bus.c
+++ b/bus.c
@@ -35,42 +35,36 @@ void processCmd(char* buffer)
 	}
 	else if(strcmp(buffer, "setpumpon") == 0)
 	{
-		printx(INFO, BUS, "Setting PUMP ON\n");
+		printx(INFO, BUS, "Setting PUMP ON");
 		setPumpWantedState(true);
 	}
 	else if(strcmp(buffer, "setpumpoff") == 0)
 	{
-		printx(INFO, BUS, "Setting PUMP OFF\n");
+		printx(INFO, BUS, "Setting PUMP OFF");
 		setPumpWantedState(false);
 	}
 	else if(strcmp(buffer, "setheaton") == 0)
 	{
-		printx(INFO, BUS, "Setting HEAT ON\n");
+		printx(INFO, BUS, "Setting HEAT ON");
 		setHeatWantedState(true);
 	}
 	else if(strcmp(buffer, "setheatoff") == 0)
 	{
-		printx(INFO, BUS, "Setting HEAT OFF\n");
+		printx(INFO, BUS, "Setting HEAT OFF");
 		setHeatWantedState(false);
 	}
 	else if(strcmp(buffer, "setheaton5s") == 0)
 	{
-		printx(INFO, BUS, "Setting HEAT ON for 5 secs\n");
+		printx(INFO, BUS, "Setting HEAT ON for 5 secs");
 		setHeatTimer(5);
 		setHeatWantedState(true);
 	}
 	else if(strcmp(buffer, "setpumpon5s") == 0)
 	{
-		printx(INFO, BUS, "Setting PUMP ON for 5 secs\n");
+		printx(INFO, BUS, "Setting PUMP ON for 5 secs");
 		setPumpTimer(5);
 		setPumpWantedState(true);
 	}
-	else if(strcmp(buffer, "setheaton35s") == 0)
-	{
-		printx(INFO, BUS, "Setting HEAT ON for 35 secs\n");
-		setHeatTimer(35);
-		setHeatWantedState(true);
-	}
 
 	//printx(DEBUG, BUS, "STRLEN : %d and strcmp ret %d", strlen(buffer), strcmp(buffer, "quit"));
 }
@@ -87,8 +81,7 @@ void* processBus(void* we)
 		printx(DEBUG, BUS, "Event receved !\n");
 		busFree = false;
 		lseek(bus, 0, SEEK_SET);
-		read(bus, buffer, CMD_MAX);
-		//printx(DEBUG, BUS, "Data read %d\n", read(bus, buffer, CMD_MAX));
+		printx(DEBUG, BUS, "Data read %d\n", read(bus, buffer, CMD_MAX));
 		ftruncate(bus, 0);
 		sync();
 		processCmd(buffer);
diff --git a/hvc.c b/hvc.c
index 8c81cfb..26edb48 100644
--- a/hvc.c
+++ b/hvc.c
@@ -104,7 +104,6 @@ void* processHVC(void* we)
 		sendData(&hvc_fd, GET_TEMP);
 		data = getData(&hvc_fd);
 		setTemp(data);
-		printx(DEBUG, HVC, "TEMP %d\n", data);
 
 		if(tHeatTimer > 0)
 		{
@@ -113,7 +112,6 @@ void* processHVC(void* we)
 			{
 				wHeat = false;
 				tHeatTimer = 0;
-				printx(INFO, HVC, "Shutting down HEAT according to timer\n");
 			}
 
 		}
@@ -125,7 +123,6 @@ void* processHVC(void* we)
 			{
 				wPump = false;
 				tPumpTimer = 0;
-				printx(INFO, HVC, "Shutting down PUMP according to timer\n");
 			}
 		}
 
diff --git a/printx.c b/printx.c
index f0ef276..fcbc215 100644
--- a/printx.c
+++ b/printx.c
@@ -14,7 +14,6 @@
 FILE* logfile = NULL;
 char s_color[4][12] = {"\x1b[01;31m", "\x1b[01;33m", "\x1b[01;32m", "\x1b[01;36m"};
 char f_name[5][5] = {"MAIN", "UI  ", "NFC ", "HVC ", "BUS "};
-time_t	start;
 
 void removeCharFromString(char c, char *str)
 {
@@ -27,7 +26,6 @@ void removeCharFromString(char c, char *str)
 
 bool initLog()
 {
-	start = clock();
 	char	filename[FILENAME_LENGTH];
 	time_t	now = time(NULL);
 
@@ -55,11 +53,10 @@ void printx(severity s, msgfrom from, char* str, ...)
 {
 	char	buffer1[MAX_BUFFER];
 	char	buffer2[MAX_BUFFER];
-	time_t	now = clock();
 	va_list	arglist;
 	va_start(arglist, str);
 	vsprintf(buffer1, str, arglist);
-	fprintf(logfile, "[%6lu] %s", (now - start)/CLOCKS_PER_SEC , buffer1);
+	fprintf(logfile, buffer1);
 	fflush(logfile);
 	sprintf(buffer2, "[%s] %s%s%s", f_name[from], s_color[s], buffer1, S_RESET);
 	removeCharFromString('\n', buffer2);
--
libgit2 0.21.2