aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded
diff options
context:
space:
mode:
authorRonen Sberlo <ronen.s@twine-s.com>2020-11-30 12:24:14 +0200
committerRonen Sberlo <ronen.s@twine-s.com>2020-11-30 12:24:14 +0200
commit0a7295b208ad26fb5944cca0db4c92146c0659ed (patch)
tree1ac7a0a8877b970f02a7ca38829c103c26b1eff0 /Software/Embedded_SW/Embedded
parent06f6e9025818ff953151edbbffaeaa7959046482 (diff)
downloadTango-0a7295b208ad26fb5944cca0db4c92146c0659ed.tar.gz
Tango-0a7295b208ad26fb5944cca0db4c92146c0659ed.zip
present / absent waste cart status
Diffstat (limited to 'Software/Embedded_SW/Embedded')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c13
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);
+ }
}
}