comparison: main/recipes.c
main/recipes.c
- changeset 6
- e84200edc852
- parent 4
- 6d1f512cd074
- child 15
- 34b1eb93e71a
equal
deleted
inserted
replaced
| 5:87b86d16b1d6 | 6:e84200edc852 |
|---|---|
| 495 r_UpdateRec = false; | 495 r_UpdateRec = false; |
| 496 read_recipe(r_CurrentRec); | 496 read_recipe(r_CurrentRec); |
| 497 TFT_setFont(DEFAULT_FONT, NULL); | 497 TFT_setFont(DEFAULT_FONT, NULL); |
| 498 ShowText(2, 28, "Naam", recipe.Name); | 498 ShowText(2, 28, "Naam", recipe.Name); |
| 499 ShowText(2, 44, "Code", recipe.Code); | 499 ShowText(2, 44, "Code", recipe.Code); |
| 500 ShowInteger(162, 44, "Record", NULL, recipe.Record); | 500 ShowInteger(162, 44, "Record", NULL, r_CurrentRec); |
| 501 ShowInteger(2, 60, "Kooktijd", " min", recipe.BoilTime); | 501 ShowInteger(2, 60, "Kooktijd", " min", recipe.BoilTime); |
| 502 ShowFloat(162, 60, "Koel tot", " C", recipe.CoolTemp, 2); | 502 ShowFloat(162, 60, "Koel tot", " C", recipe.CoolTemp, 2); |
| 503 ShowFloat(2, 76, "Maisch in", " C", recipe.MashStep[0].Temperature, 2); | 503 ShowFloat(2, 76, "Maisch in", " C", recipe.MashStep[0].Temperature, 2); |
| 504 ShowFloat(162, 76, "Spoelwater", " C", recipe.SpargeTemp, 2); | 504 ShowFloat(162, 76, "Spoelwater", " C", recipe.SpargeTemp, 2); |
| 505 y = 92; | 505 y = 92; |
| 578 case 0: Main_Screen = MAIN_TOOLS; | 578 case 0: Main_Screen = MAIN_TOOLS; |
| 579 break; | 579 break; |
| 580 | 580 |
| 581 case 1: memset(&recipe, 0, sizeof(recipe)); | 581 case 1: memset(&recipe, 0, sizeof(recipe)); |
| 582 recipe.Version = 1; | 582 recipe.Version = 1; |
| 583 recipe.Record = r_Records + 1; | |
| 584 sprintf(recipe.Name, "Recipe %d", r_Records + 1); | 583 sprintf(recipe.Name, "Recipe %d", r_Records + 1); |
| 585 sprintf(recipe.Code, "00%d", r_Records + 1); | 584 sprintf(recipe.Code, "00%d", r_Records + 1); |
| 586 sprintf(recipe.MashStep[0].Name, "Mash-in"); | 585 sprintf(recipe.MashStep[0].Name, "Mash-in"); |
| 587 recipe.MashStep[0].Temperature = 67.5; | 586 recipe.MashStep[0].Temperature = 67.5; |
| 588 recipe.MashStep[0].Resttime = 1; | 587 recipe.MashStep[0].Resttime = 1; |
| 608 recipe.SpargeTemp = 85.0; | 607 recipe.SpargeTemp = 85.0; |
| 609 append_recipe(); | 608 append_recipe(); |
| 610 r_Records++; | 609 r_Records++; |
| 611 r_CurrentRec = r_Records; | 610 r_CurrentRec = r_Records; |
| 612 r_UpdateRec = true; | 611 r_UpdateRec = true; |
| 613 ESP_LOGI(TAG, "New recipe record %d", recipe.Record); | 612 ESP_LOGI(TAG, "New recipe record %d", r_CurrentRec); |
| 614 break; | 613 break; |
| 615 | 614 |
| 616 case 2: if ((r_CurrentRec != config.RecipeRec) && (r_Records > 1)) { | 615 case 2: if ((r_CurrentRec != config.RecipeRec) && (r_Records > 1)) { |
| 617 delete_recipe(r_CurrentRec); | 616 delete_recipe(r_CurrentRec); |
| 618 r_Records--; | 617 r_Records--; |
| 717 EditUint16("Whirlpool 60..66 graden, 0 = niet", &recipe.Whirlpool6, 0, 120); | 716 EditUint16("Whirlpool 60..66 graden, 0 = niet", &recipe.Whirlpool6, 0, 120); |
| 718 EditUint16("Whirlpool koud, 0 = niet", &recipe.Whirlpool2, 0, 120); | 717 EditUint16("Whirlpool koud, 0 = niet", &recipe.Whirlpool2, 0, 120); |
| 719 | 718 |
| 720 crc2 = crc32_le(0, dst, sizeof(recipe)); | 719 crc2 = crc32_le(0, dst, sizeof(recipe)); |
| 721 if ((crc1 != crc2) && Confirm("Gewijzigd, opslaan?", "Ja", "Nee")) { | 720 if ((crc1 != crc2) && Confirm("Gewijzigd, opslaan?", "Ja", "Nee")) { |
| 722 write_recipe(recipe.Record); | 721 write_recipe(r_CurrentRec); |
| 723 } | 722 } |
| 724 Main_Screen = MAIN_TOOLS_RECIPE; | 723 Main_Screen = MAIN_TOOLS_RECIPE; |
| 725 break; | 724 break; |
| 726 | 725 |
| 727 default: break; | 726 default: break; |
