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

Use symbolic constants for the model numbers.

Browse Source
This commit is contained in:
Jef Driesen 2014-08-03 15:03:08 +02:00
parent eb036357a6
commit 5826257a79
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mares_common.c
View File

@ -38,6 +38,14 @@
#define FP_OFFSET 8 #define FP_OFFSET 8
#define FP_SIZE 5 #define FP_SIZE 5
#define NEMO 0
#define NEMOWIDE 1
#define NEMOAIR 4
#define PUCK 7
#define NEMOEXCEL 17
#define NEMOAPNEIST 18
#define PUCKAIR 19
void void
mares_common_device_init (mares_common_device_t *device, dc_context_t *context, const dc_device_vtable_t *vtable) mares_common_device_init (mares_common_device_t *device, dc_context_t *context, const dc_device_vtable_t *vtable)
{ {
@ -205,7 +213,7 @@ mares_common_extract_dives (dc_context_t *context, const mares_common_layout_t *
// Get the freedive mode for this model. // Get the freedive mode for this model.
unsigned int model = data[1]; unsigned int model = data[1];
unsigned int freedive = 2; unsigned int freedive = 2;
if (model == 1 || model == 7 || model == 19) if (model == NEMOWIDE || model == PUCK || model == PUCKAIR)
freedive = 3; freedive = 3;
// Get the end of the profile ring buffer. // Get the end of the profile ring buffer.
@ -244,7 +252,7 @@ mares_common_extract_dives (dc_context_t *context, const mares_common_layout_t *
unsigned int extra = 0; unsigned int extra = 0;
const unsigned char marker[3] = {0xAA, 0xBB, 0xCC}; const unsigned char marker[3] = {0xAA, 0xBB, 0xCC};
if (memcmp (buffer + offset - 3, marker, sizeof (marker)) == 0) { if (memcmp (buffer + offset - 3, marker, sizeof (marker)) == 0) {
if (model == 19) if (model == PUCKAIR)
extra = 7; extra = 7;
else else
extra = 12; extra = 12;
@ -268,7 +276,7 @@ mares_common_extract_dives (dc_context_t *context, const mares_common_layout_t *
unsigned int header_size = 53; unsigned int header_size = 53;
unsigned int sample_size = 2; unsigned int sample_size = 2;
if (extra) { if (extra) {
if (model == 19) if (model == PUCKAIR)
sample_size = 3; sample_size = 3;
else else
sample_size = 5; sample_size = 5;