Dispenser EEPROM in embedded - phase 1

5 files changed, 23 insertions, 19 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 84b31c322..d31ea3c05 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -621,6 +621,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
     }
     if(Fifty_msTick)
     {
+        WHS_Read_GPI_Registers();
         Trigger_PT100_Read();//call every 50mSec (minimum delay 30mSec)
         //Set_HeadCard_PT100();//call every 50mSec (minimum delay 30mSec)
     }
diff --git a/Software/Embedded_SW/Embedded/Modules/General/process.c b/Software/Embedded_SW/Embedded/Modules/General/process.c
index 5760d5b79..289cc6c7a 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/process.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/process.c
@@ -42,7 +42,7 @@ double dryerbufferMeters = 0;
 double dryerbufferCentimeters = 0;
 
 #define MAX_ALLOWED_TEMPERATURE 280
-
+int MaxAllowedTemperature = MAX_ALLOWED_TEMPERATURE;
 char ProcessParamsConfigPath[50] = "0://SysInfo//ProcessP.cfg";
 
 ProcessParameters ProcessParametersKeep;
@@ -85,16 +85,16 @@ uint32_t HandleProcessParameters(ProcessParameters* ProcessParams,bool saveData)
             ReportWithPackageFilter(InitFilter,"HandleProcessParameters NULL",__FILE__,(int)__LINE__,(int)0,RpWarning,(int)0,0);
             return status;
         }
-    if (ProcessParams->dryerzone1temp > MAX_ALLOWED_TEMPERATURE) status = ERROR_CODE__INVALID_PARAMETER;
-    if (ProcessParams->dryerzone2temp > MAX_ALLOWED_TEMPERATURE) status = ERROR_CODE__INVALID_PARAMETER;
-    if (ProcessParams->dryerzone3temp > MAX_ALLOWED_TEMPERATURE) status = ERROR_CODE__INVALID_PARAMETER;
-    if (ProcessParams->mixertemp > MAX_ALLOWED_TEMPERATURE) status = ERROR_CODE__INVALID_PARAMETER;
-    if (ProcessParams->headzone1temp > MAX_ALLOWED_TEMPERATURE) status = ERROR_CODE__INVALID_PARAMETER;
-    if (ProcessParams->headzone2temp > MAX_ALLOWED_TEMPERATURE) status = ERROR_CODE__INVALID_PARAMETER;
-    if (ProcessParams->headzone3temp > MAX_ALLOWED_TEMPERATURE) status = ERROR_CODE__INVALID_PARAMETER;
-    if (ProcessParams->headzone4temp > MAX_ALLOWED_TEMPERATURE) status = ERROR_CODE__INVALID_PARAMETER;
-    if (ProcessParams->headzone5temp > MAX_ALLOWED_TEMPERATURE) status = ERROR_CODE__INVALID_PARAMETER;
-    if (ProcessParams->headzone6temp > MAX_ALLOWED_TEMPERATURE) status = ERROR_CODE__INVALID_PARAMETER;
+    if (ProcessParams->dryerzone1temp > MaxAllowedTemperature) status = ERROR_CODE__INVALID_PARAMETER;
+    if (ProcessParams->dryerzone2temp > MaxAllowedTemperature) status = ERROR_CODE__INVALID_PARAMETER;
+    if (ProcessParams->dryerzone3temp > MaxAllowedTemperature) status = ERROR_CODE__INVALID_PARAMETER;
+    if (ProcessParams->mixertemp > MaxAllowedTemperature) status = ERROR_CODE__INVALID_PARAMETER;
+    if (ProcessParams->headzone1temp > MaxAllowedTemperature) status = ERROR_CODE__INVALID_PARAMETER;
+    if (ProcessParams->headzone2temp > MaxAllowedTemperature) status = ERROR_CODE__INVALID_PARAMETER;
+    if (ProcessParams->headzone3temp > MaxAllowedTemperature) status = ERROR_CODE__INVALID_PARAMETER;
+    if (ProcessParams->headzone4temp > MaxAllowedTemperature) status = ERROR_CODE__INVALID_PARAMETER;
+    if (ProcessParams->headzone5temp > MaxAllowedTemperature) status = ERROR_CODE__INVALID_PARAMETER;
+    if (ProcessParams->headzone6temp > MaxAllowedTemperature) status = ERROR_CODE__INVALID_PARAMETER;
     if (status != 0)
     {
         ReportWithPackageFilter(InitFilter,"HandleProcessParameters Temperature too high",__FILE__,(int)__LINE__,(int)status,RpWarning,(int)0,0);
diff --git a/Software/Embedded_SW/Embedded/Modules/General/process.h b/Software/Embedded_SW/Embedded/Modules/General/process.h
index 695cf9516..6be41bccb 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/process.h
+++ b/Software/Embedded_SW/Embedded/Modules/General/process.h
@@ -31,6 +31,7 @@ extern uint32_t HandleProcessParameters(ProcessParameters* ProcessParams,bool sa
 uint32_t LoadProcessParamsFromFile(void);
 uint32_t ProcessParamsInit(void);
 
+extern int MaxAllowedTemperature;
 
 
 #endif /* MODULES_GENERAL_PROCESS_H_ */
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index 53f395198..c13b8ca15 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -1509,6 +1509,8 @@ void HeaterSafetyTestSetLimits(int limit)
      RemoveControlCallback(DisasterControlId, HeatersDisasterControl);
      RemoveControlCallback(MainDryerHeaterMaxTempControl ,HeaterMaxTempCBFunction);
      RemoveControlCallback(SecondDryerHeaterMaxTempControl ,HeaterMaxTempCBFunction);
+
+     MaxAllowedTemperature = limit+1;
 }
 
 bool UseSecondaryDrierHeater = true;
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c
index c8101c031..7da33efc3 100644
--- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c
@@ -450,7 +450,7 @@ U8 CartridgeWasteFilling(bool status)
 bool RdWasteTankEmptySensor()
 {
     bool ret = notOK;
-    WHS_Read_GPI_Registers();
+    //WHS_Read_GPI_Registers();
     //WHS_info.WHS_sensors.waste_tank_empty_sensor = WHS_GPI_WCONTAINER_WARN();
     //ret = WHS_info.WHS_sensors.waste_tank_empty_sensor;
      ret = WHS_GPI_WCONTAINER_WARN();
@@ -460,7 +460,7 @@ bool RdWasteTankEmptySensor()
 bool RdWasteTankFullSensor()
 {
     bool ret = notOK;
-    WHS_Read_GPI_Registers();
+    //WHS_Read_GPI_Registers();
     //WHS_info.WHS_sensors.waste_tank_full_sensor =  WHS_GPI_WCONTAINER_FULL();
     //ret = WHS_info.WHS_sensors.waste_tank_full_sensor;
     ret = WHS_GPI_WCONTAINER_FULL();
@@ -470,7 +470,7 @@ bool RdWasteTankFullSensor()
 bool RdWasteTankOverFlowSensor()
 {
     bool ret = notOK;
-    WHS_Read_GPI_Registers();
+    //WHS_Read_GPI_Registers();
     //WHS_info.WHS_sensors.waste_tank_over_flow_sensor =  WHS_GPI_WASTE_OVERFULL();
     //ret = WHS_info.WHS_sensors.waste_tank_over_flow_sensor;
     ret = WHS_GPI_WASTE_OVERFULL();
@@ -940,7 +940,7 @@ bool RdCartridgeCoverSensor()
 
     //REPORT_MSG(parameter," ------------ RD Cartridge Cover Sensor    ----------------- ");
     bool ret = notOK;
-    WHS_Read_GPI_Registers();
+    //WHS_Read_GPI_Registers();
    // WHS_info.WHS_sensors.cartridge_cover = Get_COVER_1_State(CartridgesDoor);
    // ret = WHS_info.WHS_sensors.cartridge_cover;
     ret = Get_COVER_1_State(CartridgesDoor);
@@ -1146,7 +1146,7 @@ bool InitCartStatus()
 bool RdInkCartridgeSensor()
 {
     bool ret = notOK;
-    WHS_Read_GPI_Registers();
+    //WHS_Read_GPI_Registers();
     ret = Is_Cartridge_Present(CART_1);
     return ret;
 }
@@ -1154,7 +1154,7 @@ bool RdInkCartridgeSensor()
 bool RdWasteCartridge1Sensor()
 {
     bool ret = notOK;
-    WHS_Read_GPI_Registers();
+    //WHS_Read_GPI_Registers();
     ret = Is_Cartridge_Present(CART_2);
     return ret;
 }
@@ -1162,7 +1162,7 @@ bool RdWasteCartridge1Sensor()
 bool RdWasteCartridge2Sensor()
 {
     bool ret = notOK;
-    WHS_Read_GPI_Registers();
+    //WHS_Read_GPI_Registers();
     ret = Is_Cartridge_Present(CART_3);
     return ret;
 }
@@ -1248,7 +1248,7 @@ U8 WHS_init(void)
 bool RdWasteTankFilterSensor()
 {
     bool ret = notOK;
-    WHS_Read_GPI_Registers();
+    //WHS_Read_GPI_Registers();
     WHS_info.WHS_sensors.waste_tank_filter_sensor = WHS_GPI_SW_FILTER_PRES();
     ret = WHS_info.WHS_sensors.waste_tank_filter_sensor;
     return ret;