update logic for head card

5 files changed, 37 insertions, 27 deletions

diff --git a/Software/Embedded_SW/Embedded/.cproject b/Software/Embedded_SW/Embedded/.cproject
index 7463c7147..06fa9a589 100644
--- a/Software/Embedded_SW/Embedded/.cproject
+++ b/Software/Embedded_SW/Embedded/.cproject
@@ -170,7 +170,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="Drivers/I2C_Communication/Head_Card/ADC/Head_ADC_old.c|Drivers/I2C_Communication/WHS_Card|Drivers/I2C_Communication/WHS_Card/PT100|src|EmbParam.cfg" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="Drivers/I2C_Communication/WHS_Card/I2C_WHS_Fan_Mux.c|Drivers/I2C_Communication/WHS_Card/IO_Ports_TCA9555|Drivers/I2C_Communication/WHS_Card/D_TCA9546|Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan|Drivers/I2C_Communication/Head_Card/ADC/Head_ADC_old.c|Drivers/I2C_Communication/WHS_Card/PT100|src|EmbParam.cfg" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
diff --git a/Software/Embedded_SW/Embedded/DataDef.h b/Software/Embedded_SW/Embedded/DataDef.h
index 0fd48c037..9f9afa0ec 100644
--- a/Software/Embedded_SW/Embedded/DataDef.h
+++ b/Software/Embedded_SW/Embedded/DataDef.h
@@ -26,6 +26,8 @@
 //#define USE_POWERSTEP01
 
 //#define Use_Head_Card //for real card only
+//#define Use_Head_Card50 // Shlomo's logic to read PT100 in MillisecTask.c
+
 
 //#define Use_WHS_Card //for real card only
 //#define Test_headCard_With_DispCard_I2C4_Add0xE2_DispID_0
diff --git a/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c b/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c
index 3479aff9b..810787b0a 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c
@@ -106,26 +106,30 @@ uint32_t ActivateHeater (int HeaterId)
 #ifdef Use_Head_Card
     if (HeaterId>HEATER_TYPE__DryerSecondaryHeater)
     {
-        HeadCard_Control_Heaters(HeaterIdtoHeaterpid[HeaterId],ON);
+        HeadCard_Control_Heaters(HeaterTypetoHeadHeater[HeaterId],ON);
     }
     else
-    {
+    {        //F2_CTRL |= portMap[HeaterId].m_pin;
+        F2_CTRL_Reg.ushort  |= portMap[HeaterId].m_pin;
+        F2_CTRL = F2_CTRL_Reg.ushort;
+    }
+
 #else
         if (HeaterId >= HEATER_TYPE__HeaterZone7) return OK;
-#endif
-    if (HeaterId == HARDWARE_PID_CONTROL_TYPE__DryerAirTemperature)
+
+    if (HeaterId == HEATER_TYPE__DryerAirHeater)
     {
         return OK;
     }
 #ifndef EVALUATION_BOARD
-    if(HeaterId == HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ5)
+    if(HeaterId == HEATER_TYPE__HeaterZone5)
     {
         //F1_gpo_01 |= portMap[HeaterId].m_pin;
         F1_GPO_Reg.ushort |= portMap[HeaterId].m_pin;
         F1_gpo_01 = F1_GPO_Reg.ushort;
 
     }
-    else if(HeaterId == HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ6)
+    else if(HeaterId == HEATER_TYPE__HeaterZone6)
     {
         //F3_GPO_01_bus |= portMap[HeaterId].m_pin;
         F3_GPO_01_Reg.ushort |= portMap[HeaterId].m_pin;
@@ -159,8 +163,8 @@ uint32_t ActivateHeater (int HeaterId)
     //---------------------------------------------------------------------------------------
 
     HeaterActive |= 1 << HeaterId;
-#ifdef Use_Head_Card
-    }
+
+//    } -----------------------------------------
 #endif
     //---------------------------------------------------------------------------------------
 
@@ -173,21 +177,25 @@ uint32_t DeActivateHeater (int HeaterId)
 #ifdef Use_Head_Card
     if (HeaterId>HEATER_TYPE__DryerSecondaryHeater)
     {
-        HeadCard_Control_Heaters(HeaterIdtoHeaterpid[HeaterId],ON);
+        HeadCard_Control_Heaters(HeaterTypetoHeadHeater[HeaterId],ON);
     }
     else
     {
+        //F2_CTRL &= ~portMap[HeaterId].m_pin;
+        F2_CTRL_Reg.ushort  &= ~portMap[HeaterId].m_pin;
+        F2_CTRL = F2_CTRL_Reg.ushort;
+    }
 #else
     if (HeaterId >= HEATER_TYPE__HeaterZone7) return OK;
-#endif
+
 #ifndef EVALUATION_BOARD
-    if(HeaterId == HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ5)
+    if(HeaterId == HEATER_TYPE__HeaterZone5)
     {
         //F1_gpo_01 &= ~portMap[HeaterId].m_pin;
         F1_GPO_Reg.ushort&= ~portMap[HeaterId].m_pin;
         F1_gpo_01 = F1_GPO_Reg.ushort;
     }
-    else if(HeaterId == HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ6)
+    else if(HeaterId == HEATER_TYPE__HeaterZone6)
     {
         //F3_GPO_01_bus &= ~portMap[HeaterId].m_pin;
         F3_GPO_01_Reg.ushort &= ~portMap[HeaterId].m_pin;
@@ -217,8 +225,8 @@ uint32_t DeActivateHeater (int HeaterId)
     portMap[HeaterId].Active = false;
 
     HeaterActive &= ~(1 << HeaterId);
-#ifdef Use_Head_Card
-    }
+
+    //    } -----------------------------------------
 #endif
 
     return OK;
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c
index 272713389..0fc597c4e 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c
@@ -31,9 +31,9 @@ typedef struct I2C_ReadingMessage{
 void Trigger_Heater_Current_Read(void)
 {
     I2C_ReadingMessageStruc I2C_ReadingMessage;
-    uint8_t Heater_i;
+    uint8_t Heater_i=0;
 #ifdef Use_Head_Card
-    for (Heater_i = 0;Heater_i < HEAD_NUM_OF_ADC;Heater_i++)
+   // for (Heater_i = 0;Heater_i < HEAD_NUM_OF_ADC;Heater_i++)//No need - reads all inputs at the same time
 #else
     for (Heater_i = 0;Heater_i < NUM_OF_CURRENT_HEATERS;Heater_i++)
 #endif
@@ -81,9 +81,9 @@ void I2C_ReadingTask(UArg arg0, UArg arg1)
         case Heater_Current_Reading:
             //Report("Read_Heaters_Current",__FILE__,__LINE__,255,RpWarning,0,0);
 #ifdef Use_Head_Card
-            Read_Head_ADC(I2C_ReadingMessage.parameter);
+           Read_Head_ADC(I2C_ReadingMessage.parameter);
 #else
-            Read_Heaters_Current(I2C_ReadingMessage.parameter);
+           Read_Heaters_Current(I2C_ReadingMessage.parameter);
 #endif
         break;
         default:
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 862a0f8cf..1605092e5 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -439,11 +439,11 @@ uint32_t MillisecLoop(uint32_t tick)
                {
                    TemperatureSensorReadFromFPGA_Res(Sensor_i); //got the data from the FPGA
                }
-               else if(Sensor_i < MAX_HEAD_CARD_TEMP_SENS_ID)
+               /*else if(Sensor_i < MAX_HEAD_CARD_TEMP_SENS_ID) - move to the function  control_HeadCard_PT100
                {
-                   HeadCard_Toggle_PT100(Sensor_i);
+                   //HeadCard_Toggle_PT100(Sensor_i);
                    //deley??
-                   HeadADCPT100_SendReadDataCommand(Sensor_i);
+                   //HeadADCPT100_SendReadDataCommand(Sensor_i);
                }
                else if(Sensor_i < MAX_WHS_CARD_TEMP_SENS_ID)
                {
@@ -452,7 +452,7 @@ uint32_t MillisecLoop(uint32_t tick)
                else
                {
                    //TBD
-               }
+               }*/
 
                PT100Data[Sensor_i].WaitForData = false;
                PT100Data[Sensor_i].SyncRequired = true;
@@ -466,9 +466,9 @@ uint32_t MillisecLoop(uint32_t tick)
                {
                    TemperatureSensorSync(Sensor_i);
                }
-               else if(Sensor_i < MAX_HEAD_CARD_TEMP_SENS_ID)
+               /*else if(Sensor_i < MAX_HEAD_CARD_TEMP_SENS_ID)  - NA move to the function  control_HeadCard_PT100
                {
-                   HeadADCPT100_StartSync(Sensor_i);
+                   //HeadADCPT100_StartSync(Sensor_i);
                }
                else if(Sensor_i < MAX_WHS_CARD_TEMP_SENS_ID)
                {
@@ -477,7 +477,7 @@ uint32_t MillisecLoop(uint32_t tick)
                else
                {
                    //TBD...
-               }
+               }*/
 
 
                PT100Data[Sensor_i].SyncRequired = false;
@@ -618,7 +618,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
             Set_HeadCard_PT100();//call every 50mSec (minimum delay 30mSec)
     }
 #endif
-#ifdef Use_Head_Card
+#ifdef Use_Head_Card50
     if (m20msecTick) //read odd PT1000
     {
         for (Sensor_i = HEAD_PT100_ZONE_1_0X80_0;Sensor_i < HEAD_PT100_ZONE_2_0X80_1;Sensor_i++)