diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-11-10 11:22:15 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-11-10 11:22:15 +0200 |
| commit | e76eb4aa4d7e4c4762995144765b5ee6e9532961 (patch) | |
| tree | d411eca66b4508a9b7d163f17ba25a09ee3797df /Software/Embedded_SW/Embedded/Modules/General | |
| parent | 333825f9c361d9a10e601210fdd39db8738fd8a5 (diff) | |
| parent | 1645afa4ec0756f29f524f23fdcc9e107d4b678d (diff) | |
| download | Tango-e76eb4aa4d7e4c4762995144765b5ee6e9532961.tar.gz Tango-e76eb4aa4d7e4c4762995144765b5ee6e9532961.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/General')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c index 5c41d03f3..4c248e94b 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c +++ b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c @@ -254,6 +254,10 @@ uint32_t CartridgeStateUpdate(CartridgeSlot Slot,CartridgeState State, double pe CartridgeStatus CartridgeStatus = CARTRIDGE_STATUS__INIT; Cartridge CartData = CARTRIDGE__INIT; StartInkFillingStatusResponse response = START_INK_FILLING_STATUS_RESPONSE__INIT; + response.status = my_malloc(sizeof(InkFillingStatus)); + ink_filling_status__init(response.status); + response.status->cartridgesstatuses = my_malloc(sizeof(void *)); + response.status->n_cartridgesstatuses = 1; response.status->cartridgesstatuses[0] = &CartridgeStatus; CartridgeStatus.has_state = true; @@ -306,6 +310,8 @@ uint32_t CartridgeStateUpdate(CartridgeSlot Slot,CartridgeState State, double pe SendChars((char*)container_buffer, container_size); //MessageContainer responseContainer; + my_free(response.status); + my_free(response.status->cartridgesstatuses); return status; } |