FlapJackApps/libdivecomputer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Shearwater Perdix 2 and Petrel 3

Browse Source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2022-06-14 13:40:17 -07:00 committed by Jef Driesen
parent 8451286c17
commit 26c43d6d8b
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/descriptor.c
View File

@ -352,6 +352,8 @@ static const dc_descriptor_t g_descriptors[] = {
{"Shearwater", "Nerd 2", DC_FAMILY_SHEARWATER_PETREL, 7, DC_TRANSPORT_BLE, dc_filter_shearwater}, {"Shearwater", "Nerd 2", DC_FAMILY_SHEARWATER_PETREL, 7, DC_TRANSPORT_BLE, dc_filter_shearwater},
{"Shearwater", "Teric", DC_FAMILY_SHEARWATER_PETREL, 8, DC_TRANSPORT_BLE, dc_filter_shearwater}, {"Shearwater", "Teric", DC_FAMILY_SHEARWATER_PETREL, 8, DC_TRANSPORT_BLE, dc_filter_shearwater},
{"Shearwater", "Peregrine", DC_FAMILY_SHEARWATER_PETREL, 9, DC_TRANSPORT_BLE, dc_filter_shearwater}, {"Shearwater", "Peregrine", DC_FAMILY_SHEARWATER_PETREL, 9, DC_TRANSPORT_BLE, dc_filter_shearwater},
{"Shearwater", "Petrel 3", DC_FAMILY_SHEARWATER_PETREL, 10, DC_TRANSPORT_BLE, dc_filter_shearwater},
{"Shearwater", "Perdix 2", DC_FAMILY_SHEARWATER_PETREL, 11, DC_TRANSPORT_BLE, dc_filter_shearwater},
/* Dive Rite NiTek Q */ /* Dive Rite NiTek Q */
{"Dive Rite", "NiTek Q", DC_FAMILY_DIVERITE_NITEKQ, 0, DC_TRANSPORT_SERIAL, NULL}, {"Dive Rite", "NiTek Q", DC_FAMILY_DIVERITE_NITEKQ, 0, DC_TRANSPORT_SERIAL, NULL},
/* Citizen Hyper Aqualand */ /* Citizen Hyper Aqualand */
@ -616,9 +618,11 @@ static int dc_filter_shearwater (dc_transport_t transport, const void *userdata,
static const char * const bluetooth[] = { static const char * const bluetooth[] = {
"Predator", "Predator",
"Petrel", "Petrel",
"Petrel 3",
"NERD", "NERD",
"NERD 2", "NERD 2",
"Perdix", "Perdix",
"Perdix 2",
"Teric", "Teric",
"Peregrine", "Peregrine",
}; };

2
src/shearwater_common.h
View File

@ -44,6 +44,8 @@ extern "C" {
#define NERD2 7 #define NERD2 7
#define TERIC 8 #define TERIC 8
#define PEREGRINE 9 #define PEREGRINE 9
#define PETREL3 10
#define PERDIX2 11
#define NSTEPS 10000 #define NSTEPS 10000
#define STEP(i,n) ((NSTEPS * (i) + (n) / 2) / (n)) #define STEP(i,n) ((NSTEPS * (i) + (n) / 2) / (n))

6
src/shearwater_petrel.c
View File

@ -230,6 +230,9 @@ shearwater_petrel_device_foreach (dc_device_t *abstract, dc_dive_callback_t call
case 0x8838: case 0x8838:
model = PETREL2; model = PETREL2;
break; break;
case 0xB407:
model = PETREL3;
break;
case 0x0606: case 0x0606:
case 0x0A0A: case 0x0A0A:
model = NERD; model = NERD;
@ -245,6 +248,9 @@ shearwater_petrel_device_foreach (dc_device_t *abstract, dc_dive_callback_t call
case 0x7C2D: case 0x7C2D:
model = PERDIXAI; model = PERDIXAI;
break; break;
case 0xC407:
model = PERDIX2;
break;
case 0x0F0F: case 0x0F0F:
case 0x1F0A: case 0x1F0A:
case 0x1F0F: case 0x1F0F: