Skip to content

Commit 7eecfce

Browse files
authored
Merge pull request #239 from ShimmerEngineering/DEV-425_BLE_BT_on_off_control
DEV-425 Option to enable/disable bt classic/ble
2 parents 563dd5b + 41dd24e commit 7eecfce

3 files changed

Lines changed: 40 additions & 0 deletions

File tree

ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2078,6 +2078,13 @@ public boolean isSupportedSdLogSync() {
20782078
return false;
20792079
}
20802080

2081+
public boolean isFWSupportedBtBleControl() {
2082+
if(getFirmwareIdentifier()==ShimmerVerDetails.FW_ID.LOGANDSTREAM
2083+
&& mShimmerVerObject.compareVersions(HW_ID.SHIMMER_3, FW_ID.LOGANDSTREAM, 1, 0, 4)){
2084+
return true;
2085+
}
2086+
return false;
2087+
}
20812088

20822089
public boolean isLegacySdLog(){
20832090
if (getFirmwareIdentifier()==FW_ID.SDLOG && getFirmwareVersionMajor()==0 && getFirmwareVersionMinor()==5){

ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerObject.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10830,6 +10830,14 @@ public static boolean isSupportedNewImuSensors(ShimmerVerObject svo, ExpansionBo
1083010830
return false;
1083110831
}
1083210832
}
10833+
10834+
public boolean isSupportedBtBleControl() {
10835+
//TODO check S3/S3R FW version in-which command was introduced?
10836+
BluetoothModuleVersionDetails bluetoothModuleVersionDetails = getBtFwVerDetails();
10837+
return (bluetoothModuleVersionDetails.isBtModuleVersionKnown()
10838+
&& !bluetoothModuleVersionDetails.isBtModuleVersionRn41()
10839+
&& !bluetoothModuleVersionDetails.isBtModuleVersionRn42());
10840+
}
1083310841

1083410842
@Override
1083510843
public LinkedHashMap<String, ChannelDetails> getMapOfAllChannelsForStoringToDB(COMMUNICATION_TYPE commType, CHANNEL_TYPE channelType, boolean isKeyOJCName, boolean showDisabledChannels) {

ShimmerDriver/src/main/java/com/shimmerresearch/driver/shimmer2r3/BluetoothModuleVersionDetails.java

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,29 @@ public String getBtModuleVersionReceived() {
7474
return mBtModuleVersionReceived;
7575
}
7676

77+
public boolean isBtModuleVersionKnown() {
78+
return mBtModuleVersionParsed != BT_MODULE_VERSION.UNKNOWN && mBtModuleVersionParsed != BT_MODULE_VERSION.NOT_READ;
79+
}
80+
81+
public boolean isBtModuleVersionRn42() {
82+
return mBtModuleVersionParsed == BT_MODULE_VERSION.RN42_VERSION_RESPONSE_V4_77 ||
83+
mBtModuleVersionParsed == BT_MODULE_VERSION.RN42_VERSION_RESPONSE_V6_15;
84+
}
85+
86+
public boolean isBtModuleVersionRn41() {
87+
return mBtModuleVersionParsed == BT_MODULE_VERSION.RN41_VERSION_RESPONSE_V4_77;
88+
}
89+
90+
public boolean isBtModuleVersionRn4678() {
91+
return mBtModuleVersionParsed == BT_MODULE_VERSION.RN4678_VERSION_RESPONSE_V1_00_5
92+
|| mBtModuleVersionParsed == BT_MODULE_VERSION.RN4678_VERSION_RESPONSE_V1_11_0
93+
|| mBtModuleVersionParsed == BT_MODULE_VERSION.RN4678_VERSION_RESPONSE_V1_13_5
94+
|| mBtModuleVersionParsed == BT_MODULE_VERSION.RN4678_VERSION_RESPONSE_V1_22_0
95+
|| mBtModuleVersionParsed == BT_MODULE_VERSION.RN4678_VERSION_RESPONSE_V1_23_0;
96+
}
97+
98+
public boolean isBtModuleVersionVelaIf820() {
99+
return mBtModuleVersionParsed == BT_MODULE_VERSION.VELA_IF820_V01_04_12_12
100+
|| mBtModuleVersionParsed == BT_MODULE_VERSION.VELA_IF820_V01_04_16_16;
101+
}
77102
}

0 commit comments

Comments
 (0)