diff --git a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/Shimmer.java b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/Shimmer.java index 0fa52b8..e3f18d5 100644 --- a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/Shimmer.java +++ b/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) { diff --git a/ShimmerAndroidInstrumentDriver/shimmerServiceExample/src/main/java/com/shimmerresearch/shimmercapture/MainActivity.java b/ShimmerAndroidInstrumentDriver/shimmerServiceExample/src/main/java/com/shimmerresearch/shimmercapture/MainActivity.java index aa560e4..a707d7d 100644 --- a/ShimmerAndroidInstrumentDriver/shimmerServiceExample/src/main/java/com/shimmerresearch/shimmercapture/MainActivity.java +++ b/ShimmerAndroidInstrumentDriver/shimmerServiceExample/src/main/java/com/shimmerresearch/shimmercapture/MainActivity.java @@ -523,6 +523,7 @@ 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("")) @@ -530,7 +531,7 @@ public void onClick(DialogInterface dialog, int id) { 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;