Mercurial > mbsePi-apps / file diff

--- a/brewpanel/dlgBrew.c	Thu Nov 19 22:50:17 2015 +0100
+++ b/brewpanel/dlgBrew.c	Fri Nov 20 20:49:58 2015 +0100
@@ -24,10 +24,10 @@
  *****************************************************************************/
 
 #include "brewpanel.h"
-#include "sockio.h"
 #include "dlgBrew.h"
 #include "sdlgui.h"
 #include "slcd.h"
+#include "sockio.h"
 
 
 #ifdef HAVE_SDL_SDL_H
@@ -51,23 +51,26 @@
 /* The main dialog: */
 static SGOBJ maindlg[] =
 {
-/*        type      flags     state   x    y    w    h  txt  */
-	{ SGBOX,    0,           0,   0,   0, 374, 470, NULL },
-	{ SGLCD,    0,           0,  -1,  44,  20,   4, NULL },
-	{ SGBUTTON, 0,           0, 147, 430,  80,  20, (char *)"Quit" },
-	{ SGBUTTON, 0,           0,  80, 135,  30,  30, (char *)"1" },
-	{ SGTTF,    0,           0,  85, 170,  20,  20, (char *)"Up" },
-	{ SGBUTTON, 0,           0, 140, 135,  30,  30, (char *)"2" },
-	{ SGTTF,    0,           0, 135, 170,  20,  20, (char *)"Down" },
-	{ SGBUTTON, 0,           0, 200, 135,  30,  30, (char *)"3" },
-	{ SGTTF,    0,           0, 203, 170,  20,  20, (char *)"Ret" },
-	{ SGBUTTON, 0,           0, 260, 135,  30,  30, (char *)"4" },
-	{ SGTTF,    0,           0, 258, 170,  20,  20, (char *)"Enter" },
-	{ SGBUTTON, 0,           0, 110, 195,  30,  30, (char *)"12" },
-	{ SGBUTTON, 0,           0, 170, 195,  30,  30, (char *)"23" },
-	{ SGBUTTON, 0,           0, 230, 195,  30,  30, (char *)"34" },
-	{ SGBUTTON, 0,           0, 170, 255,  30,  30, (char *)"All" },
-	{ -1,       0,           0,   0,   0,   0,   0, NULL }
+/*        type         flags     state   x    y    w    h  txt  */
+	{ SGBOX,       0,           0,   0,   0, 374, 470, NULL },
+	{ SGLCD,       0,           0,  -1,  44,  20,   4, NULL },
+	{ SGBUTTON,    0,           0, 147, 430,  80,  20, (char *)"Quit" },
+	{ SGBUTTON,    0,           0,  80, 135,  30,  30, (char *)"1" },
+	{ SGTTF,       0,           0,  85, 170,  20,  20, (char *)"Up" },
+	{ SGBUTTON,    0,           0, 140, 135,  30,  30, (char *)"2" },
+	{ SGTTF,       0,           0, 135, 170,  20,  20, (char *)"Down" },
+	{ SGBUTTON,    0,           0, 200, 135,  30,  30, (char *)"3" },
+	{ SGTTF,       0,           0, 203, 170,  20,  20, (char *)"Ret" },
+	{ SGBUTTON,    0,           0, 260, 135,  30,  30, (char *)"4" },
+	{ SGTTF,       0,           0, 258, 170,  20,  20, (char *)"Enter" },
+	{ SGBUTTON,    0,           0, 110, 195,  30,  30, (char *)"12" },
+	{ SGBUTTON,    0,           0, 170, 195,  30,  30, (char *)"23" },
+	{ SGBUTTON,    0,           0, 230, 195,  30,  30, (char *)"34" },
+	{ SGBUTTON,    0,           0, 170, 255,  30,  30, (char *)"All" },
+	{ SGLEDRED,    0,           0, 110, 300,  12,   0, NULL },
+	{ SGLEDBLUE,   0,           0, 170, 300,  12,   0, NULL },
+	{ SGLEDYELLOW, 0,           0, 230, 300,  12,   0, NULL },
+	{ -1,          0,           0,   0,   0,   0,   0, NULL }
 };
 
 
@@ -106,7 +109,7 @@
     if (fermenter == 1) {
     	maindlg[1].w = 16;
     	maindlg[1].h = 2;
-	maindlg[7].type = SGLEDRED;
+	maindlg[7].type = SGLEDGREEN;
 	maindlg[7].x = 218;
 	maindlg[7].y = 153;
 	maindlg[7].w = 12;
@@ -119,7 +122,7 @@
     fd = Dialog_LCDinit(&x, &y, &w, &h, &cols, &rows, 0);
     fprintf(stdout, "Dialog_LCDinit(%d, %d, %d, %d, %d, %d, 0) = %d\n", x, y, w, h, cols, rows, fd);
     socket_connect();
-    slcdInit(fd, x, y, w, h, cols, rows);
+    slcdInit(maindlg, fd, x, y, w, h, cols, rows);
 
     do {
 	retbut = SDLGui_DoDialogLoop(maindlg);