Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 8 insertions, 2 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
index 90c18caa0..b03494496 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
@@ -57,6 +57,7 @@
 #include <Modules/Waste/newWHS_init.h>
 #include <Drivers/I2C_Communication/I2C_Task.h>
 #include "drivers/Uart_Comm/WHS_Controller_Comm/WHS_UART/WHS_Uart.h"
+#include "Modules/heaters/heaters_ex.h"
 
 uint32_t EmbeddedParametersInit(void);
 uint32_t EmbeddedParametersWrite(void * buffer, uint16_t size);
@@ -239,8 +240,8 @@ void LoadConfigurationParameters(ConfigurationParameters *Params)
             EmbeddedParameters->has_startheatingoninitsequence = true;
             EmbeddedParameters->startheatingoninitsequence = true; //set to true shlomo 14/5/2019
 
-            EmbeddedParameters->n_generalparameters = 12;
-            EmbeddedParameters->generalparameters = malloc (sizeof(double)*13);
+            EmbeddedParameters->n_generalparameters = 13;
+            EmbeddedParameters->generalparameters = malloc (sizeof(double)*14);
             if (EmbeddedParameters->generalparameters)
             {
                 EmbeddedParameters->generalparameters[0] = 1.0; //CheckHardLimitAlarms
@@ -255,6 +256,7 @@ void LoadConfigurationParameters(ConfigurationParameters *Params)
                 EmbeddedParameters->generalparameters[9] = 30; //   sublimation
                 EmbeddedParameters->generalparameters[10] = 0.07; //    AllowedRangeForHeadBlowerDeviation;
                 EmbeddedParameters->generalparameters[11] = 0.2; //                AllowedRangeForWasteBlowerDeviation = WasteLimit;
+                EmbeddedParameters->generalparameters[12] = 4; //  Voltage hysteresis (bug #2970)
             }
 
             EmbeddedParameters->has_currentalarmlowlimit = true;
@@ -407,6 +409,10 @@ uint32_t EmbeddedParametersInit(void)
     {
         setWastePrepareValues(EmbeddedParameters->generalparameters[10],EmbeddedParameters->generalparameters[11]);
     }
+    if (EmbeddedParameters->n_generalparameters >= 13)
+    {
+        Set_Voltage_Hysteresis (EmbeddedParameters->generalparameters[12]);
+    }
     PowerIdleSetParameters(EmbeddedParameters->switchtoidletimeinseconds,EmbeddedParameters->idledriertemperature,EmbeddedParameters->idleheadtemperature,EmbeddedParameters->idlemixertemperature);
 
     return Fresult;