Mercurial > brewboard / file comparison

comparison: main/setup.c

main/setup.c

changeset 111
b5037adae8ab
parent 103
1885d0c75c48
child 120
afd58d4c7b5b
equal deleted inserted replaced
110:2f9e48e5b8ce 111:b5037adae8ab
164 TopMessage((char *)"Apparatuur"); 164 TopMessage((char *)"Apparatuur");
165 UpdateRec = false; 165 UpdateRec = false;
166 read_equipment(CurrentRec); 166 read_equipment(CurrentRec);
167 TFT_setFont(DEFAULT_FONT, NULL); 167 TFT_setFont(DEFAULT_FONT, NULL);
168 ShowText(2, 28, (char *)"Naam", equipment.Name); 168 ShowText(2, 28, (char *)"Naam", equipment.Name);
169 ShowInteger( 2, 44, (char *)"Kook vermogen", (char *)"%", equipment.BoilPower); 169 ShowFloat(2, 44, (char *)"Spoelwater", NULL, equipment.TempHLT, 2);
170 ShowInteger(161, 44, (char *)"Maisch verm.", (char *)"%", equipment.MashPower); 170 Show2Integer(161, 44, (char *)"Pomp cyclus", (char *)"m", equipment.PumpCycle, equipment.PumpRest);
171 ShowInteger( 2, 60, (char *)"Ramp vermogen", (char *)"%", equipment.RampPower); 171 ShowBool( 2, 60, (char *)"Pomp opwarmen", equipment.PumpPreMash);
172 ShowFloat(161, 60, (char *)"Spoelwater", NULL, equipment.TempHLT, 2); 172 ShowBool(161, 60, (char *)"Pomp maischen", equipment.PumpOnMash);
173 ShowInteger( 2, 76, (char *)"Sample tijd", (char *)"mS", equipment.SampleTime); 173 ShowBool( 2, 76, (char *)"Pomp uitmaischen", equipment.PumpMashOut);
174 Show2Integer(161, 76, (char *)"Pomp cyclus", (char *)"m", equipment.PumpCycle, equipment.PumpRest); 174 ShowBool(161, 76, (char *)"Pomp bij koken", equipment.PumpOnBoil);
175 ShowBool( 2, 92, (char *)"Pomp opwarmen", equipment.PumpPreMash); 175 ShowInteger(2, 92, (char *)"Pomp maxtemp.", (char *)"C", equipment.PumpMaxTemp);
176 ShowBool(161, 92, (char *)"Pomp maischen", equipment.PumpOnMash); 176 ShowBool(161, 92, (char *)"PID bij mout weg", equipment.PIDPipe);
177 ShowBool( 2, 108, (char *)"Pomp uitmaischen", equipment.PumpMashOut); 177 ShowSSR2(2, 108, equipment.SSR2);
178 ShowBool(161, 108, (char *)"Pomp bij koken", equipment.PumpOnBoil); 178 ShowInteger(161, 108, (char *)"Max watt", NULL, equipment.Max_watt);
179 ShowInteger(2, 124, (char *)"Pomp maxtemp.", (char *)"C", equipment.PumpMaxTemp); 179 ShowInteger(2, 124, (char *)"MLT watt", NULL, equipment.MLT_watt);
180 ShowBool(161, 124, (char *)"PID bij mout weg", equipment.PIDPipe); 180 ShowInteger(161, 124, (char *)"HLT watt", NULL, equipment.HLT_watt);
181 ShowSSR2(2, 140, equipment.SSR2); 181 ShowInteger(2, 140, (char *)"Kook vermogen", (char *)"%", equipment.BoilPower);
182 ShowBool(161, 140, (char *)"Hendi PWM", equipment.Hendi); 182 ShowInteger(161, 140, (char *)"Naar kook verm", (char *)"%", equipment.RampPower);
183 ShowDouble(2, 156, (char *)"PID P", NULL, equipment.PID_kP, 3); 183 ShowInteger(2, 156, (char *)"PID vermogen", (char *)"%", equipment.MashPower);
184 ShowInteger(161, 156, (char *)"MLT watt", NULL, equipment.MLT_watt); 184 ShowBool(161, 156, (char *)"Hendi PWM", equipment.Hendi);
185 ShowDouble(2, 172, (char *)"PID I", NULL, equipment.PID_kI, 3); 185 ShowInteger(2, 172, (char *)"Sample tijd", (char *)"mS", equipment.SampleTime);
186 ShowInteger(161, 172, (char *)"HLT watt", NULL, equipment.HLT_watt); 186 /* 161, 172 free space */
187 ShowDouble(2, 188, (char *)"PID D", NULL, equipment.PID_kD, 3); 187 char tmp[32];
188 ShowInteger(161, 188, (char *)"Max watt", NULL, equipment.Max_watt); 188 ShowLabel(2, 188, (char *)"PID P");
189 sprintf(tmp, "%.3f", equipment.PID_kP);
190 TFT_print(tmp, LASTX, LASTY);
191 ShowLabel(LASTX, LASTY, (char *)" I");
192 sprintf(tmp, "%.3f", equipment.PID_kI);
193 TFT_print(tmp, LASTX, LASTY);
194 ShowLabel(LASTX, LASTY, (char *)" D");
195 sprintf(tmp, "%.3f", equipment.PID_kD);
196 TFT_print(tmp, LASTX, LASTY);
197
189 Buttons_Clear(); 198 Buttons_Clear();
190 Buttons_Add( 0, 210, 45, 30, (char *)"Ok" , 0); 199 Buttons_Add( 0, 210, 45, 30, (char *)"Ok" , 0);
191 Buttons_Add( 46, 210, 45, 30, (char *)"+" , 1); 200 Buttons_Add( 46, 210, 45, 30, (char *)"+" , 1);
192 if (CurrentRec != config.EquipmentRec) 201 if (CurrentRec != config.EquipmentRec)
193 Buttons_Add( 92, 210, 45, 30, (char *)"-", 2); 202 Buttons_Add( 92, 210, 45, 30, (char *)"-", 2);
285 294
286 case MAIN_TOOLS_SETUP_EQ_EDIT: 295 case MAIN_TOOLS_SETUP_EQ_EDIT:
287 dst = (uint8_t*)&equipment; 296 dst = (uint8_t*)&equipment;
288 crc1 = crc32_le(0, dst, sizeof(equipment)); 297 crc1 = crc32_le(0, dst, sizeof(equipment));
289 EditText((char *)"Naam", equipment.Name, 31); 298 EditText((char *)"Naam", equipment.Name, 31);
290 EditInt((char *)"Kook vermogen in %", &equipment.BoilPower, 0, 100);
291 EditInt((char *)"Maisch vermogen in %", &equipment.MashPower, 0, 100);
292 EditInt((char *)"Ramp vermogen in %", &equipment.RampPower, 0, 100);
293 EditFloat((char *)"Spoelwater temp", &equipment.TempHLT, 75, 98, 2); 299 EditFloat((char *)"Spoelwater temp", &equipment.TempHLT, 75, 98, 2);
294 // Round to 0.25 values. 300 // Round to 0.25 values.
295 equipment.TempHLT = ((int)(equipment.TempHLT * 4)) / 4.0; 301 equipment.TempHLT = ((int)(equipment.TempHLT * 4)) / 4.0;
302 EditInt((char *)"Pomp cyclus minuten", &equipment.PumpCycle, 5, 15);
303 EditInt((char *)"Pomp rust minuten", &equipment.PumpRest, 0, 5);
304 EditBool((char *)"Pomp bij opwarmen", &equipment.PumpPreMash);
305 EditBool((char *)"Pomp bij maischen", &equipment.PumpOnMash);
306 EditBool((char *)"Pomp bij uitmaischen", &equipment.PumpMashOut);
307 EditBool((char *)"Pomp tijdens koken", &equipment.PumpOnBoil);
308 EditInt((char *)"Pomp max. temperatuur", &equipment.PumpMaxTemp, 60, 105);
309 EditBool((char *)"PID by mout verwijderen", &equipment.PIDPipe);
310 EditSSR2(&equipment.SSR2);
311 EditInt((char *)"Max watt", &equipment.Max_watt, 100, 45000);
312 EditInt((char *)"MLT watt", &equipment.MLT_watt, 100, 45000);
313 EditInt((char *)"HLT watt", &equipment.HLT_watt, 100, 45000);
314 EditInt((char *)"Kook vermogen in %", &equipment.BoilPower, 0, 100);
315 EditInt((char *)"Naar kook vermogen in %", &equipment.RampPower, 0, 100);
316 EditInt((char *)"PID Maisch vermogen in %", &equipment.MashPower, 0, 100);
317 EditBool((char *)"Hendi PWM", &equipment.Hendi);
296 EditInt((char *)"Sample tijd in mS", &equipment.SampleTime, 1000, 20000); 318 EditInt((char *)"Sample tijd in mS", &equipment.SampleTime, 1000, 20000);
297 // Round to 250 mSec units. 319 // Round to 250 mSec units.
298 equipment.SampleTime = ((int)(equipment.SampleTime / 250)) * 250; 320 equipment.SampleTime = ((int)(equipment.SampleTime / 250)) * 250;
299 EditInt((char *)"Pomp cyclus minuten", &equipment.PumpCycle, 5, 15);
300 EditInt((char *)"Pomp rust minuten", &equipment.PumpRest, 0, 5);
301 EditBool((char *)"Pomp bij opwarmen", &equipment.PumpPreMash);
302 EditBool((char *)"Pomp bij maischen", &equipment.PumpOnMash);
303 EditBool((char *)"Pomp bij uitmaischen", &equipment.PumpMashOut);
304 EditBool((char *)"Pomp tijdens koken", &equipment.PumpOnBoil);
305 EditInt((char *)"Pomp max. temperatuur", &equipment.PumpMaxTemp, 60, 105);
306 EditBool((char *)"PID by mout verwijderen", &equipment.PIDPipe);
307 EditSSR2(&equipment.SSR2);
308 EditBool((char *)"Hendi PWM", &equipment.Hendi);
309 EditDouble((char *)"PID P", &equipment.PID_kP, 20, 2000, 3); 321 EditDouble((char *)"PID P", &equipment.PID_kP, 20, 2000, 3);
310 EditDouble((char *)"PID I", &equipment.PID_kI, 0, 100, 3); 322 EditDouble((char *)"PID I", &equipment.PID_kI, 0, 100, 3);
311 EditDouble((char *)"PID D", &equipment.PID_kD, 0, 50000, 3); 323 EditDouble((char *)"PID D", &equipment.PID_kD, 0, 50000, 3);
312 EditInt((char *)"MLT watt", &equipment.MLT_watt, 100, 45000);
313 EditInt((char *)"HLT watt", &equipment.HLT_watt, 100, 45000);
314 EditInt((char *)"Max watt", &equipment.Max_watt, 100, 45000);
315 324
316 crc2 = crc32_le(0, dst, sizeof(equipment)); 325 crc2 = crc32_le(0, dst, sizeof(equipment));
317 if ((crc1 != crc2) && Confirm((char *)"Gewijzigd, opslaan?", (char *)"Ja", (char *)"Nee")) { 326 if ((crc1 != crc2) && Confirm((char *)"Gewijzigd, opslaan?", (char *)"Ja", (char *)"Nee")) {
318 write_equipment(CurrentRec); 327 write_equipment(CurrentRec);
319 } 328 }

Mercurial Repository: brewboard

mercurial