diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-07-14 11:20:45 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-07-14 11:20:45 +0300 |
| commit | bab76eb6e2eb3d130c5802cea08fd405c599c17b (patch) | |
| tree | 30a97d20f454dc75a3a194f36b95b59f584b0a2c /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | abcacd41c915b4e96ea024bdffca0e311d80cc4f (diff) | |
| parent | 270c79f2397d33d018bc029fab6d8ce2a559a222 (diff) | |
| download | Tango-bab76eb6e2eb3d130c5802cea08fd405c599c17b.tar.gz Tango-bab76eb6e2eb3d130c5802cea08fd405c599c17b.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 | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 4ad5336d9..a56c3dae1 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -766,8 +766,12 @@ uint32_t MillisecLowLoop(uint32_t tick) } */ } + //call waste state machine Waste_StateMachine_OneSecond_Call(); + + //call IFS state machine + midTankStateMachine(); } if (Tensecond_Tick) { @@ -796,6 +800,11 @@ uint32_t MillisecLowLoop(uint32_t tick) #ifdef CONTROL_DEBUG ResetControlTime(); #endif + if (WHS_Type == WHS_TYPE_NEW) + { + waste_seq_step1();// include 1Sec delay <- to open !!!! + } + } if (OneHourTick) { @@ -807,10 +816,10 @@ uint32_t MillisecLowLoop(uint32_t tick) PumpCounter = 0; } MidTankReading(); - if (WHS_Type == WHS_TYPE_NEW) + /*if (WHS_Type == WHS_TYPE_NEW) { waste_seq_step1();// include 1Sec delay <- to open !!!! - } + }*/ //Trigger_WHS_MAX11614_Read_Gas_Sensor(); } //ROM_IntMasterEnable(); |