merge

8 files changed, 0 insertions, 104 deletions

diff --git a/Software/PMR/Messages/DataStore/DataStoreItem.proto b/Software/PMR/Messages/DataStore/DataStoreItem.proto
deleted file mode 100644
index d4b329799..000000000
--- a/Software/PMR/Messages/DataStore/DataStoreItem.proto
+++ /dev/null
@@ -1,21 +0,0 @@
-syntax = "proto3";
-
-import "DataType.proto";
-import "MessageType.proto";
-
-package Tango.PMR.DataStore;
-option java_package = "com.twine.tango.pmr.datastore";
-
-message DataStoreItem
-{
-	DataType DataType = 1;
-	int32 Int32Value = 2;
-	float FloatValue = 3;
-	double DoubleValue = 4;
-	bool BooleanValue = 5;
-	string StringValue = 6;
-	bytes BytesValue = 7;
-
-	//Use only when DataType = Proto.
-	PMR.Common.MessageType ProtoType = 20;
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/DataStore/DataStoreItemModifiedRequest.proto b/Software/PMR/Messages/DataStore/DataStoreItemModifiedRequest.proto
deleted file mode 100644
index c86d9e016..000000000
--- a/Software/PMR/Messages/DataStore/DataStoreItemModifiedRequest.proto
+++ /dev/null
@@ -1,10 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.DataStore;
-option java_package = "com.twine.tango.pmr.datastore";
-
-message DataStoreItemModifiedRequest
-{
-	string Collection = 1;
-	string Key = 2;
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/DataStore/DataStoreItemModifiedResponse.proto b/Software/PMR/Messages/DataStore/DataStoreItemModifiedResponse.proto
deleted file mode 100644
index d6a597fb5..000000000
--- a/Software/PMR/Messages/DataStore/DataStoreItemModifiedResponse.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.DataStore;
-option java_package = "com.twine.tango.pmr.datastore";
-
-message DataStoreItemModifiedResponse
-{
-
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/DataStore/DataType.proto b/Software/PMR/Messages/DataStore/DataType.proto
deleted file mode 100644
index 3c6ae0e05..000000000
--- a/Software/PMR/Messages/DataStore/DataType.proto
+++ /dev/null
@@ -1,17 +0,0 @@
-syntax = "proto3";
-
-//DO NOT EDIT THIS FILE OR IT MIGHT RESULT IN A DISCREPANCY.
-
-package Tango.PMR.DataStore;
-option java_package = "com.twine.tango.pmr.datastore";
-
-enum DataType
-{
-	Int32 = 0;
-	Float = 1;
-	Double = 2;
-	Boolean = 3;
-	String = 4;
-	Bytes = 5;
-	Proto = 6;
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/DataStore/GetDataStoreItemRequest.proto b/Software/PMR/Messages/DataStore/GetDataStoreItemRequest.proto
deleted file mode 100644
index 07d0cec47..000000000
--- a/Software/PMR/Messages/DataStore/GetDataStoreItemRequest.proto
+++ /dev/null
@@ -1,13 +0,0 @@
-syntax = "proto3";
-
-import "DataStoreItem.proto";
-
-package Tango.PMR.DataStore;
-option java_package = "com.twine.tango.pmr.datastore";
-
-message GetDataStoreItemRequest
-{
-	string Collection = 1;
-	string Key = 2;
-	DataStoreItem DefaultItem = 3;
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/DataStore/GetDataStoreItemResponse.proto b/Software/PMR/Messages/DataStore/GetDataStoreItemResponse.proto
deleted file mode 100644
index 9445a6fd9..000000000
--- a/Software/PMR/Messages/DataStore/GetDataStoreItemResponse.proto
+++ /dev/null
@@ -1,12 +0,0 @@
-syntax = "proto3";
-
-import "DataStoreItem.proto";
-
-package Tango.PMR.DataStore;
-option java_package = "com.twine.tango.pmr.datastore";
-
-message GetDataStoreItemResponse
-{
-	string Key = 1;
-	DataStoreItem Item = 2;
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/DataStore/PutDataStoreItemRequest.proto b/Software/PMR/Messages/DataStore/PutDataStoreItemRequest.proto
deleted file mode 100644
index e4dcb979c..000000000
--- a/Software/PMR/Messages/DataStore/PutDataStoreItemRequest.proto
+++ /dev/null
@@ -1,13 +0,0 @@
-syntax = "proto3";
-
-import "DataStoreItem.proto";
-
-package Tango.PMR.DataStore;
-option java_package = "com.twine.tango.pmr.datastore";
-
-message PutDataStoreItemRequest
-{
-	string Collection = 1;
-	string Key = 2;
-	DataStoreItem Item = 3;
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/DataStore/PutDataStoreItemResponse.proto b/Software/PMR/Messages/DataStore/PutDataStoreItemResponse.proto
deleted file mode 100644
index f00d41336..000000000
--- a/Software/PMR/Messages/DataStore/PutDataStoreItemResponse.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.DataStore;
-option java_package = "com.twine.tango.pmr.datastore";
-
-message PutDataStoreItemResponse
-{
-
-}
\ No newline at end of file