2011-09-12 16:19:21 +00:00
|
|
|
#include <stdio.h>
|
2011-11-27 17:10:37 +00:00
|
|
|
#include <unistd.h>
|
|
|
|
#include <inttypes.h>
|
2013-10-05 07:29:09 +00:00
|
|
|
#include <string.h>
|
2013-10-06 15:55:58 +00:00
|
|
|
#include "gettext.h"
|
2011-09-12 16:50:40 +00:00
|
|
|
#include "dive.h"
|
Assemble the actual Suunto serial number
It turns out that the serial number returned by libdivecomputer isn't
really the serial number as interpreted by the vendor. Those tend to be
strings, but libdivecomputer gives us a 32bit number.
Some experimenting showed that for the Suunto devies tested the serial
number is encoded in that 32bit number:
It so happens that the Suunto serial number strings are strings that have
all numbers, but they aren't *one* number. They are four bytes
representing two numbers each, and the "23500027" string is actually the
four bytes 23 50 00 27 (0x17 0x32 0x00 0x1b). And libdivecomputer has
incorrectly parsed those four bytes as one number, not as the encoded
serial number string it is. So the value 389152795 is actually hex
0x1732001b, which is 0x17 0x32 0x00 0x1b, which is - 23 50 00 27.
This should be done by libdivecomputer, but hey, in the meantime this at
least shows the concept. And helps test the XML save/restore code.
It depends on the two patches that create the whole "device.c"
infrastructure, of course. With this, my dive file ends up having the
settings section look like this:
<divecomputerid model='Suunto Vyper Air' deviceid='d4629110'
serial='01201094' firmware='1.1.22'/>
<divecomputerid model='Suunto HelO2' deviceid='995dd566'
serial='23500027' firmware='1.0.4'/>
where the format of the firmware version is something I guessed at,
but it was the obvious choice (again, it's byte-based, I'm ignoring
the high byte that is zero for both of my Suuntos).
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-10 00:14:21 +00:00
|
|
|
#include "device.h"
|
2011-09-12 20:25:05 +00:00
|
|
|
#include "divelist.h"
|
2011-09-12 16:19:21 +00:00
|
|
|
#include "display.h"
|
|
|
|
|
2011-09-20 19:40:34 +00:00
|
|
|
#include "libdivecomputer.h"
|
2011-09-15 04:00:49 +00:00
|
|
|
|
Make subsurface compile with current libdivecomputer git tree
libdivecomputer has the absolute worst interfaces to any library *ever*,
and randomly changes those crappy interfaces when it adds support for
new dive computers.
It would have been much better if the interface was just a "open this
device" with a device descriptor structure pointer, so that when Jef
adds support for new devices, the old descriptors still stay around and
work the same way - there's just a new descriptor structure that you
*can* use if you want. Along with a data structure to name the devices
and their descriptors, this would actually mean that users could just
support pretty much any random device that LD supports.
But no, that's not how libdivecomputer works. It has random enums and
crazy different ad-hoc interfaces for different dive computers. Or,
like in this case, crazy different ad-hoc interfaces for the *same*old*
dive computer.
Right now, for example, the support for the new Heinrichs Weikamp "Frog"
computer added a flag to the interface for the old OSTC_2 support.
Breaking any libdivecomputer users even if you didn't need Frog support.
And is there a version number in the header files to check for? Yes,
there's a version number. But no, it's not useful, since it doesn't
actually change with the interface changes. This time, Jef actually did
change the version number (from 0.1.0 to 0.2.0) as part of new
development version, but there's no reason to believe that it will
change in the future as the interfaces change - it never has before.
So it's actually safer - and easier to understand - to check for the
existence of the new header file inclusion mechanism. A new version of
libdivecomputer that supports the HW Frog computer will include the
"ostc_frog.h" header file when you include the libdivecomputer device.h
file, and that will result in HW_FROG_H being defined.
So we can check whether libdivecomputer has the new interface and
supports the Frog by doing an "#ifdef HW_FROG_H" hack. Ugh.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-05-02 16:36:55 +00:00
|
|
|
/* Christ. Libdivecomputer has the worst configuration system ever. */
|
|
|
|
#ifdef HW_FROG_H
|
2014-02-28 04:09:57 +00:00
|
|
|
#define NOT_FROG , 0
|
|
|
|
#define LIBDIVECOMPUTER_SUPPORTS_FROG
|
Make subsurface compile with current libdivecomputer git tree
libdivecomputer has the absolute worst interfaces to any library *ever*,
and randomly changes those crappy interfaces when it adds support for
new dive computers.
It would have been much better if the interface was just a "open this
device" with a device descriptor structure pointer, so that when Jef
adds support for new devices, the old descriptors still stay around and
work the same way - there's just a new descriptor structure that you
*can* use if you want. Along with a data structure to name the devices
and their descriptors, this would actually mean that users could just
support pretty much any random device that LD supports.
But no, that's not how libdivecomputer works. It has random enums and
crazy different ad-hoc interfaces for different dive computers. Or,
like in this case, crazy different ad-hoc interfaces for the *same*old*
dive computer.
Right now, for example, the support for the new Heinrichs Weikamp "Frog"
computer added a flag to the interface for the old OSTC_2 support.
Breaking any libdivecomputer users even if you didn't need Frog support.
And is there a version number in the header files to check for? Yes,
there's a version number. But no, it's not useful, since it doesn't
actually change with the interface changes. This time, Jef actually did
change the version number (from 0.1.0 to 0.2.0) as part of new
development version, but there's no reason to believe that it will
change in the future as the interfaces change - it never has before.
So it's actually safer - and easier to understand - to check for the
existence of the new header file inclusion mechanism. A new version of
libdivecomputer that supports the HW Frog computer will include the
"ostc_frog.h" header file when you include the libdivecomputer device.h
file, and that will result in HW_FROG_H being defined.
So we can check whether libdivecomputer has the new interface and
supports the Frog by doing an "#ifdef HW_FROG_H" hack. Ugh.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-05-02 16:36:55 +00:00
|
|
|
#else
|
2014-02-28 04:09:57 +00:00
|
|
|
#define NOT_FROG
|
Make subsurface compile with current libdivecomputer git tree
libdivecomputer has the absolute worst interfaces to any library *ever*,
and randomly changes those crappy interfaces when it adds support for
new dive computers.
It would have been much better if the interface was just a "open this
device" with a device descriptor structure pointer, so that when Jef
adds support for new devices, the old descriptors still stay around and
work the same way - there's just a new descriptor structure that you
*can* use if you want. Along with a data structure to name the devices
and their descriptors, this would actually mean that users could just
support pretty much any random device that LD supports.
But no, that's not how libdivecomputer works. It has random enums and
crazy different ad-hoc interfaces for different dive computers. Or,
like in this case, crazy different ad-hoc interfaces for the *same*old*
dive computer.
Right now, for example, the support for the new Heinrichs Weikamp "Frog"
computer added a flag to the interface for the old OSTC_2 support.
Breaking any libdivecomputer users even if you didn't need Frog support.
And is there a version number in the header files to check for? Yes,
there's a version number. But no, it's not useful, since it doesn't
actually change with the interface changes. This time, Jef actually did
change the version number (from 0.1.0 to 0.2.0) as part of new
development version, but there's no reason to believe that it will
change in the future as the interfaces change - it never has before.
So it's actually safer - and easier to understand - to check for the
existence of the new header file inclusion mechanism. A new version of
libdivecomputer that supports the HW Frog computer will include the
"ostc_frog.h" header file when you include the libdivecomputer device.h
file, and that will result in HW_FROG_H being defined.
So we can check whether libdivecomputer has the new interface and
supports the Frog by doing an "#ifdef HW_FROG_H" hack. Ugh.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-05-02 16:36:55 +00:00
|
|
|
#endif
|
|
|
|
|
2013-12-25 00:26:00 +00:00
|
|
|
char *dumpfile_name;
|
|
|
|
char *logfile_name;
|
2013-05-20 19:43:33 +00:00
|
|
|
const char *progress_bar_text = "";
|
|
|
|
double progress_bar_fraction = 0.0;
|
|
|
|
|
2012-12-08 22:02:31 +00:00
|
|
|
static int stoptime, stopdepth, ndl, po2, cns;
|
2013-10-05 07:29:09 +00:00
|
|
|
static bool in_deco, first_temp_is_air;
|
2012-09-20 19:56:42 +00:00
|
|
|
|
2012-06-22 20:37:39 +00:00
|
|
|
static dc_status_t create_parser(device_data_t *devdata, dc_parser_t **parser)
|
2011-09-12 17:27:35 +00:00
|
|
|
{
|
2012-06-22 20:37:39 +00:00
|
|
|
return dc_parser_new(parser, devdata->device);
|
2011-09-12 17:27:35 +00:00
|
|
|
}
|
|
|
|
|
2012-12-28 16:53:16 +00:00
|
|
|
/* Atomics Aquatics Cobalt specific parsing of tank information
|
|
|
|
* realistically this REALLY needs to be done in libdivecomputer - but the
|
|
|
|
* current API doesn't even have the notion of tank size, so for now I do
|
|
|
|
* this here, but I need to work with Jef to make sure this gets added in
|
|
|
|
* the new libdivecomputer API */
|
|
|
|
#define COBALT_HEADER 228
|
|
|
|
struct atomics_gas_info {
|
|
|
|
uint8_t gas_nr;
|
|
|
|
uint8_t po2imit;
|
2014-02-28 04:09:57 +00:00
|
|
|
uint8_t tankspecmethod; /* 1: CF@psi 2: CF@bar 3: wet vol in deciliter */
|
2012-12-28 16:53:16 +00:00
|
|
|
uint8_t gasmixtype;
|
|
|
|
uint8_t fo2;
|
|
|
|
uint8_t fhe;
|
2014-02-28 04:09:57 +00:00
|
|
|
uint16_t startpressure; /* in psi */
|
|
|
|
uint16_t tanksize; /* CF or dl */
|
2012-12-28 16:53:16 +00:00
|
|
|
uint16_t workingpressure;
|
|
|
|
uint16_t sensorid;
|
2014-02-28 04:09:57 +00:00
|
|
|
uint16_t endpressure; /* in psi */
|
|
|
|
uint16_t totalconsumption; /* in liters */
|
2012-12-28 16:53:16 +00:00
|
|
|
};
|
|
|
|
#define COBALT_CFATPSI 1
|
|
|
|
#define COBALT_CFATBAR 2
|
|
|
|
#define COBALT_WETINDL 3
|
|
|
|
|
2013-11-23 22:54:42 +00:00
|
|
|
static bool get_tanksize(device_data_t *devdata, const unsigned char *data, cylinder_t *cyl, int idx)
|
2012-12-28 16:53:16 +00:00
|
|
|
{
|
|
|
|
/* I don't like this kind of match... I'd love to have an ID and
|
|
|
|
* a firmware version or... something; and even better, just get
|
|
|
|
* this from libdivecomputer */
|
|
|
|
if (!strcmp(devdata->vendor, "Atomic Aquatics") &&
|
|
|
|
!strcmp(devdata->product, "Cobalt")) {
|
|
|
|
struct atomics_gas_info *atomics_gas_info;
|
|
|
|
double airvolume;
|
|
|
|
int mbar;
|
|
|
|
|
|
|
|
/* at least some quick sanity check to make sure this is the
|
|
|
|
* right data */
|
|
|
|
if (*(uint32_t *)data != 0xFFFEFFFE) {
|
|
|
|
printf("incorrect header for Atomics dive\n");
|
2014-01-15 18:54:41 +00:00
|
|
|
return false;
|
2012-12-28 16:53:16 +00:00
|
|
|
}
|
2014-02-28 04:09:57 +00:00
|
|
|
atomics_gas_info = (void *)(data + COBALT_HEADER);
|
2012-12-28 16:53:16 +00:00
|
|
|
switch (atomics_gas_info[idx].tankspecmethod) {
|
|
|
|
case COBALT_CFATPSI:
|
|
|
|
airvolume = cuft_to_l(atomics_gas_info[idx].tanksize) * 1000.0;
|
|
|
|
mbar = psi_to_mbar(atomics_gas_info[idx].workingpressure);
|
2014-02-12 22:19:53 +00:00
|
|
|
cyl[idx].type.size.mliter = rint(airvolume / bar_to_atm(mbar / 1000.0));
|
2012-12-28 16:53:16 +00:00
|
|
|
cyl[idx].type.workingpressure.mbar = mbar;
|
|
|
|
break;
|
|
|
|
case COBALT_CFATBAR:
|
|
|
|
airvolume = cuft_to_l(atomics_gas_info[idx].tanksize) * 1000.0;
|
|
|
|
mbar = atomics_gas_info[idx].workingpressure * 1000;
|
2014-02-12 22:19:53 +00:00
|
|
|
cyl[idx].type.size.mliter = rint(airvolume / bar_to_atm(mbar / 1000.0));
|
2012-12-28 16:53:16 +00:00
|
|
|
cyl[idx].type.workingpressure.mbar = mbar;
|
|
|
|
break;
|
|
|
|
case COBALT_WETINDL:
|
|
|
|
cyl[idx].type.size.mliter = atomics_gas_info[idx].tanksize * 100;
|
|
|
|
break;
|
|
|
|
}
|
2014-01-15 18:54:41 +00:00
|
|
|
return true;
|
2012-12-28 16:53:16 +00:00
|
|
|
}
|
2014-01-15 18:54:41 +00:00
|
|
|
return false;
|
2012-12-28 16:53:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int parse_gasmixes(device_data_t *devdata, struct dive *dive, dc_parser_t *parser, int ngases,
|
2014-02-28 04:09:57 +00:00
|
|
|
const unsigned char *data)
|
2011-09-12 18:05:32 +00:00
|
|
|
{
|
2014-08-06 13:19:31 +00:00
|
|
|
static bool shown_warning = false;
|
2011-09-12 18:05:32 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < ngases; i++) {
|
|
|
|
int rc;
|
2014-02-28 04:09:57 +00:00
|
|
|
dc_gasmix_t gasmix = { 0 };
|
2011-09-12 20:31:43 +00:00
|
|
|
int o2, he;
|
2011-09-12 18:05:32 +00:00
|
|
|
|
2012-06-22 20:37:39 +00:00
|
|
|
rc = dc_parser_get_field(parser, DC_FIELD_GASMIX, i, &gasmix);
|
|
|
|
if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED)
|
2011-09-12 18:05:32 +00:00
|
|
|
return rc;
|
|
|
|
|
2011-09-12 20:25:05 +00:00
|
|
|
if (i >= MAX_CYLINDERS)
|
|
|
|
continue;
|
|
|
|
|
2014-02-12 22:19:53 +00:00
|
|
|
o2 = rint(gasmix.oxygen * 1000);
|
|
|
|
he = rint(gasmix.helium * 1000);
|
2011-09-12 20:31:43 +00:00
|
|
|
|
|
|
|
/* Ignore bogus data - libdivecomputer does some crazy stuff */
|
2014-06-11 14:15:40 +00:00
|
|
|
if (o2 + he <= O2_IN_AIR || o2 > 1000) {
|
2014-08-06 13:19:31 +00:00
|
|
|
if (!shown_warning) {
|
|
|
|
shown_warning = true;
|
|
|
|
report_error("unlikely dive gas data from libdivecomputer: o2 = %d he = %d", o2, he);
|
|
|
|
}
|
2011-09-12 20:31:43 +00:00
|
|
|
o2 = 0;
|
2014-06-11 14:15:40 +00:00
|
|
|
}
|
|
|
|
if (he < 0 || o2 + he > 1000) {
|
2014-08-06 13:19:31 +00:00
|
|
|
if (!shown_warning) {
|
|
|
|
shown_warning = true;
|
|
|
|
report_error("unlikely dive gas data from libdivecomputer: o2 = %d he = %d", o2, he);
|
|
|
|
}
|
2011-09-12 20:31:43 +00:00
|
|
|
he = 0;
|
2014-06-11 14:15:40 +00:00
|
|
|
}
|
2011-09-12 20:31:43 +00:00
|
|
|
dive->cylinder[i].gasmix.o2.permille = o2;
|
|
|
|
dive->cylinder[i].gasmix.he.permille = he;
|
2012-12-28 16:53:16 +00:00
|
|
|
|
2014-03-15 20:13:01 +00:00
|
|
|
/* for the first tank, if there is no tanksize available from the
|
|
|
|
* dive computer, fill in the default tank information (if set) */
|
2014-03-15 20:46:35 +00:00
|
|
|
if (!get_tanksize(devdata, data, dive->cylinder, i) && i == 0)
|
2013-11-23 22:54:42 +00:00
|
|
|
fill_default_cylinder(&dive->cylinder[i]);
|
2011-09-12 18:05:32 +00:00
|
|
|
}
|
2012-06-22 20:37:39 +00:00
|
|
|
return DC_STATUS_SUCCESS;
|
2011-09-12 18:05:32 +00:00
|
|
|
}
|
|
|
|
|
2012-11-24 02:51:27 +00:00
|
|
|
static void handle_event(struct divecomputer *dc, struct sample *sample, dc_sample_value_t value)
|
2011-09-12 18:05:32 +00:00
|
|
|
{
|
2011-09-22 23:55:55 +00:00
|
|
|
int type, time;
|
2012-10-21 18:34:11 +00:00
|
|
|
/* we mark these for translation here, but we store the untranslated strings
|
|
|
|
* and only translate them when they are displayed on screen */
|
2011-09-12 18:05:32 +00:00
|
|
|
static const char *events[] = {
|
2014-02-28 04:09:57 +00:00
|
|
|
QT_TRANSLATE_NOOP("gettextFromC", "none"), QT_TRANSLATE_NOOP("gettextFromC", "deco stop"), QT_TRANSLATE_NOOP("gettextFromC", "rbt"), QT_TRANSLATE_NOOP("gettextFromC", "ascent"), QT_TRANSLATE_NOOP("gettextFromC", "ceiling"), QT_TRANSLATE_NOOP("gettextFromC", "workload"),
|
|
|
|
QT_TRANSLATE_NOOP("gettextFromC", "transmitter"), QT_TRANSLATE_NOOP("gettextFromC", "violation"), QT_TRANSLATE_NOOP("gettextFromC", "bookmark"), QT_TRANSLATE_NOOP("gettextFromC", "surface"), QT_TRANSLATE_NOOP("gettextFromC", "safety stop"),
|
|
|
|
QT_TRANSLATE_NOOP("gettextFromC", "gaschange"), QT_TRANSLATE_NOOP("gettextFromC", "safety stop (voluntary)"), QT_TRANSLATE_NOOP("gettextFromC", "safety stop (mandatory)"),
|
|
|
|
QT_TRANSLATE_NOOP("gettextFromC", "deepstop"), QT_TRANSLATE_NOOP("gettextFromC", "ceiling (safety stop)"), QT_TRANSLATE_NOOP3("gettextFromC", "below floor", "event showing dive is below deco floor and adding deco time"), QT_TRANSLATE_NOOP("gettextFromC", "divetime"),
|
|
|
|
QT_TRANSLATE_NOOP("gettextFromC", "maxdepth"), QT_TRANSLATE_NOOP("gettextFromC", "OLF"), QT_TRANSLATE_NOOP("gettextFromC", "PO2"), QT_TRANSLATE_NOOP("gettextFromC", "airtime"), QT_TRANSLATE_NOOP("gettextFromC", "rgbm"), QT_TRANSLATE_NOOP("gettextFromC", "heading"),
|
|
|
|
QT_TRANSLATE_NOOP("gettextFromC", "tissue level warning"), QT_TRANSLATE_NOOP("gettextFromC", "gaschange"), QT_TRANSLATE_NOOP("gettextFromC", "non stop time")
|
2011-09-22 23:55:55 +00:00
|
|
|
};
|
|
|
|
const int nr_events = sizeof(events) / sizeof(const char *);
|
|
|
|
const char *name;
|
|
|
|
/*
|
|
|
|
* Just ignore surface events. They are pointless. What "surface"
|
|
|
|
* means depends on the dive computer (and possibly even settings
|
|
|
|
* in the dive computer). It does *not* necessarily mean "depth 0",
|
|
|
|
* so don't even turn it into that.
|
|
|
|
*/
|
|
|
|
if (value.event.type == SAMPLE_EVENT_SURFACE)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Other evens might be more interesting, but for now we just print them out.
|
|
|
|
*/
|
|
|
|
type = value.event.type;
|
2014-02-28 04:09:57 +00:00
|
|
|
name = QT_TRANSLATE_NOOP("gettextFromC", "invalid event number");
|
2011-09-22 23:55:55 +00:00
|
|
|
if (type < nr_events)
|
2012-10-21 18:34:11 +00:00
|
|
|
name = events[type];
|
2011-09-22 23:55:55 +00:00
|
|
|
|
|
|
|
time = value.event.time;
|
|
|
|
if (sample)
|
|
|
|
time += sample->time.seconds;
|
|
|
|
|
2012-11-24 02:51:27 +00:00
|
|
|
add_event(dc, time, type, value.event.flags, value.event.value, name);
|
2011-09-22 23:45:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2012-06-22 20:37:39 +00:00
|
|
|
sample_cb(dc_sample_type_t type, dc_sample_value_t value, void *userdata)
|
2011-09-22 23:45:28 +00:00
|
|
|
{
|
|
|
|
int i;
|
2012-11-24 02:51:27 +00:00
|
|
|
struct divecomputer *dc = userdata;
|
2011-09-12 20:25:05 +00:00
|
|
|
struct sample *sample;
|
|
|
|
|
|
|
|
/*
|
2012-06-22 20:37:39 +00:00
|
|
|
* We fill in the "previous" sample - except for DC_SAMPLE_TIME,
|
2011-09-12 20:25:05 +00:00
|
|
|
* which creates a new one.
|
|
|
|
*/
|
2014-02-28 04:09:57 +00:00
|
|
|
sample = dc->samples ? dc->sample + dc->samples - 1 : NULL;
|
2011-09-12 18:05:32 +00:00
|
|
|
|
2013-12-10 23:53:36 +00:00
|
|
|
/*
|
2014-03-05 20:19:45 +00:00
|
|
|
* Ok, sanity check.
|
|
|
|
* If first sample is not a DC_SAMPLE_TIME, Allocate a sample for us
|
|
|
|
*/
|
2013-12-10 23:53:36 +00:00
|
|
|
if (sample == NULL && type != DC_SAMPLE_TIME)
|
|
|
|
sample = prepare_sample(dc);
|
|
|
|
|
2011-09-12 18:05:32 +00:00
|
|
|
switch (type) {
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_SAMPLE_TIME:
|
2012-12-05 22:35:49 +00:00
|
|
|
if (sample) {
|
2012-12-31 02:11:01 +00:00
|
|
|
sample->in_deco = in_deco;
|
2012-12-05 22:35:49 +00:00
|
|
|
sample->ndl.seconds = ndl;
|
|
|
|
sample->stoptime.seconds = stoptime;
|
|
|
|
sample->stopdepth.mm = stopdepth;
|
2014-10-19 14:07:07 +00:00
|
|
|
sample->setpoint.mbar = po2;
|
2012-12-08 22:02:31 +00:00
|
|
|
sample->cns = cns;
|
2012-12-05 22:35:49 +00:00
|
|
|
}
|
2012-11-24 02:51:27 +00:00
|
|
|
sample = prepare_sample(dc);
|
2011-09-12 20:25:05 +00:00
|
|
|
sample->time.seconds = value.time;
|
2012-11-24 02:51:27 +00:00
|
|
|
finish_sample(dc);
|
2011-09-12 18:05:32 +00:00
|
|
|
break;
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_SAMPLE_DEPTH:
|
2014-02-12 22:19:53 +00:00
|
|
|
sample->depth.mm = rint(value.depth * 1000);
|
2011-09-12 18:05:32 +00:00
|
|
|
break;
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_SAMPLE_PRESSURE:
|
First step in cleaning up cylinder pressure sensor logic
This clarifies/changes the meaning of our "cylinderindex" entry in our
samples. It has been rather confused, because different dive computers
have done things differently, and the naming really hasn't helped.
There are two totally different - and independent - cylinder "indexes":
- the pressure sensor index, which indicates which cylinder the sensor
data is from.
- the "active cylinder" index, which indicates which cylinder we actually
breathe from.
These two values really are totally independent, and have nothing
what-so-ever to do with each other. The sensor index may well be fixed:
many dive computers only support a single pressure sensor (whether
wireless or wired), and the sensor index is thus always zero.
Other dive computers may support multiple pressure sensors, and the gas
switch event may - or may not - indicate that the sensor changed too. A
dive computer might give the sensor data for *all* cylinders it can read,
regardless of which one is the one we're actively breathing. In fact, some
dive computers might give sensor data for not just *your* cylinder, but
your buddies.
This patch renames "cylinderindex" in the samples as "sensor", making it
quite clear that it's about which sensor index the pressure data in the
sample is about.
The way we figure out which is the currently active gas is with an
explicit has change event. If a computer (like the Uemis Zurich) joins the
two concepts together, then a sensor change should also create a gas
switch event. This patch also changes the Uemis importer to do that.
Finally, it should be noted that the plot info works totally separately
from the sample data, and is about what we actually *display*, not about
the sample pressures etc. In the plot info, the "cylinderindex" does in
fact mean the currently active cylinder, and while it is initially set to
match the sensor information from the samples, we then walk the gas change
events and fix it up - and if the active cylinder differs from the sensor
cylinder, we clear the sensor data.
[Dirk Hohndel: this conflicted with some of my recent changes - I think
I merged things correctly...]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-31 04:00:51 +00:00
|
|
|
sample->sensor = value.pressure.tank;
|
2014-02-12 22:19:53 +00:00
|
|
|
sample->cylinderpressure.mbar = rint(value.pressure.value * 1000);
|
2011-09-12 18:05:32 +00:00
|
|
|
break;
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_SAMPLE_TEMPERATURE:
|
2013-11-26 22:11:30 +00:00
|
|
|
sample->temperature.mkelvin = C_to_mkelvin(value.temperature);
|
2011-09-12 18:05:32 +00:00
|
|
|
break;
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_SAMPLE_EVENT:
|
2012-11-24 02:51:27 +00:00
|
|
|
handle_event(dc, sample, value);
|
2011-09-12 18:05:32 +00:00
|
|
|
break;
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_SAMPLE_RBT:
|
2011-09-12 18:05:32 +00:00
|
|
|
printf(" <rbt>%u</rbt>\n", value.rbt);
|
|
|
|
break;
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_SAMPLE_HEARTBEAT:
|
2014-01-17 22:00:28 +00:00
|
|
|
sample->heartbeat = value.heartbeat;
|
2011-09-12 18:05:32 +00:00
|
|
|
break;
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_SAMPLE_BEARING:
|
2014-06-03 17:21:41 +00:00
|
|
|
sample->bearing.degrees = value.bearing;
|
2011-09-12 18:05:32 +00:00
|
|
|
break;
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_SAMPLE_VENDOR:
|
2012-12-31 01:53:51 +00:00
|
|
|
printf(" <vendor time='%u:%02u' type=\"%u\" size=\"%u\">", FRACTION(sample->time.seconds, 60),
|
2014-02-28 04:09:57 +00:00
|
|
|
value.vendor.type, value.vendor.size);
|
2011-09-12 18:05:32 +00:00
|
|
|
for (i = 0; i < value.vendor.size; ++i)
|
2014-02-28 04:09:57 +00:00
|
|
|
printf("%02X", ((unsigned char *)value.vendor.data)[i]);
|
2011-09-12 18:05:32 +00:00
|
|
|
printf("</vendor>\n");
|
|
|
|
break;
|
2012-12-08 04:08:29 +00:00
|
|
|
#if DC_VERSION_CHECK(0, 3, 0)
|
|
|
|
case DC_SAMPLE_SETPOINT:
|
|
|
|
/* for us a setpoint means constant pO2 from here */
|
2014-10-19 14:07:07 +00:00
|
|
|
sample->setpoint.mbar = po2 = rint(value.setpoint * 1000);
|
2012-12-08 04:08:29 +00:00
|
|
|
break;
|
|
|
|
case DC_SAMPLE_PPO2:
|
2014-10-19 14:07:07 +00:00
|
|
|
sample->setpoint.mbar = po2 = rint(value.ppo2 * 1000);
|
2012-12-08 04:08:29 +00:00
|
|
|
break;
|
|
|
|
case DC_SAMPLE_CNS:
|
2014-02-12 22:19:53 +00:00
|
|
|
sample->cns = cns = rint(value.cns * 100);
|
2012-12-08 04:08:29 +00:00
|
|
|
break;
|
2012-12-11 15:43:11 +00:00
|
|
|
case DC_SAMPLE_DECO:
|
|
|
|
if (value.deco.type == DC_DECO_NDL) {
|
2012-12-31 02:11:01 +00:00
|
|
|
sample->ndl.seconds = ndl = value.deco.time;
|
2014-02-12 22:19:53 +00:00
|
|
|
sample->stopdepth.mm = stopdepth = rint(value.deco.depth * 1000.0);
|
2014-01-15 18:54:41 +00:00
|
|
|
sample->in_deco = in_deco = false;
|
2012-12-11 15:43:11 +00:00
|
|
|
} else if (value.deco.type == DC_DECO_DECOSTOP ||
|
|
|
|
value.deco.type == DC_DECO_DEEPSTOP) {
|
2014-01-15 18:54:41 +00:00
|
|
|
sample->in_deco = in_deco = true;
|
2014-02-12 22:19:53 +00:00
|
|
|
sample->stopdepth.mm = stopdepth = rint(value.deco.depth * 1000.0);
|
2012-12-31 02:11:01 +00:00
|
|
|
sample->stoptime.seconds = stoptime = value.deco.time;
|
2012-12-29 02:39:01 +00:00
|
|
|
ndl = 0;
|
2012-12-31 02:11:01 +00:00
|
|
|
} else if (value.deco.type == DC_DECO_SAFETYSTOP) {
|
2014-01-15 18:54:41 +00:00
|
|
|
sample->in_deco = in_deco = false;
|
2014-02-12 22:19:53 +00:00
|
|
|
sample->stopdepth.mm = stopdepth = rint(value.deco.depth * 1000.0);
|
2012-12-31 02:11:01 +00:00
|
|
|
sample->stoptime.seconds = stoptime = value.deco.time;
|
2012-12-11 15:43:11 +00:00
|
|
|
}
|
2012-12-08 04:08:29 +00:00
|
|
|
#endif
|
2011-09-12 18:05:32 +00:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-05-03 00:40:39 +00:00
|
|
|
static void dev_info(device_data_t *devdata, const char *fmt, ...)
|
|
|
|
{
|
2013-03-04 01:53:43 +00:00
|
|
|
static char buffer[1024];
|
2012-05-03 00:40:39 +00:00
|
|
|
va_list ap;
|
|
|
|
|
|
|
|
va_start(ap, fmt);
|
|
|
|
vsnprintf(buffer, sizeof(buffer), fmt, ap);
|
|
|
|
va_end(ap);
|
2012-09-20 19:56:42 +00:00
|
|
|
progress_bar_text = buffer;
|
2012-05-03 00:40:39 +00:00
|
|
|
}
|
2011-09-12 18:05:32 +00:00
|
|
|
|
2012-05-03 00:40:39 +00:00
|
|
|
static int import_dive_number = 0;
|
|
|
|
|
2012-11-24 02:51:27 +00:00
|
|
|
static int parse_samples(device_data_t *devdata, struct divecomputer *dc, dc_parser_t *parser)
|
2011-09-12 18:05:32 +00:00
|
|
|
{
|
|
|
|
// Parse the sample data.
|
2012-11-24 02:51:27 +00:00
|
|
|
return dc_parser_samples_foreach(parser, sample_cb, dc);
|
2011-09-12 18:05:32 +00:00
|
|
|
}
|
|
|
|
|
2012-12-28 22:12:10 +00:00
|
|
|
static int might_be_same_dc(struct divecomputer *a, struct divecomputer *b)
|
|
|
|
{
|
|
|
|
if (!a->model || !b->model)
|
|
|
|
return 1;
|
|
|
|
if (strcasecmp(a->model, b->model))
|
|
|
|
return 0;
|
|
|
|
if (!a->deviceid || !b->deviceid)
|
|
|
|
return 1;
|
|
|
|
return a->deviceid == b->deviceid;
|
|
|
|
}
|
|
|
|
|
2012-12-16 18:40:17 +00:00
|
|
|
static int match_one_dive(struct divecomputer *a, struct dive *dive)
|
2012-11-25 03:06:06 +00:00
|
|
|
{
|
2012-12-16 18:40:17 +00:00
|
|
|
struct divecomputer *b = &dive->dc;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Walk the existing dive computer data,
|
|
|
|
* see if we have a match (or an anti-match:
|
|
|
|
* the same dive computer but a different
|
|
|
|
* dive ID).
|
|
|
|
*/
|
|
|
|
do {
|
|
|
|
int match = match_one_dc(a, b);
|
|
|
|
if (match)
|
|
|
|
return match > 0;
|
|
|
|
b = b->next;
|
|
|
|
} while (b);
|
|
|
|
|
|
|
|
/* Ok, no exact dive computer match. Does the date match? */
|
|
|
|
b = &dive->dc;
|
|
|
|
do {
|
2012-12-28 22:12:10 +00:00
|
|
|
if (a->when == b->when && might_be_same_dc(a, b))
|
2012-12-16 18:40:17 +00:00
|
|
|
return 1;
|
|
|
|
b = b->next;
|
|
|
|
} while (b);
|
|
|
|
|
|
|
|
return 0;
|
2012-11-25 03:06:06 +00:00
|
|
|
}
|
|
|
|
|
2011-09-26 20:04:14 +00:00
|
|
|
/*
|
|
|
|
* Check if this dive already existed before the import
|
|
|
|
*/
|
2012-11-25 03:06:06 +00:00
|
|
|
static int find_dive(struct divecomputer *match)
|
2011-09-26 20:04:14 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
2011-10-05 15:31:31 +00:00
|
|
|
for (i = 0; i < dive_table.preexisting; i++) {
|
2011-09-26 20:04:14 +00:00
|
|
|
struct dive *old = dive_table.dives[i];
|
|
|
|
|
2012-12-16 18:40:17 +00:00
|
|
|
if (match_one_dive(match, old))
|
2012-11-25 03:06:06 +00:00
|
|
|
return 1;
|
2011-09-26 20:04:14 +00:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-05-03 23:04:07 +00:00
|
|
|
static inline int year(int year)
|
|
|
|
{
|
|
|
|
if (year < 70)
|
|
|
|
return year + 2000;
|
|
|
|
if (year < 100)
|
|
|
|
return year + 1900;
|
|
|
|
return year;
|
|
|
|
}
|
|
|
|
|
2012-11-25 19:44:27 +00:00
|
|
|
/*
|
|
|
|
* Like g_strdup_printf(), but without the stupid g_malloc/g_free confusion.
|
|
|
|
* And we limit the string to some arbitrary size.
|
|
|
|
*/
|
|
|
|
static char *str_printf(const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list args;
|
2013-03-04 01:53:43 +00:00
|
|
|
char buf[1024];
|
2012-11-25 19:44:27 +00:00
|
|
|
|
|
|
|
va_start(args, fmt);
|
2014-02-28 04:09:57 +00:00
|
|
|
vsnprintf(buf, sizeof(buf) - 1, fmt, args);
|
2012-11-25 19:44:27 +00:00
|
|
|
va_end(args);
|
2014-02-28 04:09:57 +00:00
|
|
|
buf[sizeof(buf) - 1] = 0;
|
2012-11-25 19:44:27 +00:00
|
|
|
return strdup(buf);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The dive ID for libdivecomputer dives is the first word of the
|
|
|
|
* SHA1 of the fingerprint, if it exists.
|
|
|
|
*
|
|
|
|
* NOTE! This is byte-order dependent, and I don't care.
|
|
|
|
*/
|
|
|
|
static uint32_t calculate_diveid(const unsigned char *fingerprint, unsigned int fsize)
|
|
|
|
{
|
|
|
|
uint32_t csum[5];
|
|
|
|
|
|
|
|
if (!fingerprint || !fsize)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
SHA1(fingerprint, fsize, (unsigned char *)csum);
|
|
|
|
return csum[0];
|
|
|
|
}
|
|
|
|
|
2014-01-27 19:42:19 +00:00
|
|
|
/* returns true if we want libdivecomputer's dc_device_foreach() to continue,
|
|
|
|
* false otherwise */
|
2011-09-12 17:27:35 +00:00
|
|
|
static int dive_cb(const unsigned char *data, unsigned int size,
|
2014-02-28 04:09:57 +00:00
|
|
|
const unsigned char *fingerprint, unsigned int fsize,
|
|
|
|
void *userdata)
|
2011-09-12 17:27:35 +00:00
|
|
|
{
|
|
|
|
int rc;
|
2012-06-22 20:37:39 +00:00
|
|
|
dc_parser_t *parser = NULL;
|
2011-09-12 17:27:35 +00:00
|
|
|
device_data_t *devdata = userdata;
|
2014-02-28 04:09:57 +00:00
|
|
|
dc_datetime_t dt = { 0 };
|
2011-09-12 20:25:05 +00:00
|
|
|
struct tm tm;
|
2014-03-09 01:27:33 +00:00
|
|
|
struct dive *dive = NULL;
|
2011-09-12 17:27:35 +00:00
|
|
|
|
2012-12-05 22:35:49 +00:00
|
|
|
/* reset the deco / ndl data */
|
|
|
|
ndl = stoptime = stopdepth = 0;
|
2014-01-15 18:54:41 +00:00
|
|
|
in_deco = false;
|
2012-12-05 22:35:49 +00:00
|
|
|
|
2011-09-12 17:27:35 +00:00
|
|
|
rc = create_parser(devdata, &parser);
|
2012-06-22 20:37:39 +00:00
|
|
|
if (rc != DC_STATUS_SUCCESS) {
|
2014-02-28 04:09:57 +00:00
|
|
|
dev_info(devdata, translate("gettextFromC", "Unable to create parser for %s %s"), devdata->vendor, devdata->product);
|
2014-01-27 19:42:19 +00:00
|
|
|
return false;
|
2011-09-12 17:27:35 +00:00
|
|
|
}
|
|
|
|
|
2012-06-22 20:37:39 +00:00
|
|
|
rc = dc_parser_set_data(parser, data, size);
|
|
|
|
if (rc != DC_STATUS_SUCCESS) {
|
2014-02-28 04:09:57 +00:00
|
|
|
dev_info(devdata, translate("gettextFromC", "Error registering the data"));
|
2014-03-06 23:36:46 +00:00
|
|
|
goto error_exit;
|
2011-09-12 17:27:35 +00:00
|
|
|
}
|
|
|
|
|
2012-05-03 00:40:39 +00:00
|
|
|
import_dive_number++;
|
2011-09-12 20:25:05 +00:00
|
|
|
dive = alloc_dive();
|
2012-06-22 20:37:39 +00:00
|
|
|
rc = dc_parser_get_datetime(parser, &dt);
|
|
|
|
if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) {
|
2014-02-28 04:09:57 +00:00
|
|
|
dev_info(devdata, translate("gettextFromC", "Error parsing the datetime"));
|
2014-03-06 23:36:46 +00:00
|
|
|
goto error_exit;
|
2011-09-12 17:27:35 +00:00
|
|
|
}
|
2013-02-06 09:17:30 +00:00
|
|
|
dive->dc.model = strdup(devdata->model);
|
2012-11-25 19:44:27 +00:00
|
|
|
dive->dc.deviceid = devdata->deviceid;
|
|
|
|
dive->dc.diveid = calculate_diveid(fingerprint, fsize);
|
2011-09-12 17:27:35 +00:00
|
|
|
|
2011-09-12 20:25:05 +00:00
|
|
|
tm.tm_year = dt.year;
|
2014-02-28 04:09:57 +00:00
|
|
|
tm.tm_mon = dt.month - 1;
|
2011-09-12 20:25:05 +00:00
|
|
|
tm.tm_mday = dt.day;
|
|
|
|
tm.tm_hour = dt.hour;
|
|
|
|
tm.tm_min = dt.minute;
|
|
|
|
tm.tm_sec = dt.second;
|
2012-11-25 02:50:21 +00:00
|
|
|
dive->when = dive->dc.when = utc_mktime(&tm);
|
2011-09-12 17:27:35 +00:00
|
|
|
|
2011-09-12 18:05:32 +00:00
|
|
|
// Parse the divetime.
|
2014-08-03 20:02:32 +00:00
|
|
|
dev_info(devdata, translate("gettextFromC", "Dive %d: %s"), import_dive_number, get_dive_date_c_string(dive->when));
|
2011-09-12 18:05:32 +00:00
|
|
|
unsigned int divetime = 0;
|
2014-02-28 04:09:57 +00:00
|
|
|
rc = dc_parser_get_field(parser, DC_FIELD_DIVETIME, 0, &divetime);
|
2012-06-22 20:37:39 +00:00
|
|
|
if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) {
|
2014-02-28 04:09:57 +00:00
|
|
|
dev_info(devdata, translate("gettextFromC", "Error parsing the divetime"));
|
2014-03-06 23:36:46 +00:00
|
|
|
goto error_exit;
|
2011-09-12 18:05:32 +00:00
|
|
|
}
|
2013-01-23 18:25:31 +00:00
|
|
|
dive->dc.duration.seconds = divetime;
|
2011-09-12 18:05:32 +00:00
|
|
|
|
|
|
|
// Parse the maxdepth.
|
|
|
|
double maxdepth = 0.0;
|
2012-06-22 20:37:39 +00:00
|
|
|
rc = dc_parser_get_field(parser, DC_FIELD_MAXDEPTH, 0, &maxdepth);
|
|
|
|
if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) {
|
2014-02-28 04:09:57 +00:00
|
|
|
dev_info(devdata, translate("gettextFromC", "Error parsing the maxdepth"));
|
2014-03-06 23:36:46 +00:00
|
|
|
goto error_exit;
|
2011-09-12 18:05:32 +00:00
|
|
|
}
|
2014-02-12 22:19:53 +00:00
|
|
|
dive->dc.maxdepth.mm = rint(maxdepth * 1000);
|
2011-09-12 18:05:32 +00:00
|
|
|
|
|
|
|
// Parse the gas mixes.
|
|
|
|
unsigned int ngases = 0;
|
2012-06-22 20:37:39 +00:00
|
|
|
rc = dc_parser_get_field(parser, DC_FIELD_GASMIX_COUNT, 0, &ngases);
|
|
|
|
if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) {
|
2014-02-28 04:09:57 +00:00
|
|
|
dev_info(devdata, translate("gettextFromC", "Error parsing the gas mix count"));
|
2014-03-06 23:36:46 +00:00
|
|
|
goto error_exit;
|
2011-09-12 18:05:32 +00:00
|
|
|
}
|
|
|
|
|
2013-10-03 12:06:12 +00:00
|
|
|
#if DC_VERSION_CHECK(0, 3, 0)
|
|
|
|
// Check if the libdivecomputer version already supports salinity & atmospheric
|
|
|
|
dc_salinity_t salinity = {
|
|
|
|
.type = DC_WATER_SALT,
|
2014-02-28 04:09:57 +00:00
|
|
|
.density = SEAWATER_SALINITY / 10.0
|
2013-10-03 12:06:12 +00:00
|
|
|
};
|
2012-11-10 18:18:10 +00:00
|
|
|
rc = dc_parser_get_field(parser, DC_FIELD_SALINITY, 0, &salinity);
|
|
|
|
if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) {
|
2014-02-28 04:09:57 +00:00
|
|
|
dev_info(devdata, translate("gettextFromC", "Error obtaining water salinity"));
|
2014-03-06 23:36:46 +00:00
|
|
|
goto error_exit;
|
2012-11-10 18:18:10 +00:00
|
|
|
}
|
2014-02-12 22:19:53 +00:00
|
|
|
dive->dc.salinity = rint(salinity.density * 10.0);
|
2013-10-03 12:06:12 +00:00
|
|
|
|
2014-02-12 22:11:21 +00:00
|
|
|
double surface_pressure = 0;
|
2013-10-03 12:06:12 +00:00
|
|
|
rc = dc_parser_get_field(parser, DC_FIELD_ATMOSPHERIC, 0, &surface_pressure);
|
|
|
|
if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) {
|
2014-02-28 04:09:57 +00:00
|
|
|
dev_info(devdata, translate("gettextFromC", "Error obtaining surface pressure"));
|
2014-03-06 23:36:46 +00:00
|
|
|
goto error_exit;
|
2013-10-03 12:06:12 +00:00
|
|
|
}
|
2014-02-12 22:19:53 +00:00
|
|
|
dive->dc.surface_pressure.mbar = rint(surface_pressure * 1000.0);
|
2012-11-25 19:44:05 +00:00
|
|
|
#endif
|
2012-11-10 18:18:10 +00:00
|
|
|
|
2012-12-28 16:53:16 +00:00
|
|
|
rc = parse_gasmixes(devdata, dive, parser, ngases, data);
|
2012-06-22 20:37:39 +00:00
|
|
|
if (rc != DC_STATUS_SUCCESS) {
|
2014-02-28 04:09:57 +00:00
|
|
|
dev_info(devdata, translate("gettextFromC", "Error parsing the gas mix"));
|
2014-03-06 23:36:46 +00:00
|
|
|
goto error_exit;
|
2011-09-12 18:05:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Initialize the sample data.
|
2012-11-24 02:51:27 +00:00
|
|
|
rc = parse_samples(devdata, &dive->dc, parser);
|
2012-06-22 20:37:39 +00:00
|
|
|
if (rc != DC_STATUS_SUCCESS) {
|
2014-02-28 04:09:57 +00:00
|
|
|
dev_info(devdata, translate("gettextFromC", "Error parsing the samples"));
|
2014-03-06 23:36:46 +00:00
|
|
|
goto error_exit;
|
2011-09-12 18:05:32 +00:00
|
|
|
}
|
|
|
|
|
2011-09-26 20:04:14 +00:00
|
|
|
/* If we already saw this dive, abort. */
|
2012-11-25 03:06:06 +00:00
|
|
|
if (!devdata->force_download && find_dive(&dive->dc))
|
2014-03-06 23:36:46 +00:00
|
|
|
goto error_exit;
|
|
|
|
|
|
|
|
dc_parser_destroy(parser);
|
2011-09-26 20:04:14 +00:00
|
|
|
|
2013-01-23 02:15:07 +00:00
|
|
|
/* Various libdivecomputer interface fixups */
|
|
|
|
if (first_temp_is_air && dive->dc.samples) {
|
2013-01-23 18:25:31 +00:00
|
|
|
dive->dc.airtemp = dive->dc.sample[0].temperature;
|
2013-01-23 02:15:07 +00:00
|
|
|
dive->dc.sample[0].temperature.mkelvin = 0;
|
|
|
|
}
|
|
|
|
|
2014-07-24 20:59:11 +00:00
|
|
|
if (devdata->create_new_trip) {
|
|
|
|
if (!devdata->trip)
|
|
|
|
devdata->trip = create_and_hookup_trip_from_dive(dive);
|
|
|
|
else
|
|
|
|
add_dive_to_trip(dive, devdata->trip);
|
|
|
|
}
|
|
|
|
|
2014-01-15 18:54:41 +00:00
|
|
|
dive->downloaded = true;
|
2011-09-26 20:04:14 +00:00
|
|
|
record_dive(dive);
|
2014-01-15 18:54:41 +00:00
|
|
|
mark_divelist_changed(true);
|
2014-01-27 19:42:19 +00:00
|
|
|
return true;
|
2014-03-06 23:36:46 +00:00
|
|
|
|
|
|
|
error_exit:
|
|
|
|
dc_parser_destroy(parser);
|
|
|
|
free(dive);
|
|
|
|
return false;
|
|
|
|
|
2011-09-12 17:27:35 +00:00
|
|
|
}
|
|
|
|
|
2012-11-25 19:44:27 +00:00
|
|
|
/*
|
|
|
|
* The device ID for libdivecomputer devices is the first 32-bit word
|
|
|
|
* of the SHA1 hash of the model/firmware/serial numbers.
|
|
|
|
*
|
|
|
|
* NOTE! This is byte-order-dependent. And I can't find it in myself to
|
|
|
|
* care.
|
|
|
|
*/
|
|
|
|
static uint32_t calculate_sha1(unsigned int model, unsigned int firmware, unsigned int serial)
|
|
|
|
{
|
|
|
|
SHA_CTX ctx;
|
|
|
|
uint32_t csum[5];
|
|
|
|
|
|
|
|
SHA1_Init(&ctx);
|
|
|
|
SHA1_Update(&ctx, &model, sizeof(model));
|
|
|
|
SHA1_Update(&ctx, &firmware, sizeof(firmware));
|
|
|
|
SHA1_Update(&ctx, &serial, sizeof(serial));
|
|
|
|
SHA1_Final((unsigned char *)csum, &ctx);
|
|
|
|
return csum[0];
|
|
|
|
}
|
2012-05-03 00:40:39 +00:00
|
|
|
|
2013-01-23 00:54:09 +00:00
|
|
|
/*
|
|
|
|
* libdivecomputer has returned two different serial numbers for the
|
|
|
|
* same device in different versions. First it used to just do the four
|
|
|
|
* bytes as one 32-bit number, then it turned it into a decimal number
|
|
|
|
* with each byte giving two digits (0-99).
|
|
|
|
*
|
|
|
|
* The only way we can tell is by looking at the format of the number,
|
|
|
|
* so we'll just fix it to the first format.
|
|
|
|
*/
|
|
|
|
static unsigned int undo_libdivecomputer_suunto_nr_changes(unsigned int serial)
|
|
|
|
{
|
|
|
|
unsigned char b0, b1, b2, b3;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The second format will never have more than 8 decimal
|
|
|
|
* digits, so do a cheap check first
|
|
|
|
*/
|
|
|
|
if (serial >= 100000000)
|
|
|
|
return serial;
|
|
|
|
|
|
|
|
/* The original format seems to be four bytes of values 00-99 */
|
|
|
|
b0 = (serial >> 0) & 0xff;
|
|
|
|
b1 = (serial >> 8) & 0xff;
|
|
|
|
b2 = (serial >> 16) & 0xff;
|
|
|
|
b3 = (serial >> 24) & 0xff;
|
|
|
|
|
|
|
|
/* Looks like an old-style libdivecomputer serial number */
|
|
|
|
if ((b0 < 100) && (b1 < 100) && (b2 < 100) && (b3 < 100))
|
|
|
|
return serial;
|
|
|
|
|
|
|
|
/* Nope, it was converted. */
|
2014-02-28 04:09:57 +00:00
|
|
|
b0 = serial % 100;
|
|
|
|
serial /= 100;
|
|
|
|
b1 = serial % 100;
|
|
|
|
serial /= 100;
|
|
|
|
b2 = serial % 100;
|
|
|
|
serial /= 100;
|
|
|
|
b3 = serial % 100;
|
2013-01-23 00:54:09 +00:00
|
|
|
|
|
|
|
serial = b0 + (b1 << 8) + (b2 << 16) + (b3 << 24);
|
|
|
|
return serial;
|
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned int fixup_suunto_versions(device_data_t *devdata, const dc_event_devinfo_t *devinfo)
|
Assemble the actual Suunto serial number
It turns out that the serial number returned by libdivecomputer isn't
really the serial number as interpreted by the vendor. Those tend to be
strings, but libdivecomputer gives us a 32bit number.
Some experimenting showed that for the Suunto devies tested the serial
number is encoded in that 32bit number:
It so happens that the Suunto serial number strings are strings that have
all numbers, but they aren't *one* number. They are four bytes
representing two numbers each, and the "23500027" string is actually the
four bytes 23 50 00 27 (0x17 0x32 0x00 0x1b). And libdivecomputer has
incorrectly parsed those four bytes as one number, not as the encoded
serial number string it is. So the value 389152795 is actually hex
0x1732001b, which is 0x17 0x32 0x00 0x1b, which is - 23 50 00 27.
This should be done by libdivecomputer, but hey, in the meantime this at
least shows the concept. And helps test the XML save/restore code.
It depends on the two patches that create the whole "device.c"
infrastructure, of course. With this, my dive file ends up having the
settings section look like this:
<divecomputerid model='Suunto Vyper Air' deviceid='d4629110'
serial='01201094' firmware='1.1.22'/>
<divecomputerid model='Suunto HelO2' deviceid='995dd566'
serial='23500027' firmware='1.0.4'/>
where the format of the firmware version is something I guessed at,
but it was the obvious choice (again, it's byte-based, I'm ignoring
the high byte that is zero for both of my Suuntos).
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-10 00:14:21 +00:00
|
|
|
{
|
2013-01-23 00:54:09 +00:00
|
|
|
unsigned int serial = devinfo->serial;
|
2013-06-17 22:58:26 +00:00
|
|
|
char serial_nr[13] = "";
|
|
|
|
char firmware[13] = "";
|
2013-01-23 00:54:09 +00:00
|
|
|
|
2013-01-23 02:15:07 +00:00
|
|
|
first_temp_is_air = 1;
|
|
|
|
|
2013-01-23 00:54:09 +00:00
|
|
|
serial = undo_libdivecomputer_suunto_nr_changes(serial);
|
Assemble the actual Suunto serial number
It turns out that the serial number returned by libdivecomputer isn't
really the serial number as interpreted by the vendor. Those tend to be
strings, but libdivecomputer gives us a 32bit number.
Some experimenting showed that for the Suunto devies tested the serial
number is encoded in that 32bit number:
It so happens that the Suunto serial number strings are strings that have
all numbers, but they aren't *one* number. They are four bytes
representing two numbers each, and the "23500027" string is actually the
four bytes 23 50 00 27 (0x17 0x32 0x00 0x1b). And libdivecomputer has
incorrectly parsed those four bytes as one number, not as the encoded
serial number string it is. So the value 389152795 is actually hex
0x1732001b, which is 0x17 0x32 0x00 0x1b, which is - 23 50 00 27.
This should be done by libdivecomputer, but hey, in the meantime this at
least shows the concept. And helps test the XML save/restore code.
It depends on the two patches that create the whole "device.c"
infrastructure, of course. With this, my dive file ends up having the
settings section look like this:
<divecomputerid model='Suunto Vyper Air' deviceid='d4629110'
serial='01201094' firmware='1.1.22'/>
<divecomputerid model='Suunto HelO2' deviceid='995dd566'
serial='23500027' firmware='1.0.4'/>
where the format of the firmware version is something I guessed at,
but it was the obvious choice (again, it's byte-based, I'm ignoring
the high byte that is zero for both of my Suuntos).
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-10 00:14:21 +00:00
|
|
|
|
2013-06-17 22:58:26 +00:00
|
|
|
if (serial) {
|
Assemble the actual Suunto serial number
It turns out that the serial number returned by libdivecomputer isn't
really the serial number as interpreted by the vendor. Those tend to be
strings, but libdivecomputer gives us a 32bit number.
Some experimenting showed that for the Suunto devies tested the serial
number is encoded in that 32bit number:
It so happens that the Suunto serial number strings are strings that have
all numbers, but they aren't *one* number. They are four bytes
representing two numbers each, and the "23500027" string is actually the
four bytes 23 50 00 27 (0x17 0x32 0x00 0x1b). And libdivecomputer has
incorrectly parsed those four bytes as one number, not as the encoded
serial number string it is. So the value 389152795 is actually hex
0x1732001b, which is 0x17 0x32 0x00 0x1b, which is - 23 50 00 27.
This should be done by libdivecomputer, but hey, in the meantime this at
least shows the concept. And helps test the XML save/restore code.
It depends on the two patches that create the whole "device.c"
infrastructure, of course. With this, my dive file ends up having the
settings section look like this:
<divecomputerid model='Suunto Vyper Air' deviceid='d4629110'
serial='01201094' firmware='1.1.22'/>
<divecomputerid model='Suunto HelO2' deviceid='995dd566'
serial='23500027' firmware='1.0.4'/>
where the format of the firmware version is something I guessed at,
but it was the obvious choice (again, it's byte-based, I'm ignoring
the high byte that is zero for both of my Suuntos).
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-10 00:14:21 +00:00
|
|
|
snprintf(serial_nr, sizeof(serial_nr), "%02d%02d%02d%02d",
|
2014-02-28 04:09:57 +00:00
|
|
|
(devinfo->serial >> 24) & 0xff,
|
|
|
|
(devinfo->serial >> 16) & 0xff,
|
|
|
|
(devinfo->serial >> 8) & 0xff,
|
|
|
|
(devinfo->serial >> 0) & 0xff);
|
Assemble the actual Suunto serial number
It turns out that the serial number returned by libdivecomputer isn't
really the serial number as interpreted by the vendor. Those tend to be
strings, but libdivecomputer gives us a 32bit number.
Some experimenting showed that for the Suunto devies tested the serial
number is encoded in that 32bit number:
It so happens that the Suunto serial number strings are strings that have
all numbers, but they aren't *one* number. They are four bytes
representing two numbers each, and the "23500027" string is actually the
four bytes 23 50 00 27 (0x17 0x32 0x00 0x1b). And libdivecomputer has
incorrectly parsed those four bytes as one number, not as the encoded
serial number string it is. So the value 389152795 is actually hex
0x1732001b, which is 0x17 0x32 0x00 0x1b, which is - 23 50 00 27.
This should be done by libdivecomputer, but hey, in the meantime this at
least shows the concept. And helps test the XML save/restore code.
It depends on the two patches that create the whole "device.c"
infrastructure, of course. With this, my dive file ends up having the
settings section look like this:
<divecomputerid model='Suunto Vyper Air' deviceid='d4629110'
serial='01201094' firmware='1.1.22'/>
<divecomputerid model='Suunto HelO2' deviceid='995dd566'
serial='23500027' firmware='1.0.4'/>
where the format of the firmware version is something I guessed at,
but it was the obvious choice (again, it's byte-based, I'm ignoring
the high byte that is zero for both of my Suuntos).
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-10 00:14:21 +00:00
|
|
|
}
|
2013-06-17 22:58:26 +00:00
|
|
|
if (devinfo->firmware) {
|
Assemble the actual Suunto serial number
It turns out that the serial number returned by libdivecomputer isn't
really the serial number as interpreted by the vendor. Those tend to be
strings, but libdivecomputer gives us a 32bit number.
Some experimenting showed that for the Suunto devies tested the serial
number is encoded in that 32bit number:
It so happens that the Suunto serial number strings are strings that have
all numbers, but they aren't *one* number. They are four bytes
representing two numbers each, and the "23500027" string is actually the
four bytes 23 50 00 27 (0x17 0x32 0x00 0x1b). And libdivecomputer has
incorrectly parsed those four bytes as one number, not as the encoded
serial number string it is. So the value 389152795 is actually hex
0x1732001b, which is 0x17 0x32 0x00 0x1b, which is - 23 50 00 27.
This should be done by libdivecomputer, but hey, in the meantime this at
least shows the concept. And helps test the XML save/restore code.
It depends on the two patches that create the whole "device.c"
infrastructure, of course. With this, my dive file ends up having the
settings section look like this:
<divecomputerid model='Suunto Vyper Air' deviceid='d4629110'
serial='01201094' firmware='1.1.22'/>
<divecomputerid model='Suunto HelO2' deviceid='995dd566'
serial='23500027' firmware='1.0.4'/>
where the format of the firmware version is something I guessed at,
but it was the obvious choice (again, it's byte-based, I'm ignoring
the high byte that is zero for both of my Suuntos).
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-10 00:14:21 +00:00
|
|
|
snprintf(firmware, sizeof(firmware), "%d.%d.%d",
|
2014-02-28 04:09:57 +00:00
|
|
|
(devinfo->firmware >> 16) & 0xff,
|
|
|
|
(devinfo->firmware >> 8) & 0xff,
|
|
|
|
(devinfo->firmware >> 0) & 0xff);
|
Assemble the actual Suunto serial number
It turns out that the serial number returned by libdivecomputer isn't
really the serial number as interpreted by the vendor. Those tend to be
strings, but libdivecomputer gives us a 32bit number.
Some experimenting showed that for the Suunto devies tested the serial
number is encoded in that 32bit number:
It so happens that the Suunto serial number strings are strings that have
all numbers, but they aren't *one* number. They are four bytes
representing two numbers each, and the "23500027" string is actually the
four bytes 23 50 00 27 (0x17 0x32 0x00 0x1b). And libdivecomputer has
incorrectly parsed those four bytes as one number, not as the encoded
serial number string it is. So the value 389152795 is actually hex
0x1732001b, which is 0x17 0x32 0x00 0x1b, which is - 23 50 00 27.
This should be done by libdivecomputer, but hey, in the meantime this at
least shows the concept. And helps test the XML save/restore code.
It depends on the two patches that create the whole "device.c"
infrastructure, of course. With this, my dive file ends up having the
settings section look like this:
<divecomputerid model='Suunto Vyper Air' deviceid='d4629110'
serial='01201094' firmware='1.1.22'/>
<divecomputerid model='Suunto HelO2' deviceid='995dd566'
serial='23500027' firmware='1.0.4'/>
where the format of the firmware version is something I guessed at,
but it was the obvious choice (again, it's byte-based, I'm ignoring
the high byte that is zero for both of my Suuntos).
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-10 00:14:21 +00:00
|
|
|
}
|
2013-06-17 22:58:26 +00:00
|
|
|
create_device_node(devdata->model, devdata->deviceid, serial_nr, firmware, "");
|
|
|
|
|
2013-01-23 00:54:09 +00:00
|
|
|
return serial;
|
Assemble the actual Suunto serial number
It turns out that the serial number returned by libdivecomputer isn't
really the serial number as interpreted by the vendor. Those tend to be
strings, but libdivecomputer gives us a 32bit number.
Some experimenting showed that for the Suunto devies tested the serial
number is encoded in that 32bit number:
It so happens that the Suunto serial number strings are strings that have
all numbers, but they aren't *one* number. They are four bytes
representing two numbers each, and the "23500027" string is actually the
four bytes 23 50 00 27 (0x17 0x32 0x00 0x1b). And libdivecomputer has
incorrectly parsed those four bytes as one number, not as the encoded
serial number string it is. So the value 389152795 is actually hex
0x1732001b, which is 0x17 0x32 0x00 0x1b, which is - 23 50 00 27.
This should be done by libdivecomputer, but hey, in the meantime this at
least shows the concept. And helps test the XML save/restore code.
It depends on the two patches that create the whole "device.c"
infrastructure, of course. With this, my dive file ends up having the
settings section look like this:
<divecomputerid model='Suunto Vyper Air' deviceid='d4629110'
serial='01201094' firmware='1.1.22'/>
<divecomputerid model='Suunto HelO2' deviceid='995dd566'
serial='23500027' firmware='1.0.4'/>
where the format of the firmware version is something I guessed at,
but it was the obvious choice (again, it's byte-based, I'm ignoring
the high byte that is zero for both of my Suuntos).
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-10 00:14:21 +00:00
|
|
|
}
|
|
|
|
|
2012-06-22 20:37:39 +00:00
|
|
|
static void event_cb(dc_device_t *device, dc_event_type_t event, const void *data, void *userdata)
|
2011-09-12 16:50:40 +00:00
|
|
|
{
|
2012-06-22 20:37:39 +00:00
|
|
|
const dc_event_progress_t *progress = data;
|
|
|
|
const dc_event_devinfo_t *devinfo = data;
|
|
|
|
const dc_event_clock_t *clock = data;
|
2014-01-07 19:38:36 +00:00
|
|
|
const dc_event_vendor_t *vendor = data;
|
2011-10-06 19:08:48 +00:00
|
|
|
device_data_t *devdata = userdata;
|
2013-01-23 00:54:09 +00:00
|
|
|
unsigned int serial;
|
2011-09-12 17:37:54 +00:00
|
|
|
|
|
|
|
switch (event) {
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_EVENT_WAITING:
|
2014-02-28 04:09:57 +00:00
|
|
|
dev_info(devdata, translate("gettextFromC", "Event: waiting for user action"));
|
2011-09-12 17:37:54 +00:00
|
|
|
break;
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_EVENT_PROGRESS:
|
2012-09-20 19:56:42 +00:00
|
|
|
if (!progress->maximum)
|
|
|
|
break;
|
2014-02-28 04:09:57 +00:00
|
|
|
progress_bar_fraction = (double)progress->current / (double)progress->maximum;
|
2011-09-12 17:37:54 +00:00
|
|
|
break;
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_EVENT_DEVINFO:
|
2014-02-28 04:09:57 +00:00
|
|
|
dev_info(devdata, translate("gettextFromC", "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"),
|
|
|
|
devinfo->model, devinfo->model,
|
|
|
|
devinfo->firmware, devinfo->firmware,
|
|
|
|
devinfo->serial, devinfo->serial);
|
2014-01-07 19:38:36 +00:00
|
|
|
if (devdata->libdc_logfile) {
|
|
|
|
fprintf(devdata->libdc_logfile, "Event: model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)\n",
|
|
|
|
devinfo->model, devinfo->model,
|
|
|
|
devinfo->firmware, devinfo->firmware,
|
|
|
|
devinfo->serial, devinfo->serial);
|
|
|
|
}
|
Assemble the actual Suunto serial number
It turns out that the serial number returned by libdivecomputer isn't
really the serial number as interpreted by the vendor. Those tend to be
strings, but libdivecomputer gives us a 32bit number.
Some experimenting showed that for the Suunto devies tested the serial
number is encoded in that 32bit number:
It so happens that the Suunto serial number strings are strings that have
all numbers, but they aren't *one* number. They are four bytes
representing two numbers each, and the "23500027" string is actually the
four bytes 23 50 00 27 (0x17 0x32 0x00 0x1b). And libdivecomputer has
incorrectly parsed those four bytes as one number, not as the encoded
serial number string it is. So the value 389152795 is actually hex
0x1732001b, which is 0x17 0x32 0x00 0x1b, which is - 23 50 00 27.
This should be done by libdivecomputer, but hey, in the meantime this at
least shows the concept. And helps test the XML save/restore code.
It depends on the two patches that create the whole "device.c"
infrastructure, of course. With this, my dive file ends up having the
settings section look like this:
<divecomputerid model='Suunto Vyper Air' deviceid='d4629110'
serial='01201094' firmware='1.1.22'/>
<divecomputerid model='Suunto HelO2' deviceid='995dd566'
serial='23500027' firmware='1.0.4'/>
where the format of the firmware version is something I guessed at,
but it was the obvious choice (again, it's byte-based, I'm ignoring
the high byte that is zero for both of my Suuntos).
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-10 00:14:21 +00:00
|
|
|
/*
|
|
|
|
* libdivecomputer doesn't give serial numbers in the proper string form,
|
|
|
|
* so we have to see if we can do some vendor-specific munging.
|
|
|
|
*/
|
2013-01-23 00:54:09 +00:00
|
|
|
serial = devinfo->serial;
|
Assemble the actual Suunto serial number
It turns out that the serial number returned by libdivecomputer isn't
really the serial number as interpreted by the vendor. Those tend to be
strings, but libdivecomputer gives us a 32bit number.
Some experimenting showed that for the Suunto devies tested the serial
number is encoded in that 32bit number:
It so happens that the Suunto serial number strings are strings that have
all numbers, but they aren't *one* number. They are four bytes
representing two numbers each, and the "23500027" string is actually the
four bytes 23 50 00 27 (0x17 0x32 0x00 0x1b). And libdivecomputer has
incorrectly parsed those four bytes as one number, not as the encoded
serial number string it is. So the value 389152795 is actually hex
0x1732001b, which is 0x17 0x32 0x00 0x1b, which is - 23 50 00 27.
This should be done by libdivecomputer, but hey, in the meantime this at
least shows the concept. And helps test the XML save/restore code.
It depends on the two patches that create the whole "device.c"
infrastructure, of course. With this, my dive file ends up having the
settings section look like this:
<divecomputerid model='Suunto Vyper Air' deviceid='d4629110'
serial='01201094' firmware='1.1.22'/>
<divecomputerid model='Suunto HelO2' deviceid='995dd566'
serial='23500027' firmware='1.0.4'/>
where the format of the firmware version is something I guessed at,
but it was the obvious choice (again, it's byte-based, I'm ignoring
the high byte that is zero for both of my Suuntos).
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-10 00:14:21 +00:00
|
|
|
if (!strcmp(devdata->vendor, "Suunto"))
|
2013-01-23 00:54:09 +00:00
|
|
|
serial = fixup_suunto_versions(devdata, devinfo);
|
|
|
|
devdata->deviceid = calculate_sha1(devinfo->model, devinfo->firmware, serial);
|
|
|
|
|
2011-09-12 17:37:54 +00:00
|
|
|
break;
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_EVENT_CLOCK:
|
2014-02-28 04:09:57 +00:00
|
|
|
dev_info(devdata, translate("gettextFromC", "Event: systime=%" PRId64 ", devtime=%u\n"),
|
|
|
|
(uint64_t)clock->systime, clock->devtime);
|
2014-01-07 19:38:36 +00:00
|
|
|
if (devdata->libdc_logfile) {
|
2014-02-28 04:09:57 +00:00
|
|
|
fprintf(devdata->libdc_logfile, "Event: systime=%" PRId64 ", devtime=%u\n",
|
2014-01-07 19:38:36 +00:00
|
|
|
(uint64_t)clock->systime, clock->devtime);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case DC_EVENT_VENDOR:
|
|
|
|
if (devdata->libdc_logfile) {
|
|
|
|
fprintf(devdata->libdc_logfile, "Event: vendor=");
|
|
|
|
for (unsigned int i = 0; i < vendor->size; ++i)
|
|
|
|
fprintf(devdata->libdc_logfile, "%02X", vendor->data[i]);
|
2014-02-28 04:09:57 +00:00
|
|
|
fprintf(devdata->libdc_logfile, "\n");
|
2014-01-07 19:38:36 +00:00
|
|
|
}
|
2011-09-12 17:37:54 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2011-09-12 16:50:40 +00:00
|
|
|
}
|
|
|
|
|
2014-02-28 04:09:57 +00:00
|
|
|
int import_thread_cancelled;
|
2011-09-16 05:58:02 +00:00
|
|
|
|
2011-09-12 16:50:40 +00:00
|
|
|
static int
|
2011-09-12 18:41:26 +00:00
|
|
|
cancel_cb(void *userdata)
|
2011-09-12 16:50:40 +00:00
|
|
|
{
|
2011-09-16 05:58:02 +00:00
|
|
|
return import_thread_cancelled;
|
2011-09-12 16:50:40 +00:00
|
|
|
}
|
|
|
|
|
2012-08-27 22:06:58 +00:00
|
|
|
static const char *do_device_import(device_data_t *data)
|
2011-09-12 16:19:21 +00:00
|
|
|
{
|
2012-06-22 20:37:39 +00:00
|
|
|
dc_status_t rc;
|
2012-08-27 22:06:58 +00:00
|
|
|
dc_device_t *device = data->device;
|
2011-09-12 16:50:40 +00:00
|
|
|
|
Assemble the actual Suunto serial number
It turns out that the serial number returned by libdivecomputer isn't
really the serial number as interpreted by the vendor. Those tend to be
strings, but libdivecomputer gives us a 32bit number.
Some experimenting showed that for the Suunto devies tested the serial
number is encoded in that 32bit number:
It so happens that the Suunto serial number strings are strings that have
all numbers, but they aren't *one* number. They are four bytes
representing two numbers each, and the "23500027" string is actually the
four bytes 23 50 00 27 (0x17 0x32 0x00 0x1b). And libdivecomputer has
incorrectly parsed those four bytes as one number, not as the encoded
serial number string it is. So the value 389152795 is actually hex
0x1732001b, which is 0x17 0x32 0x00 0x1b, which is - 23 50 00 27.
This should be done by libdivecomputer, but hey, in the meantime this at
least shows the concept. And helps test the XML save/restore code.
It depends on the two patches that create the whole "device.c"
infrastructure, of course. With this, my dive file ends up having the
settings section look like this:
<divecomputerid model='Suunto Vyper Air' deviceid='d4629110'
serial='01201094' firmware='1.1.22'/>
<divecomputerid model='Suunto HelO2' deviceid='995dd566'
serial='23500027' firmware='1.0.4'/>
where the format of the firmware version is something I guessed at,
but it was the obvious choice (again, it's byte-based, I'm ignoring
the high byte that is zero for both of my Suuntos).
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-10 00:14:21 +00:00
|
|
|
data->model = str_printf("%s %s", data->vendor, data->product);
|
|
|
|
|
2011-09-12 16:50:40 +00:00
|
|
|
// Register the event handler.
|
2014-01-07 19:38:36 +00:00
|
|
|
int events = DC_EVENT_WAITING | DC_EVENT_PROGRESS | DC_EVENT_DEVINFO | DC_EVENT_CLOCK | DC_EVENT_VENDOR;
|
2012-06-22 20:37:39 +00:00
|
|
|
rc = dc_device_set_events(device, events, event_cb, data);
|
2012-08-27 22:06:58 +00:00
|
|
|
if (rc != DC_STATUS_SUCCESS)
|
2014-02-28 04:09:57 +00:00
|
|
|
return translate("gettextFromC", "Error registering the event handler.");
|
2011-09-12 16:50:40 +00:00
|
|
|
|
|
|
|
// Register the cancellation handler.
|
2012-06-22 20:37:39 +00:00
|
|
|
rc = dc_device_set_cancel(device, cancel_cb, data);
|
2012-08-27 22:06:58 +00:00
|
|
|
if (rc != DC_STATUS_SUCCESS)
|
2014-02-28 04:09:57 +00:00
|
|
|
return translate("gettextFromC", "Error registering the cancellation handler.");
|
2011-09-12 16:50:40 +00:00
|
|
|
|
2013-12-25 00:26:00 +00:00
|
|
|
if (data->libdc_dump) {
|
2014-02-28 04:09:57 +00:00
|
|
|
dc_buffer_t *buffer = dc_buffer_new(0);
|
2013-12-23 20:09:33 +00:00
|
|
|
|
2014-02-28 04:09:57 +00:00
|
|
|
rc = dc_device_dump(device, buffer);
|
2014-01-07 14:41:20 +00:00
|
|
|
if (rc == DC_STATUS_SUCCESS && dumpfile_name) {
|
2014-02-28 04:09:57 +00:00
|
|
|
FILE *fp = subsurface_fopen(dumpfile_name, "wb");
|
2013-12-23 20:09:33 +00:00
|
|
|
if (fp != NULL) {
|
2014-02-28 04:09:57 +00:00
|
|
|
fwrite(dc_buffer_get_data(buffer), 1, dc_buffer_get_size(buffer), fp);
|
|
|
|
fclose(fp);
|
2013-12-23 20:09:33 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-28 04:09:57 +00:00
|
|
|
dc_buffer_free(buffer);
|
2013-12-23 20:09:33 +00:00
|
|
|
} else {
|
|
|
|
rc = dc_device_foreach(device, dive_cb, data);
|
|
|
|
}
|
|
|
|
|
2014-02-26 13:34:16 +00:00
|
|
|
if (rc != DC_STATUS_SUCCESS) {
|
|
|
|
progress_bar_fraction = 0.0;
|
2014-02-28 04:09:57 +00:00
|
|
|
return translate("gettextFromC", "Dive data import error");
|
2014-02-26 13:34:16 +00:00
|
|
|
}
|
2011-09-12 17:27:35 +00:00
|
|
|
|
2012-08-27 22:06:58 +00:00
|
|
|
/* All good */
|
2011-09-16 05:58:02 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-12-23 20:07:13 +00:00
|
|
|
static void
|
|
|
|
logfunc(dc_context_t *context, dc_loglevel_t loglevel, const char *file, unsigned int line, const char *function, const char *msg, void *userdata)
|
|
|
|
{
|
2014-02-28 04:09:57 +00:00
|
|
|
const char *loglevels[] = { "NONE", "ERROR", "WARNING", "INFO", "DEBUG", "ALL" };
|
2013-12-23 20:07:13 +00:00
|
|
|
|
2014-02-28 04:09:57 +00:00
|
|
|
FILE *fp = (FILE *)userdata;
|
2013-12-23 20:07:13 +00:00
|
|
|
|
|
|
|
if (loglevel == DC_LOGLEVEL_ERROR || loglevel == DC_LOGLEVEL_WARNING) {
|
|
|
|
fprintf(fp, "%s: %s [in %s:%d (%s)]\n", loglevels[loglevel], msg, file, line, function);
|
|
|
|
} else {
|
|
|
|
fprintf(fp, "%s: %s\n", loglevels[loglevel], msg);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-05-20 19:43:33 +00:00
|
|
|
const char *do_libdivecomputer_import(device_data_t *data)
|
2012-08-27 22:06:58 +00:00
|
|
|
{
|
|
|
|
dc_status_t rc;
|
|
|
|
const char *err;
|
2013-12-23 20:07:13 +00:00
|
|
|
FILE *fp = NULL;
|
2012-08-27 22:06:58 +00:00
|
|
|
|
|
|
|
import_dive_number = 0;
|
2013-01-23 02:15:07 +00:00
|
|
|
first_temp_is_air = 0;
|
2012-08-27 22:06:58 +00:00
|
|
|
data->device = NULL;
|
|
|
|
data->context = NULL;
|
|
|
|
|
2014-01-07 14:41:20 +00:00
|
|
|
if (data->libdc_log && logfile_name)
|
2013-12-25 00:26:00 +00:00
|
|
|
fp = subsurface_fopen(logfile_name, "w");
|
2013-12-23 20:07:13 +00:00
|
|
|
|
2014-01-07 19:38:36 +00:00
|
|
|
data->libdc_logfile = fp;
|
|
|
|
|
2012-08-27 22:06:58 +00:00
|
|
|
rc = dc_context_new(&data->context);
|
|
|
|
if (rc != DC_STATUS_SUCCESS)
|
2014-02-28 04:09:57 +00:00
|
|
|
return translate("gettextFromC", "Unable to create libdivecomputer context");
|
2012-08-27 22:06:58 +00:00
|
|
|
|
2013-12-23 20:07:13 +00:00
|
|
|
if (fp) {
|
|
|
|
dc_context_set_loglevel(data->context, DC_LOGLEVEL_ALL);
|
|
|
|
dc_context_set_logfunc(data->context, logfunc, fp);
|
|
|
|
}
|
|
|
|
|
2014-02-28 04:09:57 +00:00
|
|
|
err = translate("gettextFromC", "Unable to open %s %s (%s)");
|
2012-08-27 22:06:58 +00:00
|
|
|
rc = dc_device_open(&data->device, data->context, data->descriptor, data->devname);
|
|
|
|
if (rc == DC_STATUS_SUCCESS) {
|
|
|
|
err = do_device_import(data);
|
2013-12-23 20:07:13 +00:00
|
|
|
/* TODO: Show the logfile to the user on error. */
|
2012-08-27 22:06:58 +00:00
|
|
|
dc_device_close(data->device);
|
|
|
|
}
|
|
|
|
dc_context_free(data->context);
|
2013-12-23 20:07:13 +00:00
|
|
|
|
|
|
|
if (fp) {
|
|
|
|
fclose(fp);
|
|
|
|
}
|
|
|
|
|
2012-08-27 22:06:58 +00:00
|
|
|
return err;
|
|
|
|
}
|