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 upstream libdivecomputer changes from Jef Driesen.

A harmless build cleanup, and a small fix for the Mares Smart Apnea
temperature parsing.

* git://github.com/libdivecomputer/libdivecomputer:
  Fix the Mares Smart Apnea min/max temperature
  Fix the libusb and hidapi includes
This commit is contained in:
Linus Torvalds 2018-09-21 14:33:18 -07:00
commit 0d1e8f1803
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/atomics_cobalt.c
View File

@ -30,7 +30,7 @@
#ifdef _WIN32 #ifdef _WIN32
#define NOGDI #define NOGDI
#endif #endif
#include <libusb-1.0/libusb.h> #include <libusb.h>
#endif #endif
#include "atomics_cobalt.h" #include "atomics_cobalt.h"

4
src/mares_iconhd_parser.c
View File

@ -457,7 +457,7 @@ mares_iconhd_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsi
break; break;
case DC_FIELD_TEMPERATURE_MINIMUM: case DC_FIELD_TEMPERATURE_MINIMUM:
if (parser->model == SMARTAPNEA) if (parser->model == SMARTAPNEA)
*((double *) value) = (signed short) array_uint16_le (p + 0x3C) / 10.0; *((double *) value) = (signed short) array_uint16_le (p + 0x3E) / 10.0;
else if (parser->mode == FREEDIVE) else if (parser->mode == FREEDIVE)
*((double *) value) = (signed short) array_uint16_le (p + 0x1C) / 10.0; *((double *) value) = (signed short) array_uint16_le (p + 0x1C) / 10.0;
else else
@ -465,7 +465,7 @@ mares_iconhd_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsi
break; break;
case DC_FIELD_TEMPERATURE_MAXIMUM: case DC_FIELD_TEMPERATURE_MAXIMUM:
if (parser->model == SMARTAPNEA) if (parser->model == SMARTAPNEA)
*((double *) value) = (signed short) array_uint16_le (p + 0x3E) / 10.0; *((double *) value) = (signed short) array_uint16_le (p + 0x3C) / 10.0;
else if (parser->mode == FREEDIVE) else if (parser->mode == FREEDIVE)
*((double *) value) = (signed short) array_uint16_le (p + 0x1E) / 10.0; *((double *) value) = (signed short) array_uint16_le (p + 0x1E) / 10.0;
else else

4
src/usbhid.c
View File

@ -45,9 +45,9 @@
#ifdef _WIN32 #ifdef _WIN32
#define NOGDI #define NOGDI
#endif #endif
#include <libusb-1.0/libusb.h> #include <libusb.h>
#elif defined(USE_HIDAPI) #elif defined(USE_HIDAPI)
#include <hidapi/hidapi.h> #include <hidapi.h>
#endif #endif
#include <libdivecomputer/usbhid.h> #include <libdivecomputer/usbhid.h>