Update libdivecomputer

Merge upstream updates from Jef Driesen:

 - Deepblu Cosmiq+ support has been merged upstream

 - Oceans S1 support has been merged upstream

- Various new models supported: Cressi Donatello, Scubapro G2 TEK, new
  Excursion v6+ firmware.

- misc core changes, most notably supporting a new annoying specialized
  binary format for decomode, because Jef still can't deal with
  strings.

- lots of small details

(all the work done by Linus - I'm just adding this to Surface)

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2023-02-20 11:57:27 -08:00
parent 6b272ac3aa
commit e11c196a6a
4 changed files with 12 additions and 7 deletions

View file

@ -12,6 +12,7 @@ statistics: fix display of month number in continuous date axis
statistics: fix range of continuous date axis statistics: fix range of continuous date axis
desktop: fix dive time display in time shift dialog desktop: fix dive time display in time shift dialog
libdivecomputer: garmin: relax string parsing sanity checks libdivecomputer: garmin: relax string parsing sanity checks
libdivecomputer: add Cressi Donatello, Scubapro G2 TEK, Oceanic Geo Air, Scorpena Alpha
--- ---
* Always add new entries at the very top of this file above other existing entries and this note. * Always add new entries at the very top of this file above other existing entries and this note.

View file

@ -21,7 +21,7 @@
<li>Commander I, Commander II, Commander TM, EMC-14, EMC-16, EMC-20H</li></ul> <li>Commander I, Commander II, Commander TM, EMC-14, EMC-16, EMC-20H</li></ul>
</dd> </dd>
<dt>Cressi</dt><dd><ul> <dt>Cressi</dt><dd><ul>
<li>Cartesio, Drake, Edy, Giotto, Goa, Leonardo, Michelangelo, Neon, Newton</li></ul> <li>Cartesio, Donatello, Drake, Edy, Giotto, Goa, Leonardo, Michelangelo, Neon, Newton</li></ul>
</dd> </dd>
<dt>Crest</dt><dd><ul> <dt>Crest</dt><dd><ul>
<li>CR-4</li></ul> <li>CR-4</li></ul>
@ -60,7 +60,7 @@
<li>Extreme</li></ul> <li>Extreme</li></ul>
</dd> </dd>
<dt>Oceanic</dt><dd><ul> <dt>Oceanic</dt><dd><ul>
<li>Atom 1.0, Atom 2.0, Atom 3.0, Atom 3.1, Datamask, F10, F11, Geo, Geo 2.0, Geo 4.0, OC1, OCS, OCi, Pro Plus 2, Pro Plus 2.1, Pro Plus 3, Pro Plus 4, Pro Plus X, VT 4.1, VT Pro, VT3, VT4, VTX, Veo 1.0, Veo 180, Veo 2.0, Veo 200, Veo 250, Veo 3.0, Veo 4.0, Versa Pro</li></ul> <li>Atom 1.0, Atom 2.0, Atom 3.0, Atom 3.1, Datamask, F10, F11, Geo, Geo 2.0, Geo 4.0, Geo Air, OC1, OCS, OCi, Pro Plus 2, Pro Plus 2.1, Pro Plus 3, Pro Plus 4, Pro Plus X, VT 4.1, VT Pro, VT3, VT4, VTX, Veo 1.0, Veo 180, Veo 2.0, Veo 200, Veo 250, Veo 3.0, Veo 4.0, Versa Pro</li></ul>
</dd> </dd>
<dt>Oceans</dt><dd><ul> <dt>Oceans</dt><dd><ul>
<li>S1</li></ul> <li>S1</li></ul>
@ -71,8 +71,11 @@
<dt>Reefnet</dt><dd><ul> <dt>Reefnet</dt><dd><ul>
<li>Sensus, Sensus Pro, Sensus Ultra</li></ul> <li>Sensus, Sensus Pro, Sensus Ultra</li></ul>
</dd> </dd>
<dt>Scorpena</dt><dd><ul>
<li>Alpha</li></ul>
</dd>
<dt>Scubapro</dt><dd><ul> <dt>Scubapro</dt><dd><ul>
<li>Aladin A1, Aladin A2, Aladin H Matrix, Aladin Sport Matrix, Aladin Square, Chromis, G2, G2 Console, G2 HUD, Mantis, Mantis 2, Meridian, XTender 5</li></ul> <li>Aladin A1, Aladin A2, Aladin H Matrix, Aladin Sport Matrix, Aladin Square, Chromis, G2, G2 Console, G2 HUD, G2 TEK, Mantis, Mantis 2, Meridian, XTender 5</li></ul>
</dd> </dd>
<dt>Seabaer</dt><dd><ul> <dt>Seabaer</dt><dd><ul>
<li>T1, H3, HUDC</li></ul> <li>T1, H3, HUDC</li></ul>

View file

@ -6,7 +6,7 @@ Atomic Aquatics: Cobalt, Cobalt 2
Beuchat: Mundial 2, Mundial 3, Voyager 2G Beuchat: Mundial 2, Mundial 3, Voyager 2G
Citizen: Hyper Aqualand Citizen: Hyper Aqualand
Cochran: Commander I, Commander II, Commander TM, EMC-14, EMC-16, EMC-20H Cochran: Commander I, Commander II, Commander TM, EMC-14, EMC-16, EMC-20H
Cressi: Cartesio, Drake, Edy, Giotto, Goa, Leonardo, Michelangelo, Neon, Newton Cressi: Cartesio, Donatello, Drake, Edy, Giotto, Goa, Leonardo, Michelangelo, Neon, Newton
Crest: CR-4 Crest: CR-4
Deep Six: Excursion Deep Six: Excursion
Deepblu: Cosmiq+ Deepblu: Cosmiq+
@ -19,11 +19,12 @@ Hollis: DG02, DG03, TX1
Liquivision: Kaon, Lynx, Xen, Xeo Liquivision: Kaon, Lynx, Xen, Xeo
Mares: Airlab, Darwin, Darwin Air, Genius, Horizon, Icon HD, Icon HD Net Ready, M1, M2, Matrix, Nemo, Nemo Air, Nemo Apneist, Nemo Excel, Nemo Steel, Nemo Titanium, Nemo Wide, Nemo Wide 2, Puck, Puck 2, Puck Air, Puck Pro, Puck Pro +, Quad, Quad Air, Smart, Smart Air, Smart Apnea Mares: Airlab, Darwin, Darwin Air, Genius, Horizon, Icon HD, Icon HD Net Ready, M1, M2, Matrix, Nemo, Nemo Air, Nemo Apneist, Nemo Excel, Nemo Steel, Nemo Titanium, Nemo Wide, Nemo Wide 2, Puck, Puck 2, Puck Air, Puck Pro, Puck Pro +, Quad, Quad Air, Smart, Smart Air, Smart Apnea
McLean: Extreme McLean: Extreme
Oceanic: Atom 1.0, Atom 2.0, Atom 3.0, Atom 3.1, Datamask, F10, F11, Geo, Geo 2.0, Geo 4.0, OC1, OCS, OCi, Pro Plus 2, Pro Plus 2.1, Pro Plus 3, Pro Plus 4, Pro Plus X, VT 4.1, VT Pro, VT3, VT4, VTX, Veo 1.0, Veo 180, Veo 2.0, Veo 200, Veo 250, Veo 3.0, Veo 4.0, Versa Pro Oceanic: Atom 1.0, Atom 2.0, Atom 3.0, Atom 3.1, Datamask, F10, F11, Geo, Geo 2.0, Geo 4.0, Geo Air, OC1, OCS, OCi, Pro Plus 2, Pro Plus 2.1, Pro Plus 3, Pro Plus 4, Pro Plus X, VT 4.1, VT Pro, VT3, VT4, VTX, Veo 1.0, Veo 180, Veo 2.0, Veo 200, Veo 250, Veo 3.0, Veo 4.0, Versa Pro
Oceans: S1 Oceans: S1
Ratio: iDive Color Deep, iDive Color Easy, iDive Color Fancy, iDive Color Free, iDive Color Pro, iDive Color Reb, iDive Color Tech+, iDive Deep, iDive Easy, iDive Fancy, iDive Free, iDive Pro, iDive Reb, iDive Tech+, iX3M 2 Deep, iX3M 2 Easy, iX3M 2 Gauge, iX3M 2 Pro, iX3M 2 Tech+, iX3M 2021 GPS Deep, iX3M 2021 GPS Easy, iX3M 2021 GPS Fancy, iX3M 2021 GPS Pro , iX3M 2021 GPS Reb, iX3M 2021 GPS Tech+, iX3M 2021 Pro Deep, iX3M 2021 Pro Easy, iX3M 2021 Pro Fancy, iX3M 2021 Pro Pro, iX3M 2021 Pro Reb, iX3M 2021 Pro Tech+, iX3M GPS Deep, iX3M GPS Easy, iX3M GPS Fancy, iX3M GPS Pro , iX3M GPS Reb, iX3M GPS Tech+, iX3M Pro Deep, iX3M Pro Easy, iX3M Pro Fancy, iX3M Pro Pro, iX3M Pro Reb, iX3M Pro Tech+ Ratio: iDive Color Deep, iDive Color Easy, iDive Color Fancy, iDive Color Free, iDive Color Pro, iDive Color Reb, iDive Color Tech+, iDive Deep, iDive Easy, iDive Fancy, iDive Free, iDive Pro, iDive Reb, iDive Tech+, iX3M 2 Deep, iX3M 2 Easy, iX3M 2 Gauge, iX3M 2 Pro, iX3M 2 Tech+, iX3M 2021 GPS Deep, iX3M 2021 GPS Easy, iX3M 2021 GPS Fancy, iX3M 2021 GPS Pro , iX3M 2021 GPS Reb, iX3M 2021 GPS Tech+, iX3M 2021 Pro Deep, iX3M 2021 Pro Easy, iX3M 2021 Pro Fancy, iX3M 2021 Pro Pro, iX3M 2021 Pro Reb, iX3M 2021 Pro Tech+, iX3M GPS Deep, iX3M GPS Easy, iX3M GPS Fancy, iX3M GPS Pro , iX3M GPS Reb, iX3M GPS Tech+, iX3M Pro Deep, iX3M Pro Easy, iX3M Pro Fancy, iX3M Pro Pro, iX3M Pro Reb, iX3M Pro Tech+
Reefnet: Sensus, Sensus Pro, Sensus Ultra Reefnet: Sensus, Sensus Pro, Sensus Ultra
Scubapro: Aladin A1, Aladin A2, Aladin H Matrix, Aladin Sport Matrix, Aladin Square, Chromis, G2, G2 Console, G2 HUD, Mantis, Mantis 2, Meridian, XTender 5 Scorpena: Alpha
Scubapro: Aladin A1, Aladin A2, Aladin H Matrix, Aladin Sport Matrix, Aladin Square, Chromis, G2, G2 Console, G2 HUD, G2 TEK, Mantis, Mantis 2, Meridian, XTender 5
Seabaer: T1, H3, HUDC Seabaer: T1, H3, HUDC
Seac: Action, Guru, Jack, Screen Seac: Action, Guru, Jack, Screen
Seemann: XP5 Seemann: XP5

@ -1 +1 @@
Subproject commit 064e198315715e4e03b404e23f5251734fdf283b Subproject commit 7efedfbb2b91a660e496cf3ced9cc115bab9006f