4 files changed, 41 insertions, 0 deletions
diff --git a/Software/PMR/Messages/MachineStatus/IDSPackLevel.proto b/Software/PMR/Messages/MachineStatus/IDSPackLevel.proto
index d0db26eb3..a8336c333 100644
--- a/Software/PMR/Messages/MachineStatus/IDSPackLevel.proto
+++ b/Software/PMR/Messages/MachineStatus/IDSPackLevel.proto
@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+import "PumpStatus.proto";
+
 package Tango.PMR.MachineStatus;
 option java_package = "com.twine.tango.pmr.machinestatus";
 
@@ -21,4 +23,5 @@ message IDSPackLevel
 	float TotalPumpFlow = 10;
 	uint32 TotalPumpActivityTime = 11;
 
+	repeated PumpStatus Pumps = 12;
 }
 \ No newline at end of file
diff --git a/Software/PMR/Messages/MachineStatus/PumpState.proto b/Software/PMR/Messages/MachineStatus/PumpState.proto
new file mode 100644
index 000000000..fc9a1de30
--- /dev/null
+++ b/Software/PMR/Messages/MachineStatus/PumpState.proto
@@ -0,0 +1,12 @@
+syntax = "proto3";
+
+package Tango.PMR.MachineStatus;
+option java_package = "com.twine.tango.pmr.machinestatus";
+
+enum PumpState
+{
+    OK = 0;
+    Missing = 1;
+	Faulty = 2;
+	WornOut = 3;
+}
+\ No newline at end of file
diff --git a/Software/PMR/Messages/MachineStatus/PumpStatus.proto b/Software/PMR/Messages/MachineStatus/PumpStatus.proto
new file mode 100644
index 000000000..9be411a9b
--- /dev/null
+++ b/Software/PMR/Messages/MachineStatus/PumpStatus.proto
@@ -0,0 +1,16 @@
+syntax = "proto3";
+
+import "PumpType.proto";
+import "PumpState.proto";
+
+package Tango.PMR.MachineStatus;
+option java_package = "com.twine.tango.pmr.machinestatus";
+
+message PumpStatus
+{
+	PumpType Type = 1;
+	int32 Index = 2;
+	int64 Capacity = 3;
+	int64 Level = 4;
+	PumpState State = 5;
+}
+\ No newline at end of file
diff --git a/Software/PMR/Messages/MachineStatus/PumpType.proto b/Software/PMR/Messages/MachineStatus/PumpType.proto
new file mode 100644
index 000000000..c4d3fea83
--- /dev/null
+++ b/Software/PMR/Messages/MachineStatus/PumpType.proto
@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+package Tango.PMR.MachineStatus;
+option java_package = "com.twine.tango.pmr.machinestatus";
+
+enum PumpType
+{
+    T330 = 0;
+    T450 = 1;
+}