diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-10-19 14:16:58 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-10-19 14:16:58 +0300 |
| commit | 4dd9e04cade78d1aa9b30d4164b2ce50b0938c77 (patch) | |
| tree | 9a59577350b4821ff5746f8be9fe82fc7557fecb /Software/Embedded_SW/Embedded/Modules | |
| parent | 1cdac5261f96f1d5e01d18cbd833744d67d42db7 (diff) | |
| parent | 0111d071d51d34d7bcbf9d7f487f1178414d11b3 (diff) | |
| download | Tango-4dd9e04cade78d1aa9b30d4164b2ce50b0938c77.tar.gz Tango-4dd9e04cade78d1aa9b30d4164b2ce50b0938c77.zip | |
merge
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
3 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 4b3f555f4..f04483361 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c +++ b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c @@ -237,7 +237,7 @@ uint32_t CartridgeStateUpdate(CartridgeSlot Slot,CartridgeState State) { if (WasteEmptyingToken[0] == 0) return ERROR; - uint32_t status = NOT_SUPPORTED,i; + uint32_t status = NOT_SUPPORTED; MessageContainer responseContainer; CartridgeStatus CartridgeStatus = CARTRIDGE_STATUS__INIT; Cartridge CartData = CARTRIDGE__INIT; diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c index 97a269105..706aa5bce 100644 --- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c +++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c @@ -1241,7 +1241,7 @@ void Stub_ProgressRequest(MessageContainer* requestContainer) response.progress = request->delay; response.has_progress = true; } -#ifdef 0 +#ifdef MIDTANK_MITIGATION else if(request->amount == 0xC12) { diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Cartridge.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Cartridge.c index 9f99ec558..63c7b6963 100644 --- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Cartridge.c +++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Cartridge.c @@ -23,7 +23,7 @@ void Stub_CartridgeReadRequest(MessageContainer* requestContainer) { - uint32_t status = PASSED; + //uint32_t status = PASSED; MessageContainer responseContainer; static bool first_time = true; @@ -82,7 +82,7 @@ void Stub_CartridgeReadRequest(MessageContainer* requestContainer) void Stub_CartridgeWriteRequest(MessageContainer* requestContainer) { - uint32_t status = NOT_SUPPORTED; + //uint32_t status = NOT_SUPPORTED; MessageContainer responseContainer; StubCartridgeWriteRequest* request = stub_cartridge_write_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data); |