diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-06-04 10:29:10 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-06-04 10:29:10 +0300 |
| commit | 922546a39a76280382a82607ed1f54e565f1d71e (patch) | |
| tree | 19fd4cfb950bd3b3496f9a58144e98e6f1e94e78 /Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | |
| parent | 08e54b8c5cc6339f0abd2b478a9eff99a7318e14 (diff) | |
| parent | 2a0e5736df4a6514baeea815152528632c285478 (diff) | |
| download | Tango-922546a39a76280382a82607ed1f54e565f1d71e.tar.gz Tango-922546a39a76280382a82607ed1f54e565f1d71e.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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index cb1be7fa5..b5797e749 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -501,6 +501,8 @@ uint32_t MillisecLowLoop(uint32_t tick) //gather Motor data from FPGA //ROM_IntMasterDisable(); + //Screw_ENC_Velocity_to_DAC(); - for testing the screw enc + if (Ten_msTick) { //Speed_Data = Calculate_Speed_Sensor_Velocity(); @@ -563,13 +565,13 @@ uint32_t MillisecLowLoop(uint32_t tick) DrawerFansStatus = temp & 0x1F; SystemFansStatus = temp & 0xE0; //KeepAliveOneSecondCall(); - for (Motor_i = 0;Motor_i < NUM_OF_MOTORS;Motor_i++) + /*for (Motor_i = 0;Motor_i < NUM_OF_MOTORS;Motor_i++) { if (Motor_i == HARDWARE_MOTOR_TYPE__MOTO_SCREW) continue; // if (isMotorConfigured(Motor_i)) MotorGetStatusFromFPGA(Motor_i); - } + }*/ if (!(OneMinute_Tick)) { for (Heater_i = 0;Heater_i < NUM_OF_CURRENT_HEATERS;Heater_i++) |