aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Control
diff options
context:
space:
mode:
authorRoy Ben Shabat <Roy.mail.net@gmail.com>2019-03-11 08:56:21 +0200
committerRoy Ben Shabat <Roy.mail.net@gmail.com>2019-03-11 08:56:21 +0200
commit8c72f411d06dfd663347bef9adaad195fd060edc (patch)
tree1db085b8723dabf9b383bf84fcb957abc5dc784e /Software/Embedded_SW/Embedded/Modules/Control
parent8d3a394993673df4b9fab8bee62f4ac8b25e1a5a (diff)
parent719d6a683c0f7bfdef232003385e5da14c4522e7 (diff)
downloadTango-8c72f411d06dfd663347bef9adaad195fd060edc.tar.gz
Tango-8c72f411d06dfd663347bef9adaad195fd060edc.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.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 8e4a36e62..5fe242436 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++)
{