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

4 files changed, 19 insertions, 9 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
index f13dda4a0..50e885efa 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
@@ -24,6 +24,7 @@
 #include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h"
 #include "drivers/FPGA/FPGA.h"
 #include "PMR/Hardware/HardwareDancerType.pb-c.h"
+#include "drivers/I2C_Communication/ADC_MUX/ADC_MUX.h"
 
 #include "modules/thread/thread_ex.h"
 #include "modules/heaters/heaters_ex.h"
@@ -265,6 +266,14 @@ const AlarmHandlingItemStruc  AlarmItem[MAX_SYSTEM_ALARMS]={
  { eOneSecond, MotorAlarm, HARDWARE_MOTOR_TYPE__MOTO_DH_LID          , HARDWARE_MOTOR_TYPE__MOTO_DH_LID          , x_STATUS_UVLO         , FALSE , DEBUG_LOG_CATEGORY__Error , 0xFF , 2 , EVENT_TYPE__DYEING_HEAD_COVER_MOTOR_UNDERVOLTAGE                   ," MotorDyeingHeadCoverUnderVoltage    "        },                                           /* 5034 */
  { eOneSecond, MotorAlarm, HARDWARE_MOTOR_TYPE__MOTO_DH_CLEANMECH    , HARDWARE_MOTOR_TYPE__MOTO_DH_CLEANMECH    , x_STATUS_UVLO         , FALSE , DEBUG_LOG_CATEGORY__Error , 0xFF , 2 , EVENT_TYPE__DYEING_HEAD_CLEANING_MECHANISM_MOTOR_UNDERVOLTAGE                ," MotorDyeingHeadCleaningUnderVoltage "        },                                           /* 5038 */
  { eOneSecond, MotorAlarm, HARDWARE_MOTOR_TYPE__MOTO_DH_CLEANHEAD    , HARDWARE_MOTOR_TYPE__MOTO_DH_CLEANHEAD    , x_STATUS_UVLO         , FALSE , DEBUG_LOG_CATEGORY__Error , 0xFF , 2 , EVENT_TYPE__DYEING_HEAD_CLEANING_HEAD_MOTOR_UNDERVOLTAGE           ," MotorDyeingHeadCleaningHeadUnderVoltage "    },                                           /* 5042 */
+
+// { eOneSecond, CurrentAlarm, HEAD_ZONE_1    , HEAD_ZONE_1    , 1         , FALSE , DEBUG_LOG_CATEGORY__Warning , 0xFF , 2 , EVENT_TYPE__DYEING_HEAD_ZONE_1_CURRENT_OUT_OF_RANGE           ," Head Zone 1 Heater Current Out Of Range "    },                                           /* 5018 */
+// { eOneSecond, CurrentAlarm, HEAD_ZONE_2    , HEAD_ZONE_2    , 1         , FALSE , DEBUG_LOG_CATEGORY__Warning , 0xFF , 2 , EVENT_TYPE__DYEING_HEAD_ZONE_2_CURRENT_OUT_OF_RANGE           ," Head Zone 2 Heater Current Out Of Range "    },                                           /* 5019 */
+// { eOneSecond, CurrentAlarm, HEAD_ZONE_3    , HEAD_ZONE_3    , 1         , FALSE , DEBUG_LOG_CATEGORY__Warning , 0xFF , 2 , EVENT_TYPE__DYEING_HEAD_ZONE_3_CURRENT_OUT_OF_RANGE           ," Head Zone 3 Heater Current Out Of Range "    },                                           /* 5020 */
+// { eOneSecond, CurrentAlarm, HEAD_ZONE_4    , HEAD_ZONE_4    , 1         , FALSE , DEBUG_LOG_CATEGORY__Warning , 0xFF , 2 , EVENT_TYPE__DYEING_HEAD_ZONE_4_CURRENT_OUT_OF_RANGE           ," Head Zone 4 Heater Current Out Of Range "    },                                           /* 5021 */
+// { eOneSecond, CurrentAlarm, HEAD_ZONE_5_6  , HEAD_ZONE_5_6  , 1         , FALSE , DEBUG_LOG_CATEGORY__Warning , 0xFF , 2 , EVENT_TYPE__DYEING_HEAD_ZONE_5_6_CURRENT_OUT_OF_RANGE         ," Head Zone 5-6 Heater Current Out Of Range "    },                                           /* 5022 */
+// { eOneSecond, CurrentAlarm, MIXCHIP        , MIXCHIP        , 1         , FALSE , DEBUG_LOG_CATEGORY__Warning , 0xFF , 2 , EVENT_TYPE__MIXER_CURRENT_OUT_OF_RANGE                        ," Mixer Heater Current Out Of Range "    },                                           /* 6004 */
+
  {eOneSecond,DoNotPollAlarm,0,0,0,0,DEBUG_LOG_CATEGORY__Warning,0xFF,0,EVENT_TYPE__THREAD_BREAK,"Thread Break"},
  {eOneSecond,DoNotPollAlarm,0,0,0,0,DEBUG_LOG_CATEGORY__Warning,0xFF,0,EVENT_TYPE__THREAD_TENSION_CONTROL_FAILURE_FEEDER_DANCER,"Thread Feeder Tension Control Failure"},
  {eOneSecond,DoNotPollAlarm,0,0,0,0,DEBUG_LOG_CATEGORY__Warning,0xFF,0,EVENT_TYPE__THREAD_TENSION_CONTROL_FAILURE_PULLER_DANCER,"Thread Puller Tension Control Failure"},
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 5943c11c5..471833dc5 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -428,7 +428,7 @@ uint32_t MillisecLoop(uint32_t tick)
 }
 uint32_t MillisecLowLoop(uint32_t tick)
 {
-    uint8_t Motor_i,Disp_i;
+    uint8_t Motor_i,Disp_i,Heater_i;
     TEMPERATURE_SENSOR_ID_ENUM Sensor_i;
 
     //static int temp=0;
@@ -489,6 +489,10 @@ uint32_t MillisecLowLoop(uint32_t tick)
             if (isMotorConfigured(Motor_i))
                 MotorGetStatusFromFPGA(Motor_i);
         }
+        for (Heater_i = 0;Heater_i < NUM_OF_HEATERS;Heater_i++)
+        {
+            Read_Head_MixChip_Heaters_Current(Heater_i);
+        }
     }
     if (OneMinute_Tick)
     {
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index fe060874f..b696532ec 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -237,12 +237,12 @@ void DiagnosticsLoadDigitalValues(void)
     DigitalOutputState[9].interfaceio = INTERFACE_IOS__GPO_MIXCHIP_SSR4_CTRL;
     DigitalOutputState[9].value = GetHeaterState(9);
 
-    DigitalOutputState[9].interfaceio = INTERFACE_IOS__GPO_SPARE_SSR13_CTRL;
-    DigitalOutputState[9].value = 0;
+    DigitalOutputState[10].interfaceio = INTERFACE_IOS__GPO_SPARE_SSR13_CTRL;
+    DigitalOutputState[10].value = ReadHeadMagnetBit();
 #warning get the magnet state
 
-    DigitalOutputState[9].interfaceio = INTERFACE_IOS__GPO_LED4;
-    DigitalOutputState[9].value = DataUpdated;
+    DigitalOutputState[11].interfaceio = INTERFACE_IOS__GPO_LED4;
+    DigitalOutputState[11].value = DataUpdated;
 
 }
 void DiagnosticLoadTemperature(int HeaterId, int temperature)
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
index bfc469093..8ddc2f84d 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
@@ -69,12 +69,12 @@ uint32_t MotorHomingRequestFunc(MessageContainer* requestContainer)
     {
         if ((JobIsActive() == false)&&(isMotorConfigured(MotorId) == true))
         {
+            ustrncpy (HomingToken[MotorId], requestContainer->token,36);
             if (request->direction == MOTOR_DIRECTION__Backward) //opening the loading system
             {
                 if(MotorId == HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID)
                 {
                     MotorGotoWithCallback(HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID, DRIER_LID_OPEN, GPI_LS_DRYER_LID_OPEN, MotorHomingRequestCallback,4000);
-                    ustrncpy (HomingToken[MotorId], requestContainer->token,36);
                     return OK;
                 }
                 else
@@ -82,7 +82,6 @@ uint32_t MotorHomingRequestFunc(MessageContainer* requestContainer)
                     if ( Motor_Id_to_LS_IdDown[MotorId] != MAX_GPI)
                     {
                         MotorMovetoLimitSwitch (MotorId,1-MotorsCfg[MotorId].directionthreadwize, speed,  Motor_Id_to_LS_IdUp[MotorId], MotorHomingRequestCallback,10000);
-                        ustrncpy (HomingToken[MotorId], requestContainer->token,36);
                         return OK;
                     }
                 }
@@ -92,7 +91,6 @@ uint32_t MotorHomingRequestFunc(MessageContainer* requestContainer)
                 if(MotorId == HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID)
                 {
                     MotorGotoWithCallback(HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID, DRIER_LID_CLOSE, GPI_LS_DRYER_LID_CLOSED, MotorHomingRequestCallback,4000);
-                    ustrncpy (HomingToken[MotorId], requestContainer->token,36);
                     return OK;
                 }
                 else
@@ -100,7 +98,6 @@ uint32_t MotorHomingRequestFunc(MessageContainer* requestContainer)
                     if ( Motor_Id_to_LS_IdUp[MotorId] != MAX_GPI)
                     {
                         MotorMovetoLimitSwitch (MotorId,MotorsCfg[MotorId].directionthreadwize, speed,  Motor_Id_to_LS_IdDown[MotorId], MotorHomingRequestCallback,10000);
-                        ustrncpy (HomingToken[MotorId], requestContainer->token,36);
                         return OK;
                     }
                 }