diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-05-17 17:34:44 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-05-17 17:34:44 +0300 |
| commit | ede7471b32b1157ee932fa8f6e7918b8f147b36e (patch) | |
| tree | 831dfeb19a1e8941cc5b3ab1120af0e6a1130528 /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | 46319e63c88d7b8277f80051c499f94e1b8e18c4 (diff) | |
| parent | b9c99b358ba0124e32a12f401b7054ce1f85f18c (diff) | |
| download | Tango-ede7471b32b1157ee932fa8f6e7918b8f147b36e.tar.gz Tango-ede7471b32b1157ee932fa8f6e7918b8f147b36e.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 2fe813395..11095b757 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -218,7 +218,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 @@ -241,7 +241,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) @@ -250,13 +250,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) { |