From 0a7295b208ad26fb5944cca0db4c92146c0659ed Mon Sep 17 00:00:00 2001 From: Ronen Sberlo Date: Mon, 30 Nov 2020 12:24:14 +0200 Subject: present / absent waste cart status --- Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'Software/Embedded_SW/Embedded') 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); + } } } -- cgit v1.3.1