diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-05-07 15:27:06 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-05-07 15:27:06 +0300 |
| commit | c17847b396ac6fddfb09f593302c1390c8ba2b53 (patch) | |
| tree | 8336dd8150819d432a7f71c21d197ab37c618b38 /Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | |
| parent | 27edb703322de623299f7203b289a61de1a91754 (diff) | |
| parent | ec7c46b91f779db7317dc7384660bb9d9d370e74 (diff) | |
| download | Tango-c17847b396ac6fddfb09f593302c1390c8ba2b53.tar.gz Tango-c17847b396ac6fddfb09f593302c1390c8ba2b53.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 64784dfcd..af3ba7668 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) { @@ -732,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 (); @@ -742,7 +742,7 @@ uint32_t MillisecLowLoop(uint32_t tick) // #warning TBD need to define the timing if(Whs_emptying_cycle >= 2) { - waste_seq_step1();// include 1Sec delay + //waste_seq_step1();// include 1Sec delay Whs_emptying_cycle = 0; } else |