diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-08-06 08:15:53 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-08-06 08:15:53 +0300 |
| commit | db2ff630640c1f2ae5df69a80a883dc8f5de17e1 (patch) | |
| tree | a29ceb8184827181d0b6addab70d742f3b0b282b /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | 266c4dd5f8ae09d7e601f7ef8a62642aba00dcb0 (diff) | |
| download | Tango-db2ff630640c1f2ae5df69a80a883dc8f5de17e1.tar.gz Tango-db2ff630640c1f2ae5df69a80a883dc8f5de17e1.zip | |
evaluation board adjustments, uart clock timer
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 4 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/control.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index e2ff16d5a..cc0d00f20 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -387,14 +387,14 @@ uint32_t MillisecLoop(uint32_t tick) { Speed_Data = Read_Speed_Sensor(); } -/* 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++) 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(); |
