merge

9 files changed, 8 insertions, 78 deletions

diff --git a/Software/PMR/Messages/Integration/ApplicationInformation.proto b/Software/PMR/Messages/Integration/ApplicationInformation.proto
deleted file mode 100644
index 7dd05daa0..000000000
--- a/Software/PMR/Messages/Integration/ApplicationInformation.proto
+++ /dev/null
@@ -1,10 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Integration;
-option java_package = "com.twine.tango.pmr.integration";
-
-message ApplicationInformation
-{
-	string Version = 1;
-	string StartupDate = 2;
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Integration/ConfigureProtocolRequest.proto b/Software/PMR/Messages/Integration/ConfigureProtocolRequest.proto
deleted file mode 100644
index 850df63de..000000000
--- a/Software/PMR/Messages/Integration/ConfigureProtocolRequest.proto
+++ /dev/null
@@ -1,12 +0,0 @@
-syntax = "proto3";
-
-import "GenericMessageProtocol.proto";
-
-package Tango.PMR.Integration;
-option java_package = "com.twine.tango.pmr.integration";
-
-message ConfigureProtocolRequest
-{
-	bool EnableCompression = 1;
-	GenericMessageProtocol GenericProtocol = 2;
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Integration/ConfigureProtocolResponse.proto b/Software/PMR/Messages/Integration/ConfigureProtocolResponse.proto
deleted file mode 100644
index 1f32296da..000000000
--- a/Software/PMR/Messages/Integration/ConfigureProtocolResponse.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Integration;
-option java_package = "com.twine.tango.pmr.integration";
-
-message ConfigureProtocolResponse
-{
-	bool Confirmed = 1;
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Integration/ExternalBridgeLoginRequest.proto b/Software/PMR/Messages/Integration/ExternalBridgeLoginRequest.proto
index 2c8eb99b6..8e76542e7 100644
--- a/Software/PMR/Messages/Integration/ExternalBridgeLoginRequest.proto
+++ b/Software/PMR/Messages/Integration/ExternalBridgeLoginRequest.proto
@@ -12,7 +12,4 @@ message ExternalBridgeLoginRequest
 	string HostName = 3;
 	string Password = 4;
 	ExternalBridgeLoginIntent Intent = 5;
-	bool RequireSafetyLevelOperations = 6;
-	string UserName = 7;
-	repeated string Permissions = 8;
 }
\ No newline at end of file
diff --git a/Software/PMR/Messages/Integration/ExternalBridgeLoginResponse.proto b/Software/PMR/Messages/Integration/ExternalBridgeLoginResponse.proto
index 165fe2d80..481646244 100644
--- a/Software/PMR/Messages/Integration/ExternalBridgeLoginResponse.proto
+++ b/Software/PMR/Messages/Integration/ExternalBridgeLoginResponse.proto
@@ -1,8 +1,6 @@
 syntax = "proto3";
 
 import "DeviceInformation.proto";
-import "ApplicationInformation.proto";
-import "UpdateStatus.proto";
 
 package Tango.PMR.Integration;
 option java_package = "com.twine.tango.pmr.integration";
@@ -12,6 +10,4 @@ message ExternalBridgeLoginResponse
 	bool Authenticated = 1;
 	string SerialNumber = 2;
 	PMR.Connection.DeviceInformation DeviceInformation = 3;
-	ApplicationInformation ApplicationInformation = 4;
-	UpdateStatus Status = 5;
 }
\ No newline at end of file
diff --git a/Software/PMR/Messages/Integration/GenericMessageProtocol.proto b/Software/PMR/Messages/Integration/GenericMessageProtocol.proto
deleted file mode 100644
index cb6021944..000000000
--- a/Software/PMR/Messages/Integration/GenericMessageProtocol.proto
+++ /dev/null
@@ -1,11 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Integration;
-option java_package = "com.twine.tango.pmr.integration";
-
-enum GenericMessageProtocol
-{
-	Json = 0;
-	Bson = 1;
-	Protobuf = 2;
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Integration/GenericRequest.proto b/Software/PMR/Messages/Integration/GenericRequest.proto
deleted file mode 100644
index 0bc44d5fa..000000000
--- a/Software/PMR/Messages/Integration/GenericRequest.proto
+++ /dev/null
@@ -1,10 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Integration;
-option java_package = "com.twine.tango.pmr.integration";
-
-message GenericRequest
-{
-	string Type = 1;
-	bytes Data = 2;
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Integration/GenericResponse.proto b/Software/PMR/Messages/Integration/GenericResponse.proto
deleted file mode 100644
index 4d8151c58..000000000
--- a/Software/PMR/Messages/Integration/GenericResponse.proto
+++ /dev/null
@@ -1,10 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Integration;
-option java_package = "com.twine.tango.pmr.integration";
-
-message GenericResponse
-{
-	string Type = 1;
-	bytes Data = 2;
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Integration/UpdateStatus.proto b/Software/PMR/Messages/Integration/UpdateStatus.proto
index 9cf98a9db..373705ed8 100644
--- a/Software/PMR/Messages/Integration/UpdateStatus.proto
+++ b/Software/PMR/Messages/Integration/UpdateStatus.proto
@@ -6,13 +6,12 @@ option java_package = "com.twine.tango.pmr.integration";
 enum UpdateStatus
 {
 	Disconnected = 0;
-	PowerUp = 1;
-	Standby = 2;
-	ReadyToDye = 3;
-	GettingReady = 4;
-	Printing = 5;
-	Service = 6;
-	Upgrading = 7;
-	ShuttingDown = 8;
-	Error = 9;
+	Standby = 1;
+	ReadyToDye = 2;
+	GettingReady = 3;
+	Printing = 4;
+	Service = 5;
+	Upgrading = 6;
+	ShuttingDown = 7;
+	Error = 8;
 }
\ No newline at end of file