Merge branch 'master' into DEV-135

Author: JongChern

ShimmerBluetoothManager/build.gradle

@@ -24,8 +24,8 @@ publishing {
             from components.java
 
             groupId = 'com.shimmerresearch' // Replace with your package's group/organization name
-            artifactId = 'shimmerbluetoothmanagerdev' // Replace with the name of your package
-            version = '0.10.21_alpha' // Replace with your package version
+            artifactId = 'shimmerbluetoothmanager' // Replace with the name of your package
+            version = '0.11.4_beta' // Replace with your package version
 
             // Jar publication
             //(

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

@@ -55,6 +55,7 @@ public abstract class ShimmerBluetoothManager{
 	protected static final boolean USE_INFOMEM_CONFIG_METHOD = true;
 	public static final long SLEEP_BETWEEN_GROUP_ACTIONS_MS = 50;
 	public static final String COMPORT_PREFIX = "COM";
+	public static final String COMPORT_PREFIX_MAC = "/dev/";
 	protected int mSyncTrainingIntervalInSeconds = 15;
 	protected int msDelayBetweenSetCommands = 0;
 	protected BluetoothProgressReportAll mProgressReportAll;
@@ -502,7 +503,7 @@ public void removeShimmerDeviceBtConnected(String connectionHandle){
 	}
 
 	protected BluetoothDeviceDetails getBluetoothDeviceDetails(String connectionHandle){
-		if (!connectionHandle.contains(COMPORT_PREFIX)) {
+		if (!connectionHandle.contains(COMPORT_PREFIX) && !connectionHandle.contains(COMPORT_PREFIX_MAC)) {
 			return getBLEDeviceDetails(connectionHandle);
 		}
     	return mMapOfParsedBtComPorts.get(connectionHandle);
@@ -835,7 +836,7 @@ else if(deviceTypeDetected==DEVICE_TYPE.ARDUINO){
 						if (shimmerDevice!=null && !(shimmerDevice instanceof ShimmerShell)){
 							printMessage("Connecting to " + shimmerDevice.getClass().getSimpleName() + " with connection handle = " + (connectThroughComPort? comPort:bluetoothAddress));
 							if(connectThroughComPort){
-								if (!comPort.contains(COMPORT_PREFIX)) {
+								if (!comPort.contains(COMPORT_PREFIX) && !comPort.contains(COMPORT_PREFIX_MAC)) {
 									connectShimmer3BleGrpc(bluetoothDetails);
 								}else {
 									connectExistingShimmer(shimmerDevice, comPort, bluetoothAddress);

ShimmerDriver/build.gradle

@@ -46,8 +46,8 @@ publishing {
             from components.java
 
             groupId = 'com.shimmerresearch' // Replace with your package's group/organization name
-            artifactId = 'shimmerdriverdev' // Replace with the name of your package
-            version = '0.10.21_alpha' // Replace with your package version
+            artifactId = 'shimmerdriver' // Replace with the name of your package
+            version = '0.11.4_beta' // Replace with your package version
 
             // Jar publication
             //(

ShimmerDriver/src/main/java/com/shimmerresearch/algorithms/orientation/OrientationModule9DOF.java

@@ -295,7 +295,7 @@ public static class DatabaseChannelHandles{
 					Configuration.Shimmer3.SENSOR_ID.SHIMMER_LSM303_MAG,
 					Configuration.Shimmer3.SENSOR_ID.SHIMMER_LSM6DSV_ACCEL_LN,
 					Configuration.Shimmer3.SENSOR_ID.SHIMMER_LSM6DSV_GYRO,
-					Configuration.Shimmer3.SENSOR_ID.SHIMMER_LIS3MDL_MAG),
+					Configuration.Shimmer3.SENSOR_ID.SHIMMER_LIS2MDL_MAG),
 					CHANNEL_UNITS.NO_UNITS,
 					SENSOR_CHECK_METHOD.ANY,
 					listChannelsEuler9DOF_LN);
@@ -318,7 +318,7 @@ public static class DatabaseChannelHandles{
 					Configuration.Shimmer3.SENSOR_ID.SHIMMER_LSM303_MAG,
 					Configuration.Shimmer3.SENSOR_ID.SHIMMER_LIS2DW12_ACCEL_WR,
 					Configuration.Shimmer3.SENSOR_ID.SHIMMER_LSM6DSV_GYRO,
-					Configuration.Shimmer3.SENSOR_ID.SHIMMER_LIS3MDL_MAG),
+					Configuration.Shimmer3.SENSOR_ID.SHIMMER_LIS2MDL_MAG),
 					CHANNEL_UNITS.NO_UNITS,
 					SENSOR_CHECK_METHOD.ANY,
 					listChannelsQuat9DOF_WR);