Merge pull request #102 from ShimmerEngineering/DEV-479

DEV_479 fix for batt percentage

Author: MAzalya

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/shimmerServiceExample/src/main/java/com/shimmerresearch/shimmercapture/MainActivity.java

@@ -523,14 +523,15 @@ public void onClick(DialogInterface dialog, int id) {
                     return true;
                 }
                 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);
+                alertDialog.setMessage("Shimmer Version: "+shimmerVersion + "\n\nFirmware Version: "+FWName + "\n\nCharge Percentage: "+ (int)chargePercentage +"%");
                 alertDialog.show();
 
                 return true;