diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-05-14 08:05:06 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-05-14 08:05:06 +0300 |
| commit | d62893c320429b1fc50c9b86cfaa3345850e46a4 (patch) | |
| tree | 4580556f84ce6ba20b5eacc5313e329c1baa2c87 /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | 2f510ce9b99796ac95510980b9b8e8ea6ca57591 (diff) | |
| download | Tango-d62893c320429b1fc50c9b86cfaa3345850e46a4.tar.gz Tango-d62893c320429b1fc50c9b86cfaa3345850e46a4.zip | |
Dancers Enum changed - unified
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 6bbf1efc3..eaf7e81d8 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -235,8 +235,8 @@ uint32_t MillisecLoop(uint32_t tick) for (Motor_i = 0;Motor_i < NUM_OF_MOTORS;Motor_i++) { -// if (MotorDriverResponse[Motor_i].Busy == true) -// continue; + if (MotorDriverResponse[Motor_i].Busy == true) + 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 @@ -296,9 +296,9 @@ uint32_t MillisecLoop(uint32_t tick) } } } - Dancer_Data[FEEDER_DANCER] = Read_Dancer_Position(ROTENC_RDANCER); - Dancer_Data[POOLER_DANCER] = Read_Dancer_Position(ROTENC_LDANCER1); - Dancer_Data[WINDER_DANCER] = Read_Dancer_Position(ROTENC_LDANCER2); + Dancer_Data[FEEDER_DANCER] = Read_Dancer_Position(FEEDER_DANCER); + Dancer_Data[POOLER_DANCER] = Read_Dancer_Position(POOLER_DANCER); + Dancer_Data[WINDER_DANCER] = Read_Dancer_Position(WINDER_DANCER); if (Hundred_msTick) { } |