Mercurial > mbsePi-apps / changeset

--- a/thermferm/thermferm.c	Mon Aug 18 19:44:41 2014 +0200
+++ b/thermferm/thermferm.c	Mon Aug 18 19:55:52 2014 +0200
@@ -221,12 +221,6 @@
 
 	case MENU_SYS_REBOOT:	lcdPuts(lcdHandle, "Reboot system");
 				break;
-
-	case MENU_SYS_MASH:	lcdPuts(lcdHandle, "Run Mash program");
-				break;
-
-	case MENU_SYS_THERMS:	lcdPuts(lcdHandle, "Run Thermometers");
-				break;
     }
 
     piUnlock(LOCK_MENU);
@@ -681,11 +675,9 @@
 	case MENU_SYS_HALT:
 			if (key == KEY_ESCAPE)
 			    go_menu(MENU_TOP_SYS);
-			if (key == KEY_DOWN)
+			if ((key == KEY_DOWN) || (key == KEY_UP))
 			    go_menu(MENU_SYS_REBOOT);
-			if (key == KEY_UP)
-			    go_menu(MENU_SYS_THERMS);
-			if (key == KEY_ENTER) {
+			if (key == KEY_CONFIRM) {
 			    rc = system("/sbin/halt");
 			    syslog(LOG_NOTICE, "System halt from panel: /sbin/halt rc=%d", rc);
 			    go_menu(MENU_NONE);
@@ -695,35 +687,14 @@
 	case MENU_SYS_REBOOT:
 			if (key == KEY_ESCAPE)
 			    go_menu(MENU_TOP_SYS);
-			if (key == KEY_DOWN)
-			    go_menu(MENU_SYS_MASH);
-			if (key == KEY_UP)
+			if ((key == KEY_DOWN) || (key == KEY_UP))
 			    go_menu(MENU_SYS_HALT);
-			if (key == KEY_ENTER) {
+			if (key == KEY_CONFIRM) {
 			    rc = system("/sbin/reboot");
 			    syslog(LOG_NOTICE, "System reboot from panel: /sbin/reboot rc=%d", rc);
 			    go_menu(MENU_NONE);
 			}
 			break;
-
-	case MENU_SYS_MASH:
-			if (key == KEY_ESCAPE)
-			    go_menu(MENU_TOP_SYS);
-			if (key == KEY_DOWN)
-			    go_menu(MENU_SYS_THERMS);
-			if (key == KEY_UP)
-			    go_menu(MENU_SYS_REBOOT);
-			break;
-
-	case MENU_SYS_THERMS:
-			if (key == KEY_ESCAPE)
-			    go_menu(MENU_TOP_SYS);
-			if (key == KEY_DOWN)
-			    go_menu(MENU_SYS_HALT);
-			if (key == KEY_UP)
-			    go_menu(MENU_SYS_MASH);
-			break;
-
     }
 }
 #endif

--- a/thermferm/thermferm.h	Mon Aug 18 19:44:41 2014 +0200
+++ b/thermferm/thermferm.h	Mon Aug 18 19:55:52 2014 +0200
@@ -81,8 +81,6 @@
 #define	MENU_TOP_SYS		3
 #define	MENU_SYS_HALT		31
 #define	MENU_SYS_REBOOT		32
-#define	MENU_SYS_MASH		33
-#define	MENU_SYS_THERMS		34
 
 #endif