diff options
| author | Ronen Sberlo <ronen.s@twine-s.com> | 2020-07-27 13:53:44 +0300 |
|---|---|---|
| committer | Ronen Sberlo <ronen.s@twine-s.com> | 2020-07-27 13:53:44 +0300 |
| commit | 6814745b10c3e2f369c1d52efa5a83405c3d1274 (patch) | |
| tree | 5d7dfc29288978367175b97e1fd82f7449bf9495 /Software/Embedded_SW/Embedded/Modules | |
| parent | fac017b03233b5c16ada31753ff61fdb14a7349c (diff) | |
| download | Tango-6814745b10c3e2f369c1d52efa5a83405c3d1274.tar.gz Tango-6814745b10c3e2f369c1d52efa5a83405c3d1274.zip | |
bug fix
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/IFS/ifs.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c index bfffb0d9b..e0a2f79d5 100644 --- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c +++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c @@ -253,12 +253,6 @@ void midTankStateMachine(void) if (!RdInkCartridgeSensor()) { // cartridge not presence Pannel_Leds( CART_1, MODE_OFF); cart1.color = colorOFF; - if (IFS_MidTankFilling()) { - MidTankValvesAction(Cartridge_MidTank_OFF); - Report("Cartridge extracted during filling!!!", __FILE__, __LINE__, midTankState, RpMessage, 0, 0); - Report("Mid-tank # filling fail", __FILE__, __LINE__, midTankState, RpMessage, 0, 0); - midTankState = MidTankStateIdle; - } } else { // cartridge presence if (cart1.color == colorOFF) { Pannel_Leds( CART_1, MODE_ON); @@ -275,6 +269,10 @@ void midTankStateMachine(void) break; } + // check if cartridge presence + if (!RdInkCartridgeSensor()) { + break; + } //check RFID? (TBD) // send request for validation to ppc @@ -336,6 +334,12 @@ void midTankStateMachine(void) midTankState = MidTankStateFilling; break; case MidTankStateFilling: + if (!RdInkCartridgeSensor()) { // cartridge not presence + MidTankValvesAction(Cartridge_MidTank_OFF); + Report("Cartridge extracted during filling!!!", __FILE__, __LINE__, midTankState, RpMessage, 0, 0); + Report("Mid-tank # filling fail", __FILE__, __LINE__, midTankState, RpMessage, 0, 0); + midTankState = MidTankStateIdle; + } // if time out or emptying done - idle if (midTankTimeoutCounter++ > CartridgeInkTimeout) { midTankTimeoutCounter = 0; |