diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-31 10:09:14 -0700 |
|---|---|---|
| committer |  Lubomir I. Ivanov <neolit123@gmail.com> | 2019-06-01 05:25:23 +0300 |
| commit | ba31c56c78540942f9187cd5b9ed87b845819b9e (patch) | |
| tree | 5145af6eec2a7e1694e13fe33a34656f5e3a683f | |
| parent | 476734911175ceb0ab6e0c4c741223d70087a787 (diff) | |
| download | subsurface-ba31c56c78540942f9187cd5b9ed87b845819b9e.tar.gz | |
Add BLE detection for the new Oceanic Geo 4.0
Note that we don't really have libdivecomputer support for it yet, only
newly added model numbers etc. But the name detection should make it
easier for people to at least download a memory dump.
In addition to the libdivecomputer model number updates, this also has a
merge of Jef's upstram libdivecomputer changes.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | core/btdiscovery.cpp | 5 | ||||
| m--------- | libdivecomputer | 0 |
2 files changed, 5 insertions, 0 deletions
diff --git a/core/btdiscovery.cpp b/core/btdiscovery.cpp index 20dda1a39..d945dcf21 100644 --- a/core/btdiscovery.cpp +++ b/core/btdiscovery.cpp @@ -85,6 +85,11 @@ static dc_descriptor_t *getDeviceType(QString btName) product = "Pro Plus X"; } + if (btName.contains(QRegularExpression("^FS\\d{6}$"))) { + vendor = "Oceanic"; + product = "Geo 4.0"; + } + if (!vendor.isEmpty() && !product.isEmpty()) return descriptorLookup.value(vendor + product); diff --git a/libdivecomputer b/libdivecomputer -Subproject 1194585595f7a26f3ec7f96b5ad6e8f689a7025 +Subproject e38406b353bb0e6f27248c59eba7794cc559303 |