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

1 files changed, 15 insertions, 4 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
index 25a51edfa..1defda43c 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
@@ -245,8 +245,8 @@ void LoadConfigurationParameters(ConfigurationParameters *Params)
             EmbeddedParameters->has_startheatingoninitsequence = true;
             EmbeddedParameters->startheatingoninitsequence = true; //set to true shlomo 14/5/2019
 
-            EmbeddedParameters->n_generalparameters = 9;
-            EmbeddedParameters->generalparameters = malloc (sizeof(double)*10);
+            EmbeddedParameters->n_generalparameters = 12;
+            EmbeddedParameters->generalparameters = malloc (sizeof(double)*13);
             if (EmbeddedParameters->generalparameters)
             {
                 EmbeddedParameters->generalparameters[0] = 1.0; //CheckHardLimitAlarms
@@ -257,7 +257,10 @@ void LoadConfigurationParameters(ConfigurationParameters *Params)
                 EmbeddedParameters->generalparameters[5] = 1000.0; //Dispenser initial pressure speed
                 EmbeddedParameters->generalparameters[6] = Diagnostic_Extended_Mode; //Diagnostic Mode SetDiagnosticMode
                 EmbeddedParameters->generalparameters[7] = AutoHoming_JobEnd_PowerOn_off; //
-                EmbeddedParameters->generalparameters[8] = false; //
+                EmbeddedParameters->generalparameters[8] = false; //PowerOffDisableCleaning
+                EmbeddedParameters->generalparameters[9] = 30; //   sublimation
+                EmbeddedParameters->generalparameters[10] = 0.07; //    AllowedRangeForHeadBlowerDeviation;
+                EmbeddedParameters->generalparameters[11] = 0.2; //                AllowedRangeForWasteBlowerDeviation = WasteLimit;
             }
 
             EmbeddedParameters->has_currentalarmlowlimit = true;
@@ -399,9 +402,17 @@ uint32_t EmbeddedParametersInit(void)
     }
     if (EmbeddedParameters->n_generalparameters >= 9)
     {
-        if (EmbeddedParameters->generalparameters[9]< 0.5) setPowerOffDisableCleaning(false);
+        if (EmbeddedParameters->generalparameters[8]< 0.5) setPowerOffDisableCleaning(false);
         else setPowerOffDisableCleaning(true);
     }
+    if (EmbeddedParameters->n_generalparameters >= 10)
+    {
+        setSublimationBlowTime(EmbeddedParameters->generalparameters[9]);
+    }
+    if (EmbeddedParameters->n_generalparameters >= 12)
+    {
+        setWastePrepareValues(EmbeddedParameters->generalparameters[10],EmbeddedParameters->generalparameters[11]);
+    }
     PowerIdleSetParameters(EmbeddedParameters->switchtoidletimeinseconds,EmbeddedParameters->idledriertemperature,EmbeddedParameters->idleheadtemperature,EmbeddedParameters->idlemixertemperature);
 
     return Fresult;