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

Try to correct an invalid model code.

Browse Source 
We received data from an Icon HD Net Ready with a model code equal to
0xFF, which is an invalid value. Fortunately we can figure out the
correct model code from the data in the version packet.
This commit is contained in:
Jef Driesen 2011-11-03 21:17:30 +01:00
parent fd8b88891f
commit 0ea9f5e8ca
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mares_iconhd.c
View File

@ -76,6 +76,20 @@ device_is_mares_iconhd (device_t *abstract)
}
static device_status_t
mares_iconhd_get_model (mares_iconhd_device_t *device, unsigned int model)
{
// Try to correct an invalid model code using the version packet.
if (model == 0xFF) {
WARNING("Invalid model code detected!");
const unsigned char iconhdnet[] = "Icon AIR";
if (device && memcmp (device->version + 0x46, iconhdnet, sizeof (iconhdnet) - 1) == 0)
model = ICONHDNET;
}
return model;
}
static device_status_t
mares_iconhd_transfer (mares_iconhd_device_t *device,
const unsigned char command[], unsigned int csize,
@ -324,6 +338,8 @@ mares_iconhd_device_dump (device_t *abstract, dc_buffer_t *buffer)
static device_status_t
mares_iconhd_device_foreach (device_t *abstract, dive_callback_t callback, void *userdata)
{
mares_iconhd_device_t *device = (mares_iconhd_device_t *) abstract;
dc_buffer_t *buffer = dc_buffer_new (MARES_ICONHD_MEMORY_SIZE);
if (buffer == NULL)
return DEVICE_STATUS_MEMORY;
@ -337,7 +353,7 @@ mares_iconhd_device_foreach (device_t *abstract, dive_callback_t callback, void
// Emit a device info event.
unsigned char *data = dc_buffer_get_data (buffer);
device_devinfo_t devinfo;
devinfo.model = data[0];
devinfo.model = mares_iconhd_get_model (device, data[0]);
devinfo.firmware = 0;
devinfo.serial = array_uint16_le (data + 12);
device_event_emit (abstract, DEVICE_EVENT_DEVINFO, &devinfo);
@ -363,7 +379,7 @@ mares_iconhd_extract_dives (device_t *abstract, const unsigned char data[], unsi
return DEVICE_STATUS_ERROR;
// Get the model code.
unsigned int model = data[0];
unsigned int model = mares_iconhd_get_model (device, data[0]);
// Get the corresponding dive header size.
unsigned int header = 0x5C;