diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-10-24 17:08:45 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-10-24 17:08:45 +0300 |
| commit | b63e2f557d781fa3cfcf8e6b9c784641c0c8927f (patch) | |
| tree | 687c2d25f1a06f0f8a20d44a365eac33355c20f3 /Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | |
| parent | 87e24883ea2c5f1947943547cff29357bc8cbd2f (diff) | |
| parent | 50ed121723c0dad1ce5d1af7f2a12a56ae2ba8a7 (diff) | |
| download | Tango-b63e2f557d781fa3cfcf8e6b9c784641c0c8927f.tar.gz Tango-b63e2f557d781fa3cfcf8e6b9c784641c0c8927f.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c')
| -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 8e67de0f1..641a249ff 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -548,7 +548,7 @@ uint32_t MillisecLowLoop(uint32_t tick) { if (watchdogCriticalAlarm == false) { - Control_WD(ENABLE,5); //activate heaters/dispenser watchdog, 0.5 seconds + Control_WD(ENABLE,10); //activate heaters/dispenser watchdog, 0.5 seconds //LOG_ERROR (1111, "Control_WD"); } } @@ -586,8 +586,8 @@ uint32_t MillisecLowLoop(uint32_t tick) //KeepAliveOneSecondCall(); for (Motor_i = 0;Motor_i < NUM_OF_MOTORS;Motor_i++) { - // if (Motor_i == HARDWARE_MOTOR_TYPE__MOTO_SCREW) - // continue; // + if (Motor_i == HARDWARE_MOTOR_TYPE__MOTO_SCREW) + continue; // if (isMotorConfigured(Motor_i)) MotorGetStatusFromFPGA(Motor_i); } @@ -595,7 +595,7 @@ uint32_t MillisecLowLoop(uint32_t tick) { for (Heater_i = 0;Heater_i < NUM_OF_CURRENT_HEATERS;Heater_i++) { - Read_Heaters_Current(Heater_i); + //Read_Heaters_Current(Heater_i); } } for (Sensor_i = 0;Sensor_i < MAX_TEMPERATURE_SENSOR_ID;Sensor_i++) @@ -623,7 +623,7 @@ uint32_t MillisecLowLoop(uint32_t tick) } if (OneHourTick) { -#define PUMP_LIMIT 8 +#define PUMP_LIMIT 4 PumpCounter++; if (PumpCounter>=PUMP_LIMIT) { |