diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2021-01-11 17:40:10 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2021-01-11 17:40:10 +0200 |
| commit | bfd323badd5c5039f49779e3a08452d203bf284e (patch) | |
| tree | 650a96d7ef514f873becf92ae18130f274f5c5d7 /Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c | |
| parent | a84e40980f7bc2c8ef3c2bfd546cfb3ecc6e05d7 (diff) | |
| parent | 3c9d531523b255df4351d1ddafd8acffcb89237e (diff) | |
| download | Tango-bfd323badd5c5039f49779e3a08452d203bf284e.tar.gz Tango-bfd323badd5c5039f49779e3a08452d203bf284e.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c index a2ab1f426..fbbf1ec58 100644 --- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c +++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c @@ -10,6 +10,7 @@ #include <Drivers/I2C_Communication/RFID_NFC/RFIDTagInfo.h> #include <Drivers/I2C_Communication/RFID_NFC/NFC_MainBaord.h> #include "Drivers/I2C_Communication/RFID_NFC/logi-tag/LT_RFID.h" +#include <Drivers/I2C_Communication/RFID_NFC/RFID_Waste.h> #include "Drivers/I2C_Communication/RFID_NFC/NFC.h" #include <Utilities/RfidTagHandling.h> @@ -425,6 +426,8 @@ void Waste_StateMachine(void) { uint32_t activeCart; char str[100]; + uint32_t rc; + switch (WasteTankState) { case WasteTankStateIdle: @@ -461,6 +464,8 @@ void Waste_StateMachine(void) } // check RFID - check cartridge OK (inkEmpty) // RFID change status - set WasteEmpty + rc = RFID_Update_Waste_Empty(SelectedCard); + Report("RFID_Update_Waste_Empty", __FILE__, __LINE__, SelectedCard, RpMessage, rc, 0); //move to next state WasteTankState = WasteTankStateFull; @@ -493,7 +498,9 @@ void Waste_StateMachine(void) Report("WasteTankStateEmptying set Pump Open", __FILE__, activeCart, wasteLevel, RpMessage, wasteLevelEmpty, 0); //start emptying - // RFID change status - set wasteFilling + // RFID change status - set wasteFill + rc = RFID_Update_Waste_Fill(activeCart); + Report("RFID_Update_Waste_Fill", __FILE__, __LINE__, activeCart, RpMessage, rc, 0); WasteTankState = WasteTankStateEmptying; CartridgeStateUpdate(activeCart, activeCart-1, CARTRIDGE_STATE__Emptying, 0); break; @@ -515,6 +522,8 @@ void Waste_StateMachine(void) cartFILLING_END(); waste_seq_cont_stop(); // RFID change status - set wasteFull + rc = RFID_Update_Waste_Full(activeCart); + Report("RFID_Update_Waste_Full", __FILE__, __LINE__, activeCart, RpMessage, rc, 0); WasteTankState = WasteTankStateIdle; RemoveControlCallback(Cartridge_Cover_Control, Waste_DoorOpenDuringEmptying); //if (cartNotAllFull() == false) |