comparison: main/task_tft.c
main/task_tft.c
- changeset 77
- 66c77497d86d
- parent 76
- 3ff381bfa469
- child 88
- 7f02dbee58d0
equal
deleted
inserted
replaced
| 76:3ff381bfa469 | 77:66c77497d86d |
|---|---|
| 619 | 619 |
| 620 case MAIN_AUTO_INIT1: | 620 case MAIN_AUTO_INIT1: |
| 621 case MAIN_AUTO_INIT2: | 621 case MAIN_AUTO_INIT2: |
| 622 case MAIN_AUTO_DELAYSTART: | 622 case MAIN_AUTO_DELAYSTART: |
| 623 case MAIN_AUTO_HEATUP: | 623 case MAIN_AUTO_HEATUP: |
| 624 case MAIN_AUTO_MASH_IN: | 624 case MAIN_AUTO_MASH: |
| 625 case MAIN_AUTO_MASH_1: | |
| 626 case MAIN_AUTO_MASH_2: | |
| 627 case MAIN_AUTO_MASH_3: | |
| 628 case MAIN_AUTO_MASH_4: | |
| 629 case MAIN_AUTO_MASH_5: | |
| 630 case MAIN_AUTO_MASH_6: | |
| 631 case MAIN_AUTO_MASH_OUT: | |
| 632 case MAIN_AUTO_TOBOIL: | 625 case MAIN_AUTO_TOBOIL: |
| 633 case MAIN_AUTO_BOILING: | 626 case MAIN_AUTO_BOILING: |
| 634 case MAIN_AUTO_COOLING_H: | 627 case MAIN_AUTO_COOLING_H: |
| 635 case MAIN_AUTO_COOLING_M: | 628 case MAIN_AUTO_COOLING_M: |
| 636 case MAIN_AUTO_COOLING_C: | 629 case MAIN_AUTO_COOLING_C: |
| 742 | 735 |
| 743 case MAIN_AUTO_INIT1: | 736 case MAIN_AUTO_INIT1: |
| 744 case MAIN_AUTO_INIT2: | 737 case MAIN_AUTO_INIT2: |
| 745 case MAIN_AUTO_DELAYSTART: | 738 case MAIN_AUTO_DELAYSTART: |
| 746 case MAIN_AUTO_HEATUP: | 739 case MAIN_AUTO_HEATUP: |
| 747 case MAIN_AUTO_MASH_IN: | 740 case MAIN_AUTO_MASH: |
| 748 case MAIN_AUTO_MASH_1: | |
| 749 case MAIN_AUTO_MASH_2: | |
| 750 case MAIN_AUTO_MASH_3: | |
| 751 case MAIN_AUTO_MASH_4: | |
| 752 case MAIN_AUTO_MASH_5: | |
| 753 case MAIN_AUTO_MASH_6: | |
| 754 case MAIN_AUTO_MASH_OUT: | |
| 755 case MAIN_AUTO_TOBOIL: | 741 case MAIN_AUTO_TOBOIL: |
| 756 case MAIN_AUTO_BOILING: | 742 case MAIN_AUTO_BOILING: |
| 757 case MAIN_AUTO_COOLING_H: | 743 case MAIN_AUTO_COOLING_H: |
| 758 case MAIN_AUTO_COOLING_M: | 744 case MAIN_AUTO_COOLING_M: |
| 759 case MAIN_AUTO_COOLING_C: | 745 case MAIN_AUTO_COOLING_C: |
| 782 } | 768 } |
| 783 | 769 |
| 784 /* | 770 /* |
| 785 * Count power average during brewing. | 771 * Count power average during brewing. |
| 786 */ | 772 */ |
| 787 if ((Main_Screen >= MAIN_AUTO_MASH_IN) && (Main_Screen < MAIN_AUTO_DONE)) { | 773 if ((Main_Screen >= MAIN_AUTO_MASH) && (Main_Screen < MAIN_AUTO_DONE)) { |
| 788 if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) { | 774 if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) { |
| 789 power_MLT += driver_state->mlt_power; | 775 power_MLT += driver_state->mlt_power; |
| 790 power_HLT += driver_state->hlt_power; | 776 power_HLT += driver_state->hlt_power; |
| 791 counts++; | 777 counts++; |
| 792 xSemaphoreGive(xSemaphoreDriver); | 778 xSemaphoreGive(xSemaphoreDriver); |
| 795 | 781 |
| 796 if (NewMinute) { | 782 if (NewMinute) { |
| 797 /* | 783 /* |
| 798 * Brew logging. | 784 * Brew logging. |
| 799 */ | 785 */ |
| 800 if ((Main_Screen >= MAIN_AUTO_MASH_IN) && (Main_Screen < MAIN_AUTO_DONE)) { | 786 if ((Main_Screen >= MAIN_AUTO_MASH) && (Main_Screen < MAIN_AUTO_DONE)) { |
| 801 update_json(); | 787 update_json(); |
| 802 log_json(); | 788 log_json(); |
| 803 power_MLT = power_HLT = counts = 0; | 789 power_MLT = power_HLT = counts = 0; |
| 804 } | 790 } |
| 805 } | 791 } |
