From 1a3a15ed7845e68ba473c69a4842d8617bc41c11 Mon Sep 17 00:00:00 2001 From: Avi Levkovich Date: Thu, 17 May 2018 15:25:34 +0300 Subject: Update PT100 (ADS1220) module after integration --- Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 eaf7e81d8..109cf87d9 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -217,7 +217,7 @@ int32_t MillisecReadFromMotor(TimerMotors_t MotorId, unsigned long Data, int Len } uint32_t MillisecLoop(uint32_t tick) { - TimerMotors_t Motor_i; + unsigned int Motor_i; TEMPERATURE_SENSOR_ID_ENUM Sensor_i; unsigned int MotorInfo = 0; //call all modules Millisec functions @@ -239,7 +239,7 @@ uint32_t MillisecLoop(uint32_t tick) continue; if (MotorData[Motor_i].WaitForData == true) //Read request sent, data is waiting { - if (MotorGetFPGAResponse(Motor_i,&MotorInfo) == OK) //got the data from the FPGA + if (MotorGetFPGAResponse((TimerMotors_t)Motor_i,&MotorInfo) == OK) //got the data from the FPGA { MotorData[Motor_i].WaitForData = false; if (MotorData[Motor_i].Callback) @@ -248,13 +248,13 @@ uint32_t MillisecLoop(uint32_t tick) } if (SpeedSetPending[Motor_i].Active == true) { - MotorSendFPGARequest(Motor_i,SpeedSetPending[Motor_i].Data,SpeedSetPending[Motor_i].Length); + MotorSendFPGARequest((TimerMotors_t)Motor_i,SpeedSetPending[Motor_i].Data,SpeedSetPending[Motor_i].Length); if (SpeedSetPending[Motor_i].Callback) SpeedSetPending[Motor_i].Callback(Motor_i,0); } else if (Mailbox_pend(MotorsMsgQ[Motor_i] , &MotorData[Motor_i], BIOS_NO_WAIT)==true) { - if (MotorSendFPGARequest(Motor_i,MotorData[Motor_i].Data,MotorData[Motor_i].Length) == OK) //sent the data to the FPGA + if (MotorSendFPGARequest((TimerMotors_t)Motor_i,MotorData[Motor_i].Data,MotorData[Motor_i].Length) == OK) //sent the data to the FPGA { if (MotorData[Motor_i].DataRequired == true) { -- cgit v1.3.1