From c3556d81c91958bae1729402c9f8128b9d19ddb2 Mon Sep 17 00:00:00 2001 From: Jef Driesen Date: Thu, 4 Jan 2018 15:14:10 +0100 Subject: [PATCH] Use the correct model number for the Shearwater Nerd 2 Unlike the Shearwater Petrel, the Shearwater Nerd 2 appears to have a distinct model number from the Nerd. Reported-by: Janice McLaughlin --- src/descriptor.c | 2 +- src/shearwater_common.h | 1 + src/shearwater_petrel.c | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/descriptor.c b/src/descriptor.c index bdd5e60..3680683 100644 --- a/src/descriptor.c +++ b/src/descriptor.c @@ -292,9 +292,9 @@ static const dc_descriptor_t g_descriptors[] = { {"Shearwater", "Petrel", DC_FAMILY_SHEARWATER_PETREL, 3}, {"Shearwater", "Petrel 2", DC_FAMILY_SHEARWATER_PETREL, 3}, {"Shearwater", "Nerd", DC_FAMILY_SHEARWATER_PETREL, 4}, - {"Shearwater", "Nerd 2", DC_FAMILY_SHEARWATER_PETREL, 4}, {"Shearwater", "Perdix", DC_FAMILY_SHEARWATER_PETREL, 5}, {"Shearwater", "Perdix AI", DC_FAMILY_SHEARWATER_PETREL, 6}, + {"Shearwater", "Nerd 2", DC_FAMILY_SHEARWATER_PETREL, 7}, /* Dive Rite NiTek Q */ {"Dive Rite", "NiTek Q", DC_FAMILY_DIVERITE_NITEKQ, 0}, /* Citizen Hyper Aqualand */ diff --git a/src/shearwater_common.h b/src/shearwater_common.h index 4e3a561..3075f99 100644 --- a/src/shearwater_common.h +++ b/src/shearwater_common.h @@ -38,6 +38,7 @@ extern "C" { #define NERD 4 #define PERDIX 5 #define PERDIXAI 6 +#define NERD2 7 #define NSTEPS 10000 #define STEP(i,n) ((NSTEPS * (i) + (n) / 2) / (n)) diff --git a/src/shearwater_petrel.c b/src/shearwater_petrel.c index 46a7582..2f040dc 100644 --- a/src/shearwater_petrel.c +++ b/src/shearwater_petrel.c @@ -224,9 +224,11 @@ shearwater_petrel_device_foreach (dc_device_t *abstract, dc_dive_callback_t call model = PETREL; break; case 0x0A0A: // Nerd 1 - case 0x0E0D: // Nerd 2 model = NERD; break; + case 0x0E0D: // Nerd 2 + model = NERD2; + break; case 0x0707: model = PERDIX; break;