diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-06-03 11:46:27 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-06-03 11:46:27 +0300 |
| commit | 905b4b76c50600851add7f2b95cff2de0f75e1d8 (patch) | |
| tree | e0cbc8657f2f7403b4304a2a28bac79ee6e5a694 /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | 686937fc57d5020a55590612e8cdd50acf1794c5 (diff) | |
| parent | 582972578fa49e231d567682e6e61f642f760590 (diff) | |
| download | Tango-905b4b76c50600851add7f2b95cff2de0f75e1d8.tar.gz Tango-905b4b76c50600851add7f2b95cff2de0f75e1d8.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 8 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index d334c9001..a6380c188 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -570,6 +570,10 @@ float MillisecGetPressures (int SensorId) return PressureCalc[SensorId]; } +bool getRapidPressureRead(void) +{ + return RapidPressureRead; +} void setRapidPressureRead(bool value) { RapidPressureRead = value; @@ -626,6 +630,10 @@ uint32_t MillisecLowLoop(uint32_t tick) Trigger_HeaterWriting(); } + if (m20msecTick) + { + ADC0SS0Handler(); + } if(Fifty_msTick) { WHS_Read_GPI_Registers(); diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h index 9335a6d08..226d0d57a 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h @@ -36,6 +36,7 @@ uint8_t getGasReading(void); int MillisecGetTemperatures (TEMPERATURE_SENSOR_ID_ENUM SensorId); float MillisecGetPressures (int SensorId); void setRapidPressureRead(bool value); +bool getRapidPressureRead(void); void MillisecInit(void); |