diff --git a/.gitignore b/.gitignore index 3fef16f..9fc43b0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ *.o tweekd *.log +*.csv diff --git a/bus.c b/bus.c index 322a9f4..e7d4877 100644 --- a/bus.c +++ b/bus.c @@ -35,36 +35,42 @@ void processCmd(char* buffer) } else if(strcmp(buffer, "setpumpon") == 0) { - printx(INFO, BUS, "Setting PUMP ON"); + printx(INFO, BUS, "Setting PUMP ON\n"); setPumpWantedState(true); } else if(strcmp(buffer, "setpumpoff") == 0) { - printx(INFO, BUS, "Setting PUMP OFF"); + printx(INFO, BUS, "Setting PUMP OFF\n"); setPumpWantedState(false); } else if(strcmp(buffer, "setheaton") == 0) { - printx(INFO, BUS, "Setting HEAT ON"); + printx(INFO, BUS, "Setting HEAT ON\n"); setHeatWantedState(true); } else if(strcmp(buffer, "setheatoff") == 0) { - printx(INFO, BUS, "Setting HEAT OFF"); + printx(INFO, BUS, "Setting HEAT OFF\n"); setHeatWantedState(false); } else if(strcmp(buffer, "setheaton5s") == 0) { - printx(INFO, BUS, "Setting HEAT ON for 5 secs"); + printx(INFO, BUS, "Setting HEAT ON for 5 secs\n"); setHeatTimer(5); setHeatWantedState(true); } else if(strcmp(buffer, "setpumpon5s") == 0) { - printx(INFO, BUS, "Setting PUMP ON for 5 secs"); + printx(INFO, BUS, "Setting PUMP ON for 5 secs\n"); 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")); } @@ -81,7 +87,8 @@ void* processBus(void* we) printx(DEBUG, BUS, "Event receved !\n"); busFree = false; lseek(bus, 0, SEEK_SET); - printx(DEBUG, BUS, "Data read %d\n", read(bus, buffer, CMD_MAX)); + 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 26edb48..8c81cfb 100644 --- a/hvc.c +++ b/hvc.c @@ -104,6 +104,7 @@ 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) { @@ -112,6 +113,7 @@ void* processHVC(void* we) { wHeat = false; tHeatTimer = 0; + printx(INFO, HVC, "Shutting down HEAT according to timer\n"); } } @@ -123,6 +125,7 @@ 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 fcbc215..f0ef276 100644 --- a/printx.c +++ b/printx.c @@ -14,6 +14,7 @@ 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) { @@ -26,6 +27,7 @@ void removeCharFromString(char c, char *str) bool initLog() { + start = clock(); char filename[FILENAME_LENGTH]; time_t now = time(NULL); @@ -53,10 +55,11 @@ 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, buffer1); + fprintf(logfile, "[%6lu] %s", (now - start)/CLOCKS_PER_SEC , 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