Merge branch 'leonardo'

This commit is contained in:
Jef Driesen 2014-02-21 21:22:21 +01:00
commit fcc75e5a37
2 changed files with 4 additions and 3 deletions

View File

@ -273,9 +273,9 @@ cressi_leonardo_device_foreach (dc_device_t *abstract, dc_dive_callback_t callba
unsigned char *data = dc_buffer_get_data (buffer);
dc_event_devinfo_t devinfo;
devinfo.model = 0;
devinfo.model = data[0];
devinfo.firmware = 0;
devinfo.serial = array_uint32_le (data + 1);
devinfo.serial = array_uint24_le (data + 1);
device_event_emit (abstract, DC_EVENT_DEVINFO, &devinfo);
rc = cressi_leonardo_extract_dives (abstract, dc_buffer_get_data (buffer),

View File

@ -200,7 +200,8 @@ static const dc_descriptor_t g_descriptors[] = {
/* Cressi Edy */
{"Cressi", "Edy", DC_FAMILY_CRESSI_EDY, 0},
/* Cressi Leonardo */
{"Cressi", "Leonardo", DC_FAMILY_CRESSI_LEONARDO, 0},
{"Cressi", "Leonardo", DC_FAMILY_CRESSI_LEONARDO, 1},
{"Cressi", "Giotto", DC_FAMILY_CRESSI_LEONARDO, 4},
/* Zeagle N2iTiON3 */
{"Zeagle", "N2iTiON3", DC_FAMILY_ZEAGLE_N2ITION3, 0},
{"Apeks", "Quantum X", DC_FAMILY_ZEAGLE_N2ITION3, 0},