Version 1.4.6.7 : beginning of removing the #ifdefs. Sylco head and arc head temperature control fixed. new events (version 18),

1 files changed, 35 insertions, 30 deletions

diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c
index f2f4ce7ae..af326b4ed 100644
--- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c
+++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c
@@ -421,17 +421,18 @@ bool FPGA_Read_limit_Switches(FPGA_GPI_ENUM Limit_Switch)
         case GPI_LS_DH_CLEAN_DOWN:
             LM_Status = Ls_Dryer_Dh.bits.F1_LS_DH_CLEAN_DOWN;
                 break;
-#ifdef  Use_Head_Card
         case HEADCARD_COVER_LS_FRONT:
-            LM_Status = Head_I2C_EXP4_0x46.bits.INPUT_LS_FRONT;
+            if(Head_Type == HEAD_TYPE_SYLKO)
+                LM_Status = Head_I2C_EXP4_0x46.bits.INPUT_LS_FRONT;
                 break;
         case HEADCARD_COVER_LS_REAR:
-            LM_Status = Head_I2C_EXP4_0x46.bits.INPUT_LS_FRONT;
+            if(Head_Type == HEAD_TYPE_SYLKO)
+                LM_Status = Head_I2C_EXP4_0x46.bits.INPUT_LS_FRONT;
                 break;
         case HEADCARD_COVER_LS_UPPER:
-            LM_Status = Head_I2C_EXP4_0x46.bits.INPUT_LS_FRONT;
+            if(Head_Type == HEAD_TYPE_SYLKO)
+                LM_Status = Head_I2C_EXP4_0x46.bits.INPUT_LS_FRONT;
                 break;
-#endif
         default :
             LM_Status = NO_LIMIT;
             break;
@@ -511,11 +512,12 @@ uint32_t DeActivateCoolerPump() //WHS  - Pump the waste accumulated in cooler to
 uint32_t MagnetControlId = 0xFF;
 uint32_t MagnetCallBackFunction(uint32_t IfIndex, uint32_t BusyFlag)
 {
-#ifdef Use_Head_Card
-    HeadCard_HeadMagnet_Disable();
-#else
-    MotorStop(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM,Hard_Hiz );
-#endif
+
+    if(Head_Type == HEAD_TYPE_SYLKO)
+        HeadCard_HeadMagnet_Disable();
+    else
+        MotorStop(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM,Hard_Hiz );
+
     if (SafeRemoveControlCallback(MagnetControlId, MagnetCallBackFunction )==OK)
         MagnetControlId = 0xFF;
     else
@@ -528,17 +530,17 @@ uint32_t ActivateHeadMagnet()
 {
     Report("ActivateHeadMagnet - Close the lid magnet",__FILE__,__LINE__,(int)HARDWARE_MOTOR_TYPE__MOTO_RLOADARM,RpWarning,(int)DH_LID_OPEN,0);
     //Task_sleep(500);
-#ifdef Use_Head_Card
-    HeadCard_ActivateHeadMagnet();
-
-#else
-    F2_CTRL_Reg.ushort &= ~SPARE_SSR13_CTRL;
-    F2_CTRL = F2_CTRL_Reg.ushort;
-    if (isMotorConfigured(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM))
+    if(Head_Type == HEAD_TYPE_SYLKO)
+        HeadCard_ActivateHeadMagnet();
+    else
     {
-        MotorGoTo(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM,DH_LID_CLOSE );
+        F2_CTRL_Reg.ushort &= ~SPARE_SSR13_CTRL;
+        F2_CTRL = F2_CTRL_Reg.ushort;
+        if (isMotorConfigured(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM))
+        {
+            MotorGoTo(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM,DH_LID_CLOSE );
+        }
     }
-#endif
     MagnetControlId = AddControlCallback(NULL, MagnetCallBackFunction, 2* eOneSecond, TemplateDataReadCBFunction,0,0, 0 );
     return OK;
 }
@@ -550,19 +552,22 @@ uint32_t HeadCard_HeadMagnet_Disable();
 uint32_t DeActivateHeadMagnet()
 {
 
-#ifdef Use_Head_Card
-    HeadCard_DeActivateHeadMagnet();
-    MagnetControlId = AddControlCallback(NULL, MagnetCallBackFunction, 2* eOneSecond, TemplateDataReadCBFunction,0,0, 0 );
-#else
-    Report("DeActivateHeadMagnet - open the lid magnet",__FILE__,__LINE__,(int)HARDWARE_MOTOR_TYPE__MOTO_RLOADARM,RpWarning,(int)DH_LID_CLOSE,0);
-    if (isMotorConfigured(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM))
+    if(Head_Type == HEAD_TYPE_SYLKO)
     {
-        MotorGoTo(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM,DH_LID_OPEN );
-        //MotorGotoWithCallback(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM, DH_LID_OPEN, Motor_Id_to_LS_IdDown[HARDWARE_MOTOR_TYPE__MOTO_RLOADARM], NULL,1000);
+        HeadCard_DeActivateHeadMagnet();
+        MagnetControlId = AddControlCallback(NULL, MagnetCallBackFunction, 2* eOneSecond, TemplateDataReadCBFunction,0,0, 0 );
+    }
+    else
+    {
+        Report("DeActivateHeadMagnet - open the lid magnet",__FILE__,__LINE__,(int)HARDWARE_MOTOR_TYPE__MOTO_RLOADARM,RpWarning,(int)DH_LID_CLOSE,0);
+        if (isMotorConfigured(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM))
+        {
+            MotorGoTo(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM,DH_LID_OPEN );
+            //MotorGotoWithCallback(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM, DH_LID_OPEN, Motor_Id_to_LS_IdDown[HARDWARE_MOTOR_TYPE__MOTO_RLOADARM], NULL,1000);
+        }
+        F2_CTRL_Reg.ushort |= SPARE_SSR13_CTRL;
+        F2_CTRL = F2_CTRL_Reg.ushort;
     }
-    F2_CTRL_Reg.ushort |= SPARE_SSR13_CTRL;
-    F2_CTRL = F2_CTRL_Reg.ushort;
-#endif
     Task_sleep(500);
     return OK;
 }