diff options
| author | Avi Levkovich <avi@twine-s.com> | 2019-07-24 18:11:19 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2019-07-24 18:11:19 +0300 |
| commit | 0e448553af26885f648b41fed4001bcbdab9fbee (patch) | |
| tree | b6c2b0ee89cc334f3d04e829f0ec551743e4cc88 /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | 33cebf98be02ede27ee22ca98ee21f3525bfd8b9 (diff) | |
| parent | fd81643e32328a0d548c7cebdba008050ae03673 (diff) | |
| download | Tango-0e448553af26885f648b41fed4001bcbdab9fbee.tar.gz Tango-0e448553af26885f648b41fed4001bcbdab9fbee.zip | |
merge conflict
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 0b41e6076..e3955793d 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -426,10 +426,8 @@ uint32_t MillisecLoop(uint32_t tick) { #ifdef Use_Head_Card HeadADCPT100_SendReadDataCommand(Sensor_i); - #else - TemperatureSensorReadFromFPGA_Res(Sensor_i); //got the data from the FPGA #endif - + TemperatureSensorReadFromFPGA_Res(Sensor_i); //got the data from the FPGA PT100Data[Sensor_i].WaitForData = false; PT100Data[Sensor_i].SyncRequired = true; if (PT100Data[Sensor_i].Callback) @@ -440,9 +438,8 @@ uint32_t MillisecLoop(uint32_t tick) { #ifdef Use_Head_Card HeadADCPT100_StartSync(Sensor_i); - #else - TemperatureSensorSync(Sensor_i); #endif + TemperatureSensorSync(Sensor_i); PT100Data[Sensor_i].SyncRequired = false; PT100Activity--; @@ -557,6 +554,8 @@ uint32_t MillisecLowLoop(uint32_t tick) } ADC_TriggerCollection(); } + DispensersCollectionCall(); + } if ((O900Millisecond_Tick)&&(RapidPressureRead == false)) |