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

7 files changed, 23 insertions, 14 deletions

diff --git a/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c b/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c
index 0249a775a..077841577 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c
@@ -54,8 +54,8 @@ uint8_t FPGA_SensorInitConfigReg()
 
         // - - - - - - - - - - Reg2 - - - - - - - - - -
         if(Rref==1650)
-            TempSensConfig[i].Reg2.bits.IDAC       = 0x03;//Bits 0-2  IDAC current setting 100 uA SERGEY
-            //TempSensConfig[i].Reg2.bits.IDAC       = 0x05;//Bits 0-2  IDAC current setting 500 uA MICHAEL
+            //TempSensConfig[i].Reg2.bits.IDAC       = 0x03;//Bits 0-2  IDAC current setting 100 uA SERGEY
+            TempSensConfig[i].Reg2.bits.IDAC       = 0x05;//Bits 0-2  IDAC current setting 500 uA MICHAEL
         else if(Rref == 825)
             TempSensConfig[i].Reg2.bits.IDAC       = 0x06;//Bits 0-2  IDAC current setting 1000 uA
 
diff --git a/Software/Embedded_SW/Embedded/Main.c b/Software/Embedded_SW/Embedded/Main.c
index c57cd969d..c7fdf723e 100644
--- a/Software/Embedded_SW/Embedded/Main.c
+++ b/Software/Embedded_SW/Embedded/Main.c
@@ -130,9 +130,12 @@ int main(void)
 	//InitI2C();
     Init_All_I2C();
 
-	STATUS_GREEN_LED_ON;
+    #ifndef EVALUATION_BOARD
+        STATUS_GREEN_LED_ON;
+	    FPGA_Init();
+    #endif
+
 
-    FPGA_Init();
 	//ROM_GPIOPinTypeGPIOOutput(GPIO_PORTQ_BASE, GPIO_PIN_7); // set PQ7 to output (Green LED)
 	//ROM_GPIOPinTypeGPIOOutput(GPIO_PORTQ_BASE, GPIO_PIN_4); // set PQ4 to output (Blue LED)
 	//ROM_GPIOPinTypeGPIOOutput(GPIO_PORTN_BASE, GPIO_PIN_5); // set PN5 to output (RED LED)
diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandlingDiagnostics.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandlingDiagnostics.c
index a11c472b3..60a093216 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandlingDiagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandlingDiagnostics.c
@@ -131,7 +131,7 @@ void SendDiagnostics(void)
     MessageContainer responseContainer;
     StartDiagnosticsResponse response = START_DIAGNOSTICS_RESPONSE__INIT;
     DiagnosticsMonitors DiagnosticsMonitor;
-    if (DiagnosticsActive == false)
+    //if (DiagnosticsActive == false)
         return;
 
 
@@ -180,8 +180,8 @@ void SendDiagnostics(void)
 
 
     response.monitors = &DiagnosticsMonitor;
-    response.n_digitalpins = DiagnosticsIndex/**MAX_GPI*/;
-    response.digitalpins = DigitalPinArray;
+    response.n_digitalpins = 0/**MAX_GPI*/;
+    //response.digitalpins = DigitalPinArray;
     response.n_events = 0;
     response.n_componentsstates = 0;
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index 2de675d5c..32509dfea 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -45,8 +45,9 @@ typedef struct HeatersControlMessage{
 HeaterCommand          HeaterCmd[MAX_HEATERS_NUM];
 uint32_t    ControlIdtoHeaterId [MAX_HEATERS_NUM] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
 uint32_t    DryerHeaterMaxTempControl = 0xFF;
-#warning the PT100 id for the dryer control is number2 - dryer internal ambient sensor
-uint32_t HeaterId2PT100Id[MAX_HEATERS_NUM] = {TEMP_SENSE_ANALOG_DRYER_TEMP2,TEMP_SENSE_ANALOG_DRYER_TEMP1,TEMP_SENSE_ANALOG_DRYER_TEMP3,TEMP_SENSE_ANALOG_DYEINGH_TEMP1,TEMP_SENSE_ANALOG_DYEINGH_TEMP2,TEMP_SENSE_ANALOG_DYEINGH_TEMP3,TEMP_SENSE_ANALOG_DYEINGH_TEMP4,TEMP_SENSE_ANALOG_MIXCHIP_TEMP};
+#warning the PT100 id for the dryer control is number2 - dryer internal ambient sensor.
+#warning the PT100 for head 4 is number 5
+uint32_t HeaterId2PT100Id[MAX_HEATERS_NUM] = {TEMP_SENSE_ANALOG_DRYER_TEMP2,TEMP_SENSE_ANALOG_DRYER_TEMP1,TEMP_SENSE_ANALOG_DRYER_TEMP3,TEMP_SENSE_ANALOG_DYEINGH_TEMP1,TEMP_SENSE_ANALOG_DYEINGH_TEMP2,TEMP_SENSE_ANALOG_DYEINGH_TEMP3,TEMP_SENSE_ANALOG_DYEINGH_TEMP5,TEMP_SENSE_ANALOG_MIXCHIP_TEMP};
 uint32_t    DryerInternalPT100Id = TEMP_SENSE_ANALOG_DRYER_TEMP1;
 bool HeatersRestart = false;
 
@@ -466,7 +467,7 @@ uint32_t DCHeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
 */
     static int t=0;
     t++;
-    if (t >=22)
+    if (t >=23)
     {
         HeatingTestSendResonse(0,false,GetHeaterState(index), DCInitialHeating[index],index, readValue,DCTimeSliceAllocation[index],
                            HeaterPIDConfig[index].m_calculatedError,"Standard DC");
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
index 4b7648e96..092fbb252 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -16,6 +16,8 @@
 #include "drivers/motors/motor.h"
 #include "drivers/valves/valve.h"
 
+#include "modules/heaters/heaters.h"
+
 
 typedef struct
 {
@@ -252,6 +254,7 @@ uint32_t IDSPreSegmentState(void *JobDetails, int SegmentId)
                  {
                      Control3WayValvesWithCallback (DispenserId, Dispenser_Mixer, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer
                      MotorSetSpeed(HW_Motor_Id, segmentfirst_speed);
+                     HeatingTestSendResonse(0,false,0, Dispenser_Mixer,DispenserId, segmentfirst_speed,SegmentId,JobBrushStopId,"Dispenser !!!!!!!!!!!");
                  }
          }
      }
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Motor.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Motor.c
index 81f147039..261c773a2 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Motor.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Motor.c
@@ -280,7 +280,7 @@ void Stub_MotorRunRequest(MessageContainer* requestContainer)
 
 void Stub_MotorStopRequest(MessageContainer* requestContainer)
 {
-    //uint32_t read_status;
+
     //uint32_t status = FAILED;
 
     MessageContainer responseContainer;
@@ -292,6 +292,8 @@ void Stub_MotorStopRequest(MessageContainer* requestContainer)
 
 #ifdef EVALUATION_BOARD
 
+    uint32_t read_status;
+
  //SPI_Control(SKIP_INIT);
     Mot_Stop();
 #else
diff --git a/Software/Embedded_SW/Embedded/targetConfigs/Tiva TM4C129XNCZAD.ccxml b/Software/Embedded_SW/Embedded/targetConfigs/Tiva TM4C129XNCZAD.ccxml
index 91579ccd1..c68bc1759 100644
--- a/Software/Embedded_SW/Embedded/targetConfigs/Tiva TM4C129XNCZAD.ccxml
+++ b/Software/Embedded_SW/Embedded/targetConfigs/Tiva TM4C129XNCZAD.ccxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <configurations XML_version="1.2" id="configurations_0">
-<configuration XML_version="1.2" id="Texas Instruments XDS2xx USB Onboard Debug Probe_0">
-        <instance XML_version="1.2" desc="Texas Instruments XDS2xx USB Onboard Debug Probe_0" href="connections/TIXDS2XXUSB_onboard_Connection.xml" id="Texas Instruments XDS2xx USB Onboard Debug Probe_0" xml="TIXDS2XXUSB_onboard_Connection.xml" xmlpath="connections"/>
-        <connection XML_version="1.2" id="Texas Instruments XDS2xx USB Onboard Debug Probe_0">
+<configuration XML_version="1.2" id="Texas Instruments XDS2xx USB Debug Probe_0">
+        <instance XML_version="1.2" desc="Texas Instruments XDS2xx USB Debug Probe_0" href="connections/TIXDS2XXUSB_Connection.xml" id="Texas Instruments XDS2xx USB Debug Probe_0" xml="TIXDS2XXUSB_Connection.xml" xmlpath="connections"/>
+        <connection XML_version="1.2" id="Texas Instruments XDS2xx USB Debug Probe_0">
             <instance XML_version="1.2" href="drivers/tixds560cs_dap.xml" id="drivers" xml="tixds560cs_dap.xml" xmlpath="drivers"/>
             <instance XML_version="1.2" href="drivers/tixds560cortexM.xml" id="drivers" xml="tixds560cortexM.xml" xmlpath="drivers"/>
             <platform XML_version="1.2" id="platform_0">