aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Control
diff options
context:
space:
mode:
authorAvi Levkovich <avi@twine-s.com>2019-02-24 17:09:01 +0200
committerAvi Levkovich <avi@twine-s.com>2019-02-24 17:09:01 +0200
commit49823de1fda9ba72975dbc5ed466b574aec09fbe (patch)
tree5a7277a60fb76e6c51734b8b8ea73cab986d7a2d /Software/Embedded_SW/Embedded/Modules/Control
parent75381123e36a391afd356b2dd2c059e5dfcf12a1 (diff)
parent4eb01c45da6203949dbed98d3be1fbde79e697c8 (diff)
downloadTango-49823de1fda9ba72975dbc5ed466b574aec09fbe.tar.gz
Tango-49823de1fda9ba72975dbc5ed466b574aec09fbe.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.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 5943c11c5..471833dc5 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -428,7 +428,7 @@ uint32_t MillisecLoop(uint32_t tick)
}
uint32_t MillisecLowLoop(uint32_t tick)
{
- uint8_t Motor_i,Disp_i;
+ uint8_t Motor_i,Disp_i,Heater_i;
TEMPERATURE_SENSOR_ID_ENUM Sensor_i;
//static int temp=0;
@@ -489,6 +489,10 @@ uint32_t MillisecLowLoop(uint32_t tick)
if (isMotorConfigured(Motor_i))
MotorGetStatusFromFPGA(Motor_i);
}
+ for (Heater_i = 0;Heater_i < NUM_OF_HEATERS;Heater_i++)
+ {
+ Read_Head_MixChip_Heaters_Current(Heater_i);
+ }
}
if (OneMinute_Tick)
{