Skip to content

Commit 36aa869

Browse files
committed
more updates to check sequence
1 parent 74ebed2 commit 36aa869

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

ShimmerAPI/ShimmerAPI/ShimmerBluetooth.cs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4797,33 +4797,33 @@ protected void SetCompatibilityCode()
47974797
{
47984798
if (FirmwareIdentifier == ShimmerBluetooth.FW_IDENTIFIER_BTSTREAM) //BtStream //Also Used For EXG MD, 9/2/2018: No longer used for newer ECGMD fw versions
47994799
{
4800-
if (compareVersions(0,1))//FirmwareVersion == 0.1)
4800+
if (compareVersions(0, 8))//(FirmwareVersion >= 0.8)
48014801
{
4802-
CompatibilityCode = 1;
4802+
CompatibilityCode = 7;
48034803
}
4804-
else if (compareVersions(0, 2))//FirmwareVersion == 0.2)
4804+
else if (compareVersions(0, 7, 3))//(FirmwareVersion >= 0.7 && FirmwareInternal>2)
48054805
{
4806-
CompatibilityCode = 2;
4806+
CompatibilityCode = 7; //skip CompatibilityCode = 6 since functionality of code 6 and 7 was introduced at the same time
48074807
}
4808-
else if (compareVersions(0, 3))//FirmwareVersion == 0.3)
4808+
else if (compareVersions(0, 5) && (!compareVersions(0, 7, 3)))//(FirmwareVersion >= 0.5 && (FirmwareVersion <= 0.7 && FirmwareInternal <= 2))
48094809
{
4810-
CompatibilityCode = 3;
4810+
CompatibilityCode = 5;
48114811
}
48124812
else if (compareVersions(0, 4))//FirmwareVersion == 0.4)
48134813
{
48144814
CompatibilityCode = 4;
48154815
}
4816-
else if (compareVersions(0, 5) && (!compareVersions(0, 7, 3)))//(FirmwareVersion >= 0.5 && (FirmwareVersion <= 0.7 && FirmwareInternal <= 2))
4816+
else if (compareVersions(0, 3))//FirmwareVersion == 0.3)
48174817
{
4818-
CompatibilityCode = 5;
4818+
CompatibilityCode = 3;
48194819
}
4820-
else if (compareVersions(0, 7, 3))//(FirmwareVersion >= 0.7 && FirmwareInternal>2)
4820+
else if (compareVersions(0, 2))//FirmwareVersion == 0.2)
48214821
{
4822-
CompatibilityCode = 7; //skip CompatibilityCode = 6 since functionality of code 6 and 7 was introduced at the same time
4822+
CompatibilityCode = 2;
48234823
}
4824-
else if (compareVersions(0, 8))//(FirmwareVersion >= 0.8)
4824+
else if (compareVersions(0, 1))//FirmwareVersion == 0.1)
48254825
{
4826-
CompatibilityCode = 7;
4826+
CompatibilityCode = 1;
48274827
}
48284828
}
48294829
else if (FirmwareIdentifier == ShimmerBluetooth.FW_IDENTIFIER_LOGANDSTREAM) //LogAndStream
@@ -4832,21 +4832,21 @@ protected void SetCompatibilityCode()
48324832
{
48334833
CompatibilityCode = 8;
48344834
}
4835-
else if (compareVersions(0, 1)) //(FirmwareVersion == 0.1)
4836-
{
4837-
CompatibilityCode = 3;
4838-
}
4839-
else if (compareVersions(0, 2)) //(FirmwareVersion == 0.2)
4835+
else if (compareVersions(0, 5, 4) || compareVersions(0, 6))//(FirmwareVersion >= 0.5 && FirmwareInternal >= 4 || FirmwareVersion == 0.6)
48404836
{
4841-
CompatibilityCode = 4;
4837+
CompatibilityCode = 6;
48424838
}
48434839
else if ((compareVersions(0, 3)) && (!compareVersions(0, 5)))//(FirmwareVersion >= 0.3 && FirmwareVersion<0.5)
48444840
{
48454841
CompatibilityCode = 5;
48464842
}
4847-
else if (compareVersions(0, 5, 4) || compareVersions(0, 6))//(FirmwareVersion >= 0.5 && FirmwareInternal >= 4 || FirmwareVersion == 0.6)
4843+
else if (compareVersions(0, 2)) //(FirmwareVersion == 0.2)
48484844
{
4849-
CompatibilityCode = 6;
4845+
CompatibilityCode = 4;
4846+
}
4847+
else if (compareVersions(0, 1)) //(FirmwareVersion == 0.1)
4848+
{
4849+
CompatibilityCode = 3;
48504850
}
48514851
else
48524852
{

0 commit comments

Comments
 (0)