Merge pull request #219 from ShimmerEngineering/DEV-289

DEV-289

Author: JongChern

ShimmerBluetoothManager/build.gradle

@@ -25,7 +25,7 @@ publishing {
 
             groupId = 'com.shimmerresearch' // Replace with your package's group/organization name
             artifactId = 'shimmerbluetoothmanager' // Replace with the name of your package
-            version = '0.11.2_beta' // Replace with your package version
+            version = '0.11.3_beta' // Replace with your package version
 
             // Jar publication
             //(

ShimmerDriver/build.gradle

@@ -47,7 +47,7 @@ publishing {
 
             groupId = 'com.shimmerresearch' // Replace with your package's group/organization name
             artifactId = 'shimmerdriver' // Replace with the name of your package
-            version = '0.11.2_beta' // Replace with your package version
+            version = '0.11.3_beta' // Replace with your package version
 
             // Jar publication
             //(

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

@@ -1064,7 +1064,10 @@ public static String longToHexString(long number, int numBytes) {
 		}
 		return bytesToHexString(bytesArray);
 	}
-
+	public static String convertLongToHexString(long longNumber) {
+		byte[] bytesArray = convertLongToByteArray(longNumber);
+		return bytesToHexString(bytesArray);
+	}
 	public static String doubleArrayToString(double[][] doubleArray) {
 		String returnString = "";
 		for(int x=0;x<doubleArray.length;x++){

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

@@ -45,4 +45,8 @@ public static int[] parseVersion(String version) {
         }
         return null; // Return null if the format is invalid
     }
+	
+	public String getVersion() {
+		return mMajor+"."+mMinor+"."+mInternal;
+	}
 }

ShimmerDriver/src/test/java/com/shimmerresearch/driverUtilities/API_00007_UtilShimmerTest.java

@@ -28,6 +28,17 @@ public void testRoundTwoDecimalPoints() {
         assertTrue(UtilShimmer.round(-5.444, 2) == -5.44);
     }
 
+    @Test
+    public void testConvertLongToHexString() {
+        assertEquals("0000000000000000", UtilShimmer.convertLongToHexString(0L));
+        assertEquals("0000000000000001", UtilShimmer.convertLongToHexString(1L));
+        assertEquals("00000000ffffffff".toUpperCase(), UtilShimmer.convertLongToHexString(4294967295L)); // max unsigned int
+        assertEquals("7fffffffffffffff".toUpperCase(), UtilShimmer.convertLongToHexString(Long.MAX_VALUE));
+        assertEquals("8000000000000000", UtilShimmer.convertLongToHexString(Long.MIN_VALUE));
+        assertEquals("00000000075bcd15".toUpperCase(), UtilShimmer.convertLongToHexString(123456789L));
+    }
+    
+    
     @Test
     public void testRoundNegativeDecimalPoints() {
         try {

ShimmerDriverPC/build.gradle

@@ -37,7 +37,7 @@ publishing {
 
             groupId = 'com.shimmerresearch' // Replace with your package's group/organization name
             artifactId = 'shimmerdriverpc' // Replace with the name of your package
-            version = '0.11.2_beta' // Replace with your package version
+            version = '0.11.3_beta' // Replace with your package version
 
             // Jar publication
             //(