Skip to content

DEV_479 fix for batt percentage #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2025
Merged

DEV_479 fix for batt percentage #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/Shimmer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
3 changes: 2 additions & 1 deletion .../shimmerServiceExample/src/main/java/com/shimmerresearch/shimmercapture/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down