Skip to content

Commit ceca4a7

Browse files
committed
DEV-197 #time 10 support for S3R BT module version parsing
1 parent 738fd70 commit ceca4a7

1 file changed

Lines changed: 15 additions & 1 deletion

File tree

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ public static enum BT_MODULE_VERSION {
2525
RN4678_VERSION_RESPONSE_V1_22_0("RN4678 V1.22 12/08/2020 (c)Microchip Technology Inc ", "RN4678 V1.22 ", "RN4678 v1.23"),
2626
RN4678_VERSION_RESPONSE_V1_23_0("RN4678 V1.23 06/30/2021 (c)Microchip Technology Inc", "RN4678 V1.23 ", "RN4678 v1.23"),
2727

28+
VELA_IF820_V01_04_12_12("CYW20820 app=v01.04.12.12", "CYW20820 app=v01.04.12.12", "IF820 v01.04.12.12"),
29+
VELA_IF820_V01_04_16_16("CYW20820 app=v01.04.16.16", "CYW20820 app=v01.04.16.16", "IF820 v01.04.16.16"),
30+
2831
UNKNOWN("Unknown", "Unknown", "Unknown");
2932

3033
public String btModuleVerStrFull = "";
@@ -46,8 +49,15 @@ public void parseBtModuleVerBytes(byte[] responseData) {
4649

4750
mBtModuleVersionParsed = BT_MODULE_VERSION.UNKNOWN;
4851
for (BT_MODULE_VERSION btModuleVersion : BT_MODULE_VERSION.values()) {
49-
if(mBtModuleVersionReceived.contains(btModuleVersion.btModuleVerStrComparison)) {
52+
if(btModuleVersion == BT_MODULE_VERSION.NOT_READ) {
53+
if(mBtModuleVersionReceived.isEmpty()) {
54+
mBtModuleVersionParsed = BT_MODULE_VERSION.NOT_READ;
55+
break;
56+
}
57+
}
58+
else if(mBtModuleVersionReceived.contains(btModuleVersion.btModuleVerStrComparison)) {
5059
mBtModuleVersionParsed = btModuleVersion;
60+
break;
5161
}
5262
}
5363
}
@@ -60,4 +70,8 @@ public String getUserFriendlyName() {
6070
}
6171
}
6272

73+
public String getBtModuleVersionReceived() {
74+
return mBtModuleVersionReceived;
75+
}
76+
6377
}

0 commit comments

Comments
 (0)