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

Merge git://github.com/libdivecomputer/libdivecomputer into Subsurface-NG

Browse Source 
Merge with upstream Jef.

This is mainly just the (already merged as a separate patch) support for
th eOceanic Pro Plus 4, Jef committed the identical patch but without
marking it as BLE-capable (which is kind of pointless, since it doesn't
seem to work over anything _but_ BLE).

And a couple of trivial fixlets.

* git://github.com/libdivecomputer/libdivecomputer:
  Fix the Aeris Manta memory layout
  Add support for the Oceanic Pro Plus 4
  Strip the source directory from file names
This commit is contained in:
Linus Torvalds 2019-12-28 11:32:25 -08:00
commit 778adb37cc
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -190,6 +190,7 @@ AX_APPEND_COMPILE_FLAGS([ \
-Wno-unused-but-set-variable \
-Wno-pointer-sign \
-Wno-shadow \
-fmacro-prefix-map='$(top_srcdir)/'= \
])
# Windows specific compiler options.

11
src/oceanic_atom2.c
View File

@ -97,6 +97,10 @@ static const oceanic_common_version_t aeris_f11_version[] = {
{"OCEANF11 \0\0 1024"},
};
static const oceanic_common_version_t aeris_manta_version[] = {
{"MANTA R\0\0 512K"},
};
static const oceanic_common_version_t oceanic_atom1_version[] = {
{"ATOM rev\0\0 256K"},
};
@ -106,7 +110,6 @@ static const oceanic_common_version_t oceanic_atom2_version[] = {
};
static const oceanic_common_version_t oceanic_atom2a_version[] = {
{"MANTA R\0\0 512K"},
{"INSIGHT2 \0\0 512K"},
{"OCEVEO30 \0\0 512K"},
{"ATMOSAI R\0\0 512K"},
@ -946,6 +949,12 @@ oceanic_atom2_device_open (dc_device_t **out, dc_context_t *context, dc_iostream
} else if (OCEANIC_COMMON_MATCH (device->base.version, aeris_f11_version)) {
device->base.layout = &aeris_f11_layout;
device->bigpage = 8;
} else if (OCEANIC_COMMON_MATCH (device->base.version, aeris_manta_version)) {
if (array_uint16_be (device->base.version + 0x08) >= 0x3242) {
device->base.layout = &oceanic_atom2a_layout;
} else {
device->base.layout = &oceanic_atom2c_layout;
}
} else if (OCEANIC_COMMON_MATCH (device->base.version, oceanic_atom1_version)) {
device->base.layout = &oceanic_atom1_layout;
} else if (OCEANIC_COMMON_MATCH (device->base.version, oceanic_atom2_version)) {