diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-03-17 14:24:25 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-03-17 14:24:25 +0200 |
| commit | 38feb2cdb472f67d86a217074d9f7568c708dbb4 (patch) | |
| tree | 2f0d11043978a9dafea40232cab138ee6474d60f /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | aa9853ff33557531d89d8ce4f2eb196f45b0a591 (diff) | |
| parent | c8629b193fd4fa38f72905f1c33abe737f81a340 (diff) | |
| download | Tango-38feb2cdb472f67d86a217074d9f7568c708dbb4.tar.gz Tango-38feb2cdb472f67d86a217074d9f7568c708dbb4.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_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 5fe242436..8e4a36e62 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++) { |