From bb08248bd9b0a87636d98b25df3ede189e20af18 Mon Sep 17 00:00:00 2001 From: Jef Driesen Date: Mon, 28 Dec 2009 10:30:53 +0000 Subject: [PATCH] Add a parser for the Oceanic VT Pro. --- msvc/libdivecomputer.vcproj | 4 + src/Makefile.am | 2 +- src/libdivecomputer.symbols | 1 + src/oceanic_vtpro.h | 4 + src/oceanic_vtpro_parser.c | 168 ++++++++++++++++++++++++++++++++++++ src/parser.h | 2 + 6 files changed, 180 insertions(+), 1 deletion(-) create mode 100644 src/oceanic_vtpro_parser.c diff --git a/msvc/libdivecomputer.vcproj b/msvc/libdivecomputer.vcproj index 0afe446..6b8065c 100644 --- a/msvc/libdivecomputer.vcproj +++ b/msvc/libdivecomputer.vcproj @@ -244,6 +244,10 @@ RelativePath="..\src\oceanic_vtpro.c" > + + diff --git a/src/Makefile.am b/src/Makefile.am index fa1ffad..2842fb0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -67,7 +67,7 @@ libdivecomputer_la_SOURCES = \ oceanic_common.h oceanic_common.c \ oceanic_atom2.h oceanic_atom2.c oceanic_atom2_parser.c \ oceanic_veo250.h oceanic_veo250.c oceanic_veo250_parser.c \ - oceanic_vtpro.h oceanic_vtpro.c \ + oceanic_vtpro.h oceanic_vtpro.c oceanic_vtpro_parser.c \ mares.h \ mares_common.h mares_common.c \ mares_nemo.h mares_nemo.c mares_nemo_parser.c \ diff --git a/src/libdivecomputer.symbols b/src/libdivecomputer.symbols index c167fd2..9d033e1 100644 --- a/src/libdivecomputer.symbols +++ b/src/libdivecomputer.symbols @@ -29,6 +29,7 @@ suunto_solution_parser_create suunto_spyder_parser_create suunto_d9_parser_create mares_nemo_parser_create +oceanic_vtpro_parser_create oceanic_veo250_parser_create oceanic_atom2_parser_create diff --git a/src/oceanic_vtpro.h b/src/oceanic_vtpro.h index 6669fc7..8087d7a 100644 --- a/src/oceanic_vtpro.h +++ b/src/oceanic_vtpro.h @@ -27,6 +27,7 @@ extern "C" { #endif /* __cplusplus */ #include "device.h" +#include "parser.h" #define OCEANIC_VTPRO_MEMORY_SIZE 0x8000 #define OCEANIC_VTPRO_PACKET_SIZE 0x10 @@ -37,6 +38,9 @@ oceanic_vtpro_device_open (device_t **device, const char* name); device_status_t oceanic_vtpro_device_keepalive (device_t *device); +parser_status_t +oceanic_vtpro_parser_create (parser_t **parser); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/src/oceanic_vtpro_parser.c b/src/oceanic_vtpro_parser.c new file mode 100644 index 0000000..3167107 --- /dev/null +++ b/src/oceanic_vtpro_parser.c @@ -0,0 +1,168 @@ +/* + * libdivecomputer + * + * Copyright (C) 2009 Jef Driesen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +#include +#include + +#include "oceanic_vtpro.h" +#include "parser-private.h" +#include "array.h" +#include "units.h" +#include "utils.h" + +typedef struct oceanic_vtpro_parser_t oceanic_vtpro_parser_t; + +struct oceanic_vtpro_parser_t { + parser_t base; +}; + +static parser_status_t oceanic_vtpro_parser_set_data (parser_t *abstract, const unsigned char *data, unsigned int size); +static parser_status_t oceanic_vtpro_parser_samples_foreach (parser_t *abstract, sample_callback_t callback, void *userdata); +static parser_status_t oceanic_vtpro_parser_destroy (parser_t *abstract); + +static const parser_backend_t oceanic_vtpro_parser_backend = { + PARSER_TYPE_OCEANIC_VTPRO, + oceanic_vtpro_parser_set_data, /* set_data */ + oceanic_vtpro_parser_samples_foreach, /* samples_foreach */ + oceanic_vtpro_parser_destroy /* destroy */ +}; + + +static int +parser_is_oceanic_vtpro (parser_t *abstract) +{ + if (abstract == NULL) + return 0; + + return abstract->backend == &oceanic_vtpro_parser_backend; +} + + +parser_status_t +oceanic_vtpro_parser_create (parser_t **out) +{ + if (out == NULL) + return PARSER_STATUS_ERROR; + + // Allocate memory. + oceanic_vtpro_parser_t *parser = (oceanic_vtpro_parser_t *) malloc (sizeof (oceanic_vtpro_parser_t)); + if (parser == NULL) { + WARNING ("Failed to allocate memory."); + return PARSER_STATUS_MEMORY; + } + + // Initialize the base class. + parser_init (&parser->base, &oceanic_vtpro_parser_backend); + + *out = (parser_t*) parser; + + return PARSER_STATUS_SUCCESS; +} + + +static parser_status_t +oceanic_vtpro_parser_destroy (parser_t *abstract) +{ + if (! parser_is_oceanic_vtpro (abstract)) + return PARSER_STATUS_TYPE_MISMATCH; + + // Free memory. + free (abstract); + + return PARSER_STATUS_SUCCESS; +} + + +static parser_status_t +oceanic_vtpro_parser_set_data (parser_t *abstract, const unsigned char *data, unsigned int size) +{ + if (! parser_is_oceanic_vtpro (abstract)) + return PARSER_STATUS_TYPE_MISMATCH; + + return PARSER_STATUS_SUCCESS; +} + + +static parser_status_t +oceanic_vtpro_parser_samples_foreach (parser_t *abstract, sample_callback_t callback, void *userdata) +{ + if (! parser_is_oceanic_vtpro (abstract)) + return PARSER_STATUS_TYPE_MISMATCH; + + const unsigned char *data = abstract->data; + unsigned int size = abstract->size; + + if (size < 7 * OCEANIC_VTPRO_PACKET_SIZE / 2) + return PARSER_STATUS_ERROR; + + unsigned int time = 0; + unsigned int interval = 0; + switch ((data[0x27] >> 4) & 0x03) { + case 0: + interval = 2; + break; + case 1: + interval = 15; + break; + case 2: + interval = 30; + break; + case 3: + interval = 60; + break; + } + + unsigned int offset = 5 * OCEANIC_VTPRO_PACKET_SIZE / 2; + while (offset + OCEANIC_VTPRO_PACKET_SIZE / 2 <= size - OCEANIC_VTPRO_PACKET_SIZE) { + parser_sample_value_t sample = {0}; + + // Ignore empty samples. + if (array_isequal (data + offset, OCEANIC_VTPRO_PACKET_SIZE / 2, 0x00)) { + offset += OCEANIC_VTPRO_PACKET_SIZE / 2; + continue; + } + + // Time. + time += interval; + sample.time = time; + if (callback) callback (SAMPLE_TYPE_TIME, sample, userdata); + + // Vendor specific data + sample.vendor.type = SAMPLE_VENDOR_OCEANIC_VTPRO; + sample.vendor.size = OCEANIC_VTPRO_PACKET_SIZE / 2; + sample.vendor.data = data + offset; + if (callback) callback (SAMPLE_TYPE_VENDOR, sample, userdata); + + // Depth (ft) + unsigned int depth = data[offset + 3]; + sample.depth = depth * FEET; + if (callback) callback (SAMPLE_TYPE_DEPTH, sample, userdata); + + // Temperature (°F) + unsigned int temperature = data[offset + 6]; + sample.temperature = (temperature - 32.0) * (5.0 / 9.0); + if (callback) callback (SAMPLE_TYPE_TEMPERATURE, sample, userdata); + + offset += OCEANIC_VTPRO_PACKET_SIZE / 2; + } + + return PARSER_STATUS_SUCCESS; +} diff --git a/src/parser.h b/src/parser.h index f16355f..8230eab 100644 --- a/src/parser.h +++ b/src/parser.h @@ -38,6 +38,7 @@ typedef enum parser_type_t { PARSER_TYPE_UWATEC_MEMOMOUSE, PARSER_TYPE_UWATEC_SMART, PARSER_TYPE_MARES_NEMO, + PARSER_TYPE_OCEANIC_VTPRO, PARSER_TYPE_OCEANIC_VEO250, PARSER_TYPE_OCEANIC_ATOM2 } parser_type_t; @@ -99,6 +100,7 @@ typedef enum parser_sample_vendor_t { SAMPLE_VENDOR_NONE, SAMPLE_VENDOR_UWATEC_ALADIN, SAMPLE_VENDOR_UWATEC_SMART, + SAMPLE_VENDOR_OCEANIC_VTPRO, SAMPLE_VENDOR_OCEANIC_VEO250, SAMPLE_VENDOR_OCEANIC_ATOM2 } parser_sample_vendor_t;