aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-06-18 16:52:16 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-06-18 16:52:16 +0300
commit2baa6b0a84284804c699c48b0bbbde85cd8d3975 (patch)
treed2b789c59521c2a7e7fe331c9ebb9b58a1e9da68 /Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
parent054debe0f90ef6312f669963c2c62810fc766a8d (diff)
parent0bd5bb08169bf0c72dc686b48b12499f61122958 (diff)
downloadTango-2baa6b0a84284804c699c48b0bbbde85cd8d3975.tar.gz
Tango-2baa6b0a84284804c699c48b0bbbde85cd8d3975.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 312f970d6..67de0271f 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -16,6 +16,7 @@
///////////////////////////////////////////////////////////////////////////////////////////
#include "include.h"
#include "Modules/General/GeneralHardware.h"
+#include "Modules/AlarmHandling/AlarmHandling.h"
#include "MillisecTask.h"
#include <driverlib/timer.h>
@@ -342,6 +343,7 @@ uint32_t MillisecLoop(uint32_t tick)
{
for (Sensor_i = 0;Sensor_i < MAX_TEMPERATURE_SENSOR_ID;Sensor_i++)
MillisecReadFromTempSensor(Sensor_i, NULL);
+ AlarmHandler_SendDiagnostics();
}
if (O900Millisecond_Tick)