From f59cbf0fe5364a88d69416d27d7a224fc93b7a31 Mon Sep 17 00:00:00 2001 From: Jef Driesen Date: Fri, 30 Dec 2022 15:21:15 +0100 Subject: [PATCH] Move all model numbers to the common header --- src/oceanic_atom2.c | 8 --- src/oceanic_atom2_parser.c | 73 ---------------------------- src/oceanic_common.h | 97 +++++++++++++++++++++++++++++++++++++ src/oceanic_veo250_parser.c | 6 --- src/oceanic_vtpro.c | 2 - src/oceanic_vtpro_parser.c | 2 - 6 files changed, 97 insertions(+), 91 deletions(-) diff --git a/src/oceanic_atom2.c b/src/oceanic_atom2.c index 4de6dec..9f5cc17 100644 --- a/src/oceanic_atom2.c +++ b/src/oceanic_atom2.c @@ -35,14 +35,6 @@ #define ISINSTANCE(device) dc_device_isinstance((device), &oceanic_atom2_device_vtable.base) -#define PROPLUSX 0x4552 -#define VTX 0x4557 -#define I750TC 0x455A -#define SAGE 0x4647 -#define I770R 0x4651 -#define GEO40 0x4653 -#define BEACON 0x4742 - #define MAXPACKET 256 #define MAXRETRIES 2 #define MAXDELAY 16 diff --git a/src/oceanic_atom2_parser.c b/src/oceanic_atom2_parser.c index 56d9a00..f6b1f71 100644 --- a/src/oceanic_atom2_parser.c +++ b/src/oceanic_atom2_parser.c @@ -31,79 +31,6 @@ #define ISINSTANCE(parser) dc_parser_isinstance((parser), &oceanic_atom2_parser_vtable) -#define ATOM1 0x4250 -#define EPICA 0x4257 -#define VT3 0x4258 -#define T3A 0x4259 -#define ATOM2 0x4342 -#define GEO 0x4344 -#define MANTA 0x4345 -#define DATAMASK 0x4347 -#define COMPUMASK 0x4348 -#define OC1A 0x434E -#define F10A 0x434D -#define WISDOM2 0x4350 -#define INSIGHT2 0x4353 -#define ELEMENT2 0x4357 -#define VEO20 0x4359 -#define VEO30 0x435A -#define ZEN 0x4441 -#define ZENAIR 0x4442 -#define ATMOSAI2 0x4443 -#define PROPLUS21 0x4444 -#define GEO20 0x4446 -#define VT4 0x4447 -#define OC1B 0x4449 -#define VOYAGER2G 0x444B -#define ATOM3 0x444C -#define DG03 0x444D -#define OCS 0x4450 -#define OC1C 0x4451 -#define VT41 0x4452 -#define EPICB 0x4453 -#define T3B 0x4455 -#define ATOM31 0x4456 -#define A300AI 0x4457 -#define WISDOM3 0x4458 -#define A300 0x445A -#define TX1 0x4542 -#define MUNDIAL2 0x4543 -#define AMPHOS 0x4545 -#define AMPHOSAIR 0x4546 -#define PROPLUS3 0x4548 -#define F11A 0x4549 -#define OCI 0x454B -#define A300CS 0x454C -#define TALIS 0x454E -#define MUNDIAL3 0x4550 -#define PROPLUSX 0x4552 -#define F10B 0x4553 -#define F11B 0x4554 -#define XPAIR 0x4555 -#define VISION 0x4556 -#define VTX 0x4557 -#define I300 0x4559 -#define I750TC 0x455A -#define I450T 0x4641 -#define I550 0x4642 -#define I200 0x4646 -#define SAGE 0x4647 -#define I300C 0x4648 -#define I200C 0x4649 -#define I100 0x464E -#define I770R 0x4651 -#define I550C 0x4652 -#define GEO40 0x4653 -#define VEO40 0x4654 -#define WISDOM4 0x4655 -#define PROPLUS4 0x4656 -#define AMPHOS2 0x4657 -#define AMPHOSAIR2 0x4658 -#define BEACON 0x4742 -#define I470TC 0x4743 -#define I200CV2 0x4749 -#define GEOAIR 0x474B - #define NORMAL 0 #define GAUGE 1 #define FREEDIVE 2 diff --git a/src/oceanic_common.h b/src/oceanic_common.h index 915081e..16fd976 100644 --- a/src/oceanic_common.h +++ b/src/oceanic_common.h @@ -28,6 +28,103 @@ extern "C" { #endif /* __cplusplus */ +// vtpro +#define AERIS500AI 0x4151 +#define VERSAPRO 0x4155 +#define ATMOS2 0x4158 +#define PROPLUS2 0x4159 +#define ATMOSAI 0x4244 +#define VTPRO 0x4245 +#define WISDOM 0x4246 +#define ELITE 0x424F + +// veo250 +#define REACTPRO 0x4247 +#define VEO200 0x424B +#define VEO250 0x424C +#define XP5 0x4251 +#define VEO180 0x4252 +#define XR2 0x4255 +#define INSIGHT 0x425A +#define DG02 0x4352 + +// atom2 +#define ATOM1 0x4250 +#define EPICA 0x4257 +#define VT3 0x4258 +#define T3A 0x4259 +#define ATOM2 0x4342 +#define GEO 0x4344 +#define MANTA 0x4345 +#define XR1NX 0x4346 +#define DATAMASK 0x4347 +#define COMPUMASK 0x4348 +#define F10A 0x434D +#define OC1A 0x434E +#define WISDOM2 0x4350 +#define INSIGHT2 0x4353 +#define REACTPROWHITE 0x4354 +#define ELEMENT2 0x4357 +#define VEO10 0x4358 +#define VEO20 0x4359 +#define VEO30 0x435A +#define ZEN 0x4441 +#define ZENAIR 0x4442 +#define ATMOSAI2 0x4443 +#define PROPLUS21 0x4444 +#define GEO20 0x4446 +#define VT4 0x4447 +#define OC1B 0x4449 +#define VOYAGER2G 0x444B +#define ATOM3 0x444C +#define DG03 0x444D +#define OCS 0x4450 +#define OC1C 0x4451 +#define VT41 0x4452 +#define EPICB 0x4453 +#define T3B 0x4455 +#define ATOM31 0x4456 +#define A300AI 0x4457 +#define WISDOM3 0x4458 +#define A300 0x445A +#define TX1 0x4542 +#define MUNDIAL2 0x4543 +#define AMPHOS 0x4545 +#define AMPHOSAIR 0x4546 +#define PROPLUS3 0x4548 +#define F11A 0x4549 +#define OCI 0x454B +#define A300CS 0x454C +#define TALIS 0x454E +#define MUNDIAL3 0x4550 +#define PROPLUSX 0x4552 +#define F10B 0x4553 +#define F11B 0x4554 +#define XPAIR 0x4555 +#define VISION 0x4556 +#define VTX 0x4557 +#define I300 0x4559 +#define I750TC 0x455A +#define I450T 0x4641 +#define I550 0x4642 +#define I200 0x4646 +#define SAGE 0x4647 +#define I300C 0x4648 +#define I200C 0x4649 +#define I100 0x464E +#define I770R 0x4651 +#define I550C 0x4652 +#define GEO40 0x4653 +#define VEO40 0x4654 +#define WISDOM4 0x4655 +#define PROPLUS4 0x4656 +#define AMPHOS2 0x4657 +#define AMPHOSAIR2 0x4658 +#define BEACON 0x4742 +#define I470TC 0x4743 +#define I200CV2 0x4749 +#define GEOAIR 0x474B + #define PAGESIZE 0x10 #define FPMAXSIZE 0x20 diff --git a/src/oceanic_veo250_parser.c b/src/oceanic_veo250_parser.c index 4e59ede..90d3383 100644 --- a/src/oceanic_veo250_parser.c +++ b/src/oceanic_veo250_parser.c @@ -31,12 +31,6 @@ #define ISINSTANCE(parser) dc_parser_isinstance((parser), &oceanic_veo250_parser_vtable) -#define REACTPRO 0x4247 -#define VEO200 0x424B -#define VEO250 0x424C -#define INSIGHT 0x425A -#define REACTPROWHITE 0x4354 - typedef struct oceanic_veo250_parser_t oceanic_veo250_parser_t; struct oceanic_veo250_parser_t { diff --git a/src/oceanic_vtpro.c b/src/oceanic_vtpro.c index 74b94ec..4cb85f1 100644 --- a/src/oceanic_vtpro.c +++ b/src/oceanic_vtpro.c @@ -40,8 +40,6 @@ #define NAK 0xA5 #define END 0x51 -#define AERIS500AI 0x4151 - typedef enum oceanic_vtpro_protocol_t { MOD, INTR, diff --git a/src/oceanic_vtpro_parser.c b/src/oceanic_vtpro_parser.c index 1c60e62..9650c49 100644 --- a/src/oceanic_vtpro_parser.c +++ b/src/oceanic_vtpro_parser.c @@ -31,8 +31,6 @@ #define ISINSTANCE(parser) dc_parser_isinstance((parser), &oceanic_vtpro_parser_vtable) -#define AERIS500AI 0x4151 - typedef struct oceanic_vtpro_parser_t oceanic_vtpro_parser_t; struct oceanic_vtpro_parser_t {