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

Add support for the Mares Puck Air.

Browse Source
This commit is contained in:
Jef Driesen 2010-07-13 09:09:14 +02:00
parent aca36ad344
commit 5875941641
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mares_common.c
View File

@ -69,8 +69,9 @@ mares_common_extract_dives (mares_common_device_t *device, const mares_common_la
assert (layout != NULL);
// Get the freedive mode for this model.
unsigned int model = data[1];
unsigned int freedive = 2;
if (data[1] == 1 || data[1] == 7)
if (model == 1 || model == 7)
freedive = 3;
// Get the end of the profile ring buffer.
@ -109,7 +110,10 @@ mares_common_extract_dives (mares_common_device_t *device, const mares_common_la
unsigned int extra = 0;
const unsigned char marker[3] = {0xAA, 0xBB, 0xCC};
if (memcmp (buffer + offset - 3, marker, sizeof (marker)) == 0) {
extra = 12;
if (model == 19)
extra = 7;
else
extra = 12;
}
// Check for overflows due to incomplete dives.
@ -128,7 +132,13 @@ mares_common_extract_dives (mares_common_device_t *device, const mares_common_la
// The header and sample size are dependant on the dive mode. Only
// in freedive mode, the sizes are different from the other modes.
unsigned int header_size = 53;
unsigned int sample_size = (extra ? 5 : 2);
unsigned int sample_size = 2;
if (extra) {
if (model == 19)
sample_size = 3;
else
sample_size = 5;
}
if (mode == freedive) {
header_size = 28;
sample_size = 6;

15
src/mares_nemo_parser.c
View File

@ -33,6 +33,7 @@ typedef struct mares_nemo_parser_t mares_nemo_parser_t;
struct mares_nemo_parser_t {
parser_t base;
unsigned int model;
unsigned int freedive;
/* Internal state */
unsigned int mode;
@ -89,6 +90,7 @@ mares_nemo_parser_create (parser_t **out, unsigned int model)
freedive = 3;
// Set the default values.
parser->model = model;
parser->freedive = freedive;
parser->mode = 0;
parser->length = 0;
@ -144,7 +146,10 @@ mares_nemo_parser_set_data (parser_t *abstract, const unsigned char *data, unsig
unsigned int extra = 0;
const unsigned char marker[3] = {0xAA, 0xBB, 0xCC};
if (memcmp (data + length - 3, marker, sizeof (marker)) == 0) {
extra = 12;
if (parser->model == 19)
extra = 7;
else
extra = 12;
}
if (length < 2 + extra + 3)
@ -153,7 +158,13 @@ mares_nemo_parser_set_data (parser_t *abstract, const unsigned char *data, unsig
unsigned int mode = data[length - extra - 1];
unsigned int header_size = 53;
unsigned int sample_size = (extra ? 5 : 2);
unsigned int sample_size = 2;
if (extra) {
if (parser->model == 19)
sample_size = 3;
else
sample_size = 5;
}
if (mode == parser->freedive) {
header_size = 28;
sample_size = 6;