From cc5ae1911befd6217989d5b6ffe7d311f64e659f Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 18 Aug 2020 12:55:02 -0700 Subject: core/bt-discovery: recognize BT names of four more dive computers This adds the Oceanic Veo 4.0 & Pro Plus 4, the Sherwood Wisdom 4 and the Tecdiving DiveComputer.eu to our list of known names. The Oceanic Pro Plus X detection is simply moved to have the other names in a more logical order. Signed-off-by: Dirk Hohndel --- core/btdiscovery.cpp | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/core/btdiscovery.cpp b/core/btdiscovery.cpp index 7dfac0ad1..bae2ff3e4 100644 --- a/core/btdiscovery.cpp +++ b/core/btdiscovery.cpp @@ -94,12 +94,21 @@ static dc_descriptor_t *getDeviceType(QString btName) } else if (btName.contains(QRegularExpression("^FR\\d{6}$"))) { vendor = "Aqualung"; product = "i550C"; - } else if (btName.contains(QRegularExpression("^ER\\d{6}$"))) { - vendor = "Oceanic"; - product = "Pro Plus X"; } else if (btName.contains(QRegularExpression("^FS\\d{6}$"))) { vendor = "Oceanic"; product = "Geo 4.0"; + } else if (btName.contains(QRegularExpression("^FT\\d{6}$"))) { + vendor = "Oceanic"; + product = "Veo 4.0"; + } else if (btName.contains(QRegularExpression("^FU\\d{6}$"))) { + vendor = "Sherwood"; + product = "Wisdom 4"; + } else if (btName.contains(QRegularExpression("^FV\\d{6}$"))) { + vendor = "Oceanic"; + product = "ProPlus 4"; + } else if (btName.contains(QRegularExpression("^ER\\d{6}$"))) { + vendor = "Oceanic"; + product = "Pro Plus X"; } else if (btName.contains(QRegularExpression("^DS\\d{6}"))) { // The Ratio bluetooth name looks like the Pelagic ones, // but that seems to be just happenstance. @@ -114,6 +123,9 @@ static dc_descriptor_t *getDeviceType(QString btName) } else if (btName.startsWith("McLean Extreme")) { vendor = "McLean"; product = "Extreme"; + } else if (btName.startsWith("DiveComputer")) { + vendor = "Tecdiving"; + product = "DiveComputer.eu"; } // check if we found a known dive computer -- cgit v1.2.3-70-g09d2