PMR IFS.

18 files changed, 70 insertions, 126 deletions

diff --git a/Software/PMR/Messages/.vscode/settings.json b/Software/PMR/Messages/.vscode/settings.json
index 8d13ff97d..db812ef26 100644
--- a/Software/PMR/Messages/.vscode/settings.json
+++ b/Software/PMR/Messages/.vscode/settings.json
@@ -23,6 +23,7 @@
             "--proto_path=Synchronization",
             "--proto_path=TCC",
             "--proto_path=ThreadLoading",
+            "--proto_path=IFS",
             "--csharp_out=../Out"
         ]
     }
diff --git a/Software/PMR/Messages/Common/MessageType.proto b/Software/PMR/Messages/Common/MessageType.proto
index 593dcf547..38c0f3ec4 100644
--- a/Software/PMR/Messages/Common/MessageType.proto
+++ b/Software/PMR/Messages/Common/MessageType.proto
@@ -194,16 +194,8 @@ enum MessageType
 	SetBlowerStateResponse = 2037;
 	SetValveStateRequest = 2038;
 	SetValveStateResponse = 2039;
-	StartCartridgesUpdateRequest = 2040;
-	StartCartridgesUpdateResponse = 2041;
-	StopCartridgesUpdateRequest = 2042;
-	StopCartridgesUpdateResponse = 2043;
 	CartridgeValidationRequest = 2044;
 	CartridgeValidationResponse = 2045;
-	StartWasteEmptyingRequest = 2046;
-	StartWasteEmptyingResponse = 2047;
-	StartInkFillingRequest = 2048;
-	StartInkFillingResponse = 2049;
 
 	//Printing
 	JobRequest = 3000;
@@ -309,4 +301,8 @@ enum MessageType
 	StopThreadLoadingResponse = 11005;
 	TryThreadLoadingRequest = 11006;
 	TryThreadLoadingResponse = 11007;
+
+	//IFS
+	StartInkFillingStatusRequest = 12000;
+	StartInkFillingStatusResponse = 12001;
 }
diff --git a/Software/PMR/Messages/Diagnostics/FillingAction.proto b/Software/PMR/Messages/Diagnostics/FillingAction.proto
deleted file mode 100644
index fff3cc66c..000000000
--- a/Software/PMR/Messages/Diagnostics/FillingAction.proto
+++ /dev/null
@@ -1,14 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Diagnostics;
-option java_package = "com.twine.tango.pmr.diagnostics";
-
-enum FillingAction
-{
-	None = 0;
-	Inserted = 1;
-	Filling = 2;
-	End = 3;
-	Error = 4;
-	Ejected = 5;
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Diagnostics/StartCartridgesUpdateRequest.proto b/Software/PMR/Messages/Diagnostics/StartCartridgesUpdateRequest.proto
deleted file mode 100644
index 2b1be8c4f..000000000
--- a/Software/PMR/Messages/Diagnostics/StartCartridgesUpdateRequest.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Diagnostics;
-option java_package = "com.twine.tango.pmr.diagnostics";
-
-message StartCartridgesUpdateRequest
-{
-
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Diagnostics/StartCartridgesUpdateResponse.proto b/Software/PMR/Messages/Diagnostics/StartCartridgesUpdateResponse.proto
deleted file mode 100644
index 7bc9d7101..000000000
--- a/Software/PMR/Messages/Diagnostics/StartCartridgesUpdateResponse.proto
+++ /dev/null
@@ -1,13 +0,0 @@
-syntax = "proto3";
-
-import "Cartridge.proto";
-import "CartridgeAction.proto";
-
-package Tango.PMR.Diagnostics;
-option java_package = "com.twine.tango.pmr.diagnostics";
-
-message StartCartridgesUpdateResponse
-{
-	Cartridge Cartridge = 1;
-	CartridgeAction Action = 2;
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Diagnostics/StartInkFillingRequest.proto b/Software/PMR/Messages/Diagnostics/StartInkFillingRequest.proto
deleted file mode 100644
index 9e574bf7f..000000000
--- a/Software/PMR/Messages/Diagnostics/StartInkFillingRequest.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-
-package Tango.PMR.Diagnostics;
-option java_package = "com.twine.tango.pmr.diagnostics";
-
-message StartInkFillingRequest
-{
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Diagnostics/StartInkFillingResponse.proto b/Software/PMR/Messages/Diagnostics/StartInkFillingResponse.proto
deleted file mode 100644
index 735275bdd..000000000
--- a/Software/PMR/Messages/Diagnostics/StartInkFillingResponse.proto
+++ /dev/null
@@ -1,15 +0,0 @@
-syntax = "proto3";
-
-import "Cartridge.proto";
-import "FillingAction.proto";
-
-package Tango.PMR.Diagnostics;
-option java_package = "com.twine.tango.pmr.diagnostics";
-
-message StartInkFillingResponse
-{
-	Cartridge Cartridge = 1;
-	FillingAction Action = 2;
-	double ProgressPercentage = 3;
-	string Message = 4;
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Diagnostics/StartWasteEmptyingRequest.proto b/Software/PMR/Messages/Diagnostics/StartWasteEmptyingRequest.proto
deleted file mode 100644
index e33afd08d..000000000
--- a/Software/PMR/Messages/Diagnostics/StartWasteEmptyingRequest.proto
+++ /dev/null
@@ -1,8 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Diagnostics;
-option java_package = "com.twine.tango.pmr.diagnostics";
-
-message StartWasteEmptyingRequest
-{
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Diagnostics/StartWasteEmptyingResponse.proto b/Software/PMR/Messages/Diagnostics/StartWasteEmptyingResponse.proto
deleted file mode 100644
index caa7b0a4f..000000000
--- a/Software/PMR/Messages/Diagnostics/StartWasteEmptyingResponse.proto
+++ /dev/null
@@ -1,15 +0,0 @@
-syntax = "proto3";
-
-import "Cartridge.proto";
-import "FillingAction.proto";
-
-package Tango.PMR.Diagnostics;
-option java_package = "com.twine.tango.pmr.diagnostics";
-
-message StartWasteEmptyingResponse
-{
-	Cartridge Cartridge = 1;
-	FillingAction Action = 2;
-	double ProgressPercentage = 3;
-	string Message = 4;
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Diagnostics/StopCartridgesUpdateRequest.proto b/Software/PMR/Messages/Diagnostics/StopCartridgesUpdateRequest.proto
deleted file mode 100644
index ce31fc3ce..000000000
--- a/Software/PMR/Messages/Diagnostics/StopCartridgesUpdateRequest.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Diagnostics;
-option java_package = "com.twine.tango.pmr.diagnostics";
-
-message StopCartridgesUpdateRequest
-{
-
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Diagnostics/StopCartridgesUpdateResponse.proto b/Software/PMR/Messages/Diagnostics/StopCartridgesUpdateResponse.proto
deleted file mode 100644
index 8b9aa3a73..000000000
--- a/Software/PMR/Messages/Diagnostics/StopCartridgesUpdateResponse.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Diagnostics;
-option java_package = "com.twine.tango.pmr.diagnostics";
-
-message StopCartridgesUpdateResponse
-{
-
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/IFS/CartridgeState.proto b/Software/PMR/Messages/IFS/CartridgeState.proto
new file mode 100644
index 000000000..72cddce67
--- /dev/null
+++ b/Software/PMR/Messages/IFS/CartridgeState.proto
@@ -0,0 +1,19 @@
+syntax = "proto3";
+
+package Tango.PMR.IFS;
+option java_package = "com.twine.tango.pmr.ifs";
+
+enum CartridgeState
+{
+	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.
+}
\ No newline at end of file
diff --git a/Software/PMR/Messages/IFS/CartridgeStatus.proto b/Software/PMR/Messages/IFS/CartridgeStatus.proto
new file mode 100644
index 000000000..551ec73bc
--- /dev/null
+++ b/Software/PMR/Messages/IFS/CartridgeStatus.proto
@@ -0,0 +1,15 @@
+syntax = "proto3";
+
+import "Cartridge.proto";
+import "CartridgeState.proto";
+
+package Tango.PMR.IFS;
+option java_package = "com.twine.tango.pmr.ifs";
+
+message CartridgeStatus
+{
+    PMR.Diagnostics.Cartridge Cartridge = 1;
+    CartridgeState State = 2;
+    double ProgressPercentage = 3;
+    string Message = 4;
+}
\ No newline at end of file
diff --git a/Software/PMR/Messages/IFS/InkFillingStatus.proto b/Software/PMR/Messages/IFS/InkFillingStatus.proto
new file mode 100644
index 000000000..44572ec38
--- /dev/null
+++ b/Software/PMR/Messages/IFS/InkFillingStatus.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+import "CartridgeStatus.proto";
+
+package Tango.PMR.IFS;
+option java_package = "com.twine.tango.pmr.ifs";
+
+message InkFillingStatus
+{
+    repeated CartridgeStatus CartridgesStatuses = 1;
+}
\ No newline at end of file
diff --git a/Software/PMR/Messages/IFS/StartInkFillingStatusRequest.proto b/Software/PMR/Messages/IFS/StartInkFillingStatusRequest.proto
new file mode 100644
index 000000000..c2c987105
--- /dev/null
+++ b/Software/PMR/Messages/IFS/StartInkFillingStatusRequest.proto
@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+package Tango.PMR.IFS;
+option java_package = "com.twine.tango.pmr.ifs";
+
+message StartInkFillingStatusRequest
+{
+
+}
\ No newline at end of file
diff --git a/Software/PMR/Messages/IFS/StartInkFillingStatusResponse.proto b/Software/PMR/Messages/IFS/StartInkFillingStatusResponse.proto
new file mode 100644
index 000000000..06647a14b
--- /dev/null
+++ b/Software/PMR/Messages/IFS/StartInkFillingStatusResponse.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+import "InkFillingStatus.proto";
+
+package Tango.PMR.IFS;
+option java_package = "com.twine.tango.pmr.ifs";
+
+message StartInkFillingStatusResponse
+{
+    InkFillingStatus Status = 1;
+}
\ No newline at end of file
diff --git a/Software/PMR/Messages/MachineStatus/MachineStatus.proto b/Software/PMR/Messages/MachineStatus/MachineStatus.proto
index ee573c05e..312e26e01 100644
--- a/Software/PMR/Messages/MachineStatus/MachineStatus.proto
+++ b/Software/PMR/Messages/MachineStatus/MachineStatus.proto
@@ -3,7 +3,6 @@ syntax = "proto3";
 import "MachineState.proto";
 import "IDSPackLevel.proto";
 import "SpoolState.proto";
-import "WasteCartridgeState.proto";
 
 package Tango.PMR.MachineStatus;
 option java_package = "com.twine.tango.pmr.machinestatus";
@@ -14,6 +13,4 @@ message MachineStatus
 	repeated IDSPackLevel IDSPacksLevels = 2;
 	double OverallTemperature = 3;
 	SpoolState SpoolState = 4;
-	WasteCartridgeState MiddleWasteCartridgeState = 5;
-	WasteCartridgeState LowerWasteCartridgeState = 6;
 }
\ No newline at end of file
diff --git a/Software/PMR/Messages/MachineStatus/WasteCartridgeState.proto b/Software/PMR/Messages/MachineStatus/WasteCartridgeState.proto
deleted file mode 100644
index e4ef1261e..000000000
--- a/Software/PMR/Messages/MachineStatus/WasteCartridgeState.proto
+++ /dev/null
@@ -1,14 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.MachineStatus;
-option java_package = "com.twine.tango.pmr.machinestatus";
-
-enum WasteCartridgeState
-{
-    CartAbsent = 0;
-    CartEmpty = 1;
-    CartFilling = 2;
-    CartFull = 3;
-    CartError = 4;
-}
-