comparison: main/recipes.c
main/recipes.c
- changeset 75
- 224851e81117
- parent 70
- d6838a268020
- child 76
- 3ff381bfa469
equal
deleted
inserted
replaced
| 74:cba50f7529d0 | 75:224851e81117 |
|---|---|
| 569 sprintf(tmp, "%2d m", recipe.MashStep[i].Resttime); | 569 sprintf(tmp, "%2d m", recipe.MashStep[i].Resttime); |
| 570 TFT_print(tmp, 280, y); | 570 TFT_print(tmp, 280, y); |
| 571 y += 16; | 571 y += 16; |
| 572 } | 572 } |
| 573 } | 573 } |
| 574 if (recipe.Additions) { | 574 if (recipe.BoilTime) { |
| 575 _fg = TFT_YELLOW; | 575 if (recipe.Additions) { |
| 576 sprintf(tmp, "%d ", recipe.Additions); | 576 _fg = TFT_YELLOW; |
| 577 TFT_print(tmp, 2, y); | 577 sprintf(tmp, "%d ", recipe.Additions); |
| 578 _fg = TFT_WHITE; | 578 TFT_print(tmp, 2, y); |
| 579 TFT_print((char *)"toevoegingen om", LASTX, y); | 579 _fg = TFT_WHITE; |
| 580 _fg = TFT_YELLOW; | 580 TFT_print((char *)"toevoegingen om", LASTX, y); |
| 581 for (int i = 1; i <= recipe.Additions; i++) { | 581 _fg = TFT_YELLOW; |
| 582 sprintf(tmp, " %d", recipe.Addition[i-1].Time); | 582 for (int i = 1; i <= recipe.Additions; i++) { |
| 583 TFT_print(tmp, LASTX, y); | 583 sprintf(tmp, " %d", recipe.Addition[i-1].Time); |
| 584 } | 584 TFT_print(tmp, LASTX, y); |
| 585 _fg = TFT_WHITE; | 585 } |
| 586 TFT_print((char *)" minuten", LASTX, y); | 586 _fg = TFT_WHITE; |
| 587 } else { | 587 TFT_print((char *)" minuten", LASTX, y); |
| 588 _fg = TFT_WHITE; | 588 } else { |
| 589 TFT_print((char *)"Geen hop toevoegingen.", 2, y); | 589 _fg = TFT_WHITE; |
| 590 TFT_print((char *)"Geen hop toevoegingen.", 2, y); | |
| 591 } | |
| 592 y += 16; | |
| 590 } | 593 } |
| 591 y += 16; | |
| 592 if (recipe.Whirlpool9 || recipe.Whirlpool7 || recipe.Whirlpool6 || recipe.Whirlpool2) { | 594 if (recipe.Whirlpool9 || recipe.Whirlpool7 || recipe.Whirlpool6 || recipe.Whirlpool2) { |
| 593 _fg = TFT_WHITE; | 595 _fg = TFT_WHITE; |
| 594 TFT_print((char *)"Whirlpool ", 2, y); | 596 TFT_print((char *)"Whirlpool ", 2, y); |
| 595 _fg = TFT_YELLOW; | 597 _fg = TFT_YELLOW; |
| 596 if (recipe.Whirlpool9) | 598 if (recipe.Whirlpool9) |
| 757 recipe.MashStep[7].Ramptime = (int)(recipe.MashStep[7].Temperature - recipe.MashStep[mashsteps].Temperature); | 759 recipe.MashStep[7].Ramptime = (int)(recipe.MashStep[7].Temperature - recipe.MashStep[mashsteps].Temperature); |
| 758 // Zero any higher steps to diable them. | 760 // Zero any higher steps to diable them. |
| 759 for (int i = (mashsteps + 1); i < 7; i++) | 761 for (int i = (mashsteps + 1); i < 7; i++) |
| 760 recipe.MashStep[i].Resttime = 0; | 762 recipe.MashStep[i].Resttime = 0; |
| 761 | 763 |
| 762 EditUint16((char *)"Kook tijd in minuten", &recipe.BoilTime, 3, 480); | 764 EditUint16((char *)"Kook tijd in minuten", &recipe.BoilTime, 0, 480); |
| 763 EditUint8((char *)"Hop/kruiden toevoegingen", &recipe.Additions, 1, 10); | 765 if (recipe.BoilTime) { |
| 764 for (uint8_t i = 0; i < recipe.Additions; i++) { | 766 EditUint8((char *)"Hop/kruiden toevoegingen", &recipe.Additions, 1, 10); |
| 765 sprintf(tmp, "Toevoeging %d naam", i+1); | 767 for (uint8_t i = 0; i < recipe.Additions; i++) { |
| 766 if (strlen(recipe.Addition[i].Name) == 00) { | 768 sprintf(tmp, "Toevoeging %d naam", i+1); |
| 767 sprintf(recipe.Addition[i].Name, "Hop %d", (int)i+1); | 769 if (strlen(recipe.Addition[i].Name) == 00) { |
| 770 sprintf(recipe.Addition[i].Name, "Hop %d", (int)i+1); | |
| 771 } | |
| 772 EditText(tmp, recipe.Addition[i].Name, 40); | |
| 773 sprintf(tmp, "Toevoeging %d tijd", i+1); | |
| 774 if (i == 0) { | |
| 775 EditUint16(tmp, &recipe.Addition[i].Time, 0, recipe.BoilTime); | |
| 776 } else { | |
| 777 EditUint16(tmp, &recipe.Addition[i].Time, 0, recipe.Addition[i-1].Time - 1); | |
| 778 } | |
| 779 recipe.Addition[i].Type = ADDITION_HOP; | |
| 768 } | 780 } |
| 769 EditText(tmp, recipe.Addition[i].Name, 40); | |
| 770 sprintf(tmp, "Toevoeging %d tijd", i+1); | |
| 771 if (i == 0) { | |
| 772 EditUint16(tmp, &recipe.Addition[i].Time, 0, recipe.BoilTime); | |
| 773 } else { | |
| 774 EditUint16(tmp, &recipe.Addition[i].Time, 0, recipe.Addition[i-1].Time - 1); | |
| 775 } | |
| 776 recipe.Addition[i].Type = ADDITION_HOP; | |
| 777 } | 781 } |
| 778 | 782 |
| 779 EditFloat((char *)"Koel temperatuur", &recipe.CoolTemp, 10, 45, 2); | 783 EditFloat((char *)"Koel temperatuur", &recipe.CoolTemp, 10, 45, 2); |
| 780 recipe.CoolTemp = ((int)(recipe.CoolTemp * 4)) / 4.0; | 784 recipe.CoolTemp = ((int)(recipe.CoolTemp * 4)) / 4.0; |
| 781 EditFloat((char *)"Spoelwater temperatuur", &recipe.SpargeTemp, 75, 98, 2); | 785 EditFloat((char *)"Spoelwater temperatuur", &recipe.SpargeTemp, 75, 98, 2); |
