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

8 files changed, 44 insertions, 11 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
index b7b018cdb..b5c586b92 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
@@ -127,8 +127,8 @@ AlarmHandlingItem  AlarmItem[MAX_SYSTEM_ALARMS]={
 {eHundredMillisecond,TemperatureAlarm,TEMP_SENSE_ANALOG_DYEINGH_TEMP5,270,true,DEBUG_LOG_CATEGORY__Error,0xFF,10,0,false,EVENT_TYPE__DyeingHead5OverTemperature,NULL,"DyeingHead5 Over Temperature"},
 {eHundredMillisecond,TemperatureAlarm,TEMP_SENSE_ANALOG_MIXCHIP_TEMP,270,true,DEBUG_LOG_CATEGORY__Error,0xFF,10,0,false,EVENT_TYPE__DyeingHead6OverTemperature,NULL,"DyeingHead6 Over Temperature"},
 {eHundredMillisecond,TemperatureAlarm,TEMP_SENSE_ANALOG_DRYER_TEMP1,270,true,DEBUG_LOG_CATEGORY__Error,0xFF,10,0,false,EVENT_TYPE__DryerOverTemperature,NULL,"Dryer Over Temperature"},
-{eHundredMillisecond,TemperatureAlarm,TEMP_SENSE_ANALOG_DRYER_TEMP1,270,true,DEBUG_LOG_CATEGORY__Error,0xFF,10,0,false,EVENT_TYPE__DryerOverTemperature,NULL,"Dryer Over Temperature"},
-{eHundredMillisecond,TemperatureAlarm,TEMP_SENSE_ANALOG_DRYER_TEMP1,300,true,DEBUG_LOG_CATEGORY__Error,0xFF,10,0,false,EVENT_TYPE__DryerOverTemperature,NULL,"Dryer Over Temperature"},
+//{eHundredMillisecond,TemperatureAlarm,TEMP_SENSE_ANALOG_DRYER_TEMP1,270,true,DEBUG_LOG_CATEGORY__Error,0xFF,10,0,false,EVENT_TYPE__DryerOverTemperature,NULL,"Dryer Over Temperature"},
+//{eHundredMillisecond,TemperatureAlarm,TEMP_SENSE_ANALOG_DRYER_TEMP1,300,true,DEBUG_LOG_CATEGORY__Error,0xFF,10,0,false,EVENT_TYPE__DryerOverTemperature,NULL,"Dryer Over Temperature"},
 //{eHundredMillisecond,TemperatureAlarm,TEMP_SENSE_AN_ENCLOSURETEMP3,9,false,DEBUG_LOG_CATEGORY__Error,0xFF,10,0,false,EVENT_TYPE__GeneralInternalOverTemperature,NULL,"Mixer PT100 Not Working"},
 //{eHundredMillisecond,TemperatureAlarm,TEMP_SENSE_AN_ENCLOSURETEMP1,250,true,DEBUG_LOG_CATEGORY__Error,0xFF,0,0,false,EVENT_TYPE__GeneralInternalPT100 Not Working,NULL,"GeneralInternalPT100 Not Working"},
 //{eHundredMillisecond,TemperatureAlarm,TEMP_SENSE_AN_ENCLOSURETEMP2,80,true,DEBUG_LOG_CATEGORY__Error,0xFF,0,0,false,EVENT_TYPE__GeneralInternalPT100 Not Working,NULL,"GeneralInternalPT100 Not Working"},
@@ -205,6 +205,7 @@ AlarmHandlingItem  AlarmItem[MAX_SYSTEM_ALARMS]={
 {eOneSecond,DoNotPollAlarm,0,0,false,DEBUG_LOG_CATEGORY__Warning,0xFF,0,0,false,EVENT_TYPE__ThreadTensionControlFailure,NULL,"Thread Tension Control Failure"},
 };
 char TestMessage[5]="Test";
+bool DispenserInUse[MAX_SYSTEM_DISPENSERS] = {false,false,false,false,false,false,false,false};
 /*
  typedef struct
 {
@@ -294,13 +295,16 @@ uint32_t AlarmHandlingConsequentActions(uint32_t AlarmId, DebugLogCategory Sever
 JobEndReasonEnum AlarmHandlingPrepareJob(void *CurrentJob)
 {
     JobTicket* JobTicket = CurrentJob;
-    bool DispenserInUse[MAX_SYSTEM_DISPENSERS] = {false,false,false,false,false,false,false,false};
     EventType HeaterEventType[MAX_HEATERS_NUM] = {EVENT_TYPE__DryerOverTemperature,EVENT_TYPE__DryerOverTemperature,EVENT_TYPE__DryerOverTemperature,EVENT_TYPE__DyeingHead1OverTemperature,EVENT_TYPE__DyeingHead2OverTemperature,
                                                   EVENT_TYPE__DyeingHead3OverTemperature,EVENT_TYPE__DyeingHead4OverTemperature,EVENT_TYPE__DyeingHead5OverTemperature,EVENT_TYPE__DyeingHead6OverTemperature,
                                                   EVENT_TYPE__GeneralInternalOverTemperature};
     int Segment_i,Brush_i,Dispenser_i,DispenserId,Alarm_i,Heater_i,AlarmId=0;
     HeaterState HeaterState;
 
+    for (Dispenser_i = 0;Dispenser_i < MAX_SYSTEM_DISPENSERS;Dispenser_i++)
+    {
+        DispenserInUse[Dispenser_i] = false;
+    }
     JobEndReasonEnum status = JOB_OK;
     if (JobTicket->n_segments == 0)
         return OK;
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/PIDAlgo.c b/Software/Embedded_SW/Embedded/Modules/Control/PIDAlgo.c
index 72774461a..f9aee7929 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/PIDAlgo.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/PIDAlgo.c
@@ -52,8 +52,6 @@ float AdvancedPIDAlgorithmCalculation(float _setPoint,float _mesuredParam , PID_
     }
 
     derivative = (error - *_pre_error)/params->dt;
-    float IntegralErrorMultiplier;
-    float ProportionalErrorMultiplier;
 
     output = params->Kp*error/params->ProportionalErrorMultiplier + params->Ki**_integral/params->IntegralErrorMultiplier + params->Kd*derivative;
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index 82e2d1ee1..9c4ceb8d7 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -90,7 +90,7 @@ double dryerzone3temperature[DIAGNOSTICS_LIMIT];
 
 double dispensermotorfrequency[MAX_SYSTEM_DISPENSERS][DIAGNOSTICS_LIMIT];
 double dispenserspressure[MAX_SYSTEM_DISPENSERS][DIAGNOSTICS_LIMIT];
-double MidTankpressure[MAX_SYSTEM_DISPENSERS][DIAGNOSTICS_LIMIT];
+double MidTankpressure[MAX_SYSTEM_DISPENSERS][1];
 
 DoubleArray DispenserFreq[MAX_SYSTEM_DISPENSERS];
 DoubleArray DiagnosticsDispenserPressure[MAX_SYSTEM_DISPENSERS];
@@ -198,7 +198,6 @@ void DiagnosticLoadMotor(int MotorId, int frequency)
 }
 void DiagnosticsLoadDigitalValues(void)
 {
-    //int i;
     DigitalOutputState[0].interfaceio = INTERFACE_IOS__GPO_DRYER_SSR3_CTRL;
     DigitalOutputState[0].value = GetHeaterState(0);
 
@@ -367,7 +366,7 @@ void Diagnostic100msecCollection(void)
     {
         dispensermotorfrequency[i][DiagnosticsIndex] = MotorGetSpeed(HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_1+i);
         dispenserspressure[i][DiagnosticsIndex] = GetDispenserPressure(i); //Read_MidTank_Pressure_Sensor
-        MidTankpressure[i][DiagnosticsIndex] = Get_MidTank_Pressure_Sensor(i);
+        MidTankpressure[i][0] = Get_MidTank_Pressure_Sensor(i);
     }
 /*     dispenser1motorfrequency[DiagnosticsIndex] = MotorGetSpeed(HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_1);
      dispenser2motorfrequency[DiagnosticsIndex] = MotorGetSpeed(HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_2);
@@ -554,6 +553,23 @@ void SendDiagnostics(void)
     DiagnosticsMonitor.n_dispenser8pressure = DiagnosticsIndex;
     DiagnosticsMonitor.dispenser8pressure = dispenserspressure[7];
 
+
+    DiagnosticsMonitor.n_midtank1level = 1;
+    DiagnosticsMonitor.midtank1level = MidTankpressure[0];
+    DiagnosticsMonitor.n_midtank2level = 1;
+    DiagnosticsMonitor.midtank2level = MidTankpressure[1];
+    DiagnosticsMonitor.n_midtank3level = 1;
+    DiagnosticsMonitor.midtank3level = MidTankpressure[2];
+    DiagnosticsMonitor.n_midtank4level = 1;
+    DiagnosticsMonitor.midtank4level = MidTankpressure[3];
+    DiagnosticsMonitor.n_midtank5level = 1;
+    DiagnosticsMonitor.midtank5level = MidTankpressure[4];
+    DiagnosticsMonitor.n_midtank6level = 1;
+    DiagnosticsMonitor.midtank6level = MidTankpressure[5];
+    DiagnosticsMonitor.n_midtank7level = 1;
+    DiagnosticsMonitor.midtank7level = MidTankpressure[6];
+    DiagnosticsMonitor.n_midtank8level = 1;
+    DiagnosticsMonitor.midtank8level = MidTankpressure[7];
     response.monitors = &DiagnosticsMonitor;
     //response.digitalpins = DigitalPinArray;
     response.n_componentsstates = 0;
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
index 4ad9af903..f2618e65f 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
@@ -131,7 +131,6 @@ uint32_t HWConfiguration(UploadHardwareConfigurationRequest* UploadRequest)
 uint32_t HWConfigurationFunc(MessageContainer* requestContainer)
 {
     uint32_t status  = 0;
-    int Motor_i, Dancer_i, Dispenser_i,PID_i;
     MessageContainer responseContainer;
     UploadHardwareConfigurationResponse response = UPLOAD_HARDWARE_CONFIGURATION_RESPONSE__INIT;
 
diff --git a/Software/Embedded_SW/Embedded/Modules/General/process.c b/Software/Embedded_SW/Embedded/Modules/General/process.c
index 96248ab8b..a918f6574 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/process.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/process.c
@@ -15,6 +15,10 @@
 #include "PMR/Printing/UploadProcessParametersResponse.pb-c.h"
 #include "PMR/Hardware/HardwarePidControlType.pb-c.h"
 #include "PMR/common/MessageContainer.pb-c.h"
+#include "drivers/Valves/Valve.h"
+#include "drivers/I2C_Communication/ADC_MUX/ADC_MUX.h"
+#include "modules/ids/ids_ex.h"
+
 
 double dyeingspeed = 0;
 double dryerbufferlength = 0;
@@ -33,6 +37,8 @@ ProcessParameters ProcessParametersKeep;
 uint32_t HandleProcessParameters(ProcessParameters* ProcessParams)
 {
     uint32_t status = 0;
+    int Disp_i;
+
     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;
@@ -139,6 +145,12 @@ uint32_t HandleProcessParameters(ProcessParameters* ProcessParams)
     headairflow = ProcessParams->headairflow;
     dryerairflow = ProcessParams->dryerairflow;
 
+    for (Disp_i = 0;Disp_i < MAX_SYSTEM_DISPENSERS;Disp_i++)
+    {
+        Valve_Set(IDS_Id_to_AirValve[Disp_i], Atm_MidTank_ON );   //Atm_MidTank_OFF/ON
+        Read_MidTank_Pressure_Sensor(Disp_i);
+        Valve_Set(IDS_Id_to_AirValve[Disp_i], Atm_MidTank_OFF );   //Atm_MidTank_OFF/ON
+    }
    return status;//status;
 }
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters.h b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters.h
index 975635342..7d0a94cbb 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters.h
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters.h
@@ -26,9 +26,9 @@ typedef struct  HeaterPIDControlConfigstruc
   float outputproportionalband;
   //int32_t sensorcorrectionadjustment;
   //int32_t sensortypeandsetpointlimits;
-  //int32_t setpointramprateorsoftstartramp;
+  int32_t setpointramprateorsoftstartramp;
   //int32_t setpointcontroloutputrate;
-  //int32_t outputonoffhysteresisvalues;
+  int32_t outputonoffhysteresisvalue;
   //int32_t processvariablesamplingrate;
   //int32_t pvinputfilterfactormode;
   int32_t sensormaxvalue;
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c
index 169ae463e..4de0d8894 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c
@@ -137,6 +137,8 @@ uint32_t HeaterConfigRequestMessage(HardwarePidControl* request)
         HeaterControl[HeaterId].id = HeaterId;
         HeaterControl[HeaterId].outputproportionalpowerlimit = request->outputproportionalpowerlimit;
         HeaterControl[HeaterId].outputproportionalband = request->outputproportionalband;
+        HeaterControl[HeaterId].setpointramprateorsoftstartramp = request->setpointramprateorsoftstartramp;
+        HeaterControl[HeaterId].outputonoffhysteresisvalue = request->outputonoffhysteresisvalue;
         if (HeaterId == HARDWARE_PID_CONTROL_TYPE__DryerAirTemperature)
         {
             HeaterControl[HARDWARE_PID_CONTROL_TYPE__DryerHeaterMain].sensormaxvalue = request->sensormaxvalue;
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
index 62a534a1c..9db07f271 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -40,6 +40,8 @@ HardwarePidControlType ThreadDispenserIdToControlId[MAX_SYSTEM_DISPENSERS] = {
 bool    DispenserReady[MAX_SYSTEM_DISPENSERS] = {true};
 bool IDS_Active = false;
 /******************** STRUCTURES AND ENUMs  ********************************************/
+uint32_t IDS_Valve_DistanceToSpoolReady(uint32_t deviceID, uint32_t ReadValue);
+uint32_t IDS_Valve_PresegmentReady(uint32_t deviceID, uint32_t ReadValue);
 /******************** GLOBAL PARAMETERS  ********************************************/
 DispenserControlConfig_t DispenserControlConfig[MAX_SYSTEM_DISPENSERS];
 uint32_t    ControlIdtoDispenserId [MAX_SYSTEM_DISPENSERS] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};