diff -r 9833fd86736b -r 1bc6e9263ada main/setup.c --- a/main/setup.c Thu Jun 17 13:58:13 2021 +0200 +++ b/main/setup.c Sat Jun 19 20:46:42 2021 +0200 @@ -168,22 +168,24 @@ ShowText(2, 28, (char *)"Naam", equipment.Name); ShowInteger( 2, 44, (char *)"Kook vermogen", (char *)"%", equipment.BoilPower); ShowInteger(161, 44, (char *)"Maisch verm.", (char *)"%", equipment.MashPower); - ShowInteger( 2, 60, (char *)"Pomp cyclus", (char *)"m", equipment.PumpCycle); - ShowInteger(161, 60, (char *)"Pomp rust", (char *)"m", equipment.PumpRest); - ShowBool( 2, 76, (char *)"Pomp opwarmen", equipment.PumpPreMash); - ShowBool(161, 76, (char *)"Pomp maischen", equipment.PumpOnMash); - ShowBool( 2, 92, (char *)"Pomp uitmaischen", equipment.PumpMashOut); - ShowBool(161, 92, (char *)"Pomp bij koken", equipment.PumpOnBoil); - ShowInteger(2, 108, (char *)"Pomp maxtemp.", (char *)"C", equipment.PumpMaxTemp); - ShowBool(161, 108, (char *)"PID bij mout weg", equipment.PIDPipe); - ShowSSR2(2, 124, equipment.SSR2); - ShowFloat(161, 124, (char *)"Spoelwater", NULL, equipment.TempHLT, 2); - ShowDouble(2, 140, (char *)"PID P", NULL, equipment.PID_kP, 3); - ShowInteger(161, 140, (char *)"Sample tijd", (char *)"mS", equipment.SampleTime); - ShowDouble(2, 156, (char *)"PID I", NULL, equipment.PID_kI, 3); + ShowInteger( 2, 60, (char *)"Ramp vermogen", (char *)"%", equipment.RampPower); + ShowFloat(161, 60, (char *)"Spoelwater", NULL, equipment.TempHLT, 2); + ShowInteger( 2, 76, (char *)"Sample tijd", (char *)"mS", equipment.SampleTime); + Show2Integer(161, 76, (char *)"Pomp cyclus", (char *)"m", equipment.PumpCycle, equipment.PumpRest); + ShowBool( 2, 92, (char *)"Pomp opwarmen", equipment.PumpPreMash); + ShowBool(161, 92, (char *)"Pomp maischen", equipment.PumpOnMash); + ShowBool( 2, 108, (char *)"Pomp uitmaischen", equipment.PumpMashOut); + ShowBool(161, 108, (char *)"Pomp bij koken", equipment.PumpOnBoil); + ShowInteger(2, 124, (char *)"Pomp maxtemp.", (char *)"C", equipment.PumpMaxTemp); + ShowBool(161, 124, (char *)"PID bij mout weg", equipment.PIDPipe); + ShowSSR2(2, 140, equipment.SSR2); + ShowBool(161, 140, (char *)"Hendi PWM", equipment.Hendi); + ShowDouble(2, 156, (char *)"PID P", NULL, equipment.PID_kP, 3); ShowInteger(161, 156, (char *)"MLT watt", NULL, equipment.MLT_watt); - ShowDouble(2, 172, (char *)"PID D", NULL, equipment.PID_kD, 3); + ShowDouble(2, 172, (char *)"PID I", NULL, equipment.PID_kI, 3); ShowInteger(161, 172, (char *)"HLT watt", NULL, equipment.HLT_watt); + ShowDouble(2, 188, (char *)"PID D", NULL, equipment.PID_kD, 3); + ShowInteger(161, 188, (char *)"Max watt", NULL, equipment.Max_watt); Buttons_Clear(); Buttons_Add( 0, 210, 45, 30, (char *)"Ok" , 0); Buttons_Add( 46, 210, 45, 30, (char *)"+" , 1); @@ -284,6 +286,13 @@ EditText((char *)"Naam", equipment.Name, 31); EditInt((char *)"Kook vermogen in %", &equipment.BoilPower, 0, 100); EditInt((char *)"Maisch vermogen in %", &equipment.MashPower, 0, 100); + EditInt((char *)"Ramp vermogen in %", &equipment.RampPower, 0, 100); + EditFloat((char *)"Spoelwater temp", &equipment.TempHLT, 75, 98, 2); + // Round to 0.25 values. + equipment.TempHLT = ((int)(equipment.TempHLT * 4)) / 4.0; + EditInt((char *)"Sample tijd in mS", &equipment.SampleTime, 1000, 20000); + // Round to 250 mSec units. + equipment.SampleTime = ((int)(equipment.SampleTime / 250)) * 250; EditInt((char *)"Pomp cyclus minuten", &equipment.PumpCycle, 5, 15); EditInt((char *)"Pomp rust minuten", &equipment.PumpRest, 0, 5); EditBool((char *)"Pomp bij opwarmen", &equipment.PumpPreMash); @@ -293,17 +302,13 @@ EditInt((char *)"Pomp max. temperatuur", &equipment.PumpMaxTemp, 60, 105); EditBool((char *)"PID by mout verwijderen", &equipment.PIDPipe); EditSSR2(&equipment.SSR2); - EditFloat((char *)"Spoelwater temp", &equipment.TempHLT, 75, 98, 2); - // Round to 0.25 values. - equipment.TempHLT = ((int)(equipment.TempHLT * 4)) / 4.0; + EditBool((char *)"Hendi PWM", &equipment.Hendi); EditDouble((char *)"PID P", &equipment.PID_kP, 20, 2000, 3); EditDouble((char *)"PID I", &equipment.PID_kI, 0, 100, 3); EditDouble((char *)"PID D", &equipment.PID_kD, 0, 50000, 3); - EditInt((char *)"Sample tijd in mS", &equipment.SampleTime, 1000, 20000); - // Round to 250 mSec units. - equipment.SampleTime = ((int)(equipment.SampleTime / 250)) * 250; EditInt((char *)"MLT watt", &equipment.MLT_watt, 100, 45000); EditInt((char *)"HLT watt", &equipment.HLT_watt, 100, 45000); + EditInt((char *)"Max watt", &equipment.Max_watt, 100, 45000); crc2 = crc32_le(0, dst, sizeof(equipment)); if ((crc1 != crc2) && Confirm((char *)"Gewijzigd, opslaan?", (char *)"Ja", (char *)"Nee")) {