From 738fd708b37dfed99cc90901c2ae4c760c886ffa Mon Sep 17 00:00:00 2001 From: Mark Nolan Date: Thu, 19 Jun 2025 13:11:03 +0100 Subject: [PATCH 1/2] DEV-197 #time 5m adding get method for Shimmer charging status --- .../driverUtilities/ShimmerBattStatusDetails.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/ShimmerBattStatusDetails.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/ShimmerBattStatusDetails.java index 3f3bac5fd..fb7518008 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/ShimmerBattStatusDetails.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/ShimmerBattStatusDetails.java @@ -135,6 +135,10 @@ else if((mChargingStatusRaw & 0xFF) == CHARGING_STATUS_BYTE.UNKNOWN) { } } + public CHARGING_STATUS getChargingStatus() { + return mChargingStatus; + } + public static double adcValToBattVoltage(int adcVal){ double calibratedData = SensorADC.calibrateU12AdcValueToMillivolts(adcVal, 0.0, 3.0, 1.0); double battVoltage = ((calibratedData * 1.988)) / 1000; // 1.988 is due to components on the Shimmmer, 1000 is to convert to volts From ceca4a7b508bf6ae166cf011de7e38e0af6567dd Mon Sep 17 00:00:00 2001 From: Mark Nolan Date: Thu, 19 Jun 2025 14:44:04 +0100 Subject: [PATCH 2/2] DEV-197 #time 10 support for S3R BT module version parsing --- .../BluetoothModuleVersionDetails.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/shimmer2r3/BluetoothModuleVersionDetails.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/shimmer2r3/BluetoothModuleVersionDetails.java index 73831bee7..dcb20ccfe 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/shimmer2r3/BluetoothModuleVersionDetails.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/shimmer2r3/BluetoothModuleVersionDetails.java @@ -25,6 +25,9 @@ public static enum BT_MODULE_VERSION { RN4678_VERSION_RESPONSE_V1_22_0("RN4678 V1.22 12/08/2020 (c)Microchip Technology Inc ", "RN4678 V1.22 ", "RN4678 v1.23"), RN4678_VERSION_RESPONSE_V1_23_0("RN4678 V1.23 06/30/2021 (c)Microchip Technology Inc", "RN4678 V1.23 ", "RN4678 v1.23"), + VELA_IF820_V01_04_12_12("CYW20820 app=v01.04.12.12", "CYW20820 app=v01.04.12.12", "IF820 v01.04.12.12"), + VELA_IF820_V01_04_16_16("CYW20820 app=v01.04.16.16", "CYW20820 app=v01.04.16.16", "IF820 v01.04.16.16"), + UNKNOWN("Unknown", "Unknown", "Unknown"); public String btModuleVerStrFull = ""; @@ -46,8 +49,15 @@ public void parseBtModuleVerBytes(byte[] responseData) { mBtModuleVersionParsed = BT_MODULE_VERSION.UNKNOWN; for (BT_MODULE_VERSION btModuleVersion : BT_MODULE_VERSION.values()) { - if(mBtModuleVersionReceived.contains(btModuleVersion.btModuleVerStrComparison)) { + if(btModuleVersion == BT_MODULE_VERSION.NOT_READ) { + if(mBtModuleVersionReceived.isEmpty()) { + mBtModuleVersionParsed = BT_MODULE_VERSION.NOT_READ; + break; + } + } + else if(mBtModuleVersionReceived.contains(btModuleVersion.btModuleVerStrComparison)) { mBtModuleVersionParsed = btModuleVersion; + break; } } } @@ -60,4 +70,8 @@ public String getUserFriendlyName() { } } + public String getBtModuleVersionReceived() { + return mBtModuleVersionReceived; + } + }