Implemented ink waste cartridge filling emptying progress.

1 files changed, 19 insertions, 9 deletions

diff --git a/Software/PMR/Messages/IFS/CartridgeState.proto b/Software/PMR/Messages/IFS/CartridgeState.proto
index 72cddce67..b256f66b1 100644
--- a/Software/PMR/Messages/IFS/CartridgeState.proto
+++ b/Software/PMR/Messages/IFS/CartridgeState.proto
@@ -5,15 +5,25 @@ option java_package = "com.twine.tango.pmr.ifs";
 
 enum CartridgeState
 {
+	//OT = One Trigger, meaning, the state should be sent once, then return to a none OT state.
+
+	//States
+
 	None = 0; //Unspecified.
 	Absent = 1; //Waste or ink cartridge not found.
-	Exists = 2; //Waste or ink cartridge exists.
-	Inserted = 3; //Waste or ink cartridge inserted.
-	Filling = 4; //Ink cartridge is now filling...
-	FillingCompleted = 5; //Ink cartridge filing completed.
-	Emptying = 6; //Waste cartridge is emptying...
-	EmptyingCompleted = 7; //Waste cartridge emptying completed.
-	Empty = 8; //Waste or ink cartridge is empty.
-	Full = 9; //Waste or ink cartridge is full.
-	Error = 10; //Error occurred while filling or emptying.
+	Present = 2; //Waste or ink cartridge present.
+	Inserted = 3; //Waste or ink cartridge inserted. | OT
+	Empty = 4; //Waste or ink cartridge is empty.
+	Full = 5; //Waste or ink cartridge is full.
+	Error = 6; //Waste or ink is in an error state. (unrelated to filling or emptying)
+
+	//Progress
+
+	Filling = 10; //Ink cartridge is now filling...
+	FillingCompleted = 11; //Ink cartridge filing completed. | OT
+	FillingFailed = 12; //Error occurred while ink filling. | OT
+
+	Emptying = 20; //Waste cartridge is emptying...
+	EmptyingCompleted = 21; //Waste cartridge emptying completed. | OT
+	EmpyingFailed = 22; //Error occurred while waste emptying. | OT
 }
\ No newline at end of file