Mon, 22 Feb 2016 19:24:49 +0100
Merge
--- a/brewco/util.c Mon Feb 22 19:22:39 2016 +0100 +++ b/brewco/util.c Mon Feb 22 19:24:49 2016 +0100 @@ -24,7 +24,9 @@ #include "util.h" #include "slcd.h" - +#ifdef HAVE_WIRINGPI_H +extern int lcdHandle; +#endif extern int slcdHandle; @@ -142,7 +144,7 @@ } - +#ifndef HAVE_WIRINGPI_H long millis(void) { struct timespec now; @@ -150,7 +152,7 @@ clock_gettime(CLOCK_REALTIME , &now); return ((now.tv_sec * 1000000000) + now.tv_nsec) / 1000000; } - +#endif void hlt_status(int value)
--- a/brewco/util.h Mon Feb 22 19:22:39 2016 +0100 +++ b/brewco/util.h Mon Feb 22 19:24:49 2016 +0100 @@ -5,7 +5,9 @@ int mkdirs(char *, mode_t); int file_exist(char *, int); int file_cp(char *, char *); +#ifndef HAVE_WIRINGPI_H long millis(void); +#endif void hlt_status(int); void mlt_status(int); void pump_status(int);
--- a/thermferm/thermferm.c Mon Feb 22 19:22:39 2016 +0100 +++ b/thermferm/thermferm.c Mon Feb 22 19:24:49 2016 +0100 @@ -1577,7 +1577,7 @@ if (debug) fprintf(stdout, "Heat: sp=%.2f Input=%.2f iState=%.2f Err=%.2f Out=%.2f\n", unit->PID_heat->SetP, unit->PID_heat->Input, unit->PID_heat->iState, unit->PID_heat->Err, unit->PID_heat->OutP); - if (((unit->PID_heat->OutP >= 2) && unit->heater_address) || (seconds == 60) || unit->heater_state) { + if (/* ((unit->PID_heat->OutP >= 2) && unit->heater_address) || */ (seconds == 60) /* || unit->heater_state */) { syslog(LOG_NOTICE, "Heat: sp=%.2f Input=%.2f iState=%.2f Err=%.2f Out=%.2f", unit->PID_heat->SetP, unit->PID_heat->Input, unit->PID_heat->iState, unit->PID_heat->Err, unit->PID_heat->OutP); } @@ -1586,7 +1586,7 @@ if (debug) fprintf(stdout, "Cool: sp=%.2f Input=%.2f iState=%.2f Err=%.2f Out=%.2f\n", unit->PID_cool->SetP, unit->PID_cool->Input, unit->PID_cool->iState, unit->PID_cool->Err, unit->PID_cool->OutP); - if (((unit->PID_cool->OutP >= 2) && unit->cooler_address) || (seconds == 60) || unit->cooler_state) { + if (/* ((unit->PID_cool->OutP >= 2) && unit->cooler_address) || */ (seconds == 60) /* || unit->cooler_state*/ ) { syslog(LOG_NOTICE, "Cool: sp=%.2f Input=%.2f iState=%.2f Err=%.2f Out=%.2f", unit->PID_cool->SetP, unit->PID_cool->Input, unit->PID_cool->iState, unit->PID_cool->Err, unit->PID_cool->OutP); }