diff options
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/IFS/ifs.c | 13 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c | 11 |
2 files changed, 23 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c index 5b0cf9cb7..2de335432 100644 --- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c +++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c @@ -14,6 +14,7 @@ #include <PMR/Diagnostics/EventType.pb-c.h> #include "PMR/IFS/CartridgeState.pb-c.h" #include <Drivers/I2C_Communication/RFID_NFC/RFIDTagInfo.h> +#include <Drivers/I2C_Communication/RFID_NFC/RFID_IFS.h> #include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h"//#include "FPGA_GPIO.h" // use for FPGA IO #include "drivers/I2C_Communication/ADC_MUX/ADC_MUX.h" #include "StateMachines/Initialization/PowerOffSequence.h" @@ -263,6 +264,7 @@ void midTankStateMachine(void) { static int init = 1; static int authenticationTimeOutCounter = 0; + uint32_t rc; if (init) { doorState = midTankCart_door(); @@ -297,6 +299,10 @@ void midTankStateMachine(void) break; } //check RFID - check cartridge OK + if ((rc = RFID_Get_Identification_Status(READER_1)) != OK) { + Report("RFID_Get_Identification_Status failed", __FILE__, __LINE__, rc, RpMessage, 0, 0); + break; + } // send request for validation to ppc inkAuthenticationPass = 2; //not defined @@ -356,6 +362,11 @@ void midTankStateMachine(void) Report("midTankStateWait set valve", __FILE__, __LINE__, 0, RpMessage, 0, 0); // RFID change status - inkUsed, inkFill + rc = RFID_Update_Ink_Fill(); + Report("RFID_Update_Ink_Fill", __FILE__, __LINE__, rc, RpMessage, 0, 0); + + rc = RFID_Update_Ink_Used(); + Report("RFID_Update_Ink_Used", __FILE__, __LINE__, rc, RpMessage, 0, 0); // set count down midTankTimeoutCounter = 1; @@ -389,6 +400,8 @@ void midTankStateMachine(void) Report("Mid-tank # filling done", __FILE__, __LINE__, midTankState, RpMessage, 0, 0); midTankState = MidTankStateIdle; // RFID change status - inkEmpty + rc = RFID_Update_Ink_Empty(); + Report("RFID_Update_Ink_Empty", __FILE__, __LINE__, rc, RpMessage, 0, 0); CartridgeStateUpdate(CARTRIDGE_SLOT__Ink, midTankCartColor, CARTRIDGE_STATE__FillingCompleted, 100.0); } if (midTankState == MidTankStateFilling) diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c index 374977065..9ece0efe6 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) |