comparison: main/setup.c
main/setup.c
- changeset 82
- 7d17e2cb31a8
- parent 54
- 7b134c27fadb
- child 87
- 47253f294a9f
equal
deleted
inserted
replaced
| 81:72c715ac0444 | 82:7d17e2cb31a8 |
|---|---|
| 186 ShowInteger(2, 108, (char *)"Pomp maxtemp.", (char *)"C", equipment.PumpMaxTemp); | 186 ShowInteger(2, 108, (char *)"Pomp maxtemp.", (char *)"C", equipment.PumpMaxTemp); |
| 187 ShowBool(161, 108, (char *)"PID bij mout weg", equipment.PIDPipe); | 187 ShowBool(161, 108, (char *)"PID bij mout weg", equipment.PIDPipe); |
| 188 ShowSSR2(2, 124, equipment.SSR2); | 188 ShowSSR2(2, 124, equipment.SSR2); |
| 189 ShowFloat(161, 124, (char *)"Spoelwater", NULL, equipment.TempHLT, 2); | 189 ShowFloat(161, 124, (char *)"Spoelwater", NULL, equipment.TempHLT, 2); |
| 190 ShowDouble(2, 140, (char *)"PID P", NULL, equipment.PID_kP, 3); | 190 ShowDouble(2, 140, (char *)"PID P", NULL, equipment.PID_kP, 3); |
| 191 ShowBool(161, 140, (char *)"PID klassiek", equipment.PID_POn); | 191 ShowInteger(161, 140, (char *)"Sample tijd", (char *)"mS", equipment.SampleTime); |
| 192 ShowDouble(2, 156, (char *)"PID I", NULL, equipment.PID_kI, 3); | 192 ShowDouble(2, 156, (char *)"PID I", NULL, equipment.PID_kI, 3); |
| 193 ShowInteger(161, 156, (char *)"Sample tijd", (char *)"mS", equipment.SampleTime); | |
| 194 ShowDouble(2, 172, (char *)"PID D", NULL, equipment.PID_kD, 3); | 193 ShowDouble(2, 172, (char *)"PID D", NULL, equipment.PID_kD, 3); |
| 195 Buttons_Clear(); | 194 Buttons_Clear(); |
| 196 Buttons_Add( 0, 210, 45, 30, (char *)"Ok" , 0); | 195 Buttons_Add( 0, 210, 45, 30, (char *)"Ok" , 0); |
| 197 Buttons_Add( 46, 210, 45, 30, (char *)"+" , 1); | 196 Buttons_Add( 46, 210, 45, 30, (char *)"+" , 1); |
| 198 if (CurrentRec != config.EquipmentRec) | 197 if (CurrentRec != config.EquipmentRec) |
| 233 equipment.PumpOnBoil = false; | 232 equipment.PumpOnBoil = false; |
| 234 equipment.PumpMaxTemp = 80; | 233 equipment.PumpMaxTemp = 80; |
| 235 equipment.PIDPipe = true; | 234 equipment.PIDPipe = true; |
| 236 equipment.SSR2 = 0; | 235 equipment.SSR2 = 0; |
| 237 equipment.TempHLT = 85.0; | 236 equipment.TempHLT = 85.0; |
| 238 equipment.PID_kP = 150.0; | 237 equipment.PID_kP = 200.0; |
| 239 equipment.PID_kI = 1.5; | 238 equipment.PID_kI = 2.0; |
| 240 equipment.PID_kD = 15000.0; | 239 equipment.PID_kD = 1.5; |
| 241 equipment.PID_POn = PID_P_ON_E; | 240 equipment.SampleTime = 3000; |
| 242 equipment.SampleTime = 5000; | |
| 243 append_equipment(); | 241 append_equipment(); |
| 244 Records++; | 242 Records++; |
| 245 CurrentRec = Records; | 243 CurrentRec = Records; |
| 246 UpdateRec = true; | 244 UpdateRec = true; |
| 247 ESP_LOGI(TAG, "New equipment record %d", equipment.Record); | 245 ESP_LOGI(TAG, "New equipment record %d", equipment.Record); |
| 299 EditBool((char *)"PID by mout verwijderen", &equipment.PIDPipe); | 297 EditBool((char *)"PID by mout verwijderen", &equipment.PIDPipe); |
| 300 EditSSR2(&equipment.SSR2); | 298 EditSSR2(&equipment.SSR2); |
| 301 EditFloat((char *)"Spoelwater temp", &equipment.TempHLT, 75, 98, 2); | 299 EditFloat((char *)"Spoelwater temp", &equipment.TempHLT, 75, 98, 2); |
| 302 // Round to 0.25 values. | 300 // Round to 0.25 values. |
| 303 equipment.TempHLT = ((int)(equipment.TempHLT * 4)) / 4.0; | 301 equipment.TempHLT = ((int)(equipment.TempHLT * 4)) / 4.0; |
| 304 EditBool((char *)"PID klassiek", &equipment.PID_POn); | |
| 305 EditDouble((char *)"PID P", &equipment.PID_kP, 20, 2000, 3); | 302 EditDouble((char *)"PID P", &equipment.PID_kP, 20, 2000, 3); |
| 306 EditDouble((char *)"PID I", &equipment.PID_kI, 0, 100, 3); | 303 EditDouble((char *)"PID I", &equipment.PID_kI, 0, 100, 3); |
| 307 EditDouble((char *)"PID D", &equipment.PID_kD, 0, 50000, 3); | 304 EditDouble((char *)"PID D", &equipment.PID_kD, 0, 50000, 3); |
| 308 EditInt((char *)"Sample tijd in mS", &equipment.SampleTime, 1000, 20000); | 305 EditInt((char *)"Sample tijd in mS", &equipment.SampleTime, 1000, 20000); |
| 309 // Round to 250 mSec units. | 306 // Round to 250 mSec units. |
