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

Automatically cancel the waiting state.

Browse Source
This commit is contained in:
Jef Driesen 2009-01-19 09:28:57 +00:00
parent 2315f066a9
commit cf5b2acea6
3 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libdivecomputer.symbols
View File

@ -39,7 +39,6 @@ oceanic_vtpro_device_open
oceanic_vtpro_device_keepalive oceanic_vtpro_device_keepalive
oceanic_vtpro_device_calibrate oceanic_vtpro_device_calibrate
reefnet_sensus_device_open reefnet_sensus_device_open
reefnet_sensus_device_cancel
reefnet_sensuspro_device_open reefnet_sensuspro_device_open
reefnet_sensuspro_device_set_timestamp reefnet_sensuspro_device_set_timestamp
reefnet_sensuspro_device_write_interval reefnet_sensuspro_device_write_interval

51
src/reefnet_sensus.c
View File

@ -44,6 +44,7 @@ typedef struct reefnet_sensus_device_t reefnet_sensus_device_t;
struct reefnet_sensus_device_t { struct reefnet_sensus_device_t {
device_t base; device_t base;
struct serial *port; struct serial *port;
unsigned int waiting;
}; };
static device_status_t reefnet_sensus_device_handshake (device_t *abstract, unsigned char *data, unsigned int size); static device_status_t reefnet_sensus_device_handshake (device_t *abstract, unsigned char *data, unsigned int size);
@ -71,6 +72,24 @@ device_is_reefnet_sensus (device_t *abstract)
} }
static device_status_t
reefnet_sensus_cancel (reefnet_sensus_device_t *device)
{
// Send the command to the device.
unsigned char command = 0x00;
int n = serial_write (device->port, &command, 1);
if (n != 1) {
WARNING ("Failed to send the cancel command.");
return EXITCODE (n);
}
// The device leaves the waiting state.
device->waiting = 0;
return DEVICE_STATUS_SUCCESS;
}
device_status_t device_status_t
reefnet_sensus_device_open (device_t **out, const char* name) reefnet_sensus_device_open (device_t **out, const char* name)
{ {
@ -89,6 +108,7 @@ reefnet_sensus_device_open (device_t **out, const char* name)
// Set the default values. // Set the default values.
device->port = NULL; device->port = NULL;
device->waiting = 0;
// Open the device. // Open the device.
int rc = serial_open (&device->port, name); int rc = serial_open (&device->port, name);
@ -132,6 +152,11 @@ reefnet_sensus_device_close (device_t *abstract)
if (! device_is_reefnet_sensus (abstract)) if (! device_is_reefnet_sensus (abstract))
return DEVICE_STATUS_TYPE_MISMATCH; return DEVICE_STATUS_TYPE_MISMATCH;
// Safely close the connection if the last handshake was
// successful, but no data transfer was ever initiated.
if (device->waiting)
reefnet_sensus_cancel (device);
// Close the device. // Close the device.
if (serial_close (device->port) == -1) { if (serial_close (device->port) == -1) {
free (device); free (device);
@ -175,6 +200,9 @@ reefnet_sensus_device_handshake (device_t *abstract, unsigned char *data, unsign
return DEVICE_STATUS_PROTOCOL; return DEVICE_STATUS_PROTOCOL;
} }
// The device is now waiting for a data request.
device->waiting = 1;
#ifndef NDEBUG #ifndef NDEBUG
message ( message (
"Response Header: %c%c\n" "Response Header: %c%c\n"
@ -207,26 +235,6 @@ reefnet_sensus_device_handshake (device_t *abstract, unsigned char *data, unsign
} }
device_status_t
reefnet_sensus_device_cancel (device_t *abstract)
{
reefnet_sensus_device_t *device = (reefnet_sensus_device_t*) abstract;
if (! device_is_reefnet_sensus (abstract))
return DEVICE_STATUS_TYPE_MISMATCH;
// Send the command to the device.
unsigned char command = 0x00;
int n = serial_write (device->port, &command, 1);
if (n != 1) {
WARNING ("Failed to send the cancel command.");
return EXITCODE (n);
}
return DEVICE_STATUS_SUCCESS;
}
static device_status_t static device_status_t
reefnet_sensus_device_dump (device_t *abstract, unsigned char *data, unsigned int size, unsigned int *result) reefnet_sensus_device_dump (device_t *abstract, unsigned char *data, unsigned int size, unsigned int *result)
{ {
@ -247,6 +255,9 @@ reefnet_sensus_device_dump (device_t *abstract, unsigned char *data, unsigned in
return EXITCODE (n); return EXITCODE (n);
} }
// The device leaves the waiting state.
device->waiting = 0;
// Receive the answer from the device. // Receive the answer from the device.
unsigned int nbytes = 0; unsigned int nbytes = 0;
unsigned char answer[4 + REEFNET_SENSUS_MEMORY_SIZE + 2 + 3] = {0}; unsigned char answer[4 + REEFNET_SENSUS_MEMORY_SIZE + 2 + 3] = {0};

3
src/reefnet_sensus.h
View File

@ -34,9 +34,6 @@ extern "C" {
device_status_t device_status_t
reefnet_sensus_device_open (device_t **device, const char* name); reefnet_sensus_device_open (device_t **device, const char* name);
device_status_t
reefnet_sensus_device_cancel (device_t *device);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */