diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-11-24 16:41:25 +0200 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-11-24 16:41:25 +0200 |
| commit | fcc0cb38248c6115f8f1883ca6cebc4c376c486d (patch) | |
| tree | 22eccc73a377173c64968b82e24430353db8bcaf /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | 6c57a826a4287b1ca3ea418fcc2aed50ed129bdc (diff) | |
| parent | 1d4665212dd0a1260392b82a8d5655ed3c90b990 (diff) | |
| download | Tango-fcc0cb38248c6115f8f1883ca6cebc4c376c486d.tar.gz Tango-fcc0cb38248c6115f8f1883ca6cebc4c376c486d.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 | 2 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/control.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 28febe8f2..2f4a1e2d2 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -41,6 +41,7 @@ #include "Drivers/I2C_Communication/I2C.h" #include "modules/thread/thread_ex.h" +#include "modules/ifs/ifs.h" #include "modules/ids/ids_ex.h" #include "modules/Diagnostics/Diagnostics.h" #include "Modules/General/MachineStatus.h" @@ -662,6 +663,7 @@ uint32_t MillisecLowLoop(uint32_t tick) PumpActivation(900); PumpCounter = 0; } + MidTankReading(); } //ROM_IntMasterEnable(); diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.c b/Software/Embedded_SW/Embedded/Modules/Control/control.c index b7d117efe..1f5e008d3 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/control.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/control.c @@ -172,6 +172,8 @@ uint32_t ControlActivityLed( uint32_t Parameter1) ACTIVITY_GREEN_LED_ON; HWConfigurationInit(); } + else + ACTIVITY_GREEN_LED_OFF; if(power.color == fastBILNK) Pannel_Leds(POWER_ON_OFF,MODE_OFF); |