diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-08-06 16:12:38 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-08-06 16:12:38 +0300 |
| commit | 778408ff6140099aace10a915bc0296d71f967fe (patch) | |
| tree | 40bbfabe96128d777f793f0b8d14b059d0f88ce2 /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | 65d06cf7d023cfed8a1619cb2f81279b1d5096f8 (diff) | |
| parent | ce34a07e9ae75c9172425322248dc2fd1754852e (diff) | |
| download | Tango-778408ff6140099aace10a915bc0296d71f967fe.tar.gz Tango-778408ff6140099aace10a915bc0296d71f967fe.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 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/control.c | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index d587f4a4a..559db0e79 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -389,23 +389,23 @@ uint32_t MillisecLoop(uint32_t tick) { Speed_Data = Calculate_Speed_Sensor_Velocity(); } - if (Tick98) + /*if (Tick98) { MotorGetSpeedFromFPGA(HARDWARE_MOTOR_TYPE__MOTO_RDRIVING); MotorGetSpeedFromFPGA(HARDWARE_MOTOR_TYPE__MOTO_DRYER_DRIVING); MotorGetSpeedFromFPGA(HARDWARE_MOTOR_TYPE__MOTO_LDRIVING); MotorGetSpeedFromFPGA(HARDWARE_MOTOR_TYPE__MOTO_WINDER); MotorGetSpeedFromFPGA(HARDWARE_MOTOR_TYPE__MOTO_SCREW); - } + }*/ if (Hundred_msTick) { for (Sensor_i = 0;Sensor_i < MAX_TEMPERATURE_SENSOR_ID;Sensor_i++) MillisecReadFromTempSensor(Sensor_i, NULL); - MotorGetSpeedFromFPGA_Res(HARDWARE_MOTOR_TYPE__MOTO_RDRIVING); + /* MotorGetSpeedFromFPGA_Res(HARDWARE_MOTOR_TYPE__MOTO_RDRIVING); MotorGetSpeedFromFPGA_Res(HARDWARE_MOTOR_TYPE__MOTO_DRYER_DRIVING); MotorGetSpeedFromFPGA_Res(HARDWARE_MOTOR_TYPE__MOTO_LDRIVING); MotorGetSpeedFromFPGA_Res(HARDWARE_MOTOR_TYPE__MOTO_WINDER); - MotorGetSpeedFromFPGA_Res(HARDWARE_MOTOR_TYPE__MOTO_SCREW); + MotorGetSpeedFromFPGA_Res(HARDWARE_MOTOR_TYPE__MOTO_SCREW);*/ } if (O900Millisecond_Tick) diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.c b/Software/Embedded_SW/Embedded/Modules/Control/control.c index 60322b4d7..6a9735c13 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/control.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/control.c @@ -293,8 +293,10 @@ uint32_t ControlLoop(uint32_t tick) bool Ten_msTick, Hundred_msTick, Onesecond_Tick,Tick98,Tick998; Ten_msTick = (tick%eTenMillisecond == 0) ?true:false; Hundred_msTick = (tick%eHundredMillisecond == 0) ?true:false; +// Hundred_msTick = (tick%200 == 0) ?true:false; Onesecond_Tick = (tick%eOneSecond == 0) ?true:false; - Tick98 = (tick%eHundredMillisecond == 99) ?true:false; + Tick98 = (tick%eHundredMillisecond == 98) ?true:false; +// Tick98 = (tick%200 == 199) ?true:false; Tick998 = (tick%eOneSecond == 996) ?true:false; //ROM_IntMasterDisable(); |