activate magnet delay

2 files changed, 5 insertions, 8 deletions

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;
                     }
                 }