diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-07-23 18:31:18 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-07-23 18:31:18 +0300 |
| commit | 17a32af2a2500d6da0e59d3085ddfd43d0ee5270 (patch) | |
| tree | 149f3cdc8ef8564ca43c641bac9bc2a8a9df8ebe /Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | |
| parent | 0f9ed0892d136072c1e5b82c14aa401e84a5ce4f (diff) | |
| parent | 375f5b1f1a4f9d37019b8c3ec690f963426f3f5f (diff) | |
| download | Tango-17a32af2a2500d6da0e59d3085ddfd43d0ee5270.tar.gz Tango-17a32af2a2500d6da0e59d3085ddfd43d0ee5270.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 84e3bf56e..c1fcd4030 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -49,6 +49,7 @@ #include "Communication/Connection.h" #include "Modules/General/buttons.h" +#include "Drivers/I2C_Communication/Head_Card/PT100/PT100_ADC.h" Task_Handle Millisecond_Task_Handle; /******************** Definitions ********************************************/ @@ -414,14 +415,21 @@ uint32_t MillisecLoop(uint32_t tick) }*/ if (PT100Data[Sensor_i].Active == true) { - TemperatureSendSensorDummyClk(Sensor_i); + #ifndef Use_Head_Card + TemperatureSendSensorDummyClk(Sensor_i); + #endif PT100Data[Sensor_i].Active = false; PT100Data[Sensor_i].WaitForData = true; // mark the motor for data request next round break; // one PT100 activitiy per MS } else if (PT100Data[Sensor_i].WaitForData == true) //Read request sent, data is waiting { - TemperatureSensorReadFromFPGA_Res(Sensor_i); //got the data from the FPGA + #ifdef Use_Head_Card + HeadADCPT100_SendReadDataCommand(Sensor_i); + #else + TemperatureSensorReadFromFPGA_Res(Sensor_i); //got the data from the FPGA + #endif + PT100Data[Sensor_i].WaitForData = false; PT100Data[Sensor_i].SyncRequired = true; if (PT100Data[Sensor_i].Callback) @@ -430,7 +438,12 @@ uint32_t MillisecLoop(uint32_t tick) } else if (PT100Data[Sensor_i].SyncRequired == true) { - TemperatureSensorSync(Sensor_i); + #ifdef Use_Head_Card + HeadADCPT100_StartSync(Sensor_i); + #else + TemperatureSensorSync(Sensor_i); + #endif + PT100Data[Sensor_i].SyncRequired = false; PT100Activity--; break; // one PT100 activitiy per MS |