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

Merge branch 'master' of git://git.libdivecomputer.org/libdivecomputer into Subsurface-branch

Browse Source 
Merge with upstream libdivecomputer.

For once a trivial merge.  The most noticeable thing is the Mares Quad
Air support.

* 'master' of git://git.libdivecomputer.org/libdivecomputer:
  Fix a mistake in the error checking
  Add support for the Mares Quad Air
This commit is contained in:
Linus Torvalds 2018-01-03 12:04:00 -08:00
commit c354ae0506
4 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/descriptor.c
View File

@ -250,6 +250,7 @@ static const dc_descriptor_t g_descriptors[] = {
{"Mares", "Puck Pro", DC_FAMILY_MARES_ICONHD , 0x18}, {"Mares", "Puck Pro", DC_FAMILY_MARES_ICONHD , 0x18},
{"Mares", "Nemo Wide 2", DC_FAMILY_MARES_ICONHD , 0x19}, {"Mares", "Nemo Wide 2", DC_FAMILY_MARES_ICONHD , 0x19},
{"Mares", "Puck 2", DC_FAMILY_MARES_ICONHD , 0x1F}, {"Mares", "Puck 2", DC_FAMILY_MARES_ICONHD , 0x1F},
{"Mares", "Quad Air", DC_FAMILY_MARES_ICONHD , 0x23},
{"Mares", "Quad", DC_FAMILY_MARES_ICONHD , 0x29}, {"Mares", "Quad", DC_FAMILY_MARES_ICONHD , 0x29},
/* Heinrichs Weikamp */ /* Heinrichs Weikamp */
{"Heinrichs Weikamp", "OSTC", DC_FAMILY_HW_OSTC, 0}, // FTDI {"Heinrichs Weikamp", "OSTC", DC_FAMILY_HW_OSTC, 0}, // FTDI

2
src/hw_frog.c
View File

@ -182,7 +182,7 @@ hw_frog_transfer (hw_frog_device_t *device,
// Read the ready byte. // Read the ready byte.
unsigned char answer[1] = {0}; unsigned char answer[1] = {0};
status = dc_iostream_read (device->iostream, answer, sizeof (answer), NULL); status = dc_iostream_read (device->iostream, answer, sizeof (answer), NULL);
if (status != sizeof (answer)) { if (status != DC_STATUS_SUCCESS) {
ERROR (abstract->context, "Failed to receive the ready byte."); ERROR (abstract->context, "Failed to receive the ready byte.");
return status; return status;
} }

13
src/mares_iconhd.c
View File

@ -42,6 +42,7 @@
#define PUCKPRO 0x18 #define PUCKPRO 0x18
#define NEMOWIDE2 0x19 #define NEMOWIDE2 0x19
#define PUCK2 0x1F #define PUCK2 0x1F
#define QUADAIR 0x23
#define QUAD 0x29 #define QUAD 0x29
#define ACK 0xAA #define ACK 0xAA
@ -127,6 +128,7 @@ mares_iconhd_get_model (mares_iconhd_device_t *device)
{"Puck Pro", PUCKPRO}, {"Puck Pro", PUCKPRO},
{"Nemo Wide 2", NEMOWIDE2}, {"Nemo Wide 2", NEMOWIDE2},
{"Puck 2", PUCK2}, {"Puck 2", PUCK2},
{"Quad Air", QUADAIR},
{"Quad", QUAD}, {"Quad", QUAD},
}; };
@ -299,6 +301,10 @@ mares_iconhd_device_open (dc_device_t **out, dc_context_t *context, const char *
device->layout = &mares_nemowide2_layout; device->layout = &mares_nemowide2_layout;
device->packetsize = 256; device->packetsize = 256;
break; break;
case QUADAIR:
device->layout = &mares_iconhdnet_layout;
device->packetsize = 256;
break;
case ICONHDNET: case ICONHDNET:
device->layout = &mares_iconhdnet_layout; device->layout = &mares_iconhdnet_layout;
device->packetsize = 4096; device->packetsize = 4096;
@ -463,6 +469,8 @@ mares_iconhd_device_foreach (dc_device_t *abstract, dc_dive_callback_t callback,
unsigned int header = 0x5C; unsigned int header = 0x5C;
if (model == ICONHDNET) if (model == ICONHDNET)
header = 0x80; header = 0x80;
else if (model == QUADAIR)
header = 0x84;
else if (model == SMART) else if (model == SMART)
header = 4; // Type and number of samples only! header = 4; // Type and number of samples only!
else if (model == SMARTAPNEA) else if (model == SMARTAPNEA)
@ -545,6 +553,9 @@ mares_iconhd_device_foreach (dc_device_t *abstract, dc_dive_callback_t callback,
if (model == ICONHDNET) { if (model == ICONHDNET) {
headersize = 0x80; headersize = 0x80;
samplesize = 12; samplesize = 12;
} else if (model == QUADAIR) {
headersize = 0x84;
samplesize = 12;
} else if (model == SMART) { } else if (model == SMART) {
if (mode == FREEDIVE) { if (mode == FREEDIVE) {
headersize = 0x2E; headersize = 0x2E;
@ -577,7 +588,7 @@ mares_iconhd_device_foreach (dc_device_t *abstract, dc_dive_callback_t callback,
// end of the ringbuffer. The current dive is incomplete (partially // end of the ringbuffer. The current dive is incomplete (partially
// overwritten with newer data), and processing should stop. // overwritten with newer data), and processing should stop.
unsigned int nbytes = 4 + headersize + nsamples * samplesize; unsigned int nbytes = 4 + headersize + nsamples * samplesize;
if (model == ICONHDNET) { if (model == ICONHDNET || model == QUADAIR) {
nbytes += (nsamples / 4) * 8; nbytes += (nsamples / 4) * 8;
} else if (model == SMARTAPNEA) { } else if (model == SMARTAPNEA) {
unsigned int settings = array_uint16_le (buffer + offset - headersize + 0x1C); unsigned int settings = array_uint16_le (buffer + offset - headersize + 0x1C);

27
src/mares_iconhd_parser.c
View File

@ -34,6 +34,7 @@
#define SMARTAPNEA 0x010010 #define SMARTAPNEA 0x010010
#define ICONHD 0x14 #define ICONHD 0x14
#define ICONHDNET 0x15 #define ICONHDNET 0x15
#define QUADAIR 0x23
#define NGASMIXES 3 #define NGASMIXES 3
#define NTANKS NGASMIXES #define NTANKS NGASMIXES
@ -91,6 +92,8 @@ mares_iconhd_parser_cache (mares_iconhd_parser_t *parser)
unsigned int header = 0x5C; unsigned int header = 0x5C;
if (parser->model == ICONHDNET) if (parser->model == ICONHDNET)
header = 0x80; header = 0x80;
else if (parser->model == QUADAIR)
header = 0x84;
else if (parser->model == SMART) else if (parser->model == SMART)
header = 4; // Type and number of samples only! header = 4; // Type and number of samples only!
else if (parser->model == SMARTAPNEA) else if (parser->model == SMARTAPNEA)
@ -126,6 +129,9 @@ mares_iconhd_parser_cache (mares_iconhd_parser_t *parser)
if (parser->model == ICONHDNET) { if (parser->model == ICONHDNET) {
headersize = 0x80; headersize = 0x80;
samplesize = 12; samplesize = 12;
} else if (parser->model == QUADAIR) {
headersize = 0x84;
samplesize = 12;
} else if (parser->model == SMART) { } else if (parser->model == SMART) {
if (mode == FREEDIVE) { if (mode == FREEDIVE) {
headersize = 0x2E; headersize = 0x2E;
@ -175,7 +181,7 @@ mares_iconhd_parser_cache (mares_iconhd_parser_t *parser)
// Calculate the total number of bytes for this dive. // Calculate the total number of bytes for this dive.
unsigned int nbytes = 4 + headersize + nsamples * samplesize; unsigned int nbytes = 4 + headersize + nsamples * samplesize;
if (parser->model == ICONHDNET) { if (parser->model == ICONHDNET || parser->model == QUADAIR) {
nbytes += (nsamples / 4) * 8; nbytes += (nsamples / 4) * 8;
} else if (parser->model == SMARTAPNEA) { } else if (parser->model == SMARTAPNEA) {
unsigned int divetime = array_uint32_le (p + 0x24); unsigned int divetime = array_uint32_le (p + 0x24);
@ -209,10 +215,11 @@ mares_iconhd_parser_cache (mares_iconhd_parser_t *parser)
// Tanks // Tanks
unsigned int ntanks = 0; unsigned int ntanks = 0;
if (parser->model == ICONHDNET) { if (parser->model == ICONHDNET || parser->model == QUADAIR) {
unsigned int tankoffset = (parser->model == ICONHDNET) ? 0x58 : 0x5C;
while (ntanks < NTANKS) { while (ntanks < NTANKS) {
unsigned int beginpressure = array_uint16_le (p + 0x58 + ntanks * 4 + 0); unsigned int beginpressure = array_uint16_le (p + tankoffset + ntanks * 4 + 0);
unsigned int endpressure = array_uint16_le (p + 0x58 + ntanks * 4 + 2); unsigned int endpressure = array_uint16_le (p + tankoffset + ntanks * 4 + 2);
if (beginpressure == 0 && (endpressure == 0 || endpressure == 36000)) if (beginpressure == 0 && (endpressure == 0 || endpressure == 36000))
break; break;
ntanks++; ntanks++;
@ -352,6 +359,7 @@ mares_iconhd_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsi
} }
unsigned int volume = 0, workpressure = 0; unsigned int volume = 0, workpressure = 0;
unsigned int tankoffset = 0;
dc_gasmix_t *gasmix = (dc_gasmix_t *) value; dc_gasmix_t *gasmix = (dc_gasmix_t *) value;
dc_tank_t *tank = (dc_tank_t *) value; dc_tank_t *tank = (dc_tank_t *) value;
@ -394,8 +402,9 @@ mares_iconhd_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsi
*((unsigned int *) value) = parser->ntanks; *((unsigned int *) value) = parser->ntanks;
break; break;
case DC_FIELD_TANK: case DC_FIELD_TANK:
volume = array_uint16_le (p + 0x64 + flags * 8 + 0); tankoffset = (parser->model == ICONHDNET) ? 0x58 : 0x5C;
workpressure = array_uint16_le (p + 0x64 + flags * 8 + 2); volume = array_uint16_le (p + tankoffset + 0x0C + flags * 8 + 0);
workpressure = array_uint16_le (p + tankoffset + 0x0C + flags * 8 + 2);
if (parser->settings & 0x0100) { if (parser->settings & 0x0100) {
tank->type = DC_TANKVOLUME_METRIC; tank->type = DC_TANKVOLUME_METRIC;
tank->volume = volume; tank->volume = volume;
@ -408,8 +417,8 @@ mares_iconhd_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsi
tank->volume /= workpressure * PSI / ATM; tank->volume /= workpressure * PSI / ATM;
tank->workpressure = workpressure * PSI / BAR; tank->workpressure = workpressure * PSI / BAR;
} }
tank->beginpressure = array_uint16_le (p + 0x58 + flags * 4 + 0) / 100.0; tank->beginpressure = array_uint16_le (p + tankoffset + flags * 4 + 0) / 100.0;
tank->endpressure = array_uint16_le (p + 0x58 + flags * 4 + 2) / 100.0; tank->endpressure = array_uint16_le (p + tankoffset + flags * 4 + 2) / 100.0;
if (flags < parser->ngasmixes) { if (flags < parser->ngasmixes) {
tank->gasmix = flags; tank->gasmix = flags;
} else { } else {
@ -602,7 +611,7 @@ mares_iconhd_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t
nsamples++; nsamples++;
// Some extra data. // Some extra data.
if (parser->model == ICONHDNET && (nsamples % 4) == 0) { if ((parser->model == ICONHDNET || parser->model == QUADAIR) && (nsamples % 4) == 0) {
// Pressure (1/100 bar). // Pressure (1/100 bar).
unsigned int pressure = array_uint16_le(data + offset); unsigned int pressure = array_uint16_le(data + offset);
if (gasmix < parser->ntanks) { if (gasmix < parser->ntanks) {