mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add BLE detection for the new Oceanic Geo 4.0

Browse source 
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>
This commit is contained in:
Linus Torvalds 2019-05-31 10:09:14 -07:00 • committed by Lubomir I. Ivanov
parent 4767349111
commit ba31c56c78
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/btdiscovery.cpp
View file

@ -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);

2
libdivecomputer

@ -1 +1 @@
Subproject commit 1194585595f7a26f3ec7f96b5ad6e8f689a70258
Subproject commit e38406b353bb0e6f27248c59eba7794cc5593032