Skip to content

DEV-425 Option to enable/disable bt classic/ble #239

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
JongChern merged 5 commits into from
Aug 22, 2025
Merged

DEV-425 Option to enable/disable bt classic/ble #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dcbbe97
DEV-425 #time 10m method to help determine BT generation from driver
marknolan Aug 15, 2025
61073fe
DEV-425 #time 5m method for is bt control supported
marknolan Aug 15, 2025
6a2549e
add fw compatibility check
MAzalya Aug 19, 2025
0cbd875
rename
MAzalya Aug 19, 2025
41dd24e
unstaged changes issue
MAzalya Aug 21, 2025
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
7 changes: 7 additions & 0 deletions ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2078,6 +2078,13 @@ public boolean isSupportedSdLogSync() {
return false;
}

public boolean isFWSupportedBtBleControl() {
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){
Expand Down
8 changes: 8 additions & 0 deletions ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, ChannelDetails> getMapOfAllChannelsForStoringToDB(COMMUNICATION_TYPE commType, CHANNEL_TYPE channelType, boolean isKeyOJCName, boolean showDisabledChannels) {
Expand Down
25 changes: 25 additions & 0 deletions ...er/src/main/java/com/shimmerresearch/driver/shimmer2r3/BluetoothModuleVersionDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Loading