diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-02-03 12:08:59 +0200 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-02-03 12:08:59 +0200 |
| commit | c5bf753ea3fcf332d1dac399595be3e73540c348 (patch) | |
| tree | 0b2d877a9615570ee4ecc06665e1f3ed772f771f /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | 17c6006c870158b1f7cbcc193b083634ed3d3add (diff) | |
| parent | 6d9c6d87f29a93426cf09a6f486f006a6d7c1f2b (diff) | |
| download | Tango-c5bf753ea3fcf332d1dac399595be3e73540c348.tar.gz Tango-c5bf753ea3fcf332d1dac399595be3e73540c348.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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 5c43799db..6d92e06c9 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -755,6 +755,11 @@ uint32_t MillisecLowLoop(uint32_t tick) PressureCalc[Disp_i] = MillisecCalculatePressures(Disp_i); } } +#ifdef Use_WHS_Card + Trigger_WHS_PT100_Read_All(); + Trigger_WHS_MAX11614_Read_allADC(); +#endif + } if (OneMinute_Tick) { @@ -773,6 +778,7 @@ uint32_t MillisecLowLoop(uint32_t tick) }*/ midtankDisplay = 1-midtankDisplay; Gas_PPM_Info = Calculate_Gas_Power_Consumption(); + Trigger_WHS_MAX11614_Read_allADC(); } if (OneHourTick) |