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

3 files changed, 13 insertions, 10 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/Diagnostics.c
index 2e989bbf5..0e923f468 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/Diagnostics.c
@@ -127,9 +127,9 @@ void DiagnosticCollection(void)
     headzone1temperature[DiagnosticsIndex] = TemperatureSensorRead(TEMP_SENSE_ANALOG_DYEINGH_TEMP1);
     headzone2temperature[DiagnosticsIndex] = TemperatureSensorRead(TEMP_SENSE_ANALOG_DYEINGH_TEMP2);
     headzone3temperature[DiagnosticsIndex] = TemperatureSensorRead(TEMP_SENSE_ANALOG_DYEINGH_TEMP3);
-    //headzone4temperature[DiagnosticsIndex] = TemperatureSensorRead(TEMP_SENSE_ANALOG_DYEINGH_TEMP4);
-    //headzone5temperature[DiagnosticsIndex] = TemperatureSensorRead(TEMP_SENSE_ANALOG_DYEINGH_TEMP5);
-    //headzone6temperature[DiagnosticsIndex] = TemperatureSensorRead(TEMP_SENSE_AN_ENCLOSURETEMP3);
+    headzone4temperature[DiagnosticsIndex] = TemperatureSensorRead(TEMP_SENSE_ANALOG_DYEINGH_TEMP4);
+    headzone5temperature[DiagnosticsIndex] = TemperatureSensorRead(TEMP_SENSE_ANALOG_DYEINGH_TEMP5);
+    headzone6temperature[DiagnosticsIndex] = TemperatureSensorRead(TEMP_SENSE_AN_ENCLOSURETEMP3);
     dryerzone1temperature[DiagnosticsIndex] = TemperatureSensorRead(TEMP_SENSE_ANALOG_DRYER_TEMP1);
     dryerzone2temperature[DiagnosticsIndex] = TemperatureSensorRead(TEMP_SENSE_ANALOG_DRYER_TEMP2);
     dryerzone3temperature[DiagnosticsIndex] = TemperatureSensorRead(TEMP_SENSE_ANALOG_DRYER_TEMP3);
@@ -189,9 +189,9 @@ void SendDiagnostics(void)
     DiagnosticsMonitor.n_headzone1temperature = DiagnosticsIndex;
     DiagnosticsMonitor.n_headzone2temperature = DiagnosticsIndex;
     DiagnosticsMonitor.n_headzone3temperature = DiagnosticsIndex;
-    //DiagnosticsMonitor.n_headzone4temperature = DiagnosticsIndex;
-    //DiagnosticsMonitor.n_headzone5temperature = DiagnosticsIndex;
-    //DiagnosticsMonitor.n_headzone6temperature = DiagnosticsIndex;
+    DiagnosticsMonitor.n_headzone4temperature = DiagnosticsIndex;
+    DiagnosticsMonitor.n_headzone5temperature = DiagnosticsIndex;
+    DiagnosticsMonitor.n_headzone6temperature = DiagnosticsIndex;
     DiagnosticsMonitor.n_dryerzone1temperature = DiagnosticsIndex;
     DiagnosticsMonitor.n_dryerzone2temperature = DiagnosticsIndex;
     DiagnosticsMonitor.n_dryerzone3temperature = DiagnosticsIndex;
@@ -217,9 +217,9 @@ void SendDiagnostics(void)
     DiagnosticsMonitor.headzone1temperature = headzone1temperature;
     DiagnosticsMonitor.headzone2temperature = headzone2temperature;
     DiagnosticsMonitor.headzone3temperature = headzone3temperature;
-    //DiagnosticsMonitor.headzone4temperature = headzone4temperature;
-    //DiagnosticsMonitor.headzone5temperature = headzone5temperature;
-    //DiagnosticsMonitor.headzone6temperature = headzone6temperature;
+    DiagnosticsMonitor.headzone4temperature = headzone4temperature;
+    DiagnosticsMonitor.headzone5temperature = headzone5temperature;
+    DiagnosticsMonitor.headzone6temperature = headzone6temperature;
     DiagnosticsMonitor.dryerzone1temperature = dryerzone1temperature;
     DiagnosticsMonitor.dryerzone2temperature = dryerzone2temperature;
     DiagnosticsMonitor.dryerzone3temperature = dryerzone3temperature;
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.c b/Software/Embedded_SW/Embedded/Modules/Control/control.c
index 1e087eda3..379a7bb48 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/control.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/control.c
@@ -157,11 +157,14 @@ uint32_t ControlActivityLed( uint32_t Parameter1, uint32_t Parameter2)
     if (flag==true)
     {
         COMM_RED_LED_ON;
+        STATUS_GREEN_LED_ON;// Blink the green led on heating
         flag = false;
     }
     else
     {
         COMM_RED_LED_OFF;
+        if (HeaterActive == true)// Blink the green led on heating
+            STATUS_GREEN_LED_OFF;
         flag = true;
     }
 return OK;
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 f43078894..47048196b 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Motor.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Motor.c
@@ -391,7 +391,7 @@ void Stub_MotorStatusRequest(MessageContainer* requestContainer)
                     MotorGetStatusFromFPGA(Motor_Id);
                     //deley TODO
                     SysCtlDelay(10000);
-                    read_status =  Fpga_Spi[(TimerMotors_t)request->motor_id].RX_MISO>>8;//MotorGetStatusFromFPGA_Res(Motor_Id); TODO >>8 ???
+                    read_status =  Fpga_Spi[(TimerMotors_t)request->motor_id].RX_MISO;//>>8;//MotorGetStatusFromFPGA_Res(Motor_Id); TODO >>8 ???
 
                 #endif
            }