aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/General
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-10-26 18:18:58 +0200
committerShlomo Hecht <shlomo@twine-s.com>2020-10-26 18:18:58 +0200
commita32bef32ad14f565ecda6c13208fdb48a6abbf6b (patch)
treea9fb7b1118f0eec96fcd83e1a374a55a62e48a8e /Software/Embedded_SW/Embedded/Modules/General
parent730a3ec1157de96f74853e343b06725c647b3c13 (diff)
downloadTango-a32bef32ad14f565ecda6c13208fdb48a6abbf6b.tar.gz
Tango-a32bef32ad14f565ecda6c13208fdb48a6abbf6b.zip
fix cartridge state
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/General')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c
index 147015f98..801f48576 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c
@@ -256,7 +256,7 @@ uint32_t CartridgeStateUpdate(CartridgeSlot Slot,CartridgeState State, double pe
if (percentage>1)
{
CartridgeStatus.has_progresspercentage = true;
- CartridgeStatus.progresspercentage = percentage
+ CartridgeStatus.progresspercentage = percentage;
}
CartData.has_slot = true;
CartData.slot = Slot;
@@ -315,9 +315,9 @@ uint32_t StartInkFillingStatusRequestFunc(MessageContainer* requestContainer)
StartInkFillingStatusRequest* request = start_ink_filling_status_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
ustrncpy (WasteEmptyingToken, requestContainer->token,36);
- CartridgeStateUpdate(CARTRIDGE_SLOT__Ink,CARTRIDGE_STATE__None);
- CartridgeStateUpdate(CARTRIDGE_SLOT__WasteMiddle,CARTRIDGE_STATE__None);
- CartridgeStateUpdate(CARTRIDGE_SLOT__WasteLower,CARTRIDGE_STATE__None);
+ CartridgeStateUpdate(CARTRIDGE_SLOT__Ink,CARTRIDGE_STATE__None,0);
+ CartridgeStateUpdate(CARTRIDGE_SLOT__WasteMiddle,CARTRIDGE_STATE__None,0);
+ CartridgeStateUpdate(CARTRIDGE_SLOT__WasteLower,CARTRIDGE_STATE__None,0);
start_ink_filling_status_request__free_unpacked(request,NULL);
return status;
// case MESSAGE_TYPE__StartWasteEmptyingRequest: