aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Control
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2018-06-13 15:17:43 +0300
committerShlomo Hecht <shlomo@twine-s.com>2018-06-13 15:17:43 +0300
commit9d4d0c084e084273ae62fd09863142aa2f6ef53d (patch)
treee2b968a3dbaa8e363066803cb8aa5e528bb83f06 /Software/Embedded_SW/Embedded/Modules/Control
parentf502659ef54f1f798952089989923d1e76ab06cb (diff)
parent0d5c2e03b1f0e06cd307eaa2d5b7eaab894126d5 (diff)
downloadTango-9d4d0c084e084273ae62fd09863142aa2f6ef53d.tar.gz
Tango-9d4d0c084e084273ae62fd09863142aa2f6ef53d.zip
merge - all thread module related, used my code
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 a1de29b08..847b777fa 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -31,6 +31,7 @@
#include "drivers/FPGA/FPGA.h"
#include "modules/thread/thread_ex.h"
+#include "Drivers/Peripheral_GPIO/GPIO.h"
Task_Handle Millisecond_Task_Handle;
/******************** Definitions ********************************************/
@@ -236,7 +237,6 @@ uint32_t MillisecLoop(uint32_t tick)
FPGA_Read_limit_Switches_Registers();
//Read_FPGA_GPI_Rgisters();//FPGA_Read_limit_Switches();
#endif
-
temp += MotorActivity;
if (MotorActivity)
{
@@ -340,6 +340,7 @@ uint32_t MillisecLoop(uint32_t tick)
{
for (Sensor_i = 0;Sensor_i < MAX_TEMPERATURE_SENSOR_ID;Sensor_i++)
MillisecReadFromTempSensor(Sensor_i, NULL);
+ ACTIVITY_RED_LED_CHANGE_MODE;
}
if (Onesecond_Tick)