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

Remove the model number from the vtpro struct

Browse Source 
The model number is now also available in the common struct. There is no
need to store it twice. The auto-detected model number from the version
table is also more reliable than the one passed by the caller.
This commit is contained in:
Jef Driesen 2022-12-30 22:26:39 +01:00
parent d0857c49ec
commit 3414f72f60
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/oceanic_vtpro.c
View File

@ -48,7 +48,6 @@ typedef enum oceanic_vtpro_protocol_t {
typedef struct oceanic_vtpro_device_t { typedef struct oceanic_vtpro_device_t {
oceanic_common_device_t base; oceanic_common_device_t base;
dc_iostream_t *iostream; dc_iostream_t *iostream;
unsigned int model;
oceanic_vtpro_protocol_t protocol; oceanic_vtpro_protocol_t protocol;
} oceanic_vtpro_device_t; } oceanic_vtpro_device_t;
@ -379,7 +378,7 @@ oceanic_vtpro_device_logbook (dc_device_t *abstract, dc_event_progress_t *progre
{ {
oceanic_vtpro_device_t *device = (oceanic_vtpro_device_t *) abstract; oceanic_vtpro_device_t *device = (oceanic_vtpro_device_t *) abstract;
if (device->model == AERIS500AI) { if (device->base.model == AERIS500AI) {
return oceanic_aeris500ai_device_logbook (abstract, progress, logbook); return oceanic_aeris500ai_device_logbook (abstract, progress, logbook);
} else { } else {
return oceanic_common_device_logbook (abstract, progress, logbook); return oceanic_common_device_logbook (abstract, progress, logbook);
@ -410,7 +409,6 @@ oceanic_vtpro_device_open (dc_device_t **out, dc_context_t *context, dc_iostream
// Set the default values. // Set the default values.
device->iostream = iostream; device->iostream = iostream;
device->model = model;
if (model == AERIS500AI) { if (model == AERIS500AI) {
device->protocol = INTR; device->protocol = INTR;
} else { } else {