diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-12-01 00:58:10 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-12-01 00:58:10 +0200 |
| commit | b2aa323472007d32093c4c59c4e20a2fc39f9709 (patch) | |
| tree | 9cce94cf27114cc3af4dc44b6fddd06a847ebc43 /Software/Embedded_SW/Embedded | |
| parent | a9f6135bd789840c68b3759a59f4948af0cf348d (diff) | |
| parent | 0a7295b208ad26fb5944cca0db4c92146c0659ed (diff) | |
| download | Tango-b2aa323472007d32093c4c59c4e20a2fc39f9709.tar.gz Tango-b2aa323472007d32093c4c59c4e20a2fc39f9709.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c index 665e8f83c..b8f7024fb 100644 --- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c +++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c @@ -383,9 +383,16 @@ void Waste_StateMachine_OneSecond_Call(void) //update ppc for (cart = WasteCartridge_middle; cart <= WasteCartridge_lower; cart++) { - if ((insertUpdate[cart]) && (WasteEmptyingToken[0])) { - CartridgeStateUpdate(cart, cart-1, CARTRIDGE_STATE__Inserted, 0); - insertUpdate[cart] = 0; + if (WasteEmptyingToken[0]) { + if (insertUpdate[cart]) { + CartridgeStateUpdate(cart, cart-1, CARTRIDGE_STATE__Inserted, 0); + insertUpdate[cart] = 0; + } + if (Is_Cartridge_Present(cart+1)) { + CartridgeStateUpdate(cart, cart-1, CARTRIDGE_STATE__Present, 0); + } else { + CartridgeStateUpdate(cart, cart-1, CARTRIDGE_STATE__Absent, 0); + } } } |