diff options
| author | Avi Levkovich <avi@twine-s.com> | 2019-03-17 09:44:03 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2019-03-17 09:44:03 +0200 |
| commit | 389b9711ec229f68313bf5da391f05d49bb36434 (patch) | |
| tree | 6340656a31819a75de447dabe64bedd0c90ac7b5 /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | 0e214df453878313d70065f68679a5a0267b0591 (diff) | |
| parent | c5e354289baee800f4cf93b6df1836a133c1addf (diff) | |
| download | Tango-389b9711ec229f68313bf5da391f05d49bb36434.tar.gz Tango-389b9711ec229f68313bf5da391f05d49bb36434.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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 3ccb523c6..59aebd21a 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -499,9 +499,9 @@ uint32_t MillisecLowLoop(uint32_t tick) //Read_MidTank_Pressure_Sensor(Disp_i); } FPGA_GetAllDispensersValveBusyOCD(); - /*temp = Read_Fans_Tacho(); + temp = Read_Fans_Tacho(); DrawerFansStatus = temp & 0x1F; - SystemFansStatus = temp & 0xE0;*/ + SystemFansStatus = temp & 0xE0; KeepAliveOneSecondCall(); for (Motor_i = 0;Motor_i < NUM_OF_MOTORS;Motor_i++) { |