Mercurial > mbsePi-apps / changeset

--- a/brewco/setup.c	Wed Dec 16 22:06:11 2015 +0100
+++ b/brewco/setup.c	Wed Dec 16 22:54:53 2015 +0100
@@ -845,14 +845,14 @@
     for (;;) {
 
         prompt(0, NULL);
-        prompt(191, NULL);
+        prompt(191, NULL);	/* "    Edit recipe     " */
 
         if (idx == 1)
-            prompt(402, NULL);
-        else if (idx == 21)
-            prompt(404, NULL);
+            prompt(402, NULL);	/* "---  dwn  quit  ok  " */
+        else if (idx == 24)
+            prompt(404, NULL);	/* " up  ---  quit  ok  " */
         else
-            prompt(403, NULL);
+            prompt(403, NULL);	/* " up  dwn  quit  ok  " */
 
         switch (idx) {                          //   12345678901234567890
             case 1:     snprintf(pmpt, Config.lcd_cols + 1, "Recipe name:");
@@ -868,6 +868,52 @@
 	    case 3:     snprintf(pmpt, Config.lcd_cols + 1, "Boil time: %3d mins", recipe->boiltime);
 			prompt(200, pmpt);
 			break;
+	    case 4:
+	    case 5:
+	    case 6:
+	    case 7:
+	    case 8:
+	    case 9:
+	    case 10:
+	    case 11:	snprintf(pmpt, Config.lcd_cols + 1, "Mash: %s", recipe->mash[idx - 4].name);
+			prompt(200, pmpt);
+			if (recipe->mash[idx - 4].skip)
+			    snprintf(pmpt, Config.lcd_cols + 1, "Skipped");
+			else
+			    snprintf(pmpt, Config.lcd_cols + 1, "Sv %4.1f\001 %3d mins", recipe->mash[idx - 4].setpoint, recipe->mash[idx - 4].duration);
+			prompt(300, pmpt);
+			break;
+	    case 12:
+	    case 13:
+	    case 14:
+	    case 15:
+	    case 16:
+	    case 17:
+	    case 18:
+	    case 19:
+	    case 20:
+	    case 21:	snprintf(pmpt, Config.lcd_cols + 1, "Hop: %s", recipe->hops[idx - 12].name);
+			prompt(200, pmpt);
+			if (recipe->hops[idx - 12].name) {
+			    if (recipe->hops[idx - 12].boiltime == -1)
+				snprintf(pmpt, Config.lcd_cols + 1, "First Wort Hop");
+			    else
+			        snprintf(pmpt, Config.lcd_cols + 1, "Add at %3d mins", recipe->hops[idx - 12].boiltime);
+			    prompt(300, pmpt);
+			}
+			break;
+	    case 22:    
+	    case 23:
+	    case 24:	snprintf(pmpt, Config.lcd_cols + 1, "Hopstand: %s", recipe->hopstand[idx - 22].name);
+			prompt(200, pmpt);
+			if (recipe->hopstand[idx - 22].skip)
+			    snprintf(pmpt, Config.lcd_cols + 1, "Skipped");
+			else if (recipe->hopstand[idx - 22].hold)
+			    snprintf(pmpt, Config.lcd_cols + 1, "Hold at %4.1f %3d mins", recipe->hopstand[idx - 22].setpoint, recipe->hopstand[idx - 22].duration);
+			else
+			    snprintf(pmpt, Config.lcd_cols + 1, "Hold for %3d mins", recipe->hopstand[idx - 22].duration);
+			prompt(300, pmpt);
+			break;
 	}
 
         key = keywait();
@@ -882,7 +928,7 @@
 
         if ((key == KEY_UP) && (idx > 1))
             idx--;
-        if ((key == KEY_DOWN) && (idx < 6))
+        if ((key == KEY_DOWN) && (idx < 24))
             idx++;
 
         if (key == KEY_ENTER) {