aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Control
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-03-24 15:32:35 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-03-24 15:32:35 +0200
commit0aaf60dbc0322abc6707b5cf057d797fc26a1734 (patch)
treebf99b8f43808960054121e036082a629cb4e6d6d /Software/Embedded_SW/Embedded/Modules/Control
parent0aafe6fb38d19e8474483c4b8a28ce645c53045f (diff)
parentc4be36f27bc7c0fa9d0153d6d09ab13bc1826ee8 (diff)
downloadTango-0aaf60dbc0322abc6707b5cf057d797fc26a1734.tar.gz
Tango-0aaf60dbc0322abc6707b5cf057d797fc26a1734.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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 88877f113..738f59686 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -474,6 +474,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
if (Hundred_msTick)
{
Speed_Data = Calculate_Speed_Sensor_Velocity();
+ Read_Buttons_Reg();
for (Sensor_i = 0;Sensor_i < MAX_TEMPERATURE_SENSOR_ID;Sensor_i++)
{
MillisecReadFromTempSensor(Sensor_i, NULL);
@@ -510,7 +511,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
if (isMotorConfigured(Motor_i))
MotorGetStatusFromFPGA(Motor_i);
}
- for (Heater_i = 0;Heater_i < NUM_OF_HEATERS;Heater_i++)
+ for (Heater_i = 0;Heater_i < NUM_OF_CURRENT_HEATERS;Heater_i++)
{
Read_Heaters_Current(Heater_i);
}