Mercurial > brewboard / file diff

--- a/main/recipes.c	Mon Nov 25 21:01:46 2019 +0100
+++ b/main/recipes.c	Sun Apr 19 23:28:26 2020 +0200
@@ -571,24 +571,26 @@
 				    y += 16;
 				}
 			    }
-			    if (recipe.Additions) {
-				_fg = TFT_YELLOW;
-				sprintf(tmp, "%d ", recipe.Additions);
-				TFT_print(tmp, 2, y);
-				_fg = TFT_WHITE;
-				TFT_print((char *)"toevoegingen om", LASTX, y);
-				_fg = TFT_YELLOW;
-				for (int i = 1; i <= recipe.Additions; i++) {
-				    sprintf(tmp, " %d", recipe.Addition[i-1].Time);
-				    TFT_print(tmp, LASTX, y);
-				}
-				_fg = TFT_WHITE;
-				TFT_print((char *)" minuten", LASTX, y);
-			    } else {
-				_fg = TFT_WHITE;
-				TFT_print((char *)"Geen hop toevoegingen.", 2, y);
+			    if (recipe.BoilTime) {
+			    	if (recipe.Additions) {
+				    _fg = TFT_YELLOW;
+				    sprintf(tmp, "%d ", recipe.Additions);
+				    TFT_print(tmp, 2, y);
+				    _fg = TFT_WHITE;
+				    TFT_print((char *)"toevoegingen om", LASTX, y);
+				    _fg = TFT_YELLOW;
+				    for (int i = 1; i <= recipe.Additions; i++) {
+				    	sprintf(tmp, " %d", recipe.Addition[i-1].Time);
+				    	TFT_print(tmp, LASTX, y);
+				    }
+				    _fg = TFT_WHITE;
+				    TFT_print((char *)" minuten", LASTX, y);
+			    	} else {
+				    _fg = TFT_WHITE;
+				    TFT_print((char *)"Geen hop toevoegingen.", 2, y);
+			    	}
+			    	y += 16;
 			    }
-			    y += 16;
 			    if (recipe.Whirlpool9 || recipe.Whirlpool7 || recipe.Whirlpool6 || recipe.Whirlpool2) {
 				_fg = TFT_WHITE;
 				TFT_print((char *)"Whirlpool ", 2, y);
@@ -759,21 +761,23 @@
 			for (int i = (mashsteps + 1); i < 7; i++)
 			    recipe.MashStep[i].Resttime = 0;
 
-			EditUint16((char *)"Kook tijd in minuten", &recipe.BoilTime, 3, 480);
-			EditUint8((char *)"Hop/kruiden toevoegingen", &recipe.Additions, 1, 10);
-			for (uint8_t i = 0; i < recipe.Additions; i++) {
-			    sprintf(tmp, "Toevoeging %d naam", i+1);
-			    if (strlen(recipe.Addition[i].Name) == 00) {
-				sprintf(recipe.Addition[i].Name, "Hop %d", (int)i+1);
+			EditUint16((char *)"Kook tijd in minuten", &recipe.BoilTime, 0, 480);
+			if (recipe.BoilTime) {
+			    EditUint8((char *)"Hop/kruiden toevoegingen", &recipe.Additions, 1, 10);
+			    for (uint8_t i = 0; i < recipe.Additions; i++) {
+			    	sprintf(tmp, "Toevoeging %d naam", i+1);
+			    	if (strlen(recipe.Addition[i].Name) == 00) {
+				    sprintf(recipe.Addition[i].Name, "Hop %d", (int)i+1);
+			    	}
+			    	EditText(tmp, recipe.Addition[i].Name, 40);
+			    	sprintf(tmp, "Toevoeging %d tijd", i+1);
+			    	if (i == 0) {
+			    	    EditUint16(tmp, &recipe.Addition[i].Time, 0, recipe.BoilTime);
+			    	} else {
+				    EditUint16(tmp, &recipe.Addition[i].Time, 0, recipe.Addition[i-1].Time - 1);
+			    	}
+			    	recipe.Addition[i].Type = ADDITION_HOP;
 			    }
-			    EditText(tmp, recipe.Addition[i].Name, 40);
-			    sprintf(tmp, "Toevoeging %d tijd", i+1);
-			    if (i == 0) {
-			    	EditUint16(tmp, &recipe.Addition[i].Time, 0, recipe.BoilTime);
-			    } else {
-				EditUint16(tmp, &recipe.Addition[i].Time, 0, recipe.Addition[i-1].Time - 1);
-			    }
-			    recipe.Addition[i].Type = ADDITION_HOP;
 			}
 
 			EditFloat((char *)"Koel temperatuur", &recipe.CoolTemp, 10, 45, 2);