Merge branch 'master' into DEV-380

Author: MAzalya

ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle

@@ -83,7 +83,7 @@ publishing {
         bar(MavenPublication) {
             groupId = 'com.shimmerresearch' // Replace with your package's group/organization name
             artifactId = 'shimmerandroidinstrumentdriver' // Replace with the name of your package
-            version = '3.2.3_beta' // Replace with your package version
+            version = '3.2.4_beta' // Replace with your package version
             artifact("$buildDir/outputs/aar/${getArtificatId()}-release.aar")
         }
     }

ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/Shimmer.java

@@ -862,9 +862,9 @@ protected byte[] getDataFromArrayOutputStream(int extraBytesLength){
 	@Override
 	protected void processInstreamResponse(boolean shouldClearCrcFromBuffer) {
 
-		if (mBluetoothRadioState.equals(BT_STATE.CONNECTED)){
+		if (!mBluetoothRadioState.equals(BT_STATE.STREAMING)){ //every other start besides streaming
 			super.processInstreamResponse(shouldClearCrcFromBuffer);
-		} else if (mBluetoothRadioState.equals(BT_STATE.STREAMING)){
+		} else { //streaming state
 			//byte[] inStreamResponseCommandBuffer = readBytes(1, INSTREAM_CMD_RESPONSE);
 			byte[] bufferTemp = getDataFromArrayOutputStream(4);
 			if (bufferTemp != null) {

ShimmerAndroidInstrumentDriver/build.gradle

@@ -78,15 +78,15 @@ allprojects {
                 implementation 'java3d:vecmath:1.3.1'
                 implementation 'androidx.appcompat:appcompat:1.7.0'
                 implementation 'com.github.Jasonchenlijian:FastBle:2.4.0'
-                implementation (group: 'com.shimmerresearch', name: 'shimmerbluetoothmanager', version:'0.11.4_beta'){
+                implementation (group: 'com.shimmerresearch', name: 'shimmerbluetoothmanager', version:'0.11.5_beta'){
 
                     // excluding org.json which is provided by Android
                     exclude group: 'io.netty'
                     exclude group: 'com.google.protobuf'
                     exclude group: 'org.apache.commons.math'
                 }
 
-                implementation (group: 'com.shimmerresearch', name: 'shimmerdriver', version:'0.11.4_beta'){
+                implementation (group: 'com.shimmerresearch', name: 'shimmerdriver', version:'0.11.5_beta'){
 
                     // excluding org.json which is provided by Android
                     exclude group: 'io.netty'

ShimmerAndroidInstrumentDriver/shimmerServiceExample/src/main/java/com/shimmerresearch/shimmercapture/MainActivity.java

@@ -527,17 +527,18 @@ public void onClick(DialogInterface dialog, int id) {
         }else if(id == R.id.device_info){
             if (selectedDeviceAddress==null){
                 return true;
-            }
-            ShimmerDevice shimmerTemp = mService.getShimmer(selectedDeviceAddress);
-            String shimmerVersion= shimmerTemp.getHardwareVersionParsed();
-            String FWName = shimmerTemp.getFirmwareVersionParsed();
-            if(FWName.equals(""))
-                FWName = "Unknown";
-
-            AlertDialog alertDialog = new AlertDialog.Builder(MainActivity.this).create();
-            alertDialog.setTitle("Device Info");
-            alertDialog.setMessage("Shimmer Version: "+shimmerVersion + "\n\nFirmware Version: "+FWName);
-            alertDialog.show();
+              
+                ShimmerDevice shimmerTemp = mService.getShimmer(selectedDeviceAddress);
+                double chargePercentage = shimmerTemp.getEstimatedChargePercentage();
+                String shimmerVersion= shimmerTemp.getHardwareVersionParsed();
+                String FWName = shimmerTemp.getFirmwareVersionParsed();
+                if(FWName.equals(""))
+                    FWName = "Unknown";
+
+                AlertDialog alertDialog = new AlertDialog.Builder(MainActivity.this).create();
+                alertDialog.setTitle("Device Info");
+                alertDialog.setMessage("Shimmer Version: "+shimmerVersion + "\n\nFirmware Version: "+FWName + "\n\nCharge Percentage: "+ (int)chargePercentage +"%");
+                alertDialog.show();
 
             return true;