From 15c20a3c721471496edf5816a01bd5579a09f03e Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 3 May 2017 07:02:44 -0700 Subject: [PATCH] Update supported dive computers I clearly forgot to do that prior to the last release - and of course we needed to add special handling for Seabaer. And to make it more obvious that the files themselves shouldn't be edited, let's add some comment to that extend to the two files as well. Closes #375 Signed-off-by: Dirk Hohndel --- SupportedDivecomputers.html | 14 +++++++++----- SupportedDivecomputers.txt | 12 +++++++----- scripts/parse-descriptor.pl | 14 ++++++++++++++ 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/SupportedDivecomputers.html b/SupportedDivecomputers.html index b1f106be4..28837886d 100644 --- a/SupportedDivecomputers.html +++ b/SupportedDivecomputers.html @@ -1,3 +1,4 @@ +
Aeris
  • 500 AI, A300, A300 AI, A300CS, Atmos 2, Atmos AI, Atmos AI 2, Compumask, Elite, Elite T3, Epic, F10, F11, Manta, XR-1 NX, XR-2
@@ -5,7 +6,7 @@
  • Quantum X
    • Aqualung
      -
    • i300, i450T, i550T
    +
  • i300, i450T, i550, i750TC
    • Atomic Aquatics
    • Cobalt, Cobalt 2
    @@ -20,7 +21,7 @@
  • Commander, EMC-14, EMC-16, EMC-20H
    • Cressi
      -
    • Edy, Giotto, Leonardo, Newton
    +
  • Drake, Edy, Giotto, Leonardo, Newton
    • Dive Rite
    • NiTek Q, NiTek Trio
    @@ -35,13 +36,13 @@
  • Frog, OSTC, OSTC 2, OSTC 2C, OSTC 2N, OSTC 3, OSTC 3+, OSTC 4, OSTC Mk2, OSTC Sport, OSTC cR
    • Hollis
      -
    • DG03, TX1
    +
  • DG02, DG03, TX1
    • Mares
    • Airlab, Darwin, Darwin Air, 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, Smart, Smart Apnea
    Oceanic
      -
    • Atom 1.0, Atom 2.0, Atom 3.0, Atom 3.1, Datamask, F11, Geo, Geo 2.0, OC1, OCS, OCi, Pro Plus 2, Pro Plus 2.1, Pro Plus 3, VT 4.1, VT Pro, VT3, VT4, VTX, Veo 1.0, Veo 180, Veo 2.0, Veo 200, Veo 250, Veo 3.0, Versa Pro
    +
  • Atom 1.0, Atom 2.0, Atom 3.0, Atom 3.1, Datamask, F10, F11, Geo, Geo 2.0, OC1, OCS, OCi, Pro Plus 2, Pro Plus 2.1, Pro Plus 3, VT 4.1, VT Pro, VT3, VT4, VTX, Veo 1.0, Veo 180, Veo 2.0, Veo 200, Veo 250, Veo 3.0, Versa Pro
    • Reefnet
    • Sensus, Sensus Pro, Sensus Ultra
    @@ -49,6 +50,9 @@
    Scubapro
    • Chromis, Mantis, Mantis 2, Meridian, XTender 5
    +
    Seabaer
      +
    • T1, H3, HUDC
    +
    Seemann
    • XP5
    @@ -71,7 +75,7 @@
  • Zürich SDA
    • Uwatec
      -
    • Aladin 2G, Aladin Air Twin, Aladin Air Z, Aladin Air Z Nitrox, Aladin Air Z O2, Aladin Prime, Aladin Pro, Aladin Pro Ultra, Aladin Sport, Aladin Sport Plus, Aladin Tec, Aladin Tec 2G, Galileo Luna, Galileo Sol, Galileo Terra, Galileo Trimix, Memomouse, Smart Com, Smart Pro, Smart Tec, Smart Z
    +
  • Aladin 2G, Aladin Air Twin, Aladin Air Z, Aladin Air Z Nitrox, Aladin Air Z O2, Aladin Prime, Aladin Pro, Aladin Pro Ultra, Aladin Sport, Aladin Sport Plus, Aladin Tec, Aladin Tec 2G, Aladin Tec 3G, Galileo Luna, Galileo Sol, Galileo Terra, Galileo Trimix, Memomouse, Smart Com, Smart Pro, Smart Tec, Smart Z
    • Zeagle
    • N2iTiON3
      • diff --git a/SupportedDivecomputers.txt b/SupportedDivecomputers.txt index e880e4a04..ce4f606fb 100644 --- a/SupportedDivecomputers.txt +++ b/SupportedDivecomputers.txt @@ -1,20 +1,22 @@ +# This file is automatically generated, please edit scripts/parse-descriptor.pl Aeris: 500 AI, A300, A300 AI, A300CS, Atmos 2, Atmos AI, Atmos AI 2, Compumask, Elite, Elite T3, Epic, F10, F11, Manta, XR-1 NX, XR-2 Apeks: Quantum X -Aqualung: i300, i450T, i550T +Aqualung: i300, i450T, i550, i750TC Atomic Aquatics: Cobalt, Cobalt 2 Beuchat: Mundial 2, Mundial 3, Voyager 2G Citizen: Hyper Aqualand Cochran: Commander, EMC-14, EMC-16, EMC-20H -Cressi: Edy, Giotto, Leonardo, Newton +Cressi: Drake, Edy, Giotto, Leonardo, Newton Dive Rite: NiTek Q, NiTek Trio DiveSystem: Orca, iDive DAN, iDive Deep, iDive Easy, iDive Free, iDive Pro, iDive Reb, iDive Stealth, iDive Tech, iDive X3M, iX3M Deep, iX3M Easy, iX3M Reb, iX3M Tec Genesis: React Pro, React Pro White Heinrichs Weikamp: Frog, OSTC, OSTC 2, OSTC 2C, OSTC 2N, OSTC 3, OSTC 3+, OSTC 4, OSTC Mk2, OSTC Sport, OSTC cR -Hollis: DG03, TX1 +Hollis: DG02, DG03, TX1 Mares: Airlab, Darwin, Darwin Air, 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, Smart, Smart Apnea -Oceanic: Atom 1.0, Atom 2.0, Atom 3.0, Atom 3.1, Datamask, F11, Geo, Geo 2.0, OC1, OCS, OCi, Pro Plus 2, Pro Plus 2.1, Pro Plus 3, VT 4.1, VT Pro, VT3, VT4, VTX, Veo 1.0, Veo 180, Veo 2.0, Veo 200, Veo 250, Veo 3.0, Versa Pro +Oceanic: Atom 1.0, Atom 2.0, Atom 3.0, Atom 3.1, Datamask, F10, F11, Geo, Geo 2.0, OC1, OCS, OCi, Pro Plus 2, Pro Plus 2.1, Pro Plus 3, VT 4.1, VT Pro, VT3, VT4, VTX, Veo 1.0, Veo 180, Veo 2.0, Veo 200, Veo 250, Veo 3.0, Versa Pro Reefnet: Sensus, Sensus Pro, Sensus Ultra Scubapro: Chromis, Mantis, Mantis 2, Meridian, XTender 5 +Seabaer: T1, H3, HUDC Seemann: XP5 Shearwater: Nerd, Perdix, Petrel, Petrel 2, Predator Sherwood: Amphos, Amphos Air, Insight, Insight 2, Vision, Wisdom, Wisdom 2, Wisdom 3 @@ -22,5 +24,5 @@ Subgear: XP Air, XP-10, XP-3G, XP-Air Suunto: Cobra, Cobra 2, Cobra 3, D3, D4, D4i, D6, D6i, D9, D9tx, DX, EON Steel, Eon, Gekko, HelO2, Mosquito, Solution, Solution Alpha, Solution Nitrox, Spyder, Stinger, Vyper, Vyper 2, Vyper Air, Vyper Novo, Vytec, Zoop, Zoop Novo Tusa: Element II (IQ-750), IQ-700, Zen (IQ-900), Zen Air (IQ-950) Uemis: Zürich SDA -Uwatec: Aladin 2G, Aladin Air Twin, Aladin Air Z, Aladin Air Z Nitrox, Aladin Air Z O2, Aladin Prime, Aladin Pro, Aladin Pro Ultra, Aladin Sport, Aladin Sport Plus, Aladin Tec, Aladin Tec 2G, Galileo Luna, Galileo Sol, Galileo Terra, Galileo Trimix, Memomouse, Smart Com, Smart Pro, Smart Tec, Smart Z +Uwatec: Aladin 2G, Aladin Air Twin, Aladin Air Z, Aladin Air Z Nitrox, Aladin Air Z O2, Aladin Prime, Aladin Pro, Aladin Pro Ultra, Aladin Sport, Aladin Sport Plus, Aladin Tec, Aladin Tec 2G, Aladin Tec 3G, Galileo Luna, Galileo Sol, Galileo Terra, Galileo Trimix, Memomouse, Smart Com, Smart Pro, Smart Tec, Smart Z Zeagle: N2iTiON3 \ No newline at end of file diff --git a/scripts/parse-descriptor.pl b/scripts/parse-descriptor.pl index b1729a608..6bde935f0 100755 --- a/scripts/parse-descriptor.pl +++ b/scripts/parse-descriptor.pl @@ -21,6 +21,14 @@ if ($infi !~ /.*descriptor.c/) { open(my $fh, "<", $infi) || croak "can't open $infi: $!"; open(STDOUT, ">", $outfi) || croak "can't open $outfi: $!"; +my $commentStart = "# "; +my $commentEnd = ""; +if ($type eq "html") { + $commentStart = ""; +} +printf("%s This file is automatically generated, please edit scripts/parse-descriptor.pl%s\n", $commentStart, $commentEnd); + my $lastVend = ""; my $lastMod = ""; my @descriptors = (); @@ -37,6 +45,9 @@ foreach (@sortedDescriptors) { if ($vend eq $lastVend) { printf(", %s", $mod); } else { + if ($lastVend lt "Seabaer" && $vend gt "Seabaer") { + printf("
    \n
    \n
    Seabaer
      \n\t
    • T1, H3, HUDC"); + } if ($lastVend lt "Uemis" && $vend gt "Uemis") { printf("
    \n
    \n
    Uemis
      \n\t
    • Zürich SDA"); } @@ -50,6 +61,9 @@ foreach (@sortedDescriptors) { if ($vend eq $lastVend) { printf(", %s", $mod); } else { + if ($lastVend lt "Seabaer" && $vend gt "Seabaer") { + printf("\nSeabaer: T1, H3, HUDC"); + } if ($lastVend lt "Uemis" && $vend gt "Uemis") { printf("\nUemis: Zürich SDA"); }