aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Control
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2019-03-17 15:07:53 +0200
committerShlomo Hecht <shlomo@twine-s.com>2019-03-17 15:07:53 +0200
commit50cb0b54f51275ee650d4f2c838b1c670da1c8dd (patch)
treed423351789ae48dbd4466b4c937abf8b2a2cd505 /Software/Embedded_SW/Embedded/Modules/Control
parent3ba4bb906d68acb627e8814a97023c68a8ce91cd (diff)
parenta1be0b0db7f8284cac6a9b5c3aecd1c9968c82ce (diff)
downloadTango-50cb0b54f51275ee650d4f2c838b1c670da1c8dd.tar.gz
Tango-50cb0b54f51275ee650d4f2c838b1c670da1c8dd.zip
merge tpf
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c4
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++)
{