Merge pull request #52 from ShimmerEngineering/NOL-10

NOL-10 Consensys Tray Application for integration with Noldus

Author: RuMolloy

ShimmerDriver/grpcprotosrc/src/Revision_History.txt

@@ -0,0 +1,4 @@
+ShimmerGrpcAndOJC
+----------------------------------------------
+v1.0.0 - 21 January 2021
+- Addition of methods to support Noldus client

…grpcprotosrc/src/ShimmerGrpcAndOJC.proto …tosrc/src/ShimmerGrpcAndOJC_v1.0.0.protoShimmerDriver/grpcprotosrc/src/ShimmerGrpcAndOJC.proto renamed to ShimmerDriver/grpcprotosrc/src/ShimmerGrpcAndOJC_v1.0.0.proto ShimmerDriver/grpcprotosrc/src/ShimmerGrpcAndOJC.proto renamed to ShimmerDriver/grpcprotosrc/src/ShimmerGrpcAndOJC_v1.0.0.proto

@@ -66,7 +66,12 @@ service ShimmerServer {
   rpc GetInfoAllShimmers(StringMsg) returns (ShimmersInfo){}
 
   rpc GetEmulatedDevices(StringMsg) returns (EmulatedDevices){}
-
+  
+  
+  //Noldus client related
+  rpc GetPairedBtShimmers(StringMsg) returns (BluetoothDevicesDetails) {}
+    
+  rpc GetDeviceStateStream(StreamRequest) returns (stream DeviceState) {}
 }
 
 message FileByteTransfer {
@@ -187,6 +192,40 @@ message ShimmersInfo {
   map<string,ShimmerInfo> shimmerMap = 3;
 }
 
+message BluetoothDevicesDetails {
+	bool state = 1;
+	string message = 2;
+	
+	message BluetoothDeviceDetails {
+		string comPort = 1;
+		string name = 2;
+		string macId = 3;
+		string deviceType = 4;
+		string lastConnectionState = 5;
+	}
+	
+	map<string,BluetoothDeviceDetails> deviceMap = 3;
+}
+
+enum BT_STATE {
+	DISCONNECTED = 0;
+	CONNECTING = 1;
+	CONNECTED = 2;
+	STREAMING = 3;
+	STREAMING_AND_SDLOGGING = 4;
+	SDLOGGING = 5;
+	CONFIGURING = 6;
+	CONNECTION_LOST = 7;
+	CONNECTION_FAILED = 8;
+}
+
+message DeviceState {
+	string deviceName = 1;
+	string comPort = 2;
+	string macId = 3;
+	BT_STATE state = 4;
+}
+
 message Ieee802154Info {
     int32 radioChannel = 1;
 	int32 radioGroupId = 2;