Mercurial > mbsePi-apps / file diff

--- a/brewco/devices.c	Mon Dec 21 22:53:29 2015 +0100
+++ b/brewco/devices.c	Tue Dec 22 15:59:26 2015 +0100
@@ -22,6 +22,7 @@
 
 #include "brewco.h"
 #include "devices.h"
+#include "util.h"
 #include "xutil.h"
 #include "keyboard.h"
 #include "slcd.h"
@@ -137,27 +138,11 @@
 
 void hlt_heater(int value)
 {
-#ifdef HAVE_WIRINGPI_H
-    piLock(LOCK_LCD);
-    lcdPosition(lcdHandle, 0, 1);
-#endif
-    slcdPosition(slcdHandle, 0, 1);
     if (value) {
 	leds |= SLED_HLTH;
-#ifdef HAVE_WIRINGPI_H
-	lcdPutchar(lcdHandle, 5);
-#endif
-	slcdPutchar(slcdHandle, 5);
     } else {
 	leds &= ~SLED_HLTH;
-#ifdef HAVE_WIRINGPI_H
-	lcdPutchar(lcdHandle, 6);
-#endif
-	slcdPutchar(slcdHandle, 6);
     }
-#ifdef HAVE_WIRINGPI_H
-    piUnlock(LOCK_LCD);
-#endif
     slcdLEDs(slcdHandle);
 }
 
@@ -165,27 +150,11 @@
 
 void mlt_heater(int value)
 {
-#ifdef HAVE_WIRINGPI_H
-    piLock(LOCK_LCD);
-    lcdPosition(lcdHandle, 18, 1);
-#endif
-    slcdPosition(slcdHandle, 18, 1);
     if (value) {
         leds |= SLED_MLTH;
-#ifdef HAVE_WIRINGPI_H
-        lcdPutchar(lcdHandle, 5);
-#endif
-        slcdPutchar(slcdHandle, 5);
     } else {
         leds &= ~SLED_MLTH;
-#ifdef HAVE_WIRINGPI_H
-        lcdPutchar(lcdHandle, 6);
-#endif
-        slcdPutchar(slcdHandle, 6);
     }
-#ifdef HAVE_WIRINGPI_H
-    piUnlock(LOCK_LCD);
-#endif
     slcdLEDs(slcdHandle);
 }
 
@@ -193,27 +162,12 @@
 
 void mlt_pump(int value)
 {
-#ifdef HAVE_WIRINGPI_H
-    piLock(LOCK_LCD);
-    lcdPosition(lcdHandle, 19, 1);
-#endif
-    slcdPosition(slcdHandle, 19, 1);
+    pump_status(value);
     if (value) {
         leds |= SLED_MLTP;
-#ifdef HAVE_WIRINGPI_H
-        lcdPutchar(lcdHandle, 3);
-#endif
-        slcdPutchar(slcdHandle, 3);
     } else {
         leds &= ~SLED_MLTP;
-#ifdef HAVE_WIRINGPI_H
-        lcdPutchar(lcdHandle, 4);
-#endif
-        slcdPutchar(slcdHandle, 4);
     }
-#ifdef HAVE_WIRINGPI_H
-    piUnlock(LOCK_LCD);
-#endif
     slcdLEDs(slcdHandle);
 }