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

Merge branch 'veo'

Browse Source
This commit is contained in:
Jef Driesen 2015-02-27 10:31:17 +01:00
commit f205ef736c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/oceanic_atom2_parser.c
View File

@ -199,7 +199,7 @@ oceanic_atom2_parser_get_datetime (dc_parser_t *abstract, dc_datetime_t *datetim
datetime->year = ((p[3] & 0xE0) >> 1) + (p[4] & 0x0F) + 2000; datetime->year = ((p[3] & 0xE0) >> 1) + (p[4] & 0x0F) + 2000;
datetime->month = (p[4] & 0xF0) >> 4; datetime->month = (p[4] & 0xF0) >> 4;
datetime->day = p[3] & 0x1F; datetime->day = p[3] & 0x1F;
datetime->hour = bcd2dec (p[1] & 0x7F); datetime->hour = bcd2dec (p[1] & 0x1F);
datetime->minute = bcd2dec (p[0]); datetime->minute = bcd2dec (p[0]);
break; break;
case ZENAIR: case ZENAIR:
@ -339,6 +339,9 @@ oceanic_atom2_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, uns
mode = FREEDIVE; mode = FREEDIVE;
} else if (parser->model == T3B) { } else if (parser->model == T3B) {
mode = (data[2] & 0xC0) >> 6; mode = (data[2] & 0xC0) >> 6;
} else if (parser->model == VEO20 || parser->model == VEO30 ||
parser->model == VT3 || parser->model == DG03) {
mode = (data[1] & 0x60) >> 5;
} }
if (!parser->cached) { if (!parser->cached) {
@ -500,6 +503,9 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
mode = FREEDIVE; mode = FREEDIVE;
} else if (parser->model == T3B) { } else if (parser->model == T3B) {
mode = (data[2] & 0xC0) >> 6; mode = (data[2] & 0xC0) >> 6;
} else if (parser->model == VEO20 || parser->model == VEO30 ||
parser->model == VT3 || parser->model == DG03) {
mode = (data[1] & 0x60) >> 5;
} }
unsigned int time = 0; unsigned int time = 0;