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

1 files changed, 26 insertions, 20 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index d31ea3c05..e0d1e38de 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -275,19 +275,19 @@ int32_t MillisecSetMotorSpeed(TimerMotors_t MotorId, unsigned long Data, int Len
 }
 int MillisecFlushMsgQ(TimerMotors_t MotorId)
 {
-    MillisecMotorDataStruc MotorData = {0};
+    MillisecMotorDataStruc MotorInfo = {0};
     int pend = Mailbox_getNumPendingMsgs(MotorsMsgQ[MotorId]);
     int i;
     if (pend)
     {
         for (i=0;i<pend;i++)
-            Mailbox_pend(MotorsMsgQ[MotorId] , &MotorData, BIOS_NO_WAIT);
+            Mailbox_pend(MotorsMsgQ[MotorId] , &MotorInfo, BIOS_NO_WAIT);
     }
    return pend;
 }
 int32_t MillisecWriteToMotor(TimerMotors_t MotorId, unsigned long Data, int Length, MSecFptr Callback)
 {
-    MillisecMotorDataStruc MotorData = {0};
+    MillisecMotorDataStruc MotorInfo = {0};
     //==========================
     if ((MotorId == HARDWARE_MOTOR_TYPE__MOTO_WINDER)||
         (MotorId == HARDWARE_MOTOR_TYPE__MOTO_RDRIVING)||
@@ -304,17 +304,17 @@ int32_t MillisecWriteToMotor(TimerMotors_t MotorId, unsigned long Data, int Leng
     //==========================
     if (MotorId >= NUM_OF_MOTORS) return -1;
     MotorActivity++;
-    MotorData.Callback = Callback;
-    MotorData.Data = Data;
-    MotorData.Length = Length;
-    MotorData.DataRequired = false;
+    MotorInfo.Callback = Callback;
+    MotorInfo.Data = Data;
+    MotorInfo.Length = Length;
+    MotorInfo.DataRequired = false;
     if (MotorsMsgQ[MotorId] != NULL)
-        return Mailbox_post(MotorsMsgQ[MotorId] , &MotorData, BIOS_NO_WAIT);
+        return Mailbox_post(MotorsMsgQ[MotorId] , &MotorInfo, BIOS_NO_WAIT);
     else return false;
 }
 int32_t MillisecReadFromMotor(TimerMotors_t MotorId, unsigned long Data, int Length, MSecFptr Callback)
 {
-    MillisecMotorDataStruc MotorData = {0};
+    MillisecMotorDataStruc MotorInfo = {0};
     if (MotorId >= NUM_OF_MOTORS) return -1;
 //==========================
     if ((MotorId == HARDWARE_MOTOR_TYPE__MOTO_WINDER)||
@@ -332,12 +332,12 @@ int32_t MillisecReadFromMotor(TimerMotors_t MotorId, unsigned long Data, int Len
     //==========================
     MotorActivity++;
     MotorActivity++;
-    MotorData.Callback = Callback;
-    MotorData.Data = Data;
-    MotorData.Length = Length;
-    MotorData.DataRequired = true;
+    MotorInfo.Callback = Callback;
+    MotorInfo.Data = Data;
+    MotorInfo.Length = Length;
+    MotorInfo.DataRequired = true;
     if (MotorsMsgQ[MotorId] != NULL)
-        return Mailbox_post(MotorsMsgQ[MotorId] , &MotorData, BIOS_NO_WAIT);
+        return Mailbox_post(MotorsMsgQ[MotorId] , &MotorInfo, BIOS_NO_WAIT);
     else return false;
 }
 
@@ -417,7 +417,7 @@ uint32_t MillisecLoop(uint32_t tick)
    if (PT100Activity)
    {
 
-       for (Sensor_i = 0;Sensor_i < MAX_TANGO_TEMPERATURE_SENSOR_ID;Sensor_i++)
+       for (Sensor_i = 0;Sensor_i < MAX_MAIN_CARD_TEMP_SENS_ID;Sensor_i++)
        {
            /*if (TempSensorResponse[Sensor_i].Busy == true)
            {
@@ -582,7 +582,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
     //call all modules Millisec functions
     //test dancers and speed encoders
     //check all callback units (state machine waiting for completion of a change)
-    bool Ten_msTick, Fifty_msTick, Hundred_msTick , m20msecTick,m70msecTick,m90msecTick, Onesecond_Tick,OneMinute_Tick,OneHourTick,Gradient_Tick;
+    bool Ten_msTick, Fifty_msTick, Hundred_msTick , m20msecTick,m70msecTick,m90msecTick, Onesecond_Tick,Tensecond_Tick,OneMinute_Tick,OneHourTick,Gradient_Tick;
     bool O700Millisecond_Tick,O200Millisecond_Tick,O400Millisecond_Tick,O500Millisecond_Tick,O600Millisecond_Tick;
     //bool O100Millisecond_Tick,O200Millisecond_Tick,O400Millisecond_Tick,O500Millisecond_Tick,O600Millisecond_Tick,O800Millisecond_Tick,O900Millisecond_Tick;
     Ten_msTick      =   (tick%eTenMillisecond == 0)      ?true:false;
@@ -600,6 +600,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
     //O900Millisecond_Tick  =   (tick%eOneSecond == 900)           ?true:false;
     Gradient_Tick  =   (tick%400 == 0)           ?true:false;
     Onesecond_Tick  =   (tick%eOneSecond == 0)           ?true:false;
+    Tensecond_Tick  =   (tick%10000 == 0)           ?true:false;
     OneMinute_Tick  =   (tick%eOneMinute == 0)           ?true:false;
     OneHourTick  =   (tick%eOneHour == 0)           ?true:false;
     realtimetest[(tick%1000)/10]++;
@@ -731,7 +732,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
         }
         if (WHS_Type == WHS_TYPE_NEW)
         {
-            Trigger_WHS_PT100_Read_All();
+            //Trigger_WHS_PT100_Read_All();
             WHS_Blower_Avarege(HEAD_FLOW_METER);
             WHS_Blower_Avarege(DRIER_FLOW_METER);
             WHS_Start_Blower_Control_Closed_Loop ();
@@ -751,13 +752,16 @@ uint32_t MillisecLowLoop(uint32_t tick)
 
         }
     }
-    if (OneMinute_Tick)
+    if (Tensecond_Tick)
     {
         //Trigger_MidTank_Pressure_Read();
         for (Disp_i = 0;Disp_i < MAX_SYSTEM_DISPENSERS;Disp_i++)
         {
             Read_MidTank_Pressure_Sensor(Disp_i);
         }
+    }
+    if (OneMinute_Tick)
+    {
 //        MachineUpdateResponseFunc();
         /*        for (Motor_i = 0;Motor_i < NUM_OF_MOTORS;Motor_i++)
         {
@@ -767,8 +771,10 @@ uint32_t MillisecLowLoop(uint32_t tick)
                 MotorGetStatusFromFPGA(Motor_i);
         }*/
         midtankDisplay = 1-midtankDisplay;
-        if (WHS_Type == WHS_TYPE_UNKNOWN)
-            Gas_PPM_Info = Calculate_Gas_Power_Consumption();
+        /*if (WHS_Type == WHS_TYPE_UNKNOWN)
+            Gas_PPM_Info = Calculate_Gas_Power_Consumption();*/
+        if (WHS_Type == WHS_TYPE_NEW)
+            ReportWithPackageFilter(ThreadFilter,"waste tank calculate level",__FILE__,__LINE__,(int)(GetWHSWasteTankLevelMiliLiter()*1000),RpWarning,(int) msec_millisecondCounter,0);
         //Trigger_WHS_MAX11614_Read_allADC();
 #ifdef CONTROL_DEBUG
         ResetControlTime();