Merge pull request #90 from ShimmerEngineering/CON-663

CON-663 updates to support customer Shimmer3 sensor model

Author: marknolan

ShimmerBluetoothManager/src/main/java/com/shimmerresearch/managers/bluetoothManager/ShimmerBluetoothManager.java

@@ -796,7 +796,9 @@ else if(deviceTypeDetected==DEVICE_TYPE.ARDUINO){
 		private ShimmerDevice createShimmerIfKnown() {
 			ShimmerDevice shimmerDevice = null;
 			deviceTypeDetected = useMockHWID(deviceTypeDetected);
-			if(deviceTypeDetected==DEVICE_TYPE.SHIMMER3 || deviceTypeDetected==DEVICE_TYPE.SHIMMER_ECG_MD){
+			if(deviceTypeDetected==DEVICE_TYPE.SHIMMER3
+					|| deviceTypeDetected==DEVICE_TYPE.SHIMMER3_OUTPUT
+					|| deviceTypeDetected==DEVICE_TYPE.SHIMMER_ECG_MD){
 				shimmerDevice = createNewShimmer3(comPort, bluetoothAddress);
 			}
 			else if(deviceTypeDetected==DEVICE_TYPE.SHIMMER4){

ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/BluetoothDeviceDetails.java

@@ -56,6 +56,9 @@ public void checkDeviceType() {
 			if(mFriendlyName.contains(HwDriverShimmerDeviceDetails.SH_SEARCH.BT.SHIMMER3)){
 				mDeviceTypeDetected = DEVICE_TYPE.SHIMMER3;
 			}
+			else if(mFriendlyName.contains(HwDriverShimmerDeviceDetails.DEVICE_TYPE.SHIMMER3_OUTPUT.getLabel())){
+				mDeviceTypeDetected = DEVICE_TYPE.SHIMMER3_OUTPUT;
+			} 
 			else if(mFriendlyName.contains(HwDriverShimmerDeviceDetails.SH_SEARCH.BT.SHIMMER4)){
 				mDeviceTypeDetected = DEVICE_TYPE.SHIMMER4;
 			}
@@ -73,7 +76,8 @@ else if(mFriendlyName.contains(HwDriverShimmerDeviceDetails.SH_SEARCH.BT.MANUFAC
 			}
 			else if(mFriendlyName.contains(HwDriverShimmerDeviceDetails.SH_SEARCH.BT.MANUFACTURER_NONIN)){
 				mDeviceTypeDetected = DEVICE_TYPE.NONIN_ONYX_II;
-			} else {
+			}
+			else {
 				mDeviceTypeDetected = DEVICE_TYPE.UNKOWN;
 			}
 		} else {

ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java

@@ -19,6 +19,7 @@ public static enum DEVICE_TYPE {
 		RN42("RN42"),
 		RNBT("RNBT"),
 		SHIMMER3("Shimmer3"),
+		SHIMMER3_OUTPUT("OUTPUT"),
 		SHIMMER_ECG_MD("ShimmerECGmd"),
 		SHIMMER4("Shimmer4"),
 
@@ -196,6 +197,7 @@ public static final class TOSHIBA_DRIVER {
 
             public static final String[] SHIMMER_DEVICE = new String[] {
             	SHIMMER3,
+            	DEVICE_TYPE.SHIMMER3_OUTPUT.getLabel(),
             	SHIMMER_ECG_MD,
             	SHIMMER4,
             	RN42,