From dcbbe97dbcf8274b545a6cfd714da0c77079dd18 Mon Sep 17 00:00:00 2001 From: Mark Nolan Date: Fri, 15 Aug 2025 09:01:13 +0100 Subject: [PATCH 1/5] DEV-425 #time 10m method to help determine BT generation from driver --- .../BluetoothModuleVersionDetails.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) 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 dcb20ccfe..32beae51c 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/shimmer2r3/BluetoothModuleVersionDetails.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/shimmer2r3/BluetoothModuleVersionDetails.java @@ -74,4 +74,29 @@ public String getBtModuleVersionReceived() { return mBtModuleVersionReceived; } + public boolean isBtModuleVersionKnown() { + return mBtModuleVersionParsed != BT_MODULE_VERSION.UNKNOWN && mBtModuleVersionParsed != BT_MODULE_VERSION.NOT_READ; + } + + public boolean isBtModuleVersionRn42() { + return mBtModuleVersionParsed == BT_MODULE_VERSION.RN42_VERSION_RESPONSE_V4_77 || + mBtModuleVersionParsed == BT_MODULE_VERSION.RN42_VERSION_RESPONSE_V6_15; + } + + public boolean isBtModuleVersionRn41() { + return mBtModuleVersionParsed == BT_MODULE_VERSION.RN41_VERSION_RESPONSE_V4_77; + } + + public boolean isBtModuleVersionRn4678() { + return mBtModuleVersionParsed == BT_MODULE_VERSION.RN4678_VERSION_RESPONSE_V1_00_5 + || mBtModuleVersionParsed == BT_MODULE_VERSION.RN4678_VERSION_RESPONSE_V1_11_0 + || mBtModuleVersionParsed == BT_MODULE_VERSION.RN4678_VERSION_RESPONSE_V1_13_5 + || mBtModuleVersionParsed == BT_MODULE_VERSION.RN4678_VERSION_RESPONSE_V1_22_0 + || mBtModuleVersionParsed == BT_MODULE_VERSION.RN4678_VERSION_RESPONSE_V1_23_0; + } + + public boolean isBtModuleVersionVelaIf820() { + return mBtModuleVersionParsed == BT_MODULE_VERSION.VELA_IF820_V01_04_12_12 + || mBtModuleVersionParsed == BT_MODULE_VERSION.VELA_IF820_V01_04_16_16; + } } From 61073fe96edde295b13de680cb7012dbd8b66cc7 Mon Sep 17 00:00:00 2001 From: Mark Nolan Date: Fri, 15 Aug 2025 10:38:19 +0100 Subject: [PATCH 2/5] DEV-425 #time 5m method for is bt control supported --- .../java/com/shimmerresearch/driver/ShimmerObject.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerObject.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerObject.java index 396c75e68..eca0679ed 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerObject.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerObject.java @@ -10830,6 +10830,14 @@ public static boolean isSupportedNewImuSensors(ShimmerVerObject svo, ExpansionBo return false; } } + + public boolean isSupportedBtBleControl() { + //TODO check S3/S3R FW version in-which command was introduced? + BluetoothModuleVersionDetails bluetoothModuleVersionDetails = getBtFwVerDetails(); + return (bluetoothModuleVersionDetails.isBtModuleVersionKnown() + && !bluetoothModuleVersionDetails.isBtModuleVersionRn41() + && !bluetoothModuleVersionDetails.isBtModuleVersionRn42()); + } @Override public LinkedHashMap getMapOfAllChannelsForStoringToDB(COMMUNICATION_TYPE commType, CHANNEL_TYPE channelType, boolean isKeyOJCName, boolean showDisabledChannels) { From 6a2549e759f0692a77658ee6fb7673ba4815a866 Mon Sep 17 00:00:00 2001 From: Mas Azalya Date: Tue, 19 Aug 2025 11:27:15 +0800 Subject: [PATCH 3/5] add fw compatibility check --- .../java/com/shimmerresearch/driver/ShimmerDevice.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java index 54a55ee54..875765671 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java @@ -2078,6 +2078,13 @@ public boolean isSupportedSdLogSync() { return false; } + public boolean isSupportedBtBleControl() { + if(getFirmwareIdentifier()==ShimmerVerDetails.FW_ID.LOGANDSTREAM + && mShimmerVerObject.compareVersions(HW_ID.SHIMMER_3, FW_ID.LOGANDSTREAM, 1, 0, 4)){ + return true; + } + return false; + } public boolean isLegacySdLog(){ if (getFirmwareIdentifier()==FW_ID.SDLOG && getFirmwareVersionMajor()==0 && getFirmwareVersionMinor()==5){ From 0cbd875713b3886677a7824113c1b8aaadd223a3 Mon Sep 17 00:00:00 2001 From: Mas Azalya Date: Tue, 19 Aug 2025 12:01:55 +0800 Subject: [PATCH 4/5] rename --- .../src/main/java/com/shimmerresearch/driver/ShimmerDevice.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java index 875765671..9e1265b19 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java @@ -2078,7 +2078,7 @@ public boolean isSupportedSdLogSync() { return false; } - public boolean isSupportedBtBleControl() { + public boolean isFWSupportedBtBleControl() { if(getFirmwareIdentifier()==ShimmerVerDetails.FW_ID.LOGANDSTREAM && mShimmerVerObject.compareVersions(HW_ID.SHIMMER_3, FW_ID.LOGANDSTREAM, 1, 0, 4)){ return true; From 41dd24ed44bf6882a6d080f7e2abdf26ca43b3af Mon Sep 17 00:00:00 2001 From: Mas Azalya Date: Thu, 21 Aug 2025 10:53:54 +0800 Subject: [PATCH 5/5] unstaged changes issue --- .../shimmer2r3/BluetoothModuleVersionDetails.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 32beae51c..379058e30 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/shimmer2r3/BluetoothModuleVersionDetails.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/shimmer2r3/BluetoothModuleVersionDetails.java @@ -74,20 +74,20 @@ public String getBtModuleVersionReceived() { return mBtModuleVersionReceived; } - public boolean isBtModuleVersionKnown() { - return mBtModuleVersionParsed != BT_MODULE_VERSION.UNKNOWN && mBtModuleVersionParsed != BT_MODULE_VERSION.NOT_READ; + public boolean isBtModuleVersionKnown() { + return mBtModuleVersionParsed != BT_MODULE_VERSION.UNKNOWN && mBtModuleVersionParsed != BT_MODULE_VERSION.NOT_READ; } - public boolean isBtModuleVersionRn42() { - return mBtModuleVersionParsed == BT_MODULE_VERSION.RN42_VERSION_RESPONSE_V4_77 || - mBtModuleVersionParsed == BT_MODULE_VERSION.RN42_VERSION_RESPONSE_V6_15; + public boolean isBtModuleVersionRn42() { + return mBtModuleVersionParsed == BT_MODULE_VERSION.RN42_VERSION_RESPONSE_V4_77 || + mBtModuleVersionParsed == BT_MODULE_VERSION.RN42_VERSION_RESPONSE_V6_15; } public boolean isBtModuleVersionRn41() { return mBtModuleVersionParsed == BT_MODULE_VERSION.RN41_VERSION_RESPONSE_V4_77; } - public boolean isBtModuleVersionRn4678() { + public boolean isBtModuleVersionRn4678() { return mBtModuleVersionParsed == BT_MODULE_VERSION.RN4678_VERSION_RESPONSE_V1_00_5 || mBtModuleVersionParsed == BT_MODULE_VERSION.RN4678_VERSION_RESPONSE_V1_11_0 || mBtModuleVersionParsed == BT_MODULE_VERSION.RN4678_VERSION_RESPONSE_V1_13_5 @@ -95,7 +95,7 @@ public boolean isBtModuleVersionRn4678() { || mBtModuleVersionParsed == BT_MODULE_VERSION.RN4678_VERSION_RESPONSE_V1_23_0; } - public boolean isBtModuleVersionVelaIf820() { + public boolean isBtModuleVersionVelaIf820() { return mBtModuleVersionParsed == BT_MODULE_VERSION.VELA_IF820_V01_04_12_12 || mBtModuleVersionParsed == BT_MODULE_VERSION.VELA_IF820_V01_04_16_16; }