workaround for V0 init value

2 files changed, 8 insertions, 7 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
index b450d58db..b2498ee7f 100644
--- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
+++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
@@ -148,7 +148,6 @@ bool CartridgeInkFull()
             //currently sensor work properly only until 1.6 - 1.8 Liter (TBD)
             Report("DetectIfCartridgeFinished", __FILE__,__LINE__,int_MidTank_Pressure_1000, RpMessage, int_MidTank_Pressure_1000, 0);
             //return true;
-            //IFS_State = CARTRIDGE_STATE__FillingCompleted;
         }
     }
     return false;
@@ -284,7 +283,7 @@ void midTankStateMachine(void)
                 if (!RdInkCartridgeSensor()) {
                     break;
                 }
-                //check RFID? (TBD)
+                //check RFID - check cartridge OK
                 CartridgeStateUpdate(CARTRIDGE_SLOT__Ink, CARTRIDGE_STATE__Inserted, 0);
 
                 // send request for validation to ppc
@@ -317,6 +316,7 @@ void midTankStateMachine(void)
                 midTankState = MidTankStateIdle;
                 break;
             }
+            // Cartridge status received from user - assume cartridge is full
 
             midTankCapacity = Get_MidTank_Pressure_Sensor(midTankCartColor);
             if ((midTankCapacity > MidTankEmptyLimit)&&(midTankCartColor!=MIDTANK_8))//enable lubricant filling in two stages
@@ -342,7 +342,7 @@ void midTankStateMachine(void)
             MidTankValvesAction(Cartridge_MidTank_ON);
             Report("midTankStateWait set valve", __FILE__, __LINE__, 0, RpMessage, 0, 0);
 
-            // RFID change status - TBD
+            // RFID change status - inkUsed, inkFill
 
             // set count down
             midTankTimeoutCounter = 1;
@@ -375,6 +375,7 @@ void midTankStateMachine(void)
                 MidTankValvesAction(Cartridge_MidTank_OFF);
                 Report("Mid-tank # filling done", __FILE__, __LINE__, midTankState, RpMessage, 0, 0);
                 midTankState = MidTankStateIdle;
+                // RFID change status - inkEmpty
                 CartridgeStateUpdate(CARTRIDGE_SLOT__Ink, CARTRIDGE_STATE__FillingCompleted, 100.0);
             }
             CartridgeStateUpdate(CARTRIDGE_SLOT__Ink, CARTRIDGE_STATE__Filling, GetCartridgeFillPercent());
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c
index bfed5d0ee..4343c1607 100644
--- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c
+++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c
@@ -426,7 +426,8 @@ void Waste_StateMachine(void)
                     //Report("Close cartridge cover", __FILE__, __LINE__, DoorState, RpMessage, 0, 0);
                     break;
                 }
-                //check RFID? (TBD)
+                // check RFID - check cartridge OK (inkEmpty)
+                // RFID change status - set WasteEmpty
 
                 //move to next state
                 WasteTankState = WasteTankStateFull;
@@ -441,7 +442,6 @@ void Waste_StateMachine(void)
             activeCart = cartGetActiveCart();
             //Report("WasteTankStateEmptying set valve", __FILE__, __LINE__, activeCart, RpMessage, 0, 0);
             setWasteValve(activeCart);
-            // RFID change status - TBD
 
             // set count down
             timeout_counter = 1;
@@ -459,6 +459,7 @@ void Waste_StateMachine(void)
             Report("WasteTankStateEmptying set Pump Open", __FILE__, activeCart, wasteLevel, RpMessage, wasteLevelEmpty, 0);
 
             //start  emptying
+            // RFID change status - set wasteFilling
             WasteTankState = WasteTankStateEmptying;
             CartridgeStateUpdate(activeCart, CARTRIDGE_STATE__Emptying, 0);
             break;
@@ -468,7 +469,6 @@ void Waste_StateMachine(void)
             if (timeout_counter++ > WASTE_EMPTING_TIMEOUT) {
                 SetWastePump(CLOSE);
                 cartFILLING_END();
-                // RFID change status - TBD
                 WasteTankState = WasteTankStateIdle;
                 Report("WasteTankStateEmptying TimeOut", __FILE__, __LINE__, 0, RpMessage, 0, 0);
                 CartridgeStateUpdate(activeCart, CARTRIDGE_STATE__Error, WHS_GetCartridgeFillPercent());
@@ -479,7 +479,7 @@ void Waste_StateMachine(void)
                 SetWastePump(CLOSE);
                 cartFILLING_END();
                 waste_seq_cont_stop();
-                // RFID change status - TBD
+                // RFID change status - set wasteFull
                 WasteTankState = WasteTankStateIdle;
                 RemoveControlCallback(Cartridge_Cover_Control, Waste_DoorOpenDuringEmptying);
                 //if (cartNotAllFull() == false)