mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 20:33:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Core: don't prevent some OSTC models from being recognized

Browse source 
The code seemed to do something really reasonable by picking one of the
supported OSTC versions - except that the one it picked didn't support
BT/BLE and therefore our logic of recognizing dive computers on iOS
failed.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2019-11-21 03:38:35 -08:00
parent bde4537320
commit c36513a9f3
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -1,3 +1,4 @@
Mobile: ensure that all BT/BLE flavors of the OSTC are recognized as dive computers [#2358]
Desktop: allow copy&pasting of multiple cylinders [#2386] Desktop: allow copy&pasting of multiple cylinders [#2386]
Desktop: don't output random SAC values for cylinders without data [#2376] Desktop: don't output random SAC values for cylinders without data [#2376]
Mobile: add menu entry to start a support email, using native email client Mobile: add menu entry to start a support email, using native email client

7
core/btdiscovery.cpp
View file

@ -30,9 +30,10 @@ static dc_descriptor_t *getDeviceType(QString btName)
else if (btName.mid(4,2) == "4-") product = "OSTC 4"; else if (btName.mid(4,2) == "4-") product = "OSTC 4";
else if (btName.mid(4,2) == "2-") product = "OSTC 2N"; else if (btName.mid(4,2) == "2-") product = "OSTC 2N";
else if (btName.mid(4,2) == "+ ") product = "OSTC 2"; else if (btName.mid(4,2) == "+ ") product = "OSTC 2";
// all OSTCs are HW_FAMILY_OSTC_3, so when we do not know, // all BT/BLE enabled OSTCs are HW_FAMILY_OSTC_3, so when we do not know,
// just try this // just use a default product that allows the codoe to download from the
else product = "OSTC 3"; // all OSTCs are HW_FAMILY_OSTC_3 // user's dive computer
else product = "OSTC 2";
} }
if (btName.startsWith("Predator") || if (btName.startsWith("Predator") ||