diff --git a/src/Makefile.am b/src/Makefile.am index 9d1eb73..2cfa98d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -43,7 +43,7 @@ libdivecomputer_la_SOURCES = \ parser.h parser-private.h parser.c \ suunto.h \ suunto_common.h suunto_common.c \ - suunto_solution.h suunto_solution.c \ + suunto_solution.h suunto_solution.c suunto_solution_parser.c \ suunto_eon.h suunto_eon.c \ suunto_vyper.h suunto_vyper.c suunto_vyper_parser.c suunto_spyder_parser.c \ suunto_vyper2.h suunto_vyper2.c \ diff --git a/src/libdivecomputer.symbols b/src/libdivecomputer.symbols index 99d6dc0..4f2fb5c 100644 --- a/src/libdivecomputer.symbols +++ b/src/libdivecomputer.symbols @@ -10,6 +10,7 @@ reefnet_sensusultra_parser_set_calibration uwatec_memomouse_parser_create uwatec_smart_parser_create suunto_vyper_parser_create +suunto_solution_parser_create suunto_spyder_parser_create suunto_d9_parser_create mares_nemo_parser_create diff --git a/src/parser.h b/src/parser.h index 92f8da6..8ad9f6d 100644 --- a/src/parser.h +++ b/src/parser.h @@ -28,6 +28,7 @@ extern "C" { typedef enum parser_type_t { PARSER_TYPE_NULL = 0, + PARSER_TYPE_SUUNTO_SOLUTION, PARSER_TYPE_SUUNTO_SPYDER, PARSER_TYPE_SUUNTO_VYPER, PARSER_TYPE_SUUNTO_D9, diff --git a/src/suunto_solution.h b/src/suunto_solution.h index a58fb0a..cf0fcca 100644 --- a/src/suunto_solution.h +++ b/src/suunto_solution.h @@ -23,6 +23,7 @@ #define SUUNTO_SOLUTION_H #include "device.h" +#include "parser.h" #ifdef __cplusplus extern "C" { @@ -36,6 +37,9 @@ suunto_solution_device_open (device_t **device, const char* name); device_status_t suunto_solution_extract_dives (const unsigned char data[], unsigned int size, dive_callback_t callback, void *userdata); +parser_status_t +suunto_solution_parser_create (parser_t **parser); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/src/suunto_solution_parser.c b/src/suunto_solution_parser.c new file mode 100644 index 0000000..c761902 --- /dev/null +++ b/src/suunto_solution_parser.c @@ -0,0 +1,170 @@ +/* + * libdivecomputer + * + * Copyright (C) 2008 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 "suunto_solution.h" +#include "parser-private.h" +#include "units.h" +#include "utils.h" + +#define WARNING(expr) \ +{ \ + message ("%s:%d: %s\n", __FILE__, __LINE__, expr); \ +} + +typedef struct suunto_solution_parser_t suunto_solution_parser_t; + +struct suunto_solution_parser_t { + parser_t base; +}; + +static parser_status_t suunto_solution_parser_set_data (parser_t *abstract, const unsigned char *data, unsigned int size); +static parser_status_t suunto_solution_parser_samples_foreach (parser_t *abstract, sample_callback_t callback, void *userdata); +static parser_status_t suunto_solution_parser_destroy (parser_t *abstract); + +static const parser_backend_t suunto_solution_parser_backend = { + PARSER_TYPE_SUUNTO_SOLUTION, + suunto_solution_parser_set_data, /* set_data */ + suunto_solution_parser_samples_foreach, /* samples_foreach */ + suunto_solution_parser_destroy /* destroy */ +}; + + +static int +parser_is_suunto_solution (parser_t *abstract) +{ + if (abstract == NULL) + return 0; + + return abstract->backend == &suunto_solution_parser_backend; +} + + +parser_status_t +suunto_solution_parser_create (parser_t **out) +{ + if (out == NULL) + return PARSER_STATUS_ERROR; + + // Allocate memory. + suunto_solution_parser_t *parser = (suunto_solution_parser_t *) malloc (sizeof (suunto_solution_parser_t)); + if (parser == NULL) { + WARNING ("Failed to allocate memory."); + return PARSER_STATUS_MEMORY; + } + + // Initialize the base class. + parser_init (&parser->base, &suunto_solution_parser_backend); + + *out = (parser_t*) parser; + + return PARSER_STATUS_SUCCESS; +} + + +static parser_status_t +suunto_solution_parser_destroy (parser_t *abstract) +{ + if (! parser_is_suunto_solution (abstract)) + return PARSER_STATUS_TYPE_MISMATCH; + + // Free memory. + free (abstract); + + return PARSER_STATUS_SUCCESS; +} + + +static parser_status_t +suunto_solution_parser_set_data (parser_t *abstract, const unsigned char *data, unsigned int size) +{ + if (! parser_is_suunto_solution (abstract)) + return PARSER_STATUS_TYPE_MISMATCH; + + return PARSER_STATUS_SUCCESS; +} + + +static parser_status_t +suunto_solution_parser_samples_foreach (parser_t *abstract, sample_callback_t callback, void *userdata) +{ + if (! parser_is_suunto_solution (abstract)) + return PARSER_STATUS_TYPE_MISMATCH; + + const unsigned char *data = abstract->data; + unsigned int size = abstract->size; + + if (size < 4) + return PARSER_STATUS_ERROR; + + unsigned int time = 0, depth = 0; + + unsigned int offset = 3; + while (offset < size && data[offset] != 0x80) { + parser_sample_value_t sample = {0}; + unsigned char value = data[offset++]; + if (value < 0x7e || value > 0x82) { + // Time (minutes). + time += 3 * 60; + sample.time = time; + if (callback) callback (SAMPLE_TYPE_TIME, sample, userdata); + + // Depth (ft). + depth += (signed char) value; + if (value == 0x7D || value == 0x83) { + // A value of 0x7D (125) or 0x83 (-125) indicates a descent + // or ascent greater than 124 feet. The remaining part of + // the total delta value is stored in the next byte. + assert (offset < size); + depth += (signed char) data[offset++]; + } + sample.depth = depth * FEET; + if (callback) callback (SAMPLE_TYPE_DEPTH, sample, userdata); + } else { + // Event. + sample.event.time = 0; + sample.event.flags = 0; + sample.event.value = 0; + switch (value) { + case 0x7e: // Deco, ASC + sample.event.type = SAMPLE_EVENT_DECOSTOP; + break; + case 0x7f: // Ceiling, ERR + sample.event.type = SAMPLE_EVENT_CEILING; + break; + case 0x81: // Slow + sample.event.type = SAMPLE_EVENT_ASCENT; + break; + default: // Unknown + WARNING ("Unknown event"); + break; + } + + if (callback) callback (SAMPLE_TYPE_EVENT, sample, userdata); + } + } + + assert (data[offset] == 0x80); + + return PARSER_STATUS_SUCCESS; +}