Mercurial > mbsePi-apps / file diff

--- a/thermferm/thermferm.c	Tue Aug 12 12:49:26 2014 +0200
+++ b/thermferm/thermferm.c	Tue Aug 12 13:09:50 2014 +0200
@@ -40,7 +40,6 @@
 extern sys_config	Config;
 #ifdef HAVE_WIRINGPI_H
 extern int		lcdHandle;
-extern unsigned char	lcdbuf[MAX_LCDS][20][4];
 int			setupmenu = MENU_NONE;
 
 #endif
@@ -92,7 +91,7 @@
 #ifdef HAVE_WIRINGPI_H
 void go_menu(int menu)
 {
-    mb_lcdClear(lcdHandle);
+    lcdClear(lcdHandle);
     lcdPosition(lcdHandle, 0, 0);
     setupmenu = menu;
 
@@ -100,78 +99,78 @@
 	case MENU_NONE:		lcd_buf_show();
 				break;
 
-	case MENU_TOP_DEFAULT:	mb_lcdPuts(lcdHandle, "Setup mode.");
+	case MENU_TOP_DEFAULT:	lcdPuts(lcdHandle, "Setup mode.");
 				lcdPosition(lcdHandle, 0, 1);
-				mb_lcdPuts(lcdHandle, "Up&Down = Escape");
+				lcdPuts(lcdHandle, "Up&Down = Escape");
 				break;
 
-	case MENU_TOP_UNITS:	mb_lcdPuts(lcdHandle, "Select units");
+	case MENU_TOP_UNITS:	lcdPuts(lcdHandle, "Select units");
 				break;
 
-	case MENU_UNITS:	mb_lcdPuts(lcdHandle, "Choose unit:");
+	case MENU_UNITS:	lcdPuts(lcdHandle, "Choose unit:");
 				break;
 
-	case MENU_MODE_OFF:	mb_lcdPuts(lcdHandle, "Set unit OFF");
+	case MENU_MODE_OFF:	lcdPuts(lcdHandle, "Set unit OFF");
 				break;
 
-	case MENU_MODE_NONE:	mb_lcdPuts(lcdHandle, "Set unit NONE");
+	case MENU_MODE_NONE:	lcdPuts(lcdHandle, "Set unit NONE");
 				break;
 
-	case MENU_NONE_HEAT:	mb_lcdPuts(lcdHandle, "Switch heater");
+	case MENU_NONE_HEAT:	lcdPuts(lcdHandle, "Switch heater");
 				break;
 
-	case MENU_NONE_COOL:	mb_lcdPuts(lcdHandle, "Switch cooler");
+	case MENU_NONE_COOL:	lcdPuts(lcdHandle, "Switch cooler");
 				break;
 
-	case MENU_NONE_FAN:	mb_lcdPuts(lcdHandle, "Switch Fan");
+	case MENU_NONE_FAN:	lcdPuts(lcdHandle, "Switch Fan");
 				break;
 
-	case MENU_MODE_BEER:	mb_lcdPuts(lcdHandle, "Set unit BEER");
+	case MENU_MODE_BEER:	lcdPuts(lcdHandle, "Set unit BEER");
 				break;
 
-	case MENU_BEER_TEMP:	mb_lcdPuts(lcdHandle, "Set beer temp");
+	case MENU_BEER_TEMP:	lcdPuts(lcdHandle, "Set beer temp");
 				break;
 
-	case MENU_MODE_FRIDGE:	mb_lcdPuts(lcdHandle, "Set unit FRIDGE");
+	case MENU_MODE_FRIDGE:	lcdPuts(lcdHandle, "Set unit FRIDGE");
 				break;
 
-	case MENU_FRIDGE_TEMP:	mb_lcdPuts(lcdHandle, "Set fridge temp");
+	case MENU_FRIDGE_TEMP:	lcdPuts(lcdHandle, "Set fridge temp");
 				break;
 
-	case MENU_MODE_PROFILE:	mb_lcdPuts(lcdHandle, "Set unit PROFILE");
+	case MENU_MODE_PROFILE:	lcdPuts(lcdHandle, "Set unit PROFILE");
 				break;
 
-	case MENU_PROFILE_SELECT:	mb_lcdPuts(lcdHandle, "Select profile");
+	case MENU_PROFILE_SELECT:	lcdPuts(lcdHandle, "Select profile");
 					break;
 	
-	case MENU_PROFILE_START:	mb_lcdPuts(lcdHandle, "Start profile");
+	case MENU_PROFILE_START:	lcdPuts(lcdHandle, "Start profile");
 					break;
 	
-	case MENU_PROFILE_PAUSE:	mb_lcdPuts(lcdHandle, "Pause profile");
+	case MENU_PROFILE_PAUSE:	lcdPuts(lcdHandle, "Pause profile");
 					break;
 
-	case MENU_PROFILE_ABORT:	mb_lcdPuts(lcdHandle, "Abort profile");
+	case MENU_PROFILE_ABORT:	lcdPuts(lcdHandle, "Abort profile");
 					break;
 
-	case MENU_PROFILE_RESUME:	mb_lcdPuts(lcdHandle, "Resume profile");
+	case MENU_PROFILE_RESUME:	lcdPuts(lcdHandle, "Resume profile");
 					break;
 
-	case MENU_PROFILE_GOOFF:	mb_lcdPuts(lcdHandle, "Set profile OFF");
+	case MENU_PROFILE_GOOFF:	lcdPuts(lcdHandle, "Set profile OFF");
 					break;
 
-	case MENU_TOP_SYS:	mb_lcdPuts(lcdHandle, "System menu");
+	case MENU_TOP_SYS:	lcdPuts(lcdHandle, "System menu");
 				break;
 
-	case MENU_SYS_HALT:	mb_lcdPuts(lcdHandle, "Halt system");
+	case MENU_SYS_HALT:	lcdPuts(lcdHandle, "Halt system");
 				break;
 
-	case MENU_SYS_REBOOT:	mb_lcdPuts(lcdHandle, "Reboot system");
+	case MENU_SYS_REBOOT:	lcdPuts(lcdHandle, "Reboot system");
 				break;
 
-	case MENU_SYS_MASH:	mb_lcdPuts(lcdHandle, "Start Mash program");
+	case MENU_SYS_MASH:	lcdPuts(lcdHandle, "Start Mash program");
 				break;
 
-	case MENU_SYS_THERMS:	mb_lcdPuts(lcdHandle, "Start Thermometers");
+	case MENU_SYS_THERMS:	lcdPuts(lcdHandle, "Start Thermometers");
 				break;
     }
 }
@@ -180,7 +179,7 @@
 
 void stopLCD(void)
 {
-    mb_lcdClear(lcdHandle);
+    lcdClear(lcdHandle);
     setBacklight(0);
 }
 #endif