--- a/brewpanel/dlgBrew.c Thu Nov 19 15:05:19 2015 +0100
+++ b/brewpanel/dlgBrew.c Thu Nov 19 20:45:09 2015 +0100
@@ -37,11 +37,15 @@
extern uint16_t keys;
-#define MAINDLG_B1 2
-#define MAINDLG_B2 3
-#define MAINDLG_B3 4
-#define MAINDLG_B4 5
-#define MAINDLG_QUIT 6
+#define MAINDLG_QUIT 2
+#define MAINDLG_B1 3
+#define MAINDLG_B2 5
+#define MAINDLG_B3 7
+#define MAINDLG_B4 9
+#define MAINDLG_B12 11
+#define MAINDLG_B23 12
+#define MAINDLG_B34 13
+#define MAINDLG_BALL 14
/* The main dialog: */
@@ -50,15 +54,19 @@
/* 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" },
- { SGBUTTON, 0, 0, 147, 430, 80, 20, (char *)"Quit" },
- { SGTTF, 0, 0, 85, 170, 20, 20, (char *)"Up" },
- { SGTTF, 0, 0, 135, 170, 20, 20, (char *)"Down" },
- { SGTTF, 0, 0, 203, 170, 20, 20, (char *)"Ret" },
{ 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 }
};
@@ -79,7 +87,7 @@
/*
* This functions sets up the actual font and then displays the brew panel dialog.
*/
-int Dialog_BrewDlg(void)
+int Dialog_BrewDlg(int fermenter)
{
int retbut;
int bOldMouseVisibility;
@@ -95,6 +103,17 @@
bOldMouseVisibility = SDL_ShowCursor(SDL_QUERY);
SDL_ShowCursor(SDL_ENABLE);
+ if (fermenter == 1) {
+ maindlg[1].w = 16;
+ maindlg[1].h = 2;
+ maindlg[7].type = SGLEDRED;
+ maindlg[7].x = 218;
+ maindlg[7].y = 153;
+ maindlg[7].w = 12;
+ maindlg[8].txt = (char *)"";
+ maindlg[11].type = -1;
+ }
+
SDLGui_CenterDlg(maindlg);
SDLGui_DoDialogInit(maindlg);
fd = Dialog_LCDinit(&x, &y, &w, &h, &cols, &rows, 0);
@@ -131,6 +150,30 @@
case MAINDLG_B4:
keys &= ~0x0001;
break;
+ case MAINDLG_B12 + 1000:
+ keys |= 0x000c;
+ break;
+ case MAINDLG_B12:
+ keys &= ~0x000c;
+ break;
+ case MAINDLG_B23 + 1000:
+ keys |= 0x0006;
+ break;
+ case MAINDLG_B23:
+ keys &= ~0x0006;
+ break;
+ case MAINDLG_B34 + 1000:
+ keys |= 0x0003;
+ break;
+ case MAINDLG_B34:
+ keys &= ~0x0003;
+ break;
+ case MAINDLG_BALL + 1000:
+ keys |= 0x000f;
+ break;
+ case MAINDLG_BALL:
+ keys &= ~0x000f;
+ break;
case MAINDLG_QUIT: my_shutdown = TRUE;
break;
}