From 0ceddf4eb2f986b3623349fbbfe614328e9937df Mon Sep 17 00:00:00 2001
From: Avi Levkovich <avi@twine-s.com>
Date: Sun, 10 Nov 2019 10:13:28 +0200
Subject: Head card PT100

---
 .../Embedded/Modules/Control/MillisecTask.c        | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'Software/Embedded_SW/Embedded/Modules/Control')

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index d9af23cac..4003581c0 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -54,7 +54,7 @@
 
 #include "Communication/Connection.h"
 #include "Modules/General/buttons.h"
-#include "Drivers/I2C_Communication/Head_Card/PT100/PT100_ADC.h"
+#include "Drivers/I2C_Communication/Head_Card/PT100/Head_PT100_ADC.h"
 
 Task_Handle Millisecond_Task_Handle;
 /******************** Definitions  ********************************************/
@@ -103,7 +103,7 @@ MillisecMotorDataStruc ScrewSetMaxSpeedPending = {0};
 MillisecMotorDataStruc ScrewMovePending = {0};
 MillisecMotorDataStruc MotorData[NUM_OF_MOTORS] = {0};
 MillisecMotorDataStruc SpeedSetPending[NUM_OF_MOTORS] = {0};
-MillisecMotorDataStruc PT100Data[MAX_MAIN_CARD_TEMPERATURE_SENSOR_ID] = {0};
+MillisecMotorDataStruc PT100Data[MAX_MAIN_CARD_TEMP_SENS_ID] = {0};
 /******************** GLOBAL PARAMETERS  ********************************************/
 Mailbox_Handle          MillisecMsgQ = NULL;
 Mailbox_Handle          TenMillisecMsgQ = NULL;
@@ -228,7 +228,7 @@ void OneMilliSecondMillisecInterrupt(UArg arg0)
 uint32_t PT100Activity = 0;
 int32_t MillisecReadFromTempSensor(uint32_t TempSensorId,  MSecFptr Callback)
 {
-    if (TempSensorId >= MAX_MAIN_CARD_TEMPERATURE_SENSOR_ID) return -1;
+    if (TempSensorId >= MAX_MAIN_CARD_TEMP_SENS_ID) return -1;
     PT100Activity++; //read request
     PT100Data[TempSensorId].Callback = Callback;
     PT100Data[TempSensorId].Active = true;
@@ -421,7 +421,7 @@ uint32_t MillisecLoop(uint32_t tick)
            }*/
            if (PT100Data[Sensor_i].Active == true)
            {
-               if(Sensor_i < MAX_MAIN_CARD_TEMPERATURE_SENSOR_ID)
+               if(Sensor_i < MAX_MAIN_CARD_TEMP_SENS_ID)
                {
                    TemperatureSendSensorDummyClk(Sensor_i);
                }
@@ -431,15 +431,15 @@ uint32_t MillisecLoop(uint32_t tick)
            }
            else if (PT100Data[Sensor_i].WaitForData == true) //Read request sent, data is waiting
            {
-               if(Sensor_i < MAX_MAIN_CARD_TEMPERATURE_SENSOR_ID)
+               if(Sensor_i < MAX_MAIN_CARD_TEMP_SENS_ID)
                {
                    TemperatureSensorReadFromFPGA_Res(Sensor_i); //got the data from the FPGA
                }
-               else if(Sensor_i < MAX_HEAD_CARD_TEMPERATURE_SENSOR_ID)
+               else if(Sensor_i < MAX_HEAD_CARD_TEMP_SENS_ID)
                {
                    HeadADCPT100_SendReadDataCommand(Sensor_i);
                }
-               else if(Sensor_i < MAX_WHS_CARD_TEMPERATURE_SENSOR_ID)
+               else if(Sensor_i < MAX_WHS_CARD_TEMP_SENS_ID)
                {
                    //for WHS...
                }
@@ -456,15 +456,15 @@ uint32_t MillisecLoop(uint32_t tick)
            }
            else if (PT100Data[Sensor_i].SyncRequired == true)
            {
-               if(Sensor_i < MAX_MAIN_CARD_TEMPERATURE_SENSOR_ID)
+               if(Sensor_i < MAX_MAIN_CARD_TEMP_SENS_ID)
                {
                    TemperatureSensorSync(Sensor_i);
                }
-               else if(Sensor_i < MAX_HEAD_CARD_TEMPERATURE_SENSOR_ID)
+               else if(Sensor_i < MAX_HEAD_CARD_TEMP_SENS_ID)
                {
                    HeadADCPT100_StartSync(Sensor_i);
                }
-               else if(Sensor_i < MAX_WHS_CARD_TEMPERATURE_SENSOR_ID)
+               else if(Sensor_i < MAX_WHS_CARD_TEMP_SENS_ID)
                {
                    //StartSync WHS...
                }
@@ -489,11 +489,11 @@ uint32_t MillisecLoop(uint32_t tick)
 #endif
     return OK;
 }
-int TemperatureSum[MAX_MAIN_CARD_TEMPERATURE_SENSOR_ID];
-int TemperatureMin[MAX_MAIN_CARD_TEMPERATURE_SENSOR_ID];
-int TemperatureMax[MAX_MAIN_CARD_TEMPERATURE_SENSOR_ID];
-int TemperatureCount[MAX_MAIN_CARD_TEMPERATURE_SENSOR_ID];
-int TemperatureCalc[MAX_MAIN_CARD_TEMPERATURE_SENSOR_ID];
+int TemperatureSum[MAX_MAIN_CARD_TEMP_SENS_ID];
+int TemperatureMin[MAX_MAIN_CARD_TEMP_SENS_ID];
+int TemperatureMax[MAX_MAIN_CARD_TEMP_SENS_ID];
+int TemperatureCount[MAX_MAIN_CARD_TEMP_SENS_ID];
+int TemperatureCalc[MAX_MAIN_CARD_TEMP_SENS_ID];
 void MillisecUpdateTemperatures (TEMPERATURE_SENSOR_ID_ENUM SensorId,int temperature)
 {
    //if(TemperatureCount[SensorId]++>=10)
@@ -559,7 +559,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
     }
     if (m90msecTick)
     {
-        for (Sensor_i = 0;Sensor_i < MAX_MAIN_CARD_TEMPERATURE_SENSOR_ID;Sensor_i++)
+        for (Sensor_i = 0;Sensor_i < MAX_MAIN_CARD_TEMP_SENS_ID;Sensor_i++)
         {
             MillisecReadFromTempSensor(Sensor_i, NULL);
         }
@@ -569,7 +569,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
         Speed_Data = Calculate_Speed_Sensor_Velocity();
         Read_Buttons_Reg();
         //Ink_Cart_Led();
-        for (Sensor_i = 0;Sensor_i < MAX_MAIN_CARD_TEMPERATURE_SENSOR_ID;Sensor_i++)
+        for (Sensor_i = 0;Sensor_i < MAX_MAIN_CARD_TEMP_SENS_ID;Sensor_i++)
         {
             MillisecUpdateTemperatures (Sensor_i,TemperatureSensorRead(Sensor_i));
         }
@@ -627,7 +627,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
                 Read_Heaters_Current(Heater_i);
             }*/
         }
-        for (Sensor_i = 0;Sensor_i < MAX_MAIN_CARD_TEMPERATURE_SENSOR_ID;Sensor_i++)
+        for (Sensor_i = 0;Sensor_i < MAX_MAIN_CARD_TEMP_SENS_ID;Sensor_i++)
         {
             TemperatureCalc[Sensor_i] =  MillisecCalculateTemperatures ( Sensor_i);
         }
-- 
cgit v1.3.1