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

Add fingerprint support for the Suunto Vyper2 and D9.

Browse Source
This commit is contained in:
Jef Driesen 2009-02-23 13:04:08 +00:00
parent 11dc4715a4
commit a2ccc4926d
2 changed files with 68 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/suunto_d9.c
View File

@ -46,14 +46,19 @@
#define RB_PROFILE_END SUUNTO_D9_MEMORY_SIZE - 2 #define RB_PROFILE_END SUUNTO_D9_MEMORY_SIZE - 2
#define RB_PROFILE_DISTANCE(a,b) ringbuffer_distance (a, b, RB_PROFILE_BEGIN, RB_PROFILE_END) #define RB_PROFILE_DISTANCE(a,b) ringbuffer_distance (a, b, RB_PROFILE_BEGIN, RB_PROFILE_END)
#define FP_OFFSET 0x15
#define FP_SIZE 7
typedef struct suunto_d9_device_t suunto_d9_device_t; typedef struct suunto_d9_device_t suunto_d9_device_t;
struct suunto_d9_device_t { struct suunto_d9_device_t {
device_t base; device_t base;
struct serial *port; struct serial *port;
unsigned char fingerprint[FP_SIZE];
}; };
static device_status_t suunto_d9_device_set_fingerprint (device_t *abstract, const unsigned char data[], unsigned int size);
static device_status_t suunto_d9_device_version (device_t *abstract, unsigned char data[], unsigned int size); static device_status_t suunto_d9_device_version (device_t *abstract, unsigned char data[], unsigned int size);
static device_status_t suunto_d9_device_read (device_t *abstract, unsigned int address, unsigned char data[], unsigned int size); static device_status_t suunto_d9_device_read (device_t *abstract, unsigned int address, unsigned char data[], unsigned int size);
static device_status_t suunto_d9_device_write (device_t *abstract, unsigned int address, const unsigned char data[], unsigned int size); static device_status_t suunto_d9_device_write (device_t *abstract, unsigned int address, const unsigned char data[], unsigned int size);
@ -63,7 +68,7 @@ static device_status_t suunto_d9_device_close (device_t *abstract);
static const device_backend_t suunto_d9_device_backend = { static const device_backend_t suunto_d9_device_backend = {
DEVICE_TYPE_SUUNTO_D9, DEVICE_TYPE_SUUNTO_D9,
NULL, /* set_fingerprint */ suunto_d9_device_set_fingerprint, /* set_fingerprint */
NULL, /* handshake */ NULL, /* handshake */
suunto_d9_device_version, /* version */ suunto_d9_device_version, /* version */
suunto_d9_device_read, /* read */ suunto_d9_device_read, /* read */
@ -101,6 +106,7 @@ suunto_d9_device_open (device_t **out, const char* name)
// Set the default values. // Set the default values.
device->port = NULL; device->port = NULL;
memset (device->fingerprint, 0, FP_SIZE);
// Open the device. // Open the device.
int rc = serial_open (&device->port, name); int rc = serial_open (&device->port, name);
@ -253,6 +259,26 @@ suunto_d9_transfer (suunto_d9_device_t *device, const unsigned char command[], u
} }
static device_status_t
suunto_d9_device_set_fingerprint (device_t *abstract, const unsigned char data[], unsigned int size)
{
suunto_d9_device_t *device = (suunto_d9_device_t*) abstract;
if (! device_is_suunto_d9 (abstract))
return DEVICE_STATUS_TYPE_MISMATCH;
if (size && size != FP_SIZE)
return DEVICE_STATUS_ERROR;
if (size)
memcpy (device->fingerprint, data, FP_SIZE);
else
memset (device->fingerprint, 0, FP_SIZE);
return DEVICE_STATUS_SUCCESS;
}
static device_status_t static device_status_t
suunto_d9_device_version (device_t *abstract, unsigned char data[], unsigned int size) suunto_d9_device_version (device_t *abstract, unsigned char data[], unsigned int size)
{ {
@ -440,6 +466,8 @@ suunto_d9_device_dump (device_t *abstract, unsigned char data[], unsigned int si
static device_status_t static device_status_t
suunto_d9_device_foreach (device_t *abstract, dive_callback_t callback, void *userdata) suunto_d9_device_foreach (device_t *abstract, dive_callback_t callback, void *userdata)
{ {
suunto_d9_device_t *device = (suunto_d9_device_t*) abstract;
if (! device_is_suunto_d9 (abstract)) if (! device_is_suunto_d9 (abstract))
return DEVICE_STATUS_TYPE_MISMATCH; return DEVICE_STATUS_TYPE_MISMATCH;
@ -606,7 +634,11 @@ suunto_d9_device_foreach (device_t *abstract, dive_callback_t callback, void *us
message ("\"\n"); message ("\"\n");
#endif #endif
if (callback && !callback (data + MINIMUM + remaining + 4, size - 4, userdata)) unsigned int offset = MINIMUM + remaining;
if (memcmp (data + offset + FP_OFFSET, device->fingerprint, FP_SIZE) == 0)
return DEVICE_STATUS_SUCCESS;
if (callback && !callback (data + offset + 4, size - 4, userdata))
return DEVICE_STATUS_SUCCESS; return DEVICE_STATUS_SUCCESS;
} }
assert (remaining == 0); assert (remaining == 0);

36
src/suunto_vyper2.c
View File

@ -46,14 +46,19 @@
#define RB_PROFILE_END SUUNTO_VYPER2_MEMORY_SIZE - 2 #define RB_PROFILE_END SUUNTO_VYPER2_MEMORY_SIZE - 2
#define RB_PROFILE_DISTANCE(a,b) ringbuffer_distance (a, b, RB_PROFILE_BEGIN, RB_PROFILE_END) #define RB_PROFILE_DISTANCE(a,b) ringbuffer_distance (a, b, RB_PROFILE_BEGIN, RB_PROFILE_END)
#define FP_OFFSET 0x15
#define FP_SIZE 7
typedef struct suunto_vyper2_device_t suunto_vyper2_device_t; typedef struct suunto_vyper2_device_t suunto_vyper2_device_t;
struct suunto_vyper2_device_t { struct suunto_vyper2_device_t {
device_t base; device_t base;
struct serial *port; struct serial *port;
unsigned char fingerprint[FP_SIZE];
}; };
static device_status_t suunto_vyper2_device_set_fingerprint (device_t *abstract, const unsigned char data[], unsigned int size);
static device_status_t suunto_vyper2_device_version (device_t *abstract, unsigned char data[], unsigned int size); static device_status_t suunto_vyper2_device_version (device_t *abstract, unsigned char data[], unsigned int size);
static device_status_t suunto_vyper2_device_read (device_t *abstract, unsigned int address, unsigned char data[], unsigned int size); static device_status_t suunto_vyper2_device_read (device_t *abstract, unsigned int address, unsigned char data[], unsigned int size);
static device_status_t suunto_vyper2_device_write (device_t *abstract, unsigned int address, const unsigned char data[], unsigned int size); static device_status_t suunto_vyper2_device_write (device_t *abstract, unsigned int address, const unsigned char data[], unsigned int size);
@ -63,7 +68,7 @@ static device_status_t suunto_vyper2_device_close (device_t *abstract);
static const device_backend_t suunto_vyper2_device_backend = { static const device_backend_t suunto_vyper2_device_backend = {
DEVICE_TYPE_SUUNTO_VYPER2, DEVICE_TYPE_SUUNTO_VYPER2,
NULL, /* set_fingerprint */ suunto_vyper2_device_set_fingerprint, /* set_fingerprint */
NULL, /* handshake */ NULL, /* handshake */
suunto_vyper2_device_version, /* version */ suunto_vyper2_device_version, /* version */
suunto_vyper2_device_read, /* read */ suunto_vyper2_device_read, /* read */
@ -101,6 +106,7 @@ suunto_vyper2_device_open (device_t **out, const char* name)
// Set the default values. // Set the default values.
device->port = NULL; device->port = NULL;
memset (device->fingerprint, 0, FP_SIZE);
// Open the device. // Open the device.
int rc = serial_open (&device->port, name); int rc = serial_open (&device->port, name);
@ -240,6 +246,26 @@ suunto_vyper2_transfer (suunto_vyper2_device_t *device, const unsigned char comm
} }
static device_status_t
suunto_vyper2_device_set_fingerprint (device_t *abstract, const unsigned char data[], unsigned int size)
{
suunto_vyper2_device_t *device = (suunto_vyper2_device_t*) abstract;
if (! device_is_suunto_vyper2 (abstract))
return DEVICE_STATUS_TYPE_MISMATCH;
if (size && size != FP_SIZE)
return DEVICE_STATUS_ERROR;
if (size)
memcpy (device->fingerprint, data, FP_SIZE);
else
memset (device->fingerprint, 0, FP_SIZE);
return DEVICE_STATUS_SUCCESS;
}
static device_status_t static device_status_t
suunto_vyper2_device_version (device_t *abstract, unsigned char data[], unsigned int size) suunto_vyper2_device_version (device_t *abstract, unsigned char data[], unsigned int size)
{ {
@ -427,6 +453,8 @@ suunto_vyper2_device_dump (device_t *abstract, unsigned char data[], unsigned in
static device_status_t static device_status_t
suunto_vyper2_device_foreach (device_t *abstract, dive_callback_t callback, void *userdata) suunto_vyper2_device_foreach (device_t *abstract, dive_callback_t callback, void *userdata)
{ {
suunto_vyper2_device_t *device = (suunto_vyper2_device_t*) abstract;
if (! device_is_suunto_vyper2 (abstract)) if (! device_is_suunto_vyper2 (abstract))
return DEVICE_STATUS_TYPE_MISMATCH; return DEVICE_STATUS_TYPE_MISMATCH;
@ -593,7 +621,11 @@ suunto_vyper2_device_foreach (device_t *abstract, dive_callback_t callback, void
message ("\"\n"); message ("\"\n");
#endif #endif
if (callback && !callback (data + MINIMUM + remaining + 4, size - 4, userdata)) unsigned int offset = MINIMUM + remaining;
if (memcmp (data + offset + FP_OFFSET, device->fingerprint, FP_SIZE) == 0)
return DEVICE_STATUS_SUCCESS;
if (callback && !callback (data + offset + 4, size - 4, userdata))
return DEVICE_STATUS_SUCCESS; return DEVICE_STATUS_SUCCESS;
} }
assert (remaining == 0); assert (remaining == 0);