diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-02-04 22:57:48 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-02-04 22:57:48 +0200 |
| commit | aa90e13fd628c6b03b37ff7a81d3a12864e8da81 (patch) | |
| tree | 581bc58a8252cf63401abf0edbed15b8082c26ce /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | aa802e75d05ef92bb024c151000a1ba0cd310629 (diff) | |
| parent | 8d9a11659c8ae789eaf7000b712b60b90d27e033 (diff) | |
| download | Tango-aa90e13fd628c6b03b37ff7a81d3a12864e8da81.tar.gz Tango-aa90e13fd628c6b03b37ff7a81d3a12864e8da81.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index eb4d0a49a..10286853e 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -420,6 +420,7 @@ uint32_t MillisecLoop(uint32_t tick) 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); + return OK; } uint32_t MillisecLowLoop(uint32_t tick) @@ -445,6 +446,7 @@ uint32_t MillisecLowLoop(uint32_t tick) //Speed_Data = Calculate_Speed_Sensor_Velocity(); //MillisecReadFromTempSensor(Sensor_Read, NULL); //if (Sensor_Read++ >= MAX_TEMPERATURE_SENSOR_ID) Sensor_Read = 0; + //Control_LED1_PWM(); } if (Hundred_msTick) { |