Mercurial > brewboard / file diff

--- a/main/setup.c	Sun Jun 07 22:30:07 2020 +0200
+++ b/main/setup.c	Wed Jun 10 09:43:51 2020 +0200
@@ -69,9 +69,10 @@
 	case MAIN_TOOLS_SETUP_EQUIPMENT:
 			TopMessage((char *)"Apparatuur");
 			f = fopen("/spiffs/etc/equipments.conf", "r");
+			fseek(f, equipment_hdr.hdrsize, SEEK_SET);
 			dst = (uint8_t*)&equipment;
 			Records = 0;
-			while ((bytes = fread(dst, 1, sizeof(equipment), f))) {
+			while ((bytes = fread(dst, 1, equipment_hdr.recsize, f))) {
 			    Records++;
 			}
 			fclose(f);
@@ -190,7 +191,9 @@
 			    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(161, 156, (char *)"MLT watt", NULL, equipment.MLT_watt);
 			    ShowDouble(2, 172, (char *)"PID D", NULL, equipment.PID_kD, 3);
+			    ShowInteger(161, 172, (char *)"HLT watt", NULL, equipment.HLT_watt);
 			    Buttons_Clear();
 			    Buttons_Add(  0, 210, 45, 30, (char *)"Ok"  , 0);
 			    Buttons_Add( 46, 210, 45, 30, (char *)"+"   , 1);
@@ -219,8 +222,8 @@
 					break;
 
 			    case 1:	memset(&equipment, 0, sizeof(equipment));
-					equipment.Version = 1;
-					equipment.Record = Records + 1;
+					equipment.MLT_watt = 2000;
+					equipment.HLT_watt = 2000;
 					sprintf(equipment.Name, "new eq %d", Records + 1);
 					equipment.BoilPower = 80;
 					equipment.MashPower = 100;
@@ -242,13 +245,17 @@
 					Records++;
 					CurrentRec = Records;
 					UpdateRec = true;
-					ESP_LOGI(TAG, "New equipment record %d", equipment.Record);
+					ESP_LOGI(TAG, "New equipment record %d", CurrentRec);
 					break;
 
 			    case 2:	if ((CurrentRec != config.EquipmentRec) && (Records > 1)) {
+					    _bg = TFT_BLACK;
+                                             TFT_fillScreen(_bg);
+                                            TFT_resetclipwin();
+                                            TopMessage((char *)"Apparatuur verwijderen");
 					    delete_equipment(CurrentRec);
 					    Records--;
-					    if (CurrentRec > Records)
+					    if (CurrentRec >= Records)
 						CurrentRec = Records;
 					    UpdateRec = true;
 					}
@@ -305,10 +312,12 @@
 			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);
 
 			crc2 = crc32_le(0, dst, sizeof(equipment));
 			if ((crc1 != crc2) && Confirm((char *)"Gewijzigd, opslaan?", (char *)"Ja", (char *)"Nee")) {
-			    write_equipment(equipment.Record);
+			    write_equipment(CurrentRec);
 			}
 			Main_Screen = MAIN_TOOLS_SETUP_EQUIPMENT;
 			break;