67 break; |
67 break; |
68 |
68 |
69 case MAIN_TOOLS_SETUP_EQUIPMENT: |
69 case MAIN_TOOLS_SETUP_EQUIPMENT: |
70 TopMessage((char *)"Apparatuur"); |
70 TopMessage((char *)"Apparatuur"); |
71 f = fopen("/spiffs/etc/equipments.conf", "r"); |
71 f = fopen("/spiffs/etc/equipments.conf", "r"); |
|
72 fseek(f, equipment_hdr.hdrsize, SEEK_SET); |
72 dst = (uint8_t*)&equipment; |
73 dst = (uint8_t*)&equipment; |
73 Records = 0; |
74 Records = 0; |
74 while ((bytes = fread(dst, 1, sizeof(equipment), f))) { |
75 while ((bytes = fread(dst, 1, equipment_hdr.recsize, f))) { |
75 Records++; |
76 Records++; |
76 } |
77 } |
77 fclose(f); |
78 fclose(f); |
78 // Load the default record. |
79 // Load the default record. |
79 CurrentRec = config.EquipmentRec; |
80 CurrentRec = config.EquipmentRec; |
188 ShowSSR2(2, 124, equipment.SSR2); |
189 ShowSSR2(2, 124, equipment.SSR2); |
189 ShowFloat(161, 124, (char *)"Spoelwater", NULL, equipment.TempHLT, 2); |
190 ShowFloat(161, 124, (char *)"Spoelwater", NULL, equipment.TempHLT, 2); |
190 ShowDouble(2, 140, (char *)"PID P", NULL, equipment.PID_kP, 3); |
191 ShowDouble(2, 140, (char *)"PID P", NULL, equipment.PID_kP, 3); |
191 ShowInteger(161, 140, (char *)"Sample tijd", (char *)"mS", equipment.SampleTime); |
192 ShowInteger(161, 140, (char *)"Sample tijd", (char *)"mS", equipment.SampleTime); |
192 ShowDouble(2, 156, (char *)"PID I", NULL, equipment.PID_kI, 3); |
193 ShowDouble(2, 156, (char *)"PID I", NULL, equipment.PID_kI, 3); |
|
194 ShowInteger(161, 156, (char *)"MLT watt", NULL, equipment.MLT_watt); |
193 ShowDouble(2, 172, (char *)"PID D", NULL, equipment.PID_kD, 3); |
195 ShowDouble(2, 172, (char *)"PID D", NULL, equipment.PID_kD, 3); |
|
196 ShowInteger(161, 172, (char *)"HLT watt", NULL, equipment.HLT_watt); |
194 Buttons_Clear(); |
197 Buttons_Clear(); |
195 Buttons_Add( 0, 210, 45, 30, (char *)"Ok" , 0); |
198 Buttons_Add( 0, 210, 45, 30, (char *)"Ok" , 0); |
196 Buttons_Add( 46, 210, 45, 30, (char *)"+" , 1); |
199 Buttons_Add( 46, 210, 45, 30, (char *)"+" , 1); |
197 if (CurrentRec != config.EquipmentRec) |
200 if (CurrentRec != config.EquipmentRec) |
198 Buttons_Add( 92, 210, 45, 30, (char *)"-", 2); |
201 Buttons_Add( 92, 210, 45, 30, (char *)"-", 2); |
217 switch (Buttons_Scan()) { |
220 switch (Buttons_Scan()) { |
218 case 0: Main_Screen = MAIN_TOOLS_SETUP; |
221 case 0: Main_Screen = MAIN_TOOLS_SETUP; |
219 break; |
222 break; |
220 |
223 |
221 case 1: memset(&equipment, 0, sizeof(equipment)); |
224 case 1: memset(&equipment, 0, sizeof(equipment)); |
222 equipment.Version = 1; |
225 equipment.MLT_watt = 2000; |
223 equipment.Record = Records + 1; |
226 equipment.HLT_watt = 2000; |
224 sprintf(equipment.Name, "new eq %d", Records + 1); |
227 sprintf(equipment.Name, "new eq %d", Records + 1); |
225 equipment.BoilPower = 80; |
228 equipment.BoilPower = 80; |
226 equipment.MashPower = 100; |
229 equipment.MashPower = 100; |
227 equipment.PumpCycle = 8; |
230 equipment.PumpCycle = 8; |
228 equipment.PumpRest = 2; |
231 equipment.PumpRest = 2; |
240 equipment.SampleTime = 3000; |
243 equipment.SampleTime = 3000; |
241 append_equipment(); |
244 append_equipment(); |
242 Records++; |
245 Records++; |
243 CurrentRec = Records; |
246 CurrentRec = Records; |
244 UpdateRec = true; |
247 UpdateRec = true; |
245 ESP_LOGI(TAG, "New equipment record %d", equipment.Record); |
248 ESP_LOGI(TAG, "New equipment record %d", CurrentRec); |
246 break; |
249 break; |
247 |
250 |
248 case 2: if ((CurrentRec != config.EquipmentRec) && (Records > 1)) { |
251 case 2: if ((CurrentRec != config.EquipmentRec) && (Records > 1)) { |
|
252 _bg = TFT_BLACK; |
|
253 TFT_fillScreen(_bg); |
|
254 TFT_resetclipwin(); |
|
255 TopMessage((char *)"Apparatuur verwijderen"); |
249 delete_equipment(CurrentRec); |
256 delete_equipment(CurrentRec); |
250 Records--; |
257 Records--; |
251 if (CurrentRec > Records) |
258 if (CurrentRec >= Records) |
252 CurrentRec = Records; |
259 CurrentRec = Records; |
253 UpdateRec = true; |
260 UpdateRec = true; |
254 } |
261 } |
255 break; |
262 break; |
256 |
263 |
303 EditDouble((char *)"PID I", &equipment.PID_kI, 0, 100, 3); |
310 EditDouble((char *)"PID I", &equipment.PID_kI, 0, 100, 3); |
304 EditDouble((char *)"PID D", &equipment.PID_kD, 0, 50000, 3); |
311 EditDouble((char *)"PID D", &equipment.PID_kD, 0, 50000, 3); |
305 EditInt((char *)"Sample tijd in mS", &equipment.SampleTime, 1000, 20000); |
312 EditInt((char *)"Sample tijd in mS", &equipment.SampleTime, 1000, 20000); |
306 // Round to 250 mSec units. |
313 // Round to 250 mSec units. |
307 equipment.SampleTime = ((int)(equipment.SampleTime / 250)) * 250; |
314 equipment.SampleTime = ((int)(equipment.SampleTime / 250)) * 250; |
|
315 EditInt((char *)"MLT watt", &equipment.MLT_watt, 100, 45000); |
|
316 EditInt((char *)"HLT watt", &equipment.HLT_watt, 100, 45000); |
308 |
317 |
309 crc2 = crc32_le(0, dst, sizeof(equipment)); |
318 crc2 = crc32_le(0, dst, sizeof(equipment)); |
310 if ((crc1 != crc2) && Confirm((char *)"Gewijzigd, opslaan?", (char *)"Ja", (char *)"Nee")) { |
319 if ((crc1 != crc2) && Confirm((char *)"Gewijzigd, opslaan?", (char *)"Ja", (char *)"Nee")) { |
311 write_equipment(equipment.Record); |
320 write_equipment(CurrentRec); |
312 } |
321 } |
313 Main_Screen = MAIN_TOOLS_SETUP_EQUIPMENT; |
322 Main_Screen = MAIN_TOOLS_SETUP_EQUIPMENT; |
314 break; |
323 break; |
315 |
324 |
316 case MAIN_TOOLS_SETUP_WIFI: |
325 case MAIN_TOOLS_SETUP_WIFI: |