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

Merge branch 'master' into Subsurface-branch

Browse Source
This commit is contained in:
Dirk Hohndel 2015-10-27 19:52:32 +09:00
commit 4f321aef40
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/descriptor.c
View File

@ -238,7 +238,7 @@ static const dc_descriptor_t g_descriptors[] = {
/* Shearwater Petrel */ /* Shearwater Petrel */
{"Shearwater", "Petrel", DC_FAMILY_SHEARWATER_PETREL, 3}, {"Shearwater", "Petrel", DC_FAMILY_SHEARWATER_PETREL, 3},
{"Shearwater", "Petrel 2", DC_FAMILY_SHEARWATER_PETREL, 3}, {"Shearwater", "Petrel 2", DC_FAMILY_SHEARWATER_PETREL, 3},
{"Shearwater", "Nerd", DC_FAMILY_SHEARWATER_PETREL, 3}, {"Shearwater", "Nerd", DC_FAMILY_SHEARWATER_PETREL, 3},
/* Dive Rite NiTek Q */ /* Dive Rite NiTek Q */
{"Dive Rite", "NiTek Q", DC_FAMILY_DIVERITE_NITEKQ, 0}, {"Dive Rite", "NiTek Q", DC_FAMILY_DIVERITE_NITEKQ, 0},
/* Citizen Hyper Aqualand */ /* Citizen Hyper Aqualand */

3
src/oceanic_atom2_parser.c
View File

@ -735,6 +735,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
// bytes 6 & 7 encode minutes of NDL / deco // bytes 6 & 7 encode minutes of NDL / deco
if (parser->model == A300CS || parser->model == VTX) { if (parser->model == A300CS || parser->model == VTX) {
unsigned int deco = (data[offset + 15] & 0x70) >> 4; unsigned int deco = (data[offset + 15] & 0x70) >> 4;
unsigned int decotime = array_uint16_le(data + offset + 6) & 0x03FF;
if (deco) { if (deco) {
sample.deco.type = DC_DECO_DECOSTOP; sample.deco.type = DC_DECO_DECOSTOP;
sample.deco.depth = deco * 10 * FEET; sample.deco.depth = deco * 10 * FEET;
@ -742,7 +743,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
sample.deco.type = DC_DECO_NDL; sample.deco.type = DC_DECO_NDL;
sample.deco.depth = 0.0; sample.deco.depth = 0.0;
} }
sample.deco.time = array_uint16_le(data + offset + 6) & 0x03FF; sample.deco.time = decotime * 60;
if (callback) callback (DC_SAMPLE_DECO, sample, userdata); if (callback) callback (DC_SAMPLE_DECO, sample, userdata);
} }