Thu, 29 Jul 2021 22:36:17 +0200
Fixed Brewfather beerxml import.
0 | 1 | /** |
2 | * @file setup.c | |
3 | * @brief Setup functions. | |
4 | */ | |
5 | ||
6 | #include "config.h" | |
7 | ||
8 | ||
1
ad2c8b13eb88
Updated lots of doxygen comments
Michiel Broek <mbroek@mbse.eu>
parents:
0
diff
changeset
|
9 | extern sButton Buttons[MAXBUTTONS]; |
ad2c8b13eb88
Updated lots of doxygen comments
Michiel Broek <mbroek@mbse.eu>
parents:
0
diff
changeset
|
10 | extern int Main_Screen; |
0 | 11 | |
1
ad2c8b13eb88
Updated lots of doxygen comments
Michiel Broek <mbroek@mbse.eu>
parents:
0
diff
changeset
|
12 | bool UpdateRec = false; ///< Update record flag |
ad2c8b13eb88
Updated lots of doxygen comments
Michiel Broek <mbroek@mbse.eu>
parents:
0
diff
changeset
|
13 | int CurrentRec = 1; ///< Current record |
ad2c8b13eb88
Updated lots of doxygen comments
Michiel Broek <mbroek@mbse.eu>
parents:
0
diff
changeset
|
14 | int Records = 1; ///< Total records. |
0 | 15 | |
16 | ||
17 | static const char *TAG = "setup"; | |
18 | ||
19 | ||
20 | ||
21 | /* | |
22 | * Setup init function that only runs once a new screen | |
23 | * is entered. | |
24 | */ | |
25 | void Setup_Init(void) | |
26 | { | |
27 | FILE *f; | |
28 | size_t bytes; | |
29 | uint8_t *dst; | |
30 | ||
31 | switch (Main_Screen) { | |
32 | ||
33 | case MAIN_TOOLS_SETUP: | |
54
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
34 | TopMessage((char *)"Setup menu"); |
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
35 | Buttons_Add( 20, 40,120, 40, (char *)"Config", 0); |
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
36 | Buttons_Add(180, 40,120, 40, (char *)"Apparatuur", 1); |
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
37 | Buttons_Add( 20,120,120, 40, (char *)"WiFi", 2); |
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
38 | Buttons_Add(180,120,120, 40, (char *)"Calibratie", 3); |
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
39 | Buttons_Add(130, 200, 60, 40, (char *)"Ok", 4); |
0 | 40 | Buttons[4].dark = true; |
41 | Buttons_Show(); | |
42 | break; | |
43 | ||
44 | case MAIN_TOOLS_SETUP_CONFIG: | |
45 | _bg = TFT_BLACK; | |
54
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
46 | TopMessage((char *)"Configuratie"); |
0 | 47 | TFT_setFont(DEFAULT_FONT, NULL); |
54
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
48 | ShowFloat(2, 28, (char *)"Kook temp.", (char *)"C", config.BoilTemperature, 2); |
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
49 | ShowBool(2, 44, (char *)"Vraag mout storten", config.AskAdd); |
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
50 | ShowBool(2, 60, (char *)"Vraag mout verwijderen", config.AskRemove); |
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
51 | ShowBool(2, 76, (char *)"Vraag Jodium proef", config.AskIodine); |
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
52 | ShowInteger(2, 92, (char *)"Jodiumtest wachttijd", (char *)" min.", config.IodineTime); |
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
53 | ShowText(2, 108, (char *)"Hostnaam", config.hostname); |
95
c02e12e9c884
Removed AP configuration settings.
Michiel Broek <mbroek@mbse.eu>
parents:
87
diff
changeset
|
54 | ShowText(2, 124, (char *)"NTP server", config.ntp_server); |
0 | 55 | Buttons_Clear(); |
54
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
56 | Buttons_Add( 0, 210, 45, 30, (char *)"Ok" , 0); |
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
57 | Buttons_Add(276, 210, 45, 30, (char *)"Ed" , 1); |
0 | 58 | Buttons[0].dark = true; |
59 | Buttons_Show(); | |
60 | break; | |
61 | ||
62 | case MAIN_TOOLS_SETUP_CO_EDIT: | |
63 | break; | |
64 | ||
65 | case MAIN_TOOLS_SETUP_EQUIPMENT: | |
54
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
66 | TopMessage((char *)"Apparatuur"); |
0 | 67 | f = fopen("/spiffs/etc/equipments.conf", "r"); |
87
47253f294a9f
SDK settings to reduce bin size. Some log messages to debug level. Added KWH usage registration. Added equipment power usage for HLT and MLT. Equipment database upgraded to version 2, expandable. Fixed some screen errors during temperature mash steps.
Michiel Broek <mbroek@mbse.eu>
parents:
82
diff
changeset
|
68 | fseek(f, equipment_hdr.hdrsize, SEEK_SET); |
0 | 69 | dst = (uint8_t*)&equipment; |
70 | Records = 0; | |
87
47253f294a9f
SDK settings to reduce bin size. Some log messages to debug level. Added KWH usage registration. Added equipment power usage for HLT and MLT. Equipment database upgraded to version 2, expandable. Fixed some screen errors during temperature mash steps.
Michiel Broek <mbroek@mbse.eu>
parents:
82
diff
changeset
|
71 | while ((bytes = fread(dst, 1, equipment_hdr.recsize, f))) { |
0 | 72 | Records++; |
73 | } | |
74 | fclose(f); | |
75 | // Load the default record. | |
76 | CurrentRec = config.EquipmentRec; | |
77 | UpdateRec = true; | |
78 | break; | |
79 | ||
80 | case MAIN_TOOLS_SETUP_EQ_EDIT: | |
81 | break; | |
82 | ||
83 | case MAIN_TOOLS_SETUP_CALIBRATION: | |
84 | Calibration_Init(); | |
85 | break; | |
86 | ||
87 | default: | |
88 | break; | |
89 | } | |
90 | } | |
91 | ||
92 | ||
93 | ||
94 | /* | |
95 | * Setup loop screens, non-blocking. | |
96 | */ | |
97 | void Setup_Loop(void) | |
98 | { | |
99 | uint32_t crc1, crc2; | |
100 | uint8_t *dst; | |
101 | ||
102 | switch (Main_Screen) { | |
103 | ||
104 | case MAIN_TOOLS_SETUP: | |
105 | switch (Buttons_Scan()) { | |
106 | case 0: Main_Screen = MAIN_TOOLS_SETUP_CONFIG; | |
107 | break; | |
108 | ||
109 | case 1: Main_Screen = MAIN_TOOLS_SETUP_EQUIPMENT; | |
110 | break; | |
111 | ||
112 | case 2: Main_Screen = MAIN_TOOLS_SETUP_WIFI; | |
113 | break; | |
114 | ||
115 | case 3: Main_Screen = MAIN_TOOLS_SETUP_CALIBRATION; | |
116 | break; | |
117 | ||
118 | case 4: Main_Screen = MAIN_TOOLS; | |
119 | break; | |
120 | ||
121 | default: break; | |
122 | } | |
123 | break; | |
124 | ||
125 | case MAIN_TOOLS_SETUP_CONFIG: | |
126 | switch (Buttons_Scan()) { | |
127 | case 0: Main_Screen = MAIN_TOOLS_SETUP; | |
128 | break; | |
129 | ||
130 | case 1: Main_Screen = MAIN_TOOLS_SETUP_CO_EDIT; | |
131 | break; | |
132 | ||
133 | default: break; | |
134 | } | |
135 | break; | |
136 | ||
137 | case MAIN_TOOLS_SETUP_CO_EDIT: | |
138 | dst = (uint8_t*)&config; | |
139 | crc1 = crc32_le(0, dst, sizeof(config)); | |
54
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
140 | EditFloat((char *)"Kook temperatuur", &config.BoilTemperature, 80, 105, 2); |
0 | 141 | // Round to 0.25 degrees |
142 | config.BoilTemperature = ((int)(config.BoilTemperature * 4)) / 4.0; | |
54
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
143 | EditBool((char *)"Vraag mout storten", &config.AskAdd); |
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
144 | EditBool((char *)"Vraag mout verwijderen", &config.AskRemove); |
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
145 | EditBool((char *)"Vraag Jodium proef", &config.AskIodine); |
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
146 | EditUint8((char *)"Jodium test wachttijd", &config.IodineTime, 0, 120); |
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
147 | EditText((char *)"DHCP hostnaam", config.hostname, 31); |
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
148 | EditText((char *)"Voorkeur NTP server", config.ntp_server, 31); |
0 | 149 | |
150 | crc2 = crc32_le(0, dst, sizeof(config)); | |
54
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
151 | if ((crc1 != crc2) && Confirm((char *)"Gewijzigd, opslaan?", (char *)"Ja", (char *)"Nee")) { |
0 | 152 | write_config(); |
153 | } else { | |
154 | read_config(); | |
155 | } | |
156 | Main_Screen = MAIN_TOOLS_SETUP_CONFIG; | |
157 | break; | |
158 | ||
159 | case MAIN_TOOLS_SETUP_EQUIPMENT: | |
160 | if (UpdateRec) { | |
161 | _bg = TFT_BLACK; | |
162 | TFT_fillScreen(_bg); | |
163 | TFT_resetclipwin(); | |
54
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
164 | TopMessage((char *)"Apparatuur"); |
0 | 165 | UpdateRec = false; |
166 | read_equipment(CurrentRec); | |
167 | TFT_setFont(DEFAULT_FONT, NULL); | |
54
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
168 | ShowText(2, 28, (char *)"Naam", equipment.Name); |
111
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
169 | ShowFloat(2, 44, (char *)"Spoelwater", NULL, equipment.TempHLT, 2); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
170 | Show2Integer(161, 44, (char *)"Pomp cyclus", (char *)"m", equipment.PumpCycle, equipment.PumpRest); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
171 | ShowBool( 2, 60, (char *)"Pomp opwarmen", equipment.PumpPreMash); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
172 | ShowBool(161, 60, (char *)"Pomp maischen", equipment.PumpOnMash); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
173 | ShowBool( 2, 76, (char *)"Pomp uitmaischen", equipment.PumpMashOut); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
174 | ShowBool(161, 76, (char *)"Pomp bij koken", equipment.PumpOnBoil); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
175 | ShowInteger(2, 92, (char *)"Pomp maxtemp.", (char *)"C", equipment.PumpMaxTemp); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
176 | ShowBool(161, 92, (char *)"PID bij mout weg", equipment.PIDPipe); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
177 | ShowSSR2(2, 108, equipment.SSR2); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
178 | ShowInteger(161, 108, (char *)"Max watt", NULL, equipment.Max_watt); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
179 | ShowInteger(2, 124, (char *)"MLT watt", NULL, equipment.MLT_watt); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
180 | ShowInteger(161, 124, (char *)"HLT watt", NULL, equipment.HLT_watt); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
181 | ShowInteger(2, 140, (char *)"Kook vermogen", (char *)"%", equipment.BoilPower); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
182 | ShowInteger(161, 140, (char *)"Naar kook verm", (char *)"%", equipment.RampPower); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
183 | ShowInteger(2, 156, (char *)"PID vermogen", (char *)"%", equipment.MashPower); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
184 | ShowBool(161, 156, (char *)"Hendi PWM", equipment.Hendi); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
185 | ShowInteger(2, 172, (char *)"Sample tijd", (char *)"mS", equipment.SampleTime); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
186 | /* 161, 172 free space */ |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
187 | char tmp[32]; |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
188 | ShowLabel(2, 188, (char *)"PID P"); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
189 | sprintf(tmp, "%.3f", equipment.PID_kP); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
190 | TFT_print(tmp, LASTX, LASTY); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
191 | ShowLabel(LASTX, LASTY, (char *)" I"); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
192 | sprintf(tmp, "%.3f", equipment.PID_kI); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
193 | TFT_print(tmp, LASTX, LASTY); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
194 | ShowLabel(LASTX, LASTY, (char *)" D"); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
195 | sprintf(tmp, "%.3f", equipment.PID_kD); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
196 | TFT_print(tmp, LASTX, LASTY); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
197 | |
0 | 198 | Buttons_Clear(); |
54
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
199 | Buttons_Add( 0, 210, 45, 30, (char *)"Ok" , 0); |
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
200 | Buttons_Add( 46, 210, 45, 30, (char *)"+" , 1); |
0 | 201 | if (CurrentRec != config.EquipmentRec) |
54
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
202 | Buttons_Add( 92, 210, 45, 30, (char *)"-", 2); |
0 | 203 | else |
54
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
204 | Buttons_Add( 92, 210, 45, 30, (char *)"" , 2); |
0 | 205 | if (CurrentRec > 1) |
54
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
206 | Buttons_Add(138, 210, 45, 30, (char *)"<", 3); |
0 | 207 | else |
54
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
208 | Buttons_Add(138, 210, 45, 30, (char *)"", 3); |
0 | 209 | if (CurrentRec < Records) |
54
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
210 | Buttons_Add(184, 210, 45, 30, (char *)">", 4); |
0 | 211 | else |
54
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
212 | Buttons_Add(184, 210, 45, 30, (char *)"", 4); |
0 | 213 | if (CurrentRec != config.EquipmentRec) |
54
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
214 | Buttons_Add(230, 210, 45, 30, (char *)"Std", 5); |
0 | 215 | else |
54
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
216 | Buttons_Add(230, 210, 45, 30, (char *)"", 5); |
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
217 | Buttons_Add(276, 210, 45, 30, (char *)"Ed" , 6); |
0 | 218 | Buttons[0].dark = true; |
219 | Buttons_Show(); | |
220 | } | |
221 | switch (Buttons_Scan()) { | |
222 | case 0: Main_Screen = MAIN_TOOLS_SETUP; | |
223 | break; | |
224 | ||
225 | case 1: memset(&equipment, 0, sizeof(equipment)); | |
87
47253f294a9f
SDK settings to reduce bin size. Some log messages to debug level. Added KWH usage registration. Added equipment power usage for HLT and MLT. Equipment database upgraded to version 2, expandable. Fixed some screen errors during temperature mash steps.
Michiel Broek <mbroek@mbse.eu>
parents:
82
diff
changeset
|
226 | equipment.MLT_watt = 2000; |
47253f294a9f
SDK settings to reduce bin size. Some log messages to debug level. Added KWH usage registration. Added equipment power usage for HLT and MLT. Equipment database upgraded to version 2, expandable. Fixed some screen errors during temperature mash steps.
Michiel Broek <mbroek@mbse.eu>
parents:
82
diff
changeset
|
227 | equipment.HLT_watt = 2000; |
103
1885d0c75c48
Default equipment max_watt set to 2750. Added defaults for new equipment record. Switched PWM timer to high-speed. Implemented the safety timer to prevent the MLT + HLT will draw too much power in shared mode. Removed some code ideas that were not used. The fake heater now uses the faked PWM power.
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
228 | equipment.Max_watt = 2750; |
0 | 229 | sprintf(equipment.Name, "new eq %d", Records + 1); |
230 | equipment.BoilPower = 80; | |
103
1885d0c75c48
Default equipment max_watt set to 2750. Added defaults for new equipment record. Switched PWM timer to high-speed. Implemented the safety timer to prevent the MLT + HLT will draw too much power in shared mode. Removed some code ideas that were not used. The fake heater now uses the faked PWM power.
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
231 | equipment.RampPower = 100; |
0 | 232 | equipment.MashPower = 100; |
233 | equipment.PumpCycle = 8; | |
234 | equipment.PumpRest = 2; | |
235 | equipment.PumpPreMash = true; | |
236 | equipment.PumpOnMash = true; | |
237 | equipment.PumpMashOut = true; | |
238 | equipment.PumpOnBoil = false; | |
239 | equipment.PumpMaxTemp = 80; | |
240 | equipment.PIDPipe = true; | |
241 | equipment.SSR2 = 0; | |
103
1885d0c75c48
Default equipment max_watt set to 2750. Added defaults for new equipment record. Switched PWM timer to high-speed. Implemented the safety timer to prevent the MLT + HLT will draw too much power in shared mode. Removed some code ideas that were not used. The fake heater now uses the faked PWM power.
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
242 | equipment.Hendi = false; |
0 | 243 | equipment.TempHLT = 85.0; |
82 | 244 | equipment.PID_kP = 200.0; |
245 | equipment.PID_kI = 2.0; | |
246 | equipment.PID_kD = 1.5; | |
247 | equipment.SampleTime = 3000; | |
0 | 248 | append_equipment(); |
249 | Records++; | |
250 | CurrentRec = Records; | |
251 | UpdateRec = true; | |
87
47253f294a9f
SDK settings to reduce bin size. Some log messages to debug level. Added KWH usage registration. Added equipment power usage for HLT and MLT. Equipment database upgraded to version 2, expandable. Fixed some screen errors during temperature mash steps.
Michiel Broek <mbroek@mbse.eu>
parents:
82
diff
changeset
|
252 | ESP_LOGI(TAG, "New equipment record %d", CurrentRec); |
0 | 253 | break; |
254 | ||
255 | case 2: if ((CurrentRec != config.EquipmentRec) && (Records > 1)) { | |
87
47253f294a9f
SDK settings to reduce bin size. Some log messages to debug level. Added KWH usage registration. Added equipment power usage for HLT and MLT. Equipment database upgraded to version 2, expandable. Fixed some screen errors during temperature mash steps.
Michiel Broek <mbroek@mbse.eu>
parents:
82
diff
changeset
|
256 | _bg = TFT_BLACK; |
47253f294a9f
SDK settings to reduce bin size. Some log messages to debug level. Added KWH usage registration. Added equipment power usage for HLT and MLT. Equipment database upgraded to version 2, expandable. Fixed some screen errors during temperature mash steps.
Michiel Broek <mbroek@mbse.eu>
parents:
82
diff
changeset
|
257 | TFT_fillScreen(_bg); |
47253f294a9f
SDK settings to reduce bin size. Some log messages to debug level. Added KWH usage registration. Added equipment power usage for HLT and MLT. Equipment database upgraded to version 2, expandable. Fixed some screen errors during temperature mash steps.
Michiel Broek <mbroek@mbse.eu>
parents:
82
diff
changeset
|
258 | TFT_resetclipwin(); |
47253f294a9f
SDK settings to reduce bin size. Some log messages to debug level. Added KWH usage registration. Added equipment power usage for HLT and MLT. Equipment database upgraded to version 2, expandable. Fixed some screen errors during temperature mash steps.
Michiel Broek <mbroek@mbse.eu>
parents:
82
diff
changeset
|
259 | TopMessage((char *)"Apparatuur verwijderen"); |
0 | 260 | delete_equipment(CurrentRec); |
261 | Records--; | |
87
47253f294a9f
SDK settings to reduce bin size. Some log messages to debug level. Added KWH usage registration. Added equipment power usage for HLT and MLT. Equipment database upgraded to version 2, expandable. Fixed some screen errors during temperature mash steps.
Michiel Broek <mbroek@mbse.eu>
parents:
82
diff
changeset
|
262 | if (CurrentRec >= Records) |
0 | 263 | CurrentRec = Records; |
264 | UpdateRec = true; | |
265 | } | |
266 | break; | |
267 | ||
268 | case 3: if (CurrentRec > 1) { | |
269 | CurrentRec--; | |
270 | UpdateRec = true; | |
271 | } | |
272 | break; | |
273 | ||
274 | case 4: if (CurrentRec < Records) { | |
275 | CurrentRec++; | |
276 | UpdateRec = true; | |
277 | } | |
278 | break; | |
279 | ||
280 | case 5: if (CurrentRec != config.EquipmentRec) { | |
281 | config.EquipmentRec = CurrentRec; | |
282 | write_config(); | |
283 | UpdateRec = true; | |
284 | ESP_LOGI(TAG, "Equipment %d `%s' set as default", CurrentRec, equipment.Name); | |
285 | } | |
286 | break; | |
287 | ||
288 | case 6: Main_Screen = MAIN_TOOLS_SETUP_EQ_EDIT; | |
289 | break; | |
290 | ||
291 | default: break; | |
292 | } | |
293 | break; | |
294 | ||
295 | case MAIN_TOOLS_SETUP_EQ_EDIT: | |
296 | dst = (uint8_t*)&equipment; | |
297 | crc1 = crc32_le(0, dst, sizeof(equipment)); | |
54
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
298 | EditText((char *)"Naam", equipment.Name, 31); |
101
1bc6e9263ada
Fixed HendiControl interface connecter to match the board input. Tested the new circuit.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
299 | EditFloat((char *)"Spoelwater temp", &equipment.TempHLT, 75, 98, 2); |
1bc6e9263ada
Fixed HendiControl interface connecter to match the board input. Tested the new circuit.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
300 | // Round to 0.25 values. |
1bc6e9263ada
Fixed HendiControl interface connecter to match the board input. Tested the new circuit.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
301 | equipment.TempHLT = ((int)(equipment.TempHLT * 4)) / 4.0; |
111
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
302 | EditInt((char *)"Pomp cyclus minuten", &equipment.PumpCycle, 5, 15); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
303 | EditInt((char *)"Pomp rust minuten", &equipment.PumpRest, 0, 5); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
304 | EditBool((char *)"Pomp bij opwarmen", &equipment.PumpPreMash); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
305 | EditBool((char *)"Pomp bij maischen", &equipment.PumpOnMash); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
306 | EditBool((char *)"Pomp bij uitmaischen", &equipment.PumpMashOut); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
307 | EditBool((char *)"Pomp tijdens koken", &equipment.PumpOnBoil); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
308 | EditInt((char *)"Pomp max. temperatuur", &equipment.PumpMaxTemp, 60, 105); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
309 | EditBool((char *)"PID by mout verwijderen", &equipment.PIDPipe); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
310 | EditSSR2(&equipment.SSR2); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
311 | EditInt((char *)"Max watt", &equipment.Max_watt, 100, 45000); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
312 | EditInt((char *)"MLT watt", &equipment.MLT_watt, 100, 45000); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
313 | EditInt((char *)"HLT watt", &equipment.HLT_watt, 100, 45000); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
314 | EditInt((char *)"Kook vermogen in %", &equipment.BoilPower, 0, 100); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
315 | EditInt((char *)"Naar kook vermogen in %", &equipment.RampPower, 0, 100); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
316 | EditInt((char *)"PID Maisch vermogen in %", &equipment.MashPower, 0, 100); |
b5037adae8ab
Revised the equipment edit screen, order is more logical. Changed some label names. Made room for one more setting.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
317 | EditBool((char *)"Hendi PWM", &equipment.Hendi); |
101
1bc6e9263ada
Fixed HendiControl interface connecter to match the board input. Tested the new circuit.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
318 | EditInt((char *)"Sample tijd in mS", &equipment.SampleTime, 1000, 20000); |
1bc6e9263ada
Fixed HendiControl interface connecter to match the board input. Tested the new circuit.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
319 | // Round to 250 mSec units. |
1bc6e9263ada
Fixed HendiControl interface connecter to match the board input. Tested the new circuit.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
320 | equipment.SampleTime = ((int)(equipment.SampleTime / 250)) * 250; |
54
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
321 | EditDouble((char *)"PID P", &equipment.PID_kP, 20, 2000, 3); |
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
322 | EditDouble((char *)"PID I", &equipment.PID_kI, 0, 100, 3); |
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
323 | EditDouble((char *)"PID D", &equipment.PID_kD, 0, 50000, 3); |
0 | 324 | |
325 | crc2 = crc32_le(0, dst, sizeof(equipment)); | |
54
7b134c27fadb
Upgraded esp-ide and compilers. Adjusted the sources for the new compiler warnings.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
326 | if ((crc1 != crc2) && Confirm((char *)"Gewijzigd, opslaan?", (char *)"Ja", (char *)"Nee")) { |
87
47253f294a9f
SDK settings to reduce bin size. Some log messages to debug level. Added KWH usage registration. Added equipment power usage for HLT and MLT. Equipment database upgraded to version 2, expandable. Fixed some screen errors during temperature mash steps.
Michiel Broek <mbroek@mbse.eu>
parents:
82
diff
changeset
|
327 | write_equipment(CurrentRec); |
0 | 328 | } |
329 | Main_Screen = MAIN_TOOLS_SETUP_EQUIPMENT; | |
330 | break; | |
331 | ||
332 | case MAIN_TOOLS_SETUP_WIFI: | |
333 | break; | |
334 | ||
335 | case MAIN_TOOLS_SETUP_CALIBRATION: | |
336 | Calibration_Loop(); | |
337 | Main_Screen = MAIN_TOOLS_SETUP; | |
338 | break; | |
339 | ||
340 | default: | |
341 | break; | |
342 | } | |
343 | } | |
344 |