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

Eliminate some duplicated code.

Browse Source
This commit is contained in:
Jef Driesen 2010-11-04 20:49:14 +01:00
parent 608df2c4c1
commit 57ae6b2c13
1 changed files with 10 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/oceanic_atom2.c
View File

@ -131,7 +131,7 @@ device_is_oceanic_atom2 (device_t *abstract)
static device_status_t static device_status_t
oceanic_atom2_send (oceanic_atom2_device_t *device, const unsigned char command[], unsigned int csize) oceanic_atom2_send (oceanic_atom2_device_t *device, const unsigned char command[], unsigned int csize, unsigned char ack)
{ {
device_t *abstract = (device_t *) device; device_t *abstract = (device_t *) device;
@ -146,7 +146,7 @@ oceanic_atom2_send (oceanic_atom2_device_t *device, const unsigned char command[
} }
// Receive the response (ACK/NAK) of the dive computer. // Receive the response (ACK/NAK) of the dive computer.
unsigned char response = NAK; unsigned char response = 0;
n = serial_read (device->port, &response, 1); n = serial_read (device->port, &response, 1);
if (n != 1) { if (n != 1) {
WARNING ("Failed to receive the answer."); WARNING ("Failed to receive the answer.");
@ -154,7 +154,7 @@ oceanic_atom2_send (oceanic_atom2_device_t *device, const unsigned char command[
} }
// Verify the response of the dive computer. // Verify the response of the dive computer.
if (response != ACK) { if (response != ack) {
WARNING ("Unexpected answer start byte(s)."); WARNING ("Unexpected answer start byte(s).");
return DEVICE_STATUS_PROTOCOL; return DEVICE_STATUS_PROTOCOL;
} }
@ -174,7 +174,7 @@ oceanic_atom2_transfer (oceanic_atom2_device_t *device, const unsigned char comm
unsigned int nretries = 0; unsigned int nretries = 0;
device_status_t rc = DEVICE_STATUS_SUCCESS; device_status_t rc = DEVICE_STATUS_SUCCESS;
while ((rc = oceanic_atom2_send (device, command, csize)) != DEVICE_STATUS_SUCCESS) { while ((rc = oceanic_atom2_send (device, command, csize, ACK)) != DEVICE_STATUS_SUCCESS) {
if (rc != DEVICE_STATUS_TIMEOUT && rc != DEVICE_STATUS_PROTOCOL) if (rc != DEVICE_STATUS_TIMEOUT && rc != DEVICE_STATUS_PROTOCOL)
return rc; return rc;
@ -209,25 +209,9 @@ oceanic_atom2_init (oceanic_atom2_device_t *device)
{ {
// Send the command to the dive computer. // Send the command to the dive computer.
unsigned char command[3] = {0xA8, 0x99, 0x00}; unsigned char command[3] = {0xA8, 0x99, 0x00};
int n = serial_write (device->port, command, sizeof (command)); device_status_t rc = oceanic_atom2_send (device, command, sizeof (command), NAK);
if (n != sizeof (command)) { if (rc != DEVICE_STATUS_SUCCESS)
WARNING ("Failed to send the command."); return rc;
return EXITCODE (n);
}
// Receive the answer of the dive computer.
unsigned char answer[1] = {0};
n = serial_read (device->port, answer, sizeof (answer));
if (n != sizeof (answer)) {
WARNING ("Failed to receive the answer.");
return EXITCODE (n);
}
// Verify the answer.
if (answer[0] != NAK) {
WARNING ("Unexpected answer byte(s).");
return DEVICE_STATUS_PROTOCOL;
}
return DEVICE_STATUS_SUCCESS; return DEVICE_STATUS_SUCCESS;
} }
@ -238,25 +222,9 @@ oceanic_atom2_quit (oceanic_atom2_device_t *device)
{ {
// Send the command to the dive computer. // Send the command to the dive computer.
unsigned char command[4] = {0x6A, 0x05, 0xA5, 0x00}; unsigned char command[4] = {0x6A, 0x05, 0xA5, 0x00};
int n = serial_write (device->port, command, sizeof (command)); device_status_t rc = oceanic_atom2_send (device, command, sizeof (command), NAK);
if (n != sizeof (command)) { if (rc != DEVICE_STATUS_SUCCESS)
WARNING ("Failed to send the command."); return rc;
return EXITCODE (n);
}
// Receive the answer of the dive computer.
unsigned char answer[1] = {0};
n = serial_read (device->port, answer, sizeof (answer));
if (n != sizeof (answer)) {
WARNING ("Failed to receive the answer.");
return EXITCODE (n);
}
// Verify the answer.
if (answer[0] != NAK) {
WARNING ("Unexpected answer byte(s).");
return DEVICE_STATUS_PROTOCOL;
}
return DEVICE_STATUS_SUCCESS; return DEVICE_STATUS_SUCCESS;
} }