diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-06-21 17:31:57 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-06-21 17:31:57 +0300 |
| commit | b361b1ca7d7bf63b3bc1496cb3351d6332ea25d3 (patch) | |
| tree | c57df334e98f9f3fa44a2f41b756729aac802f9f /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | ff480b1273e4be73c16479af289cf5c94eed662c (diff) | |
| parent | 49d033e9abb82d2d2853f4e1ddacb37abedd9fda (diff) | |
| download | Tango-b361b1ca7d7bf63b3bc1496cb3351d6332ea25d3.tar.gz Tango-b361b1ca7d7bf63b3bc1496cb3351d6332ea25d3.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.c | 2 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 3066153ab..1f48d5953 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -30,6 +30,8 @@ #include "drivers/Heater/TemperatureSensor.h" #include "drivers/FPGA/FPGA_SPI_Comm.h" #include "drivers/FPGA/FPGA.h" +#include "drivers/Valves/Valve.h" +#include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h" #include "modules/thread/thread_ex.h" #include "modules/ids/ids_ex.h" diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h index 807b81e98..3f0b5f1f9 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h @@ -17,6 +17,7 @@ typedef uint32_t (* MSecFptr)(uint32_t deviceID, uint32_t ReadValue); int32_t MillisecWriteToMotor(TimerMotors_t MotorId, unsigned long Data, int Length, MSecFptr Callback); int32_t MillisecSetMotorSpeed(TimerMotors_t MotorId, unsigned long Data, int Length, MSecFptr Callback); int32_t MillisecReadFromMotor(TimerMotors_t MotorId, unsigned long Data, int Length, MSecFptr Callback); +int MillisecFlushMsgQ(TimerMotors_t MotorId); int32_t MillisecReadFromTempSensor(uint32_t TempSensorId, MSecFptr Callback); int MillisecFlushMsgQ(TimerMotors_t MotorId); |