2011-08-28 23:58:26 +00:00
|
|
|
#include <stdio.h>
|
2011-08-30 00:51:54 +00:00
|
|
|
#include <ctype.h>
|
|
|
|
#include <string.h>
|
2011-08-30 23:23:47 +00:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <errno.h>
|
2011-11-05 20:51:37 +00:00
|
|
|
#include <unistd.h>
|
2011-10-03 04:59:54 +00:00
|
|
|
#define __USE_XOPEN
|
2011-08-30 22:22:48 +00:00
|
|
|
#include <time.h>
|
2011-08-28 23:58:26 +00:00
|
|
|
#include <libxml/parser.h>
|
|
|
|
#include <libxml/tree.h>
|
2011-11-05 10:39:17 +00:00
|
|
|
#ifdef XSLT
|
|
|
|
#include <libxslt/transform.h>
|
|
|
|
#endif
|
2012-10-11 00:42:59 +00:00
|
|
|
#include <glib/gi18n.h>
|
2011-08-28 23:58:26 +00:00
|
|
|
|
2011-08-31 01:23:59 +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-08-30 23:42:05 +00:00
|
|
|
|
2011-08-31 01:40:25 +00:00
|
|
|
int verbose;
|
2011-08-30 20:48:05 +00:00
|
|
|
|
2011-08-31 01:40:25 +00:00
|
|
|
struct dive_table dive_table;
|
2011-08-31 00:18:33 +00:00
|
|
|
|
2011-08-31 01:40:25 +00:00
|
|
|
/*
|
|
|
|
* Add a dive into the dive_table array
|
|
|
|
*/
|
2011-09-12 19:56:34 +00:00
|
|
|
void record_dive(struct dive *dive)
|
2011-08-31 00:18:33 +00:00
|
|
|
{
|
2011-08-31 01:40:25 +00:00
|
|
|
int nr = dive_table.nr, allocated = dive_table.allocated;
|
|
|
|
struct dive **dives = dive_table.dives;
|
2011-08-31 00:18:33 +00:00
|
|
|
|
2011-08-31 01:40:25 +00:00
|
|
|
if (nr >= allocated) {
|
|
|
|
allocated = (nr + 32) * 3 / 2;
|
|
|
|
dives = realloc(dives, allocated * sizeof(struct dive *));
|
|
|
|
if (!dives)
|
|
|
|
exit(1);
|
|
|
|
dive_table.dives = dives;
|
|
|
|
dive_table.allocated = allocated;
|
2011-08-30 23:42:05 +00:00
|
|
|
}
|
2011-09-03 20:19:26 +00:00
|
|
|
dives[nr] = fixup_dive(dive);
|
2011-08-31 01:40:25 +00:00
|
|
|
dive_table.nr = nr+1;
|
2011-08-31 00:18:33 +00:00
|
|
|
}
|
|
|
|
|
2012-04-03 05:00:29 +00:00
|
|
|
static void delete_dive_renumber(struct dive **dives, int i, int nr)
|
|
|
|
{
|
|
|
|
struct dive *dive = dives[i];
|
|
|
|
int number = dive->number, j;
|
|
|
|
|
|
|
|
if (!number)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check that all numbered dives after the deleted
|
|
|
|
* ones are consecutive, return without renumbering
|
|
|
|
* if that is not the case.
|
|
|
|
*/
|
|
|
|
for (j = i+1; j < nr; j++) {
|
|
|
|
struct dive *next = dives[j];
|
|
|
|
if (!next->number)
|
|
|
|
break;
|
|
|
|
number++;
|
|
|
|
if (next->number != number)
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Ok, we hit the end of the dives or a unnumbered
|
|
|
|
* dive - renumber.
|
|
|
|
*/
|
|
|
|
for (j = i+1 ; j < nr; j++) {
|
|
|
|
struct dive *next = dives[j];
|
|
|
|
if (!next->number)
|
|
|
|
break;
|
|
|
|
next->number--;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-04-03 02:19:01 +00:00
|
|
|
/*
|
|
|
|
* Remove a dive from the dive_table array
|
|
|
|
*/
|
|
|
|
void delete_dive(struct dive *dive)
|
|
|
|
{
|
|
|
|
int nr = dive_table.nr, i;
|
|
|
|
struct dive **dives = dive_table.dives;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Stupid. We know the dive table is sorted by date,
|
|
|
|
* we could do a binary lookup. Sue me.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < nr; i++) {
|
|
|
|
struct dive *d = dives[i];
|
|
|
|
if (d != dive)
|
|
|
|
continue;
|
2012-04-03 05:00:29 +00:00
|
|
|
/* should we re-number? */
|
|
|
|
delete_dive_renumber(dives, i, nr);
|
2012-04-03 02:19:01 +00:00
|
|
|
memmove(dives+i, dives+i+1, sizeof(struct dive *)*(nr-i-1));
|
|
|
|
dives[nr] = NULL;
|
|
|
|
dive_table.nr = nr-1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-09-01 18:22:05 +00:00
|
|
|
static void start_match(const char *type, const char *name, char *buffer)
|
2011-08-30 20:58:19 +00:00
|
|
|
{
|
2011-09-01 18:22:05 +00:00
|
|
|
if (verbose > 2)
|
|
|
|
printf("Matching %s '%s' (%s)\n",
|
|
|
|
type, name, buffer);
|
2011-08-30 20:58:19 +00:00
|
|
|
}
|
|
|
|
|
2011-09-01 18:22:05 +00:00
|
|
|
static void nonmatch(const char *type, const char *name, char *buffer)
|
2011-08-30 20:58:19 +00:00
|
|
|
{
|
2011-09-01 18:22:05 +00:00
|
|
|
if (verbose > 1)
|
|
|
|
printf("Unable to match %s '%s' (%s)\n",
|
|
|
|
type, name, buffer);
|
2011-08-30 20:58:19 +00:00
|
|
|
}
|
|
|
|
|
2011-08-30 22:22:48 +00:00
|
|
|
typedef void (*matchfn_t)(char *buffer, void *);
|
2011-08-30 20:48:05 +00:00
|
|
|
|
2011-09-01 18:22:05 +00:00
|
|
|
static int match(const char *pattern, int plen,
|
|
|
|
const char *name, int nlen,
|
|
|
|
matchfn_t fn, char *buf, void *data)
|
2011-08-30 20:48:05 +00:00
|
|
|
{
|
2011-09-01 18:22:05 +00:00
|
|
|
if (plen > nlen)
|
|
|
|
return 0;
|
|
|
|
if (memcmp(pattern, name + nlen - plen, plen))
|
2011-08-30 22:22:48 +00:00
|
|
|
return 0;
|
|
|
|
fn(buf, data);
|
|
|
|
return 1;
|
2011-08-30 20:48:05 +00:00
|
|
|
}
|
|
|
|
|
2011-09-07 02:07:17 +00:00
|
|
|
|
2013-01-11 01:26:10 +00:00
|
|
|
struct units xml_parsing_units;
|
2012-12-10 17:20:57 +00:00
|
|
|
const struct units SI_units = SI_UNITS;
|
|
|
|
const struct units IMPERIAL_units = IMPERIAL_UNITS;
|
2011-09-07 02:07:17 +00:00
|
|
|
|
2011-08-30 20:48:05 +00:00
|
|
|
/*
|
|
|
|
* Dive info as it is being built up..
|
|
|
|
*/
|
2012-11-25 02:50:21 +00:00
|
|
|
static struct divecomputer *cur_dc;
|
2012-09-20 03:42:11 +00:00
|
|
|
static struct dive *cur_dive;
|
|
|
|
static dive_trip_t *cur_trip = NULL;
|
2012-01-05 16:16:08 +00:00
|
|
|
static struct sample *cur_sample;
|
2011-09-23 01:02:54 +00:00
|
|
|
static struct {
|
|
|
|
int active;
|
|
|
|
duration_t time;
|
|
|
|
int type, flags, value;
|
|
|
|
const char *name;
|
2012-01-05 16:16:08 +00:00
|
|
|
} cur_event;
|
2012-12-26 21:47:54 +00:00
|
|
|
static struct {
|
|
|
|
struct {
|
|
|
|
const char *model;
|
|
|
|
uint32_t deviceid;
|
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
|
|
|
const char *nickname, *serial_nr, *firmware;
|
2012-12-26 21:47:54 +00:00
|
|
|
} dc;
|
|
|
|
} cur_settings;
|
|
|
|
static gboolean in_settings = FALSE;
|
2012-01-05 16:16:08 +00:00
|
|
|
static struct tm cur_tm;
|
2012-03-24 04:07:53 +00:00
|
|
|
static int cur_cylinder_index, cur_ws_index;
|
2012-12-31 02:11:01 +00:00
|
|
|
static int lastndl, laststoptime, laststopdepth, lastcns, lastpo2, lastindeco;
|
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
|
|
|
static int lastcylinderindex, lastsensor;
|
2011-08-30 22:22:48 +00:00
|
|
|
|
2011-09-05 20:45:14 +00:00
|
|
|
static enum import_source {
|
|
|
|
UNKNOWN,
|
|
|
|
LIBDIVECOMPUTER,
|
2011-09-05 21:29:08 +00:00
|
|
|
DIVINGLOG,
|
2011-09-07 00:01:28 +00:00
|
|
|
UDDF,
|
2011-09-05 20:45:14 +00:00
|
|
|
} import_source;
|
|
|
|
|
2011-08-30 22:22:48 +00:00
|
|
|
static void divedate(char *buffer, void *_when)
|
|
|
|
{
|
|
|
|
int d,m,y;
|
2012-09-20 00:35:52 +00:00
|
|
|
timestamp_t *when = _when;
|
2011-09-02 00:13:39 +00:00
|
|
|
int success = 0;
|
2011-08-30 22:22:48 +00:00
|
|
|
|
2012-01-05 16:16:08 +00:00
|
|
|
success = cur_tm.tm_sec | cur_tm.tm_min | cur_tm.tm_hour;
|
2011-08-30 22:22:48 +00:00
|
|
|
if (sscanf(buffer, "%d.%d.%d", &d, &m, &y) == 3) {
|
2012-01-05 16:16:08 +00:00
|
|
|
cur_tm.tm_year = y;
|
|
|
|
cur_tm.tm_mon = m-1;
|
|
|
|
cur_tm.tm_mday = d;
|
2011-09-02 00:13:39 +00:00
|
|
|
} else if (sscanf(buffer, "%d-%d-%d", &y, &m, &d) == 3) {
|
2012-01-05 16:16:08 +00:00
|
|
|
cur_tm.tm_year = y;
|
|
|
|
cur_tm.tm_mon = m-1;
|
|
|
|
cur_tm.tm_mday = d;
|
2011-09-02 00:13:39 +00:00
|
|
|
} else {
|
|
|
|
fprintf(stderr, "Unable to parse date '%s'\n", buffer);
|
|
|
|
success = 0;
|
2011-08-30 22:22:48 +00:00
|
|
|
}
|
2011-09-02 00:13:39 +00:00
|
|
|
|
|
|
|
if (success)
|
2012-01-05 16:16:08 +00:00
|
|
|
*when = utc_mktime(&cur_tm);
|
2011-08-30 22:22:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void divetime(char *buffer, void *_when)
|
|
|
|
{
|
|
|
|
int h,m,s = 0;
|
2012-09-20 00:35:52 +00:00
|
|
|
timestamp_t *when = _when;
|
2011-08-30 22:22:48 +00:00
|
|
|
|
|
|
|
if (sscanf(buffer, "%d:%d:%d", &h, &m, &s) >= 2) {
|
2012-01-05 16:16:08 +00:00
|
|
|
cur_tm.tm_hour = h;
|
|
|
|
cur_tm.tm_min = m;
|
|
|
|
cur_tm.tm_sec = s;
|
|
|
|
if (cur_tm.tm_year)
|
|
|
|
*when = utc_mktime(&cur_tm);
|
2011-08-30 22:22:48 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-08-30 23:59:03 +00:00
|
|
|
/* Libdivecomputer: "2011-03-20 10:22:38" */
|
|
|
|
static void divedatetime(char *buffer, void *_when)
|
|
|
|
{
|
|
|
|
int y,m,d;
|
|
|
|
int hr,min,sec;
|
2012-09-20 00:35:52 +00:00
|
|
|
timestamp_t *when = _when;
|
2011-08-30 23:59:03 +00:00
|
|
|
|
|
|
|
if (sscanf(buffer, "%d-%d-%d %d:%d:%d",
|
|
|
|
&y, &m, &d, &hr, &min, &sec) == 6) {
|
2012-01-05 16:16:08 +00:00
|
|
|
cur_tm.tm_year = y;
|
|
|
|
cur_tm.tm_mon = m-1;
|
|
|
|
cur_tm.tm_mday = d;
|
|
|
|
cur_tm.tm_hour = hr;
|
|
|
|
cur_tm.tm_min = min;
|
|
|
|
cur_tm.tm_sec = sec;
|
|
|
|
*when = utc_mktime(&cur_tm);
|
2011-08-30 23:59:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-08-30 23:23:47 +00:00
|
|
|
union int_or_float {
|
|
|
|
double fp;
|
|
|
|
};
|
|
|
|
|
|
|
|
enum number_type {
|
|
|
|
NEITHER,
|
|
|
|
FLOAT
|
|
|
|
};
|
|
|
|
|
|
|
|
static enum number_type integer_or_float(char *buffer, union int_or_float *res)
|
|
|
|
{
|
|
|
|
char *end;
|
|
|
|
double fp;
|
|
|
|
|
2013-01-23 20:09:29 +00:00
|
|
|
errno = 0;
|
|
|
|
fp = g_ascii_strtod(buffer, &end);
|
|
|
|
if (!errno && end != buffer) {
|
|
|
|
res->fp = fp;
|
|
|
|
return FLOAT;
|
2011-08-30 23:23:47 +00:00
|
|
|
}
|
|
|
|
|
2013-01-23 20:09:29 +00:00
|
|
|
return NEITHER;
|
2011-08-30 23:23:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void pressure(char *buffer, void *_press)
|
|
|
|
{
|
2011-09-02 20:59:39 +00:00
|
|
|
double mbar;
|
2011-08-30 23:23:47 +00:00
|
|
|
pressure_t *pressure = _press;
|
|
|
|
union int_or_float val;
|
|
|
|
|
|
|
|
switch (integer_or_float(buffer, &val)) {
|
|
|
|
case FLOAT:
|
2011-09-02 21:06:26 +00:00
|
|
|
/* Just ignore zero values */
|
|
|
|
if (!val.fp)
|
|
|
|
break;
|
2013-01-11 01:26:10 +00:00
|
|
|
switch (xml_parsing_units.pressure) {
|
2011-09-07 00:01:28 +00:00
|
|
|
case PASCAL:
|
|
|
|
mbar = val.fp / 100;
|
|
|
|
break;
|
2011-09-02 20:59:39 +00:00
|
|
|
case BAR:
|
|
|
|
/* Assume mbar, but if it's really small, it's bar */
|
|
|
|
mbar = val.fp;
|
|
|
|
if (mbar < 5000)
|
|
|
|
mbar = mbar * 1000;
|
|
|
|
break;
|
|
|
|
case PSI:
|
|
|
|
mbar = val.fp * 68.95;
|
2011-08-30 23:23:47 +00:00
|
|
|
break;
|
|
|
|
}
|
2011-09-02 20:59:39 +00:00
|
|
|
if (mbar > 5 && mbar < 500000) {
|
|
|
|
pressure->mbar = mbar + 0.5;
|
2011-08-30 23:23:47 +00:00
|
|
|
break;
|
|
|
|
}
|
2011-09-02 20:59:39 +00:00
|
|
|
/* fallthrough */
|
2011-08-30 23:23:47 +00:00
|
|
|
default:
|
|
|
|
printf("Strange pressure reading %s\n", buffer);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-11-12 19:57:49 +00:00
|
|
|
static void salinity(char *buffer, void *_salinity)
|
|
|
|
{
|
|
|
|
int *salinity = _salinity;
|
|
|
|
union int_or_float val;
|
|
|
|
switch (integer_or_float(buffer, &val)) {
|
|
|
|
case FLOAT:
|
|
|
|
*salinity = val.fp * 10.0 + 0.5;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
printf("Strange salinity reading %s\n", buffer);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-08-30 23:23:47 +00:00
|
|
|
static void depth(char *buffer, void *_depth)
|
|
|
|
{
|
|
|
|
depth_t *depth = _depth;
|
|
|
|
union int_or_float val;
|
|
|
|
|
|
|
|
switch (integer_or_float(buffer, &val)) {
|
|
|
|
case FLOAT:
|
2013-01-11 01:26:10 +00:00
|
|
|
switch (xml_parsing_units.length) {
|
2011-09-02 20:59:39 +00:00
|
|
|
case METERS:
|
|
|
|
depth->mm = val.fp * 1000 + 0.5;
|
|
|
|
break;
|
|
|
|
case FEET:
|
|
|
|
depth->mm = val.fp * 304.8 + 0.5;
|
|
|
|
break;
|
|
|
|
}
|
2011-08-30 23:23:47 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
printf("Strange depth reading %s\n", buffer);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-12-24 03:41:16 +00:00
|
|
|
static void weight(char *buffer, void *_weight)
|
|
|
|
{
|
|
|
|
weight_t *weight = _weight;
|
|
|
|
union int_or_float val;
|
|
|
|
|
|
|
|
switch (integer_or_float(buffer, &val)) {
|
|
|
|
case FLOAT:
|
2013-01-11 01:26:10 +00:00
|
|
|
switch (xml_parsing_units.weight) {
|
2011-12-24 03:41:16 +00:00
|
|
|
case KG:
|
|
|
|
weight->grams = val.fp * 1000 + 0.5;
|
|
|
|
break;
|
|
|
|
case LBS:
|
|
|
|
weight->grams = val.fp * 453.6 + 0.5;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
2012-11-24 10:12:16 +00:00
|
|
|
printf("Strange weight reading %s\n", buffer);
|
2011-12-24 03:41:16 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-08-30 23:23:47 +00:00
|
|
|
static void temperature(char *buffer, void *_temperature)
|
|
|
|
{
|
|
|
|
temperature_t *temperature = _temperature;
|
|
|
|
union int_or_float val;
|
|
|
|
|
|
|
|
switch (integer_or_float(buffer, &val)) {
|
|
|
|
case FLOAT:
|
2013-01-11 01:26:10 +00:00
|
|
|
switch (xml_parsing_units.temperature) {
|
2011-09-07 00:01:28 +00:00
|
|
|
case KELVIN:
|
|
|
|
temperature->mkelvin = val.fp * 1000;
|
|
|
|
break;
|
2011-09-02 20:59:39 +00:00
|
|
|
case CELSIUS:
|
2011-09-01 23:41:10 +00:00
|
|
|
temperature->mkelvin = (val.fp + 273.15) * 1000 + 0.5;
|
2011-08-30 23:23:47 +00:00
|
|
|
break;
|
2011-09-02 20:59:39 +00:00
|
|
|
case FAHRENHEIT:
|
2011-08-30 23:23:47 +00:00
|
|
|
temperature->mkelvin = (val.fp + 459.67) * 5000/9;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
printf("Strange temperature reading %s\n", buffer);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void sampletime(char *buffer, void *_time)
|
|
|
|
{
|
2011-08-31 00:45:03 +00:00
|
|
|
int i;
|
|
|
|
int min, sec;
|
2011-08-30 23:23:47 +00:00
|
|
|
duration_t *time = _time;
|
|
|
|
|
2011-08-31 00:45:03 +00:00
|
|
|
i = sscanf(buffer, "%d:%d", &min, &sec);
|
|
|
|
switch (i) {
|
|
|
|
case 1:
|
|
|
|
sec = min;
|
|
|
|
min = 0;
|
|
|
|
/* fallthrough */
|
|
|
|
case 2:
|
|
|
|
time->seconds = sec + min*60;
|
2011-08-30 23:23:47 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
printf("Strange sample time reading %s\n", buffer);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-08-31 00:45:03 +00:00
|
|
|
static void duration(char *buffer, void *_time)
|
|
|
|
{
|
|
|
|
sampletime(buffer, _time);
|
|
|
|
}
|
|
|
|
|
Start parsing gas mixes
The suunto xml is just completely crazy. What's the helium percentage
companion to "o2pct"? Would it be "hepct"? No. It's "hepct_0".
Ok, so they didn't number the first o2pct, which could be seen as sane:
that's the only mix value that should always exist. And they clearly
started their indexing with 0. So with multiple mixes, you'd then
expect "o2pct_1" and "hepct_1", right?
Wrong! Because XML people are crazy, the second O2 mix percentage is
obviously "o2pct_2". So the O2 percentages are one-based, with an
implicit one. But the He percentages are zero-based with an explicit
zero. So the second mix is "o2pct_2" and "hepct_1".
I'd like to ask what drugs Suunto people are on, but hey, it's a Finnish
company. No need to ask. Vodka explains everything. LOTS AND LOTS OF
VODKA.
In comparison, the libdivecomputer output is nice and sane, and uses a
'gasmix' node. Of course, now we have so many different XML nesting
nodes to check that I just made it an array of different noces. That
also allows me to mark the suunto case, so that we only do the "check
for crazy alcoholic xml entries" when it's a suunto file.
The "type of file" thing is probably a good idea for deciding on default
units too. Some day.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-01 20:32:52 +00:00
|
|
|
static void percent(char *buffer, void *_fraction)
|
|
|
|
{
|
|
|
|
fraction_t *fraction = _fraction;
|
|
|
|
union int_or_float val;
|
|
|
|
|
|
|
|
switch (integer_or_float(buffer, &val)) {
|
|
|
|
case FLOAT:
|
|
|
|
if (val.fp <= 100.0)
|
|
|
|
fraction->permille = val.fp * 10 + 0.5;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
printf("Strange percentage reading %s\n", buffer);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void gasmix(char *buffer, void *_fraction)
|
|
|
|
{
|
2011-09-01 20:46:24 +00:00
|
|
|
/* libdivecomputer does negative percentages. */
|
|
|
|
if (*buffer == '-')
|
|
|
|
return;
|
2012-01-05 16:16:08 +00:00
|
|
|
if (cur_cylinder_index < MAX_CYLINDERS)
|
Start parsing gas mixes
The suunto xml is just completely crazy. What's the helium percentage
companion to "o2pct"? Would it be "hepct"? No. It's "hepct_0".
Ok, so they didn't number the first o2pct, which could be seen as sane:
that's the only mix value that should always exist. And they clearly
started their indexing with 0. So with multiple mixes, you'd then
expect "o2pct_1" and "hepct_1", right?
Wrong! Because XML people are crazy, the second O2 mix percentage is
obviously "o2pct_2". So the O2 percentages are one-based, with an
implicit one. But the He percentages are zero-based with an explicit
zero. So the second mix is "o2pct_2" and "hepct_1".
I'd like to ask what drugs Suunto people are on, but hey, it's a Finnish
company. No need to ask. Vodka explains everything. LOTS AND LOTS OF
VODKA.
In comparison, the libdivecomputer output is nice and sane, and uses a
'gasmix' node. Of course, now we have so many different XML nesting
nodes to check that I just made it an array of different noces. That
also allows me to mark the suunto case, so that we only do the "check
for crazy alcoholic xml entries" when it's a suunto file.
The "type of file" thing is probably a good idea for deciding on default
units too. Some day.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-01 20:32:52 +00:00
|
|
|
percent(buffer, _fraction);
|
|
|
|
}
|
|
|
|
|
2011-09-01 23:26:11 +00:00
|
|
|
static void gasmix_nitrogen(char *buffer, void *_gasmix)
|
|
|
|
{
|
|
|
|
/* Ignore n2 percentages. There's no value in them. */
|
|
|
|
}
|
Start parsing gas mixes
The suunto xml is just completely crazy. What's the helium percentage
companion to "o2pct"? Would it be "hepct"? No. It's "hepct_0".
Ok, so they didn't number the first o2pct, which could be seen as sane:
that's the only mix value that should always exist. And they clearly
started their indexing with 0. So with multiple mixes, you'd then
expect "o2pct_1" and "hepct_1", right?
Wrong! Because XML people are crazy, the second O2 mix percentage is
obviously "o2pct_2". So the O2 percentages are one-based, with an
implicit one. But the He percentages are zero-based with an explicit
zero. So the second mix is "o2pct_2" and "hepct_1".
I'd like to ask what drugs Suunto people are on, but hey, it's a Finnish
company. No need to ask. Vodka explains everything. LOTS AND LOTS OF
VODKA.
In comparison, the libdivecomputer output is nice and sane, and uses a
'gasmix' node. Of course, now we have so many different XML nesting
nodes to check that I just made it an array of different noces. That
also allows me to mark the suunto case, so that we only do the "check
for crazy alcoholic xml entries" when it's a suunto file.
The "type of file" thing is probably a good idea for deciding on default
units too. Some day.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-01 20:32:52 +00:00
|
|
|
|
2011-09-04 03:31:18 +00:00
|
|
|
static void cylindersize(char *buffer, void *_volume)
|
|
|
|
{
|
|
|
|
volume_t *volume = _volume;
|
|
|
|
union int_or_float val;
|
|
|
|
|
|
|
|
switch (integer_or_float(buffer, &val)) {
|
|
|
|
case FLOAT:
|
|
|
|
volume->mliter = val.fp * 1000 + 0.5;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
printf("Strange volume reading %s\n", buffer);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-09-02 02:56:04 +00:00
|
|
|
static void utf8_string(char *buffer, void *_res)
|
|
|
|
{
|
2012-12-28 16:18:23 +00:00
|
|
|
int size;
|
|
|
|
char *res;
|
|
|
|
while (isspace(*buffer))
|
|
|
|
buffer++;
|
|
|
|
size = strlen(buffer);
|
|
|
|
while (size && isspace(buffer[size-1]))
|
|
|
|
size--;
|
|
|
|
if (!size)
|
|
|
|
return;
|
|
|
|
res = malloc(size + 1);
|
|
|
|
memcpy(res, buffer, size);
|
|
|
|
res[size] = 0;
|
|
|
|
*(char **)_res = res;
|
2011-09-02 02:56:04 +00:00
|
|
|
}
|
|
|
|
|
2011-09-01 18:22:05 +00:00
|
|
|
#define MATCH(pattern, fn, dest) \
|
|
|
|
match(pattern, strlen(pattern), name, len, fn, buf, dest)
|
|
|
|
|
2011-09-02 22:01:53 +00:00
|
|
|
static void get_index(char *buffer, void *_i)
|
|
|
|
{
|
|
|
|
int *i = _i;
|
|
|
|
*i = atoi(buffer);
|
|
|
|
}
|
|
|
|
|
2012-12-08 04:08:29 +00:00
|
|
|
static void double_to_permil(char *buffer, void *_i)
|
|
|
|
{
|
|
|
|
int *i = _i;
|
|
|
|
*i = g_ascii_strtod(buffer, NULL) * 1000.0 + 0.5;
|
|
|
|
}
|
|
|
|
|
2012-11-25 19:44:27 +00:00
|
|
|
static void hex_value(char *buffer, void *_i)
|
|
|
|
{
|
|
|
|
uint32_t *i = _i;
|
|
|
|
*i = strtol(buffer, NULL, 16);
|
|
|
|
}
|
|
|
|
|
2012-08-22 05:04:24 +00:00
|
|
|
static void get_tripflag(char *buffer, void *_tf)
|
|
|
|
{
|
|
|
|
tripflag_t *tf = _tf;
|
2012-11-26 22:52:07 +00:00
|
|
|
*tf = strcmp(buffer, "NOTRIP") ? TF_NONE : NO_TRIP;
|
2012-08-22 05:04:24 +00:00
|
|
|
}
|
|
|
|
|
2011-09-05 21:29:08 +00:00
|
|
|
/*
|
|
|
|
* Divinglog is crazy. The temperatures are in celsius. EXCEPT
|
|
|
|
* for the sample temperatures, that are in Fahrenheit.
|
|
|
|
* WTF?
|
2011-09-11 20:16:23 +00:00
|
|
|
*
|
|
|
|
* Oh, and I think Diving Log *internally* probably kept them
|
|
|
|
* in celsius, because I'm seeing entries like
|
|
|
|
*
|
|
|
|
* <Temp>32.0</Temp>
|
|
|
|
*
|
|
|
|
* in there. Which is freezing, aka 0 degC. I bet the "0" is
|
|
|
|
* what Diving Log uses for "no temperature".
|
|
|
|
*
|
|
|
|
* So throw away crap like that.
|
2012-10-10 09:14:55 +00:00
|
|
|
*
|
|
|
|
* It gets worse. Sometimes the sample temperatures are in
|
|
|
|
* Celsius, which apparently happens if you are in a SI
|
|
|
|
* locale. So we now do:
|
|
|
|
*
|
|
|
|
* - temperatures < 32.0 == Celsius
|
|
|
|
* - temperature == 32.0 -> garbage, it's a missing temperature (zero converted from C to F)
|
|
|
|
* - temperatures > 32.0 == Fahrenheit
|
2011-09-05 21:29:08 +00:00
|
|
|
*/
|
|
|
|
static void fahrenheit(char *buffer, void *_temperature)
|
|
|
|
{
|
|
|
|
temperature_t *temperature = _temperature;
|
|
|
|
union int_or_float val;
|
|
|
|
|
|
|
|
switch (integer_or_float(buffer, &val)) {
|
|
|
|
case FLOAT:
|
2011-09-11 20:16:23 +00:00
|
|
|
/* Floating point equality is evil, but works for small integers */
|
|
|
|
if (val.fp == 32.0)
|
|
|
|
break;
|
2012-10-10 09:14:55 +00:00
|
|
|
if (val.fp < 32.0)
|
|
|
|
temperature->mkelvin = C_to_mkelvin(val.fp);
|
|
|
|
else
|
|
|
|
temperature->mkelvin = F_to_mkelvin(val.fp);
|
2011-09-05 21:29:08 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
fprintf(stderr, "Crazy Diving Log temperature reading %s\n", buffer);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-09-11 19:24:57 +00:00
|
|
|
/*
|
|
|
|
* Did I mention how bat-shit crazy divinglog is? The sample
|
|
|
|
* pressures are in PSI. But the tank working pressure is in
|
|
|
|
* bar. WTF^2?
|
|
|
|
*
|
2011-09-15 16:43:14 +00:00
|
|
|
* Crazy stuff like this is why subsurface has everything in
|
2011-09-11 19:24:57 +00:00
|
|
|
* these inconvenient typed structures, and you have to say
|
|
|
|
* "pressure->mbar" to get the actual value. Exactly so that
|
|
|
|
* you can never have unit confusion.
|
2012-10-10 09:14:55 +00:00
|
|
|
*
|
|
|
|
* It gets worse: sometimes apparently the pressures are in
|
|
|
|
* bar, sometimes in psi. Dirk suspects that this may be a
|
|
|
|
* DivingLog Uemis importer bug, and that they are always
|
|
|
|
* supposed to be in bar, but that the importer got the
|
|
|
|
* sample importing wrong.
|
|
|
|
*
|
|
|
|
* Sadly, there's no way to really tell. So I think we just
|
|
|
|
* have to have some arbitrary cut-off point where we assume
|
|
|
|
* that smaller values mean bar.. Not good.
|
2011-09-11 19:24:57 +00:00
|
|
|
*/
|
2012-10-10 09:14:55 +00:00
|
|
|
static void psi_or_bar(char *buffer, void *_pressure)
|
2011-09-11 19:24:57 +00:00
|
|
|
{
|
|
|
|
pressure_t *pressure = _pressure;
|
|
|
|
union int_or_float val;
|
|
|
|
|
|
|
|
switch (integer_or_float(buffer, &val)) {
|
|
|
|
case FLOAT:
|
2012-10-10 09:14:55 +00:00
|
|
|
if (val.fp > 400)
|
|
|
|
pressure->mbar = psi_to_mbar(val.fp);
|
|
|
|
else
|
|
|
|
pressure->mbar = val.fp * 1000 + 0.5;
|
2011-09-11 19:24:57 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
fprintf(stderr, "Crazy Diving Log PSI reading %s\n", buffer);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-09-05 21:29:08 +00:00
|
|
|
static int divinglog_fill_sample(struct sample *sample, const char *name, int len, char *buf)
|
|
|
|
{
|
|
|
|
return MATCH(".p.time", sampletime, &sample->time) ||
|
|
|
|
MATCH(".p.depth", depth, &sample->depth) ||
|
|
|
|
MATCH(".p.temp", fahrenheit, &sample->temperature) ||
|
2012-10-10 09:14:55 +00:00
|
|
|
MATCH(".p.press1", psi_or_bar, &sample->cylinderpressure) ||
|
2011-09-05 21:29:08 +00:00
|
|
|
0;
|
|
|
|
}
|
|
|
|
|
2011-09-07 00:33:52 +00:00
|
|
|
static int uddf_fill_sample(struct sample *sample, const char *name, int len, char *buf)
|
|
|
|
{
|
|
|
|
return MATCH(".divetime", sampletime, &sample->time) ||
|
|
|
|
MATCH(".depth", depth, &sample->depth) ||
|
|
|
|
MATCH(".temperature", temperature, &sample->temperature) ||
|
2012-06-18 19:45:09 +00:00
|
|
|
MATCH(".tankpressure", pressure, &sample->cylinderpressure) ||
|
2011-09-07 00:33:52 +00:00
|
|
|
0;
|
|
|
|
}
|
|
|
|
|
2011-09-23 01:02:54 +00:00
|
|
|
static void eventtime(char *buffer, void *_duration)
|
|
|
|
{
|
|
|
|
duration_t *duration = _duration;
|
|
|
|
sampletime(buffer, duration);
|
2012-01-05 16:16:08 +00:00
|
|
|
if (cur_sample)
|
|
|
|
duration->seconds += cur_sample->time.seconds;
|
2011-09-23 01:02:54 +00:00
|
|
|
}
|
|
|
|
|
2013-01-02 01:29:38 +00:00
|
|
|
static void try_to_match_autogroup(const char *name, char *buf)
|
|
|
|
{
|
|
|
|
int len = strlen(name);
|
|
|
|
int autogroupvalue;
|
|
|
|
|
|
|
|
start_match("autogroup", name, buf);
|
|
|
|
if (MATCH(".autogroup.state", get_index, &autogroupvalue)) {
|
|
|
|
set_autogroup(autogroupvalue);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
nonmatch("autogroup", name, buf);
|
|
|
|
}
|
|
|
|
|
2012-12-26 21:47:54 +00:00
|
|
|
static void try_to_fill_dc_settings(const char *name, char *buf)
|
|
|
|
{
|
|
|
|
int len = strlen(name);
|
|
|
|
|
|
|
|
start_match("divecomputerid", name, buf);
|
2013-01-02 01:29:38 +00:00
|
|
|
if (MATCH("divecomputerid.model", utf8_string, &cur_settings.dc.model))
|
2012-12-26 21:47:54 +00:00
|
|
|
return;
|
2013-01-02 01:29:38 +00:00
|
|
|
if (MATCH("divecomputerid.deviceid", hex_value, &cur_settings.dc.deviceid))
|
2012-12-26 21:47:54 +00:00
|
|
|
return;
|
2013-01-02 01:29:38 +00:00
|
|
|
if (MATCH("divecomputerid.nickname", utf8_string, &cur_settings.dc.nickname))
|
2012-12-26 21:47:54 +00:00
|
|
|
return;
|
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 (MATCH("divecomputerid.serial", utf8_string, &cur_settings.dc.serial_nr))
|
|
|
|
return;
|
|
|
|
if (MATCH("divecomputerid.firmware", utf8_string, &cur_settings.dc.firmware))
|
|
|
|
return;
|
2012-12-26 21:47:54 +00:00
|
|
|
|
|
|
|
nonmatch("divecomputerid", name, buf);
|
|
|
|
}
|
|
|
|
|
2011-09-23 01:02:54 +00:00
|
|
|
static void try_to_fill_event(const char *name, char *buf)
|
|
|
|
{
|
|
|
|
int len = strlen(name);
|
|
|
|
|
|
|
|
start_match("event", name, buf);
|
2012-01-05 16:16:08 +00:00
|
|
|
if (MATCH(".event", utf8_string, &cur_event.name))
|
2011-09-23 01:02:54 +00:00
|
|
|
return;
|
2012-01-05 16:16:08 +00:00
|
|
|
if (MATCH(".name", utf8_string, &cur_event.name))
|
2011-09-23 01:02:54 +00:00
|
|
|
return;
|
2012-01-05 16:16:08 +00:00
|
|
|
if (MATCH(".time", eventtime, &cur_event.time))
|
2011-09-23 01:02:54 +00:00
|
|
|
return;
|
2012-01-05 16:16:08 +00:00
|
|
|
if (MATCH(".type", get_index, &cur_event.type))
|
2011-09-23 01:02:54 +00:00
|
|
|
return;
|
2012-01-05 16:16:08 +00:00
|
|
|
if (MATCH(".flags", get_index, &cur_event.flags))
|
2011-09-23 01:02:54 +00:00
|
|
|
return;
|
2012-01-05 16:16:08 +00:00
|
|
|
if (MATCH(".value", get_index, &cur_event.value))
|
2011-10-01 04:55:51 +00:00
|
|
|
return;
|
2011-09-23 01:02:54 +00:00
|
|
|
nonmatch("event", name, buf);
|
|
|
|
}
|
|
|
|
|
2013-01-18 18:39:25 +00:00
|
|
|
/*
|
|
|
|
* If we don't have an explicit dive computer,
|
|
|
|
* we use the implicit one that every dive has..
|
|
|
|
*/
|
|
|
|
static struct divecomputer *get_dc(void)
|
|
|
|
{
|
|
|
|
return cur_dc ? : &cur_dive->dc;
|
|
|
|
}
|
|
|
|
|
2013-01-23 18:25:31 +00:00
|
|
|
static int match_dc_data_fields(struct divecomputer *dc, const char *name, int len, char *buf)
|
|
|
|
{
|
|
|
|
if (MATCH(".maxdepth", depth, &dc->maxdepth))
|
|
|
|
return 1;
|
|
|
|
if (MATCH(".meandepth", depth, &dc->meandepth))
|
|
|
|
return 1;
|
|
|
|
if (MATCH(".depth.max", depth, &dc->maxdepth))
|
|
|
|
return 1;
|
|
|
|
if (MATCH(".depth.mean", depth, &dc->meandepth))
|
|
|
|
return 1;
|
|
|
|
if (MATCH(".duration", duration, &dc->duration))
|
|
|
|
return 1;
|
|
|
|
if (MATCH(".divetime", duration, &dc->duration))
|
|
|
|
return 1;
|
|
|
|
if (MATCH(".divetimesec", duration, &dc->duration))
|
|
|
|
return 1;
|
|
|
|
if (MATCH(".surfacetime", duration, &dc->surfacetime))
|
|
|
|
return 1;
|
|
|
|
if (MATCH(".airtemp", temperature, &dc->airtemp))
|
|
|
|
return 1;
|
|
|
|
if (MATCH(".watertemp", temperature, &dc->watertemp))
|
|
|
|
return 1;
|
|
|
|
if (MATCH(".temperature.air", temperature, &dc->airtemp))
|
|
|
|
return 1;
|
|
|
|
if (MATCH(".temperature.water", temperature, &dc->watertemp))
|
|
|
|
return 1;
|
|
|
|
if (MATCH(".surface.pressure", pressure, &dc->surface_pressure))
|
|
|
|
return 1;
|
|
|
|
if (MATCH(".water.salinity", salinity, &dc->salinity))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-11-25 02:50:21 +00:00
|
|
|
/* We're in the top-level dive xml. Try to convert whatever value to a dive value */
|
|
|
|
static void try_to_fill_dc(struct divecomputer *dc, const char *name, char *buf)
|
|
|
|
{
|
|
|
|
int len = strlen(name);
|
|
|
|
|
|
|
|
start_match("divecomputer", name, buf);
|
|
|
|
|
|
|
|
if (MATCH(".date", divedate, &dc->when))
|
|
|
|
return;
|
|
|
|
if (MATCH(".time", divetime, &dc->when))
|
|
|
|
return;
|
2012-11-25 19:44:27 +00:00
|
|
|
if (MATCH(".model", utf8_string, &dc->model))
|
|
|
|
return;
|
|
|
|
if (MATCH(".deviceid", hex_value, &dc->deviceid))
|
2012-11-25 02:50:21 +00:00
|
|
|
return;
|
2012-11-25 19:44:27 +00:00
|
|
|
if (MATCH(".diveid", hex_value, &dc->diveid))
|
2012-11-25 02:50:21 +00:00
|
|
|
return;
|
|
|
|
|
2013-01-23 18:25:31 +00:00
|
|
|
if (match_dc_data_fields(dc, name, len, buf))
|
|
|
|
return;
|
|
|
|
|
2012-11-25 02:50:21 +00:00
|
|
|
nonmatch("divecomputer", name, buf);
|
|
|
|
}
|
|
|
|
|
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
|
|
|
void add_gas_switch_event(struct dive *dive, struct divecomputer *dc, int seconds, int idx)
|
|
|
|
{
|
|
|
|
/* The gas switch event format is insane. It will be fixed, I think */
|
|
|
|
int o2 = dive->cylinder[idx].gasmix.o2.permille;
|
|
|
|
int he = dive->cylinder[idx].gasmix.he.permille;
|
|
|
|
int value;
|
|
|
|
|
|
|
|
if (!o2)
|
2013-01-14 22:53:38 +00:00
|
|
|
o2 = O2_IN_AIR;
|
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
|
|
|
o2 = (o2+5) / 10;
|
|
|
|
he = (he+5) / 10;
|
|
|
|
value = o2 + (he << 16);
|
|
|
|
|
|
|
|
add_event(dc, seconds, 11, 0, value, "gaschange");
|
|
|
|
}
|
|
|
|
|
|
|
|
static void get_cylinderindex(char *buffer, void *_i)
|
|
|
|
{
|
|
|
|
int *i = _i;
|
|
|
|
*i = atoi(buffer);
|
|
|
|
if (lastcylinderindex != *i) {
|
2013-01-18 18:39:25 +00:00
|
|
|
add_gas_switch_event(cur_dive, get_dc(), cur_sample->time.seconds, *i);
|
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
|
|
|
lastcylinderindex = *i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void get_sensor(char *buffer, void *_i)
|
|
|
|
{
|
|
|
|
int *i = _i;
|
|
|
|
*i = atoi(buffer);
|
|
|
|
lastsensor = *i;
|
|
|
|
}
|
|
|
|
|
2011-08-30 22:22:48 +00:00
|
|
|
/* We're in samples - try to convert the random xml value to something useful */
|
|
|
|
static void try_to_fill_sample(struct sample *sample, const char *name, char *buf)
|
|
|
|
{
|
2011-09-01 18:22:05 +00:00
|
|
|
int len = strlen(name);
|
2012-12-31 02:11:01 +00:00
|
|
|
int in_deco;
|
2011-08-30 23:23:47 +00:00
|
|
|
|
2011-09-01 18:22:05 +00:00
|
|
|
start_match("sample", name, buf);
|
2011-09-04 03:31:18 +00:00
|
|
|
if (MATCH(".sample.pressure", pressure, &sample->cylinderpressure))
|
2011-08-30 23:23:47 +00:00
|
|
|
return;
|
2011-09-04 03:31:18 +00:00
|
|
|
if (MATCH(".sample.cylpress", pressure, &sample->cylinderpressure))
|
2011-08-30 23:23:47 +00:00
|
|
|
return;
|
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
|
|
|
if (MATCH(".sample.cylinderindex", get_cylinderindex, &sample->sensor))
|
|
|
|
return;
|
|
|
|
if (MATCH(".sample.sensor", get_sensor, &sample->sensor))
|
2011-10-19 17:06:11 +00:00
|
|
|
return;
|
2011-09-01 18:22:05 +00:00
|
|
|
if (MATCH(".sample.depth", depth, &sample->depth))
|
2011-08-30 23:23:47 +00:00
|
|
|
return;
|
2011-09-01 23:41:10 +00:00
|
|
|
if (MATCH(".sample.temp", temperature, &sample->temperature))
|
|
|
|
return;
|
2011-09-01 18:22:05 +00:00
|
|
|
if (MATCH(".sample.temperature", temperature, &sample->temperature))
|
2011-08-30 23:23:47 +00:00
|
|
|
return;
|
2011-09-01 18:22:05 +00:00
|
|
|
if (MATCH(".sample.sampletime", sampletime, &sample->time))
|
2011-08-30 23:23:47 +00:00
|
|
|
return;
|
2011-09-01 18:22:05 +00:00
|
|
|
if (MATCH(".sample.time", sampletime, &sample->time))
|
2011-08-30 23:23:47 +00:00
|
|
|
return;
|
2012-12-01 21:02:30 +00:00
|
|
|
if (MATCH(".sample.ndl", sampletime, &sample->ndl))
|
|
|
|
return;
|
2012-12-31 02:11:01 +00:00
|
|
|
if (MATCH(".sample.in_deco", get_index, &in_deco)) {
|
|
|
|
sample->in_deco = (in_deco == 1);
|
|
|
|
return;
|
|
|
|
}
|
2012-12-01 21:02:30 +00:00
|
|
|
if (MATCH(".sample.stoptime", sampletime, &sample->stoptime))
|
|
|
|
return;
|
|
|
|
if (MATCH(".sample.stopdepth", depth, &sample->stopdepth))
|
|
|
|
return;
|
2012-12-08 04:08:29 +00:00
|
|
|
if (MATCH(".sample.cns", get_index, &sample->cns))
|
2012-12-11 21:40:07 +00:00
|
|
|
return;
|
2012-12-08 04:08:29 +00:00
|
|
|
if (MATCH(".sample.po2", double_to_permil, &sample->po2))
|
2012-12-11 21:40:07 +00:00
|
|
|
return;
|
2011-08-30 23:23:47 +00:00
|
|
|
|
2011-09-05 20:45:14 +00:00
|
|
|
switch (import_source) {
|
2011-09-05 21:29:08 +00:00
|
|
|
case DIVINGLOG:
|
|
|
|
if (divinglog_fill_sample(sample, name, len, buf))
|
|
|
|
return;
|
|
|
|
break;
|
|
|
|
|
2011-09-07 00:33:52 +00:00
|
|
|
case UDDF:
|
|
|
|
if (uddf_fill_sample(sample, name, len, buf))
|
|
|
|
return;
|
|
|
|
break;
|
|
|
|
|
2011-09-05 20:45:14 +00:00
|
|
|
default:
|
|
|
|
break;
|
2011-09-02 18:32:48 +00:00
|
|
|
}
|
|
|
|
|
2011-09-01 18:22:05 +00:00
|
|
|
nonmatch("sample", name, buf);
|
2011-08-30 22:22:48 +00:00
|
|
|
}
|
|
|
|
|
2011-09-05 21:29:08 +00:00
|
|
|
static const char *country, *city;
|
|
|
|
|
|
|
|
static void divinglog_place(char *place, void *_location)
|
|
|
|
{
|
|
|
|
char **location = _location;
|
|
|
|
char buffer[256], *p;
|
|
|
|
int len;
|
|
|
|
|
|
|
|
len = snprintf(buffer, sizeof(buffer),
|
|
|
|
"%s%s%s%s%s",
|
|
|
|
place,
|
|
|
|
city ? ", " : "",
|
|
|
|
city ? city : "",
|
|
|
|
country ? ", " : "",
|
|
|
|
country ? country : "");
|
|
|
|
|
|
|
|
p = malloc(len+1);
|
|
|
|
memcpy(p, buffer, len+1);
|
|
|
|
*location = p;
|
|
|
|
|
|
|
|
city = NULL;
|
|
|
|
country = NULL;
|
|
|
|
}
|
|
|
|
|
2012-11-24 02:05:38 +00:00
|
|
|
static int divinglog_dive_match(struct dive *dive, const char *name, int len, char *buf)
|
2011-09-05 21:29:08 +00:00
|
|
|
{
|
2011-09-11 18:36:33 +00:00
|
|
|
return MATCH(".divedate", divedate, &dive->when) ||
|
2011-09-05 21:29:08 +00:00
|
|
|
MATCH(".entrytime", divetime, &dive->when) ||
|
2013-01-23 18:25:31 +00:00
|
|
|
MATCH(".depth", depth, &dive->dc.maxdepth) ||
|
2012-10-10 09:14:55 +00:00
|
|
|
MATCH(".tanktype", utf8_string, &dive->cylinder[0].type.description) ||
|
2011-09-05 21:29:08 +00:00
|
|
|
MATCH(".tanksize", cylindersize, &dive->cylinder[0].type.size) ||
|
2011-09-11 19:24:57 +00:00
|
|
|
MATCH(".presw", pressure, &dive->cylinder[0].type.workingpressure) ||
|
2012-10-10 09:14:55 +00:00
|
|
|
MATCH(".press", pressure, &dive->cylinder[0].start) ||
|
|
|
|
MATCH(".prese", pressure, &dive->cylinder[0].end) ||
|
2011-09-05 21:29:08 +00:00
|
|
|
MATCH(".comments", utf8_string, &dive->notes) ||
|
2011-09-13 21:58:06 +00:00
|
|
|
MATCH(".buddy.names", utf8_string, &dive->buddy) ||
|
2011-09-05 21:29:08 +00:00
|
|
|
MATCH(".country.name", utf8_string, &country) ||
|
|
|
|
MATCH(".city.name", utf8_string, &city) ||
|
|
|
|
MATCH(".place.name", divinglog_place, &dive->location) ||
|
|
|
|
0;
|
|
|
|
}
|
|
|
|
|
2011-09-07 00:33:52 +00:00
|
|
|
/*
|
|
|
|
* Uddf specifies ISO 8601 time format.
|
|
|
|
*
|
|
|
|
* There are many variations on that. This handles the useful cases.
|
|
|
|
*/
|
|
|
|
static void uddf_datetime(char *buffer, void *_when)
|
|
|
|
{
|
|
|
|
char c;
|
|
|
|
int y,m,d,hh,mm,ss;
|
2012-09-20 00:35:52 +00:00
|
|
|
timestamp_t *when = _when;
|
2011-09-07 00:33:52 +00:00
|
|
|
struct tm tm = { 0 };
|
|
|
|
int i;
|
|
|
|
|
|
|
|
i = sscanf(buffer, "%d-%d-%d%c%d:%d:%d", &y, &m, &d, &c, &hh, &mm, &ss);
|
|
|
|
if (i == 7)
|
|
|
|
goto success;
|
|
|
|
ss = 0;
|
|
|
|
if (i == 6)
|
|
|
|
goto success;
|
|
|
|
|
|
|
|
i = sscanf(buffer, "%04d%02d%02d%c%02d%02d%02d", &y, &m, &d, &c, &hh, &mm, &ss);
|
|
|
|
if (i == 7)
|
|
|
|
goto success;
|
|
|
|
ss = 0;
|
|
|
|
if (i == 6)
|
|
|
|
goto success;
|
|
|
|
bad_date:
|
|
|
|
printf("Bad date time %s\n", buffer);
|
|
|
|
return;
|
|
|
|
|
|
|
|
success:
|
|
|
|
if (c != 'T' && c != ' ')
|
|
|
|
goto bad_date;
|
|
|
|
tm.tm_year = y;
|
|
|
|
tm.tm_mon = m - 1;
|
|
|
|
tm.tm_mday = d;
|
|
|
|
tm.tm_hour = hh;
|
|
|
|
tm.tm_min = mm;
|
|
|
|
tm.tm_sec = ss;
|
|
|
|
*when = utc_mktime(&tm);
|
|
|
|
}
|
|
|
|
|
2012-11-24 02:05:38 +00:00
|
|
|
static int uddf_dive_match(struct dive *dive, const char *name, int len, char *buf)
|
2011-09-07 00:33:52 +00:00
|
|
|
{
|
|
|
|
return MATCH(".datetime", uddf_datetime, &dive->when) ||
|
2013-01-23 18:25:31 +00:00
|
|
|
MATCH(".diveduration", duration, &dive->dc.duration) ||
|
|
|
|
MATCH(".greatestdepth", depth, &dive->dc.maxdepth) ||
|
2011-09-07 00:33:52 +00:00
|
|
|
0;
|
|
|
|
}
|
|
|
|
|
2012-12-05 17:59:52 +00:00
|
|
|
/*
|
|
|
|
* This parses "floating point" into micro-degrees.
|
|
|
|
* We don't do exponentials etc, if somebody does
|
|
|
|
* gps locations in that format, they are insane.
|
|
|
|
*/
|
|
|
|
static degrees_t parse_degrees(char *buf, char **end)
|
|
|
|
{
|
|
|
|
int sign = 1, decimals = 6, value = 0;
|
|
|
|
degrees_t ret;
|
|
|
|
|
|
|
|
while (isspace(*buf))
|
|
|
|
buf++;
|
|
|
|
switch (*buf) {
|
|
|
|
case '-':
|
|
|
|
sign = -1;
|
|
|
|
/* fallthrough */
|
|
|
|
case '+':
|
|
|
|
buf++;
|
|
|
|
}
|
|
|
|
while (isdigit(*buf)) {
|
|
|
|
value = 10*value + *buf - '0';
|
|
|
|
buf++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get the first six decimals if they exist */
|
|
|
|
if (*buf == '.')
|
|
|
|
buf++;
|
|
|
|
do {
|
|
|
|
value *= 10;
|
|
|
|
if (isdigit(*buf)) {
|
|
|
|
value += *buf - '0';
|
|
|
|
buf++;
|
|
|
|
}
|
|
|
|
} while (--decimals);
|
|
|
|
|
|
|
|
/* Rounding */
|
|
|
|
switch (*buf) {
|
|
|
|
case '5' ... '9':
|
|
|
|
value++;
|
|
|
|
}
|
|
|
|
while (isdigit(*buf))
|
|
|
|
buf++;
|
|
|
|
|
|
|
|
*end = buf;
|
|
|
|
ret.udeg = value * sign;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-01-23 19:53:42 +00:00
|
|
|
static void gps_lat(char *buffer, void *_dive)
|
|
|
|
{
|
|
|
|
char *end;
|
|
|
|
struct dive *dive = _dive;
|
|
|
|
|
|
|
|
dive->latitude = parse_degrees(buffer, &end);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void gps_long(char *buffer, void *_dive)
|
|
|
|
{
|
|
|
|
char *end;
|
|
|
|
struct dive *dive = _dive;
|
|
|
|
|
|
|
|
dive->longitude = parse_degrees(buffer, &end);
|
|
|
|
}
|
|
|
|
|
2011-09-16 01:16:07 +00:00
|
|
|
static void gps_location(char *buffer, void *_dive)
|
|
|
|
{
|
2012-11-18 17:55:41 +00:00
|
|
|
char *end;
|
2011-09-16 01:16:07 +00:00
|
|
|
struct dive *dive = _dive;
|
|
|
|
|
2012-12-05 17:59:52 +00:00
|
|
|
dive->latitude = parse_degrees(buffer, &end);
|
|
|
|
dive->longitude = parse_degrees(end, &end);
|
2011-09-16 01:16:07 +00:00
|
|
|
}
|
|
|
|
|
2011-08-30 22:22:48 +00:00
|
|
|
/* We're in the top-level dive xml. Try to convert whatever value to a dive value */
|
2012-11-24 02:05:38 +00:00
|
|
|
static void try_to_fill_dive(struct dive *dive, const char *name, char *buf)
|
2011-08-30 22:22:48 +00:00
|
|
|
{
|
2011-09-01 18:22:05 +00:00
|
|
|
int len = strlen(name);
|
2011-08-30 22:22:48 +00:00
|
|
|
|
2011-09-01 18:22:05 +00:00
|
|
|
start_match("dive", name, buf);
|
2011-09-05 21:29:08 +00:00
|
|
|
|
|
|
|
switch (import_source) {
|
|
|
|
case DIVINGLOG:
|
2012-11-24 02:05:38 +00:00
|
|
|
if (divinglog_dive_match(dive, name, len, buf))
|
2011-09-05 21:29:08 +00:00
|
|
|
return;
|
|
|
|
break;
|
|
|
|
|
2011-09-07 00:33:52 +00:00
|
|
|
case UDDF:
|
2012-11-24 02:05:38 +00:00
|
|
|
if (uddf_dive_match(dive, name, len, buf))
|
2011-09-07 00:33:52 +00:00
|
|
|
return;
|
|
|
|
break;
|
|
|
|
|
2011-09-05 21:29:08 +00:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2011-09-11 18:36:33 +00:00
|
|
|
if (MATCH(".number", get_index, &dive->number))
|
2011-09-11 18:36:33 +00:00
|
|
|
return;
|
2012-08-22 05:04:24 +00:00
|
|
|
if (MATCH(".tripflag", get_tripflag, &dive->tripflag))
|
|
|
|
return;
|
2011-09-01 18:22:05 +00:00
|
|
|
if (MATCH(".date", divedate, &dive->when))
|
2011-08-30 22:22:48 +00:00
|
|
|
return;
|
2011-09-01 18:22:05 +00:00
|
|
|
if (MATCH(".time", divetime, &dive->when))
|
2011-08-30 22:22:48 +00:00
|
|
|
return;
|
2011-09-01 18:22:05 +00:00
|
|
|
if (MATCH(".datetime", divedatetime, &dive->when))
|
2011-08-30 23:59:03 +00:00
|
|
|
return;
|
2013-01-23 18:25:31 +00:00
|
|
|
/*
|
|
|
|
* Legacy format note: per-dive depths and duration get saved
|
|
|
|
* in the first dive computer entry
|
|
|
|
*/
|
|
|
|
if (match_dc_data_fields(&dive->dc, name, len, buf))
|
2012-11-12 19:57:49 +00:00
|
|
|
return;
|
2013-01-23 18:25:31 +00:00
|
|
|
|
2011-09-05 16:12:54 +00:00
|
|
|
if (MATCH(".cylinderstartpressure", pressure, &dive->cylinder[0].start))
|
2011-08-31 00:45:03 +00:00
|
|
|
return;
|
2011-09-05 16:12:54 +00:00
|
|
|
if (MATCH(".cylinderendpressure", pressure, &dive->cylinder[0].end))
|
2011-08-31 00:45:03 +00:00
|
|
|
return;
|
2011-09-16 01:16:07 +00:00
|
|
|
if (MATCH(".gps", gps_location, dive))
|
|
|
|
return;
|
2013-01-23 19:53:42 +00:00
|
|
|
if (MATCH(".latitude", gps_lat, dive))
|
|
|
|
return;
|
|
|
|
if (MATCH(".longitude", gps_long, dive))
|
|
|
|
return;
|
2011-09-02 02:56:04 +00:00
|
|
|
if (MATCH(".location", utf8_string, &dive->location))
|
|
|
|
return;
|
2013-01-24 22:43:00 +00:00
|
|
|
if (MATCH("dive.name", utf8_string, &dive->location))
|
2013-01-23 19:53:42 +00:00
|
|
|
return;
|
2012-08-14 23:07:25 +00:00
|
|
|
if (MATCH(".suit", utf8_string, &dive->suit))
|
|
|
|
return;
|
2012-08-18 03:22:37 +00:00
|
|
|
if (MATCH(".divesuit", utf8_string, &dive->suit))
|
|
|
|
return;
|
2011-09-02 02:56:04 +00:00
|
|
|
if (MATCH(".notes", utf8_string, &dive->notes))
|
|
|
|
return;
|
2011-09-13 21:58:06 +00:00
|
|
|
if (MATCH(".divemaster", utf8_string, &dive->divemaster))
|
|
|
|
return;
|
|
|
|
if (MATCH(".buddy", utf8_string, &dive->buddy))
|
|
|
|
return;
|
2011-12-07 19:58:16 +00:00
|
|
|
if (MATCH(".rating", get_index, &dive->rating))
|
|
|
|
return;
|
2012-10-28 22:49:02 +00:00
|
|
|
if (MATCH(".visibility", get_index, &dive->visibility))
|
|
|
|
return;
|
2012-01-05 16:16:08 +00:00
|
|
|
if (MATCH(".cylinder.size", cylindersize, &dive->cylinder[cur_cylinder_index].type.size))
|
Start parsing gas mixes
The suunto xml is just completely crazy. What's the helium percentage
companion to "o2pct"? Would it be "hepct"? No. It's "hepct_0".
Ok, so they didn't number the first o2pct, which could be seen as sane:
that's the only mix value that should always exist. And they clearly
started their indexing with 0. So with multiple mixes, you'd then
expect "o2pct_1" and "hepct_1", right?
Wrong! Because XML people are crazy, the second O2 mix percentage is
obviously "o2pct_2". So the O2 percentages are one-based, with an
implicit one. But the He percentages are zero-based with an explicit
zero. So the second mix is "o2pct_2" and "hepct_1".
I'd like to ask what drugs Suunto people are on, but hey, it's a Finnish
company. No need to ask. Vodka explains everything. LOTS AND LOTS OF
VODKA.
In comparison, the libdivecomputer output is nice and sane, and uses a
'gasmix' node. Of course, now we have so many different XML nesting
nodes to check that I just made it an array of different noces. That
also allows me to mark the suunto case, so that we only do the "check
for crazy alcoholic xml entries" when it's a suunto file.
The "type of file" thing is probably a good idea for deciding on default
units too. Some day.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-01 20:32:52 +00:00
|
|
|
return;
|
2012-01-05 16:16:08 +00:00
|
|
|
if (MATCH(".cylinder.workpressure", pressure, &dive->cylinder[cur_cylinder_index].type.workingpressure))
|
Start parsing gas mixes
The suunto xml is just completely crazy. What's the helium percentage
companion to "o2pct"? Would it be "hepct"? No. It's "hepct_0".
Ok, so they didn't number the first o2pct, which could be seen as sane:
that's the only mix value that should always exist. And they clearly
started their indexing with 0. So with multiple mixes, you'd then
expect "o2pct_1" and "hepct_1", right?
Wrong! Because XML people are crazy, the second O2 mix percentage is
obviously "o2pct_2". So the O2 percentages are one-based, with an
implicit one. But the He percentages are zero-based with an explicit
zero. So the second mix is "o2pct_2" and "hepct_1".
I'd like to ask what drugs Suunto people are on, but hey, it's a Finnish
company. No need to ask. Vodka explains everything. LOTS AND LOTS OF
VODKA.
In comparison, the libdivecomputer output is nice and sane, and uses a
'gasmix' node. Of course, now we have so many different XML nesting
nodes to check that I just made it an array of different noces. That
also allows me to mark the suunto case, so that we only do the "check
for crazy alcoholic xml entries" when it's a suunto file.
The "type of file" thing is probably a good idea for deciding on default
units too. Some day.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-01 20:32:52 +00:00
|
|
|
return;
|
2012-01-05 16:16:08 +00:00
|
|
|
if (MATCH(".cylinder.description", utf8_string, &dive->cylinder[cur_cylinder_index].type.description))
|
2011-09-04 22:07:47 +00:00
|
|
|
return;
|
2012-01-05 16:16:08 +00:00
|
|
|
if (MATCH(".cylinder.start", pressure, &dive->cylinder[cur_cylinder_index].start))
|
2011-09-05 16:12:54 +00:00
|
|
|
return;
|
2012-01-05 16:16:08 +00:00
|
|
|
if (MATCH(".cylinder.end", pressure, &dive->cylinder[cur_cylinder_index].end))
|
2011-09-05 16:12:54 +00:00
|
|
|
return;
|
2012-03-24 04:07:53 +00:00
|
|
|
if (MATCH(".weightsystem.description", utf8_string, &dive->weightsystem[cur_ws_index].description))
|
2011-12-24 03:41:16 +00:00
|
|
|
return;
|
2012-03-24 04:07:53 +00:00
|
|
|
if (MATCH(".weightsystem.weight", weight, &dive->weightsystem[cur_ws_index].weight))
|
2011-12-24 03:41:16 +00:00
|
|
|
return;
|
2012-03-24 04:07:53 +00:00
|
|
|
if (MATCH("weight", weight, &dive->weightsystem[cur_ws_index].weight))
|
2011-12-24 03:41:16 +00:00
|
|
|
return;
|
2012-01-05 16:16:08 +00:00
|
|
|
if (MATCH(".o2", gasmix, &dive->cylinder[cur_cylinder_index].gasmix.o2))
|
2011-09-04 03:31:18 +00:00
|
|
|
return;
|
2012-01-05 16:16:08 +00:00
|
|
|
if (MATCH(".n2", gasmix_nitrogen, &dive->cylinder[cur_cylinder_index].gasmix))
|
2011-09-04 03:31:18 +00:00
|
|
|
return;
|
2012-01-05 16:16:08 +00:00
|
|
|
if (MATCH(".he", gasmix, &dive->cylinder[cur_cylinder_index].gasmix.he))
|
Start parsing gas mixes
The suunto xml is just completely crazy. What's the helium percentage
companion to "o2pct"? Would it be "hepct"? No. It's "hepct_0".
Ok, so they didn't number the first o2pct, which could be seen as sane:
that's the only mix value that should always exist. And they clearly
started their indexing with 0. So with multiple mixes, you'd then
expect "o2pct_1" and "hepct_1", right?
Wrong! Because XML people are crazy, the second O2 mix percentage is
obviously "o2pct_2". So the O2 percentages are one-based, with an
implicit one. But the He percentages are zero-based with an explicit
zero. So the second mix is "o2pct_2" and "hepct_1".
I'd like to ask what drugs Suunto people are on, but hey, it's a Finnish
company. No need to ask. Vodka explains everything. LOTS AND LOTS OF
VODKA.
In comparison, the libdivecomputer output is nice and sane, and uses a
'gasmix' node. Of course, now we have so many different XML nesting
nodes to check that I just made it an array of different noces. That
also allows me to mark the suunto case, so that we only do the "check
for crazy alcoholic xml entries" when it's a suunto file.
The "type of file" thing is probably a good idea for deciding on default
units too. Some day.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-01 20:32:52 +00:00
|
|
|
return;
|
|
|
|
|
2011-09-01 18:22:05 +00:00
|
|
|
nonmatch("dive", name, buf);
|
2011-08-30 22:22:48 +00:00
|
|
|
}
|
2011-08-30 20:48:05 +00:00
|
|
|
|
2012-08-22 05:04:24 +00:00
|
|
|
/* We're in the top-level trip xml. Try to convert whatever value to a trip value */
|
2012-09-20 03:42:11 +00:00
|
|
|
static void try_to_fill_trip(dive_trip_t **dive_trip_p, const char *name, char *buf)
|
2012-08-22 05:04:24 +00:00
|
|
|
{
|
|
|
|
int len = strlen(name);
|
|
|
|
|
|
|
|
start_match("trip", name, buf);
|
|
|
|
|
2012-09-20 03:42:11 +00:00
|
|
|
dive_trip_t *dive_trip = *dive_trip_p;
|
2012-08-22 05:04:24 +00:00
|
|
|
|
2012-09-20 03:42:11 +00:00
|
|
|
if (MATCH(".date", divedate, &dive_trip->when))
|
2012-08-30 00:24:15 +00:00
|
|
|
return;
|
2012-11-26 03:09:04 +00:00
|
|
|
if (MATCH(".time", divetime, &dive_trip->when))
|
2012-08-22 05:04:24 +00:00
|
|
|
return;
|
2012-09-20 03:42:11 +00:00
|
|
|
if (MATCH(".location", utf8_string, &dive_trip->location))
|
2012-08-22 05:04:24 +00:00
|
|
|
return;
|
2012-09-20 03:42:11 +00:00
|
|
|
if (MATCH(".notes", utf8_string, &dive_trip->notes))
|
2012-08-22 05:04:24 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
nonmatch("trip", name, buf);
|
|
|
|
}
|
|
|
|
|
2011-08-30 04:32:27 +00:00
|
|
|
/*
|
2012-09-16 01:32:15 +00:00
|
|
|
* While in some formats file boundaries are dive boundaries, in many
|
|
|
|
* others (as for example in our native format) there are
|
2011-08-30 04:32:27 +00:00
|
|
|
* multiple dives per file, so there can be other events too that
|
|
|
|
* trigger a "new dive" marker and you may get some nesting due
|
|
|
|
* to that. Just ignore nesting levels.
|
2012-09-16 01:32:15 +00:00
|
|
|
* On the flipside it is possible that we start an XML file that ends
|
|
|
|
* up having no dives in it at all - don't create a bogus empty dive
|
|
|
|
* for those. It's not entirely clear what is the minimum set of data
|
|
|
|
* to make a dive valid, but if it has no location, no date and no
|
|
|
|
* samples I'm pretty sure it's useless.
|
2011-08-30 04:32:27 +00:00
|
|
|
*/
|
2012-09-16 01:32:15 +00:00
|
|
|
static gboolean is_dive(void)
|
|
|
|
{
|
|
|
|
return (cur_dive &&
|
2012-11-24 02:51:27 +00:00
|
|
|
(cur_dive->location || cur_dive->when || cur_dive->dc.samples));
|
2012-09-16 01:32:15 +00:00
|
|
|
}
|
|
|
|
|
2012-12-19 20:36:56 +00:00
|
|
|
static void reset_dc_info(struct divecomputer *dc)
|
|
|
|
{
|
2012-12-31 02:11:01 +00:00
|
|
|
lastcns = lastpo2 = lastndl = laststoptime = laststopdepth = lastindeco = 0;
|
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
|
|
|
lastsensor = lastcylinderindex = 0;
|
2012-12-19 20:36:56 +00:00
|
|
|
}
|
|
|
|
|
2012-12-26 21:47:54 +00:00
|
|
|
static void reset_dc_settings(void)
|
|
|
|
{
|
|
|
|
free((void *)cur_settings.dc.model);
|
|
|
|
free((void *)cur_settings.dc.nickname);
|
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
|
|
|
free((void *)cur_settings.dc.serial_nr);
|
|
|
|
free((void *)cur_settings.dc.firmware);
|
2012-12-26 21:47:54 +00:00
|
|
|
cur_settings.dc.model = NULL;
|
|
|
|
cur_settings.dc.nickname = NULL;
|
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
|
|
|
cur_settings.dc.serial_nr = NULL;
|
|
|
|
cur_settings.dc.firmware = NULL;
|
2012-12-26 21:47:54 +00:00
|
|
|
cur_settings.dc.deviceid = 0;
|
|
|
|
}
|
|
|
|
|
2013-01-02 01:29:38 +00:00
|
|
|
static void settings_start(void)
|
2012-12-26 21:47:54 +00:00
|
|
|
{
|
|
|
|
in_settings = TRUE;
|
2013-01-02 01:29:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void settings_end(void)
|
|
|
|
{
|
|
|
|
in_settings = FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void dc_settings_start(void)
|
|
|
|
{
|
2012-12-26 21:47:54 +00:00
|
|
|
reset_dc_settings();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void dc_settings_end(void)
|
|
|
|
{
|
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
|
|
|
struct device_info *info;
|
|
|
|
|
|
|
|
info = create_device_info(cur_settings.dc.model, cur_settings.dc.deviceid);
|
|
|
|
if (info) {
|
|
|
|
if (!info->serial_nr && cur_settings.dc.serial_nr)
|
|
|
|
info->serial_nr = strdup(cur_settings.dc.serial_nr);
|
|
|
|
if (!info->firmware && cur_settings.dc.firmware)
|
|
|
|
info->firmware = strdup(cur_settings.dc.firmware);
|
|
|
|
if (!info->nickname && cur_settings.dc.nickname)
|
|
|
|
info->nickname = strdup(cur_settings.dc.nickname);
|
|
|
|
}
|
2012-12-26 21:47:54 +00:00
|
|
|
reset_dc_settings();
|
|
|
|
}
|
|
|
|
|
2011-08-30 04:32:27 +00:00
|
|
|
static void dive_start(void)
|
|
|
|
{
|
2012-01-05 16:16:08 +00:00
|
|
|
if (cur_dive)
|
2011-08-30 22:22:48 +00:00
|
|
|
return;
|
2012-01-05 16:16:08 +00:00
|
|
|
cur_dive = alloc_dive();
|
2012-12-19 20:36:56 +00:00
|
|
|
reset_dc_info(&cur_dive->dc);
|
2012-01-05 16:16:08 +00:00
|
|
|
memset(&cur_tm, 0, sizeof(cur_tm));
|
New XML format for saving dives
This patch makes the trips nest, and it also fixes the fact that you never
saved the trip notes (you could edit it, but saving would throw it away).
I did *not* change the indentation of the dives, so the trip stuff shows
up the the beginning of the line, at the same level as the <dive> and
<dives> thing. I think it's fairly readable xml, though, and we haven't
really had proper "indentation shows nesting" anyway, since the top-level
"<dives>" thing also didn't indent stuff inside of it.
Anyway, the way I wrote it, it still parses your old "INTRIP" stuff etc,
so as far as I know, it should happily read the old-style XML too. At
least it seemed to work with your xml file that already had the old-style
one (I haven't committed my divetrips, exactly because I didn't like the
new format).
It always saves in the new style, though.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-09-30 19:36:18 +00:00
|
|
|
if (cur_trip) {
|
2012-11-10 18:51:03 +00:00
|
|
|
add_dive_to_trip(cur_dive, cur_trip);
|
New XML format for saving dives
This patch makes the trips nest, and it also fixes the fact that you never
saved the trip notes (you could edit it, but saving would throw it away).
I did *not* change the indentation of the dives, so the trip stuff shows
up the the beginning of the line, at the same level as the <dive> and
<dives> thing. I think it's fairly readable xml, though, and we haven't
really had proper "indentation shows nesting" anyway, since the top-level
"<dives>" thing also didn't indent stuff inside of it.
Anyway, the way I wrote it, it still parses your old "INTRIP" stuff etc,
so as far as I know, it should happily read the old-style XML too. At
least it seemed to work with your xml file that already had the old-style
one (I haven't committed my divetrips, exactly because I didn't like the
new format).
It always saves in the new style, though.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-09-30 19:36:18 +00:00
|
|
|
cur_dive->tripflag = IN_TRIP;
|
|
|
|
}
|
2011-08-30 04:32:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void dive_end(void)
|
|
|
|
{
|
New XML format for saving dives
This patch makes the trips nest, and it also fixes the fact that you never
saved the trip notes (you could edit it, but saving would throw it away).
I did *not* change the indentation of the dives, so the trip stuff shows
up the the beginning of the line, at the same level as the <dive> and
<dives> thing. I think it's fairly readable xml, though, and we haven't
really had proper "indentation shows nesting" anyway, since the top-level
"<dives>" thing also didn't indent stuff inside of it.
Anyway, the way I wrote it, it still parses your old "INTRIP" stuff etc,
so as far as I know, it should happily read the old-style XML too. At
least it seemed to work with your xml file that already had the old-style
one (I haven't committed my divetrips, exactly because I didn't like the
new format).
It always saves in the new style, though.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-09-30 19:36:18 +00:00
|
|
|
if (!cur_dive)
|
2011-08-30 20:48:05 +00:00
|
|
|
return;
|
New XML format for saving dives
This patch makes the trips nest, and it also fixes the fact that you never
saved the trip notes (you could edit it, but saving would throw it away).
I did *not* change the indentation of the dives, so the trip stuff shows
up the the beginning of the line, at the same level as the <dive> and
<dives> thing. I think it's fairly readable xml, though, and we haven't
really had proper "indentation shows nesting" anyway, since the top-level
"<dives>" thing also didn't indent stuff inside of it.
Anyway, the way I wrote it, it still parses your old "INTRIP" stuff etc,
so as far as I know, it should happily read the old-style XML too. At
least it seemed to work with your xml file that already had the old-style
one (I haven't committed my divetrips, exactly because I didn't like the
new format).
It always saves in the new style, though.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-09-30 19:36:18 +00:00
|
|
|
if (!is_dive())
|
|
|
|
free(cur_dive);
|
|
|
|
else
|
|
|
|
record_dive(cur_dive);
|
2012-01-05 16:16:08 +00:00
|
|
|
cur_dive = NULL;
|
2012-11-25 02:50:21 +00:00
|
|
|
cur_dc = NULL;
|
2012-01-05 16:16:08 +00:00
|
|
|
cur_cylinder_index = 0;
|
2012-03-24 04:07:53 +00:00
|
|
|
cur_ws_index = 0;
|
Start parsing gas mixes
The suunto xml is just completely crazy. What's the helium percentage
companion to "o2pct"? Would it be "hepct"? No. It's "hepct_0".
Ok, so they didn't number the first o2pct, which could be seen as sane:
that's the only mix value that should always exist. And they clearly
started their indexing with 0. So with multiple mixes, you'd then
expect "o2pct_1" and "hepct_1", right?
Wrong! Because XML people are crazy, the second O2 mix percentage is
obviously "o2pct_2". So the O2 percentages are one-based, with an
implicit one. But the He percentages are zero-based with an explicit
zero. So the second mix is "o2pct_2" and "hepct_1".
I'd like to ask what drugs Suunto people are on, but hey, it's a Finnish
company. No need to ask. Vodka explains everything. LOTS AND LOTS OF
VODKA.
In comparison, the libdivecomputer output is nice and sane, and uses a
'gasmix' node. Of course, now we have so many different XML nesting
nodes to check that I just made it an array of different noces. That
also allows me to mark the suunto case, so that we only do the "check
for crazy alcoholic xml entries" when it's a suunto file.
The "type of file" thing is probably a good idea for deciding on default
units too. Some day.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-01 20:32:52 +00:00
|
|
|
}
|
|
|
|
|
2012-08-22 05:04:24 +00:00
|
|
|
static void trip_start(void)
|
|
|
|
{
|
|
|
|
if (cur_trip)
|
|
|
|
return;
|
New XML format for saving dives
This patch makes the trips nest, and it also fixes the fact that you never
saved the trip notes (you could edit it, but saving would throw it away).
I did *not* change the indentation of the dives, so the trip stuff shows
up the the beginning of the line, at the same level as the <dive> and
<dives> thing. I think it's fairly readable xml, though, and we haven't
really had proper "indentation shows nesting" anyway, since the top-level
"<dives>" thing also didn't indent stuff inside of it.
Anyway, the way I wrote it, it still parses your old "INTRIP" stuff etc,
so as far as I know, it should happily read the old-style XML too. At
least it seemed to work with your xml file that already had the old-style
one (I haven't committed my divetrips, exactly because I didn't like the
new format).
It always saves in the new style, though.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-09-30 19:36:18 +00:00
|
|
|
dive_end();
|
2012-09-20 03:42:11 +00:00
|
|
|
cur_trip = calloc(sizeof(dive_trip_t),1);
|
2012-08-22 05:04:24 +00:00
|
|
|
memset(&cur_tm, 0, sizeof(cur_tm));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void trip_end(void)
|
|
|
|
{
|
|
|
|
if (!cur_trip)
|
|
|
|
return;
|
2012-09-05 20:54:22 +00:00
|
|
|
insert_trip(&cur_trip);
|
2012-08-22 05:04:24 +00:00
|
|
|
cur_trip = NULL;
|
|
|
|
}
|
|
|
|
|
Start parsing gas mixes
The suunto xml is just completely crazy. What's the helium percentage
companion to "o2pct"? Would it be "hepct"? No. It's "hepct_0".
Ok, so they didn't number the first o2pct, which could be seen as sane:
that's the only mix value that should always exist. And they clearly
started their indexing with 0. So with multiple mixes, you'd then
expect "o2pct_1" and "hepct_1", right?
Wrong! Because XML people are crazy, the second O2 mix percentage is
obviously "o2pct_2". So the O2 percentages are one-based, with an
implicit one. But the He percentages are zero-based with an explicit
zero. So the second mix is "o2pct_2" and "hepct_1".
I'd like to ask what drugs Suunto people are on, but hey, it's a Finnish
company. No need to ask. Vodka explains everything. LOTS AND LOTS OF
VODKA.
In comparison, the libdivecomputer output is nice and sane, and uses a
'gasmix' node. Of course, now we have so many different XML nesting
nodes to check that I just made it an array of different noces. That
also allows me to mark the suunto case, so that we only do the "check
for crazy alcoholic xml entries" when it's a suunto file.
The "type of file" thing is probably a good idea for deciding on default
units too. Some day.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-01 20:32:52 +00:00
|
|
|
static void event_start(void)
|
|
|
|
{
|
2012-01-05 16:16:08 +00:00
|
|
|
memset(&cur_event, 0, sizeof(cur_event));
|
|
|
|
cur_event.active = 1;
|
Start parsing gas mixes
The suunto xml is just completely crazy. What's the helium percentage
companion to "o2pct"? Would it be "hepct"? No. It's "hepct_0".
Ok, so they didn't number the first o2pct, which could be seen as sane:
that's the only mix value that should always exist. And they clearly
started their indexing with 0. So with multiple mixes, you'd then
expect "o2pct_1" and "hepct_1", right?
Wrong! Because XML people are crazy, the second O2 mix percentage is
obviously "o2pct_2". So the O2 percentages are one-based, with an
implicit one. But the He percentages are zero-based with an explicit
zero. So the second mix is "o2pct_2" and "hepct_1".
I'd like to ask what drugs Suunto people are on, but hey, it's a Finnish
company. No need to ask. Vodka explains everything. LOTS AND LOTS OF
VODKA.
In comparison, the libdivecomputer output is nice and sane, and uses a
'gasmix' node. Of course, now we have so many different XML nesting
nodes to check that I just made it an array of different noces. That
also allows me to mark the suunto case, so that we only do the "check
for crazy alcoholic xml entries" when it's a suunto file.
The "type of file" thing is probably a good idea for deciding on default
units too. Some day.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-01 20:32:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void event_end(void)
|
|
|
|
{
|
2012-11-25 02:50:21 +00:00
|
|
|
struct divecomputer *dc = get_dc();
|
2012-12-24 01:51:39 +00:00
|
|
|
if (cur_event.name) {
|
|
|
|
if (strcmp(cur_event.name, "surface") != 0)
|
|
|
|
add_event(dc, cur_event.time.seconds,
|
|
|
|
cur_event.type, cur_event.flags,
|
|
|
|
cur_event.value, cur_event.name);
|
|
|
|
free((void *)cur_event.name);
|
|
|
|
}
|
2012-01-05 16:16:08 +00:00
|
|
|
cur_event.active = 0;
|
Start parsing gas mixes
The suunto xml is just completely crazy. What's the helium percentage
companion to "o2pct"? Would it be "hepct"? No. It's "hepct_0".
Ok, so they didn't number the first o2pct, which could be seen as sane:
that's the only mix value that should always exist. And they clearly
started their indexing with 0. So with multiple mixes, you'd then
expect "o2pct_1" and "hepct_1", right?
Wrong! Because XML people are crazy, the second O2 mix percentage is
obviously "o2pct_2". So the O2 percentages are one-based, with an
implicit one. But the He percentages are zero-based with an explicit
zero. So the second mix is "o2pct_2" and "hepct_1".
I'd like to ask what drugs Suunto people are on, but hey, it's a Finnish
company. No need to ask. Vodka explains everything. LOTS AND LOTS OF
VODKA.
In comparison, the libdivecomputer output is nice and sane, and uses a
'gasmix' node. Of course, now we have so many different XML nesting
nodes to check that I just made it an array of different noces. That
also allows me to mark the suunto case, so that we only do the "check
for crazy alcoholic xml entries" when it's a suunto file.
The "type of file" thing is probably a good idea for deciding on default
units too. Some day.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-01 20:32:52 +00:00
|
|
|
}
|
|
|
|
|
2011-09-04 03:31:18 +00:00
|
|
|
static void cylinder_start(void)
|
Start parsing gas mixes
The suunto xml is just completely crazy. What's the helium percentage
companion to "o2pct"? Would it be "hepct"? No. It's "hepct_0".
Ok, so they didn't number the first o2pct, which could be seen as sane:
that's the only mix value that should always exist. And they clearly
started their indexing with 0. So with multiple mixes, you'd then
expect "o2pct_1" and "hepct_1", right?
Wrong! Because XML people are crazy, the second O2 mix percentage is
obviously "o2pct_2". So the O2 percentages are one-based, with an
implicit one. But the He percentages are zero-based with an explicit
zero. So the second mix is "o2pct_2" and "hepct_1".
I'd like to ask what drugs Suunto people are on, but hey, it's a Finnish
company. No need to ask. Vodka explains everything. LOTS AND LOTS OF
VODKA.
In comparison, the libdivecomputer output is nice and sane, and uses a
'gasmix' node. Of course, now we have so many different XML nesting
nodes to check that I just made it an array of different noces. That
also allows me to mark the suunto case, so that we only do the "check
for crazy alcoholic xml entries" when it's a suunto file.
The "type of file" thing is probably a good idea for deciding on default
units too. Some day.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-01 20:32:52 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2011-09-04 03:31:18 +00:00
|
|
|
static void cylinder_end(void)
|
Start parsing gas mixes
The suunto xml is just completely crazy. What's the helium percentage
companion to "o2pct"? Would it be "hepct"? No. It's "hepct_0".
Ok, so they didn't number the first o2pct, which could be seen as sane:
that's the only mix value that should always exist. And they clearly
started their indexing with 0. So with multiple mixes, you'd then
expect "o2pct_1" and "hepct_1", right?
Wrong! Because XML people are crazy, the second O2 mix percentage is
obviously "o2pct_2". So the O2 percentages are one-based, with an
implicit one. But the He percentages are zero-based with an explicit
zero. So the second mix is "o2pct_2" and "hepct_1".
I'd like to ask what drugs Suunto people are on, but hey, it's a Finnish
company. No need to ask. Vodka explains everything. LOTS AND LOTS OF
VODKA.
In comparison, the libdivecomputer output is nice and sane, and uses a
'gasmix' node. Of course, now we have so many different XML nesting
nodes to check that I just made it an array of different noces. That
also allows me to mark the suunto case, so that we only do the "check
for crazy alcoholic xml entries" when it's a suunto file.
The "type of file" thing is probably a good idea for deciding on default
units too. Some day.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-01 20:32:52 +00:00
|
|
|
{
|
2012-01-05 16:16:08 +00:00
|
|
|
cur_cylinder_index++;
|
2011-08-30 04:32:27 +00:00
|
|
|
}
|
|
|
|
|
2011-12-24 03:41:16 +00:00
|
|
|
static void ws_start(void)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ws_end(void)
|
|
|
|
{
|
2012-03-24 04:07:53 +00:00
|
|
|
cur_ws_index++;
|
2011-12-24 03:41:16 +00:00
|
|
|
}
|
|
|
|
|
2011-08-30 04:32:27 +00:00
|
|
|
static void sample_start(void)
|
|
|
|
{
|
2012-11-25 02:50:21 +00:00
|
|
|
cur_sample = prepare_sample(get_dc());
|
2012-12-01 21:02:30 +00:00
|
|
|
cur_sample->ndl.seconds = lastndl;
|
2012-12-31 02:11:01 +00:00
|
|
|
cur_sample->in_deco = lastindeco;
|
2012-12-01 21:02:30 +00:00
|
|
|
cur_sample->stoptime.seconds = laststoptime;
|
|
|
|
cur_sample->stopdepth.mm = laststopdepth;
|
2012-12-08 04:08:29 +00:00
|
|
|
cur_sample->cns = lastcns;
|
|
|
|
cur_sample->po2 = lastpo2;
|
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
|
|
|
cur_sample->sensor = lastsensor;
|
2011-08-30 04:32:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void sample_end(void)
|
|
|
|
{
|
2012-01-05 16:16:08 +00:00
|
|
|
if (!cur_dive)
|
2011-08-30 20:48:05 +00:00
|
|
|
return;
|
2011-08-31 21:36:53 +00:00
|
|
|
|
2012-11-25 02:50:21 +00:00
|
|
|
finish_sample(get_dc());
|
2012-12-01 21:02:30 +00:00
|
|
|
lastndl = cur_sample->ndl.seconds;
|
2012-12-31 02:11:01 +00:00
|
|
|
lastindeco = cur_sample->in_deco;
|
2012-12-01 21:02:30 +00:00
|
|
|
laststoptime = cur_sample->stoptime.seconds;
|
|
|
|
laststopdepth = cur_sample->stopdepth.mm;
|
2012-12-08 04:08:29 +00:00
|
|
|
lastcns = cur_sample->cns;
|
|
|
|
lastpo2 = cur_sample->po2;
|
2012-01-05 16:16:08 +00:00
|
|
|
cur_sample = NULL;
|
2011-08-30 04:32:27 +00:00
|
|
|
}
|
|
|
|
|
2012-11-25 02:50:21 +00:00
|
|
|
static void divecomputer_start(void)
|
|
|
|
{
|
|
|
|
struct divecomputer *dc;
|
|
|
|
|
|
|
|
/* Start from the previous dive computer */
|
|
|
|
dc = &cur_dive->dc;
|
|
|
|
while (dc->next)
|
|
|
|
dc = dc->next;
|
|
|
|
|
|
|
|
/* Did we already fill that in? */
|
2012-11-25 19:44:27 +00:00
|
|
|
if (dc->samples || dc->model || dc->when) {
|
2012-11-25 02:50:21 +00:00
|
|
|
struct divecomputer *newdc = calloc(1, sizeof(*newdc));
|
|
|
|
if (newdc) {
|
|
|
|
dc->next = newdc;
|
|
|
|
dc = newdc;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* .. this is the one we'll use */
|
|
|
|
cur_dc = dc;
|
2012-12-19 20:36:56 +00:00
|
|
|
reset_dc_info(dc);
|
2012-11-25 02:50:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void divecomputer_end(void)
|
|
|
|
{
|
|
|
|
if (!cur_dc->when)
|
|
|
|
cur_dc->when = cur_dive->when;
|
|
|
|
cur_dc = NULL;
|
|
|
|
}
|
|
|
|
|
2012-12-28 16:18:23 +00:00
|
|
|
static void entry(const char *name, char *buf)
|
2011-08-30 04:32:27 +00:00
|
|
|
{
|
2012-12-26 21:47:54 +00:00
|
|
|
if (in_settings) {
|
|
|
|
try_to_fill_dc_settings(name, buf);
|
2013-01-02 01:29:38 +00:00
|
|
|
try_to_match_autogroup(name, buf);
|
2012-12-26 21:47:54 +00:00
|
|
|
return;
|
|
|
|
}
|
2012-01-05 16:16:08 +00:00
|
|
|
if (cur_event.active) {
|
2011-09-23 01:02:54 +00:00
|
|
|
try_to_fill_event(name, buf);
|
|
|
|
return;
|
|
|
|
}
|
2012-01-05 16:16:08 +00:00
|
|
|
if (cur_sample) {
|
|
|
|
try_to_fill_sample(cur_sample, name, buf);
|
2011-08-30 20:48:05 +00:00
|
|
|
return;
|
|
|
|
}
|
2012-11-25 02:50:21 +00:00
|
|
|
if (cur_dc) {
|
|
|
|
try_to_fill_dc(cur_dc, name, buf);
|
|
|
|
return;
|
|
|
|
}
|
2012-01-05 16:16:08 +00:00
|
|
|
if (cur_dive) {
|
2012-11-24 02:05:38 +00:00
|
|
|
try_to_fill_dive(cur_dive, name, buf);
|
2011-08-30 20:48:05 +00:00
|
|
|
return;
|
|
|
|
}
|
New XML format for saving dives
This patch makes the trips nest, and it also fixes the fact that you never
saved the trip notes (you could edit it, but saving would throw it away).
I did *not* change the indentation of the dives, so the trip stuff shows
up the the beginning of the line, at the same level as the <dive> and
<dives> thing. I think it's fairly readable xml, though, and we haven't
really had proper "indentation shows nesting" anyway, since the top-level
"<dives>" thing also didn't indent stuff inside of it.
Anyway, the way I wrote it, it still parses your old "INTRIP" stuff etc,
so as far as I know, it should happily read the old-style XML too. At
least it seemed to work with your xml file that already had the old-style
one (I haven't committed my divetrips, exactly because I didn't like the
new format).
It always saves in the new style, though.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-09-30 19:36:18 +00:00
|
|
|
if (cur_trip) {
|
|
|
|
try_to_fill_trip(&cur_trip, name, buf);
|
|
|
|
return;
|
|
|
|
}
|
2011-08-30 04:32:27 +00:00
|
|
|
}
|
|
|
|
|
2011-08-30 00:51:54 +00:00
|
|
|
static const char *nodename(xmlNode *node, char *buf, int len)
|
2011-08-28 23:58:26 +00:00
|
|
|
{
|
2011-08-30 21:38:39 +00:00
|
|
|
if (!node || !node->name)
|
|
|
|
return "root";
|
2011-08-30 00:51:54 +00:00
|
|
|
|
|
|
|
buf += len;
|
|
|
|
*--buf = 0;
|
|
|
|
len--;
|
|
|
|
|
|
|
|
for(;;) {
|
|
|
|
const char *name = node->name;
|
|
|
|
int i = strlen(name);
|
|
|
|
while (--i >= 0) {
|
|
|
|
unsigned char c = name[i];
|
|
|
|
*--buf = tolower(c);
|
|
|
|
if (!--len)
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
node = node->parent;
|
|
|
|
if (!node || !node->name)
|
|
|
|
return buf;
|
|
|
|
*--buf = '.';
|
|
|
|
if (!--len)
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#define MAXNAME 64
|
|
|
|
|
2011-08-30 04:32:27 +00:00
|
|
|
static void visit_one_node(xmlNode *node)
|
2011-08-30 00:51:54 +00:00
|
|
|
{
|
2012-12-28 16:18:23 +00:00
|
|
|
char *content;
|
2011-08-30 00:51:54 +00:00
|
|
|
char buffer[MAXNAME];
|
|
|
|
const char *name;
|
|
|
|
|
|
|
|
content = node->content;
|
2012-12-28 16:18:23 +00:00
|
|
|
if (!content || xmlIsBlankNode(node))
|
2011-08-30 00:51:54 +00:00
|
|
|
return;
|
|
|
|
|
2011-08-30 21:38:39 +00:00
|
|
|
/* Don't print out the node name if it is "text" */
|
|
|
|
if (!strcmp(node->name, "text"))
|
|
|
|
node = node->parent;
|
|
|
|
|
2011-08-30 00:51:54 +00:00
|
|
|
name = nodename(node, buffer, sizeof(buffer));
|
2011-08-28 23:58:26 +00:00
|
|
|
|
2012-12-28 16:18:23 +00:00
|
|
|
entry(name, content);
|
2011-08-28 23:58:26 +00:00
|
|
|
}
|
|
|
|
|
2011-09-01 18:22:05 +00:00
|
|
|
static void traverse(xmlNode *root);
|
|
|
|
|
|
|
|
static void traverse_properties(xmlNode *node)
|
|
|
|
{
|
|
|
|
xmlAttr *p;
|
|
|
|
|
|
|
|
for (p = node->properties; p; p = p->next)
|
|
|
|
traverse(p->children);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void visit(xmlNode *n)
|
|
|
|
{
|
|
|
|
visit_one_node(n);
|
|
|
|
traverse_properties(n);
|
|
|
|
traverse(n->children);
|
|
|
|
}
|
|
|
|
|
2011-09-05 21:29:08 +00:00
|
|
|
static void DivingLog_importer(void)
|
|
|
|
{
|
|
|
|
import_source = DIVINGLOG;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Diving Log units are really strange.
|
|
|
|
*
|
|
|
|
* Temperatures are in C, except in samples,
|
|
|
|
* when they are in Fahrenheit. Depths are in
|
2011-09-11 19:24:57 +00:00
|
|
|
* meters, an dpressure is in PSI in the samples,
|
|
|
|
* but in bar when it comes to working pressure.
|
|
|
|
*
|
|
|
|
* Crazy f*%^ morons.
|
2011-09-05 21:29:08 +00:00
|
|
|
*/
|
2013-01-11 01:26:10 +00:00
|
|
|
xml_parsing_units = SI_units;
|
2011-09-05 21:29:08 +00:00
|
|
|
}
|
|
|
|
|
2011-09-07 00:01:28 +00:00
|
|
|
static void uddf_importer(void)
|
|
|
|
{
|
|
|
|
import_source = UDDF;
|
2013-01-11 01:26:10 +00:00
|
|
|
xml_parsing_units = SI_units;
|
|
|
|
xml_parsing_units.pressure = PASCAL;
|
|
|
|
xml_parsing_units.temperature = KELVIN;
|
2011-09-07 00:01:28 +00:00
|
|
|
}
|
|
|
|
|
Start parsing gas mixes
The suunto xml is just completely crazy. What's the helium percentage
companion to "o2pct"? Would it be "hepct"? No. It's "hepct_0".
Ok, so they didn't number the first o2pct, which could be seen as sane:
that's the only mix value that should always exist. And they clearly
started their indexing with 0. So with multiple mixes, you'd then
expect "o2pct_1" and "hepct_1", right?
Wrong! Because XML people are crazy, the second O2 mix percentage is
obviously "o2pct_2". So the O2 percentages are one-based, with an
implicit one. But the He percentages are zero-based with an explicit
zero. So the second mix is "o2pct_2" and "hepct_1".
I'd like to ask what drugs Suunto people are on, but hey, it's a Finnish
company. No need to ask. Vodka explains everything. LOTS AND LOTS OF
VODKA.
In comparison, the libdivecomputer output is nice and sane, and uses a
'gasmix' node. Of course, now we have so many different XML nesting
nodes to check that I just made it an array of different noces. That
also allows me to mark the suunto case, so that we only do the "check
for crazy alcoholic xml entries" when it's a suunto file.
The "type of file" thing is probably a good idea for deciding on default
units too. Some day.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-01 20:32:52 +00:00
|
|
|
/*
|
|
|
|
* I'm sure this could be done as some fancy DTD rules.
|
|
|
|
* It's just not worth the headache.
|
|
|
|
*/
|
|
|
|
static struct nesting {
|
|
|
|
const char *name;
|
|
|
|
void (*start)(void), (*end)(void);
|
|
|
|
} nesting[] = {
|
2012-12-26 21:47:54 +00:00
|
|
|
{ "divecomputerid", dc_settings_start, dc_settings_end },
|
2013-01-02 01:29:38 +00:00
|
|
|
{ "settings", settings_start, settings_end },
|
Start parsing gas mixes
The suunto xml is just completely crazy. What's the helium percentage
companion to "o2pct"? Would it be "hepct"? No. It's "hepct_0".
Ok, so they didn't number the first o2pct, which could be seen as sane:
that's the only mix value that should always exist. And they clearly
started their indexing with 0. So with multiple mixes, you'd then
expect "o2pct_1" and "hepct_1", right?
Wrong! Because XML people are crazy, the second O2 mix percentage is
obviously "o2pct_2". So the O2 percentages are one-based, with an
implicit one. But the He percentages are zero-based with an explicit
zero. So the second mix is "o2pct_2" and "hepct_1".
I'd like to ask what drugs Suunto people are on, but hey, it's a Finnish
company. No need to ask. Vodka explains everything. LOTS AND LOTS OF
VODKA.
In comparison, the libdivecomputer output is nice and sane, and uses a
'gasmix' node. Of course, now we have so many different XML nesting
nodes to check that I just made it an array of different noces. That
also allows me to mark the suunto case, so that we only do the "check
for crazy alcoholic xml entries" when it's a suunto file.
The "type of file" thing is probably a good idea for deciding on default
units too. Some day.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-01 20:32:52 +00:00
|
|
|
{ "dive", dive_start, dive_end },
|
2011-09-05 21:29:08 +00:00
|
|
|
{ "Dive", dive_start, dive_end },
|
2012-08-22 05:04:24 +00:00
|
|
|
{ "trip", trip_start, trip_end },
|
Start parsing gas mixes
The suunto xml is just completely crazy. What's the helium percentage
companion to "o2pct"? Would it be "hepct"? No. It's "hepct_0".
Ok, so they didn't number the first o2pct, which could be seen as sane:
that's the only mix value that should always exist. And they clearly
started their indexing with 0. So with multiple mixes, you'd then
expect "o2pct_1" and "hepct_1", right?
Wrong! Because XML people are crazy, the second O2 mix percentage is
obviously "o2pct_2". So the O2 percentages are one-based, with an
implicit one. But the He percentages are zero-based with an explicit
zero. So the second mix is "o2pct_2" and "hepct_1".
I'd like to ask what drugs Suunto people are on, but hey, it's a Finnish
company. No need to ask. Vodka explains everything. LOTS AND LOTS OF
VODKA.
In comparison, the libdivecomputer output is nice and sane, and uses a
'gasmix' node. Of course, now we have so many different XML nesting
nodes to check that I just made it an array of different noces. That
also allows me to mark the suunto case, so that we only do the "check
for crazy alcoholic xml entries" when it's a suunto file.
The "type of file" thing is probably a good idea for deciding on default
units too. Some day.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-01 20:32:52 +00:00
|
|
|
{ "sample", sample_start, sample_end },
|
2011-09-07 00:01:28 +00:00
|
|
|
{ "waypoint", sample_start, sample_end },
|
Start parsing gas mixes
The suunto xml is just completely crazy. What's the helium percentage
companion to "o2pct"? Would it be "hepct"? No. It's "hepct_0".
Ok, so they didn't number the first o2pct, which could be seen as sane:
that's the only mix value that should always exist. And they clearly
started their indexing with 0. So with multiple mixes, you'd then
expect "o2pct_1" and "hepct_1", right?
Wrong! Because XML people are crazy, the second O2 mix percentage is
obviously "o2pct_2". So the O2 percentages are one-based, with an
implicit one. But the He percentages are zero-based with an explicit
zero. So the second mix is "o2pct_2" and "hepct_1".
I'd like to ask what drugs Suunto people are on, but hey, it's a Finnish
company. No need to ask. Vodka explains everything. LOTS AND LOTS OF
VODKA.
In comparison, the libdivecomputer output is nice and sane, and uses a
'gasmix' node. Of course, now we have so many different XML nesting
nodes to check that I just made it an array of different noces. That
also allows me to mark the suunto case, so that we only do the "check
for crazy alcoholic xml entries" when it's a suunto file.
The "type of file" thing is probably a good idea for deciding on default
units too. Some day.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-01 20:32:52 +00:00
|
|
|
{ "SAMPLE", sample_start, sample_end },
|
2011-09-02 18:32:48 +00:00
|
|
|
{ "reading", sample_start, sample_end },
|
Start parsing gas mixes
The suunto xml is just completely crazy. What's the helium percentage
companion to "o2pct"? Would it be "hepct"? No. It's "hepct_0".
Ok, so they didn't number the first o2pct, which could be seen as sane:
that's the only mix value that should always exist. And they clearly
started their indexing with 0. So with multiple mixes, you'd then
expect "o2pct_1" and "hepct_1", right?
Wrong! Because XML people are crazy, the second O2 mix percentage is
obviously "o2pct_2". So the O2 percentages are one-based, with an
implicit one. But the He percentages are zero-based with an explicit
zero. So the second mix is "o2pct_2" and "hepct_1".
I'd like to ask what drugs Suunto people are on, but hey, it's a Finnish
company. No need to ask. Vodka explains everything. LOTS AND LOTS OF
VODKA.
In comparison, the libdivecomputer output is nice and sane, and uses a
'gasmix' node. Of course, now we have so many different XML nesting
nodes to check that I just made it an array of different noces. That
also allows me to mark the suunto case, so that we only do the "check
for crazy alcoholic xml entries" when it's a suunto file.
The "type of file" thing is probably a good idea for deciding on default
units too. Some day.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-01 20:32:52 +00:00
|
|
|
{ "event", event_start, event_end },
|
2011-09-04 03:31:18 +00:00
|
|
|
{ "gasmix", cylinder_start, cylinder_end },
|
|
|
|
{ "cylinder", cylinder_start, cylinder_end },
|
2011-12-24 03:41:16 +00:00
|
|
|
{ "weightsystem", ws_start, ws_end },
|
2012-11-25 02:50:21 +00:00
|
|
|
{ "divecomputer", divecomputer_start, divecomputer_end },
|
2011-09-05 21:29:08 +00:00
|
|
|
{ "P", sample_start, sample_end },
|
|
|
|
|
|
|
|
/* Import type recognition */
|
|
|
|
{ "Divinglog", DivingLog_importer },
|
2011-09-07 00:01:28 +00:00
|
|
|
{ "uddf", uddf_importer },
|
2011-09-05 21:29:08 +00:00
|
|
|
|
Start parsing gas mixes
The suunto xml is just completely crazy. What's the helium percentage
companion to "o2pct"? Would it be "hepct"? No. It's "hepct_0".
Ok, so they didn't number the first o2pct, which could be seen as sane:
that's the only mix value that should always exist. And they clearly
started their indexing with 0. So with multiple mixes, you'd then
expect "o2pct_1" and "hepct_1", right?
Wrong! Because XML people are crazy, the second O2 mix percentage is
obviously "o2pct_2". So the O2 percentages are one-based, with an
implicit one. But the He percentages are zero-based with an explicit
zero. So the second mix is "o2pct_2" and "hepct_1".
I'd like to ask what drugs Suunto people are on, but hey, it's a Finnish
company. No need to ask. Vodka explains everything. LOTS AND LOTS OF
VODKA.
In comparison, the libdivecomputer output is nice and sane, and uses a
'gasmix' node. Of course, now we have so many different XML nesting
nodes to check that I just made it an array of different noces. That
also allows me to mark the suunto case, so that we only do the "check
for crazy alcoholic xml entries" when it's a suunto file.
The "type of file" thing is probably a good idea for deciding on default
units too. Some day.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-01 20:32:52 +00:00
|
|
|
{ NULL, }
|
|
|
|
};
|
|
|
|
|
2011-09-01 18:22:05 +00:00
|
|
|
static void traverse(xmlNode *root)
|
2011-08-28 23:58:26 +00:00
|
|
|
{
|
|
|
|
xmlNode *n;
|
|
|
|
|
2011-09-01 18:22:05 +00:00
|
|
|
for (n = root; n; n = n->next) {
|
Start parsing gas mixes
The suunto xml is just completely crazy. What's the helium percentage
companion to "o2pct"? Would it be "hepct"? No. It's "hepct_0".
Ok, so they didn't number the first o2pct, which could be seen as sane:
that's the only mix value that should always exist. And they clearly
started their indexing with 0. So with multiple mixes, you'd then
expect "o2pct_1" and "hepct_1", right?
Wrong! Because XML people are crazy, the second O2 mix percentage is
obviously "o2pct_2". So the O2 percentages are one-based, with an
implicit one. But the He percentages are zero-based with an explicit
zero. So the second mix is "o2pct_2" and "hepct_1".
I'd like to ask what drugs Suunto people are on, but hey, it's a Finnish
company. No need to ask. Vodka explains everything. LOTS AND LOTS OF
VODKA.
In comparison, the libdivecomputer output is nice and sane, and uses a
'gasmix' node. Of course, now we have so many different XML nesting
nodes to check that I just made it an array of different noces. That
also allows me to mark the suunto case, so that we only do the "check
for crazy alcoholic xml entries" when it's a suunto file.
The "type of file" thing is probably a good idea for deciding on default
units too. Some day.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-01 20:32:52 +00:00
|
|
|
struct nesting *rule = nesting;
|
2011-08-30 04:32:27 +00:00
|
|
|
|
Start parsing gas mixes
The suunto xml is just completely crazy. What's the helium percentage
companion to "o2pct"? Would it be "hepct"? No. It's "hepct_0".
Ok, so they didn't number the first o2pct, which could be seen as sane:
that's the only mix value that should always exist. And they clearly
started their indexing with 0. So with multiple mixes, you'd then
expect "o2pct_1" and "hepct_1", right?
Wrong! Because XML people are crazy, the second O2 mix percentage is
obviously "o2pct_2". So the O2 percentages are one-based, with an
implicit one. But the He percentages are zero-based with an explicit
zero. So the second mix is "o2pct_2" and "hepct_1".
I'd like to ask what drugs Suunto people are on, but hey, it's a Finnish
company. No need to ask. Vodka explains everything. LOTS AND LOTS OF
VODKA.
In comparison, the libdivecomputer output is nice and sane, and uses a
'gasmix' node. Of course, now we have so many different XML nesting
nodes to check that I just made it an array of different noces. That
also allows me to mark the suunto case, so that we only do the "check
for crazy alcoholic xml entries" when it's a suunto file.
The "type of file" thing is probably a good idea for deciding on default
units too. Some day.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-01 20:32:52 +00:00
|
|
|
do {
|
|
|
|
if (!strcmp(rule->name, n->name))
|
|
|
|
break;
|
|
|
|
rule++;
|
|
|
|
} while (rule->name);
|
2011-08-30 04:32:27 +00:00
|
|
|
|
Start parsing gas mixes
The suunto xml is just completely crazy. What's the helium percentage
companion to "o2pct"? Would it be "hepct"? No. It's "hepct_0".
Ok, so they didn't number the first o2pct, which could be seen as sane:
that's the only mix value that should always exist. And they clearly
started their indexing with 0. So with multiple mixes, you'd then
expect "o2pct_1" and "hepct_1", right?
Wrong! Because XML people are crazy, the second O2 mix percentage is
obviously "o2pct_2". So the O2 percentages are one-based, with an
implicit one. But the He percentages are zero-based with an explicit
zero. So the second mix is "o2pct_2" and "hepct_1".
I'd like to ask what drugs Suunto people are on, but hey, it's a Finnish
company. No need to ask. Vodka explains everything. LOTS AND LOTS OF
VODKA.
In comparison, the libdivecomputer output is nice and sane, and uses a
'gasmix' node. Of course, now we have so many different XML nesting
nodes to check that I just made it an array of different noces. That
also allows me to mark the suunto case, so that we only do the "check
for crazy alcoholic xml entries" when it's a suunto file.
The "type of file" thing is probably a good idea for deciding on default
units too. Some day.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-01 20:32:52 +00:00
|
|
|
if (rule->start)
|
|
|
|
rule->start();
|
2011-09-01 18:22:05 +00:00
|
|
|
visit(n);
|
Start parsing gas mixes
The suunto xml is just completely crazy. What's the helium percentage
companion to "o2pct"? Would it be "hepct"? No. It's "hepct_0".
Ok, so they didn't number the first o2pct, which could be seen as sane:
that's the only mix value that should always exist. And they clearly
started their indexing with 0. So with multiple mixes, you'd then
expect "o2pct_1" and "hepct_1", right?
Wrong! Because XML people are crazy, the second O2 mix percentage is
obviously "o2pct_2". So the O2 percentages are one-based, with an
implicit one. But the He percentages are zero-based with an explicit
zero. So the second mix is "o2pct_2" and "hepct_1".
I'd like to ask what drugs Suunto people are on, but hey, it's a Finnish
company. No need to ask. Vodka explains everything. LOTS AND LOTS OF
VODKA.
In comparison, the libdivecomputer output is nice and sane, and uses a
'gasmix' node. Of course, now we have so many different XML nesting
nodes to check that I just made it an array of different noces. That
also allows me to mark the suunto case, so that we only do the "check
for crazy alcoholic xml entries" when it's a suunto file.
The "type of file" thing is probably a good idea for deciding on default
units too. Some day.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-01 20:32:52 +00:00
|
|
|
if (rule->end)
|
|
|
|
rule->end();
|
2011-08-28 23:58:26 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-09-02 18:32:48 +00:00
|
|
|
/* Per-file reset */
|
|
|
|
static void reset_all(void)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* We reset the units for each file. You'd think it was
|
|
|
|
* a per-dive property, but I'm not going to trust people
|
|
|
|
* to do per-dive setup. If the xml does have per-dive
|
|
|
|
* data within one file, we might have to reset it per
|
|
|
|
* dive for that format.
|
|
|
|
*/
|
2013-01-11 01:26:10 +00:00
|
|
|
xml_parsing_units = SI_units;
|
2011-09-05 20:45:14 +00:00
|
|
|
import_source = UNKNOWN;
|
2011-09-02 18:32:48 +00:00
|
|
|
}
|
|
|
|
|
2012-11-30 20:56:10 +00:00
|
|
|
void parse_xml_buffer(const char *url, const char *buffer, int size, GError **error)
|
2011-08-28 23:58:26 +00:00
|
|
|
{
|
|
|
|
xmlDoc *doc;
|
|
|
|
|
2012-01-26 21:00:45 +00:00
|
|
|
doc = xmlReadMemory(buffer, size, url, NULL, 0);
|
2011-08-28 23:58:26 +00:00
|
|
|
if (!doc) {
|
2012-10-11 00:42:59 +00:00
|
|
|
fprintf(stderr, _("Failed to parse '%s'.\n"), url);
|
2011-09-05 20:14:53 +00:00
|
|
|
if (error != NULL)
|
|
|
|
{
|
2011-09-15 16:43:14 +00:00
|
|
|
*error = g_error_new(g_quark_from_string("subsurface"),
|
2011-09-11 19:24:57 +00:00
|
|
|
DIVE_ERROR_PARSE,
|
2012-10-11 00:42:59 +00:00
|
|
|
_("Failed to parse '%s'"),
|
2012-01-26 21:00:45 +00:00
|
|
|
url);
|
2011-09-05 20:14:53 +00:00
|
|
|
}
|
2011-08-28 23:58:26 +00:00
|
|
|
return;
|
|
|
|
}
|
2011-09-02 18:32:48 +00:00
|
|
|
reset_all();
|
2011-08-30 04:32:27 +00:00
|
|
|
dive_start();
|
2011-11-05 10:39:17 +00:00
|
|
|
#ifdef XSLT
|
|
|
|
doc = test_xslt_transforms(doc);
|
|
|
|
#endif
|
2011-08-30 04:32:27 +00:00
|
|
|
traverse(xmlDocGetRootElement(doc));
|
|
|
|
dive_end();
|
2011-08-28 23:58:26 +00:00
|
|
|
xmlFreeDoc(doc);
|
|
|
|
}
|
|
|
|
|
2011-08-31 01:40:25 +00:00
|
|
|
void parse_xml_init(void)
|
2011-08-30 23:28:59 +00:00
|
|
|
{
|
2011-08-28 23:58:26 +00:00
|
|
|
LIBXML_TEST_VERSION
|
|
|
|
}
|
2011-11-05 10:39:17 +00:00
|
|
|
|
2012-09-18 15:33:55 +00:00
|
|
|
void parse_xml_exit(void)
|
|
|
|
{
|
|
|
|
xmlCleanupParser();
|
|
|
|
}
|
|
|
|
|
2011-11-05 10:39:17 +00:00
|
|
|
#ifdef XSLT
|
2011-11-05 20:51:37 +00:00
|
|
|
|
|
|
|
/* Maybe we'll want a environment variable that can override this.. */
|
|
|
|
static const char *xslt_path = XSLT ":xslt:.";
|
|
|
|
|
|
|
|
static xsltStylesheetPtr try_get_stylesheet(const char *path, int len, const char *name)
|
|
|
|
{
|
|
|
|
xsltStylesheetPtr ret;
|
|
|
|
int namelen = strlen(name);
|
|
|
|
char *filename = malloc(len+1+namelen+1);
|
|
|
|
|
|
|
|
if (!filename)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
memcpy(filename, path, len);
|
|
|
|
filename[len] = G_DIR_SEPARATOR;
|
|
|
|
memcpy(filename + len + 1, name, namelen+1);
|
|
|
|
|
|
|
|
ret = NULL;
|
|
|
|
if (!access(filename, R_OK))
|
|
|
|
ret = xsltParseStylesheetFile(filename);
|
|
|
|
free(filename);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static xsltStylesheetPtr get_stylesheet(const char *name)
|
|
|
|
{
|
2012-05-12 19:53:41 +00:00
|
|
|
const char *path, *next;
|
|
|
|
|
|
|
|
path = getenv("SUBSURFACE_XSLT_PATH");
|
|
|
|
if (!path)
|
|
|
|
path = xslt_path;
|
2011-11-05 20:51:37 +00:00
|
|
|
|
|
|
|
do {
|
|
|
|
int len;
|
|
|
|
xsltStylesheetPtr ret;
|
|
|
|
|
|
|
|
next = strchr(path, ':');
|
|
|
|
len = strlen(path);
|
|
|
|
if (next) {
|
|
|
|
len = next - path;
|
|
|
|
next++;
|
|
|
|
}
|
|
|
|
ret = try_get_stylesheet(path, len, name);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
} while ((path = next) != NULL);
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2011-11-16 05:12:43 +00:00
|
|
|
static struct xslt_files {
|
|
|
|
const char *root;
|
|
|
|
const char *file;
|
|
|
|
} xslt_files[] = {
|
2011-11-16 05:12:44 +00:00
|
|
|
{ "SUUNTO", "SuuntoSDM.xslt" },
|
2011-11-16 05:12:43 +00:00
|
|
|
{ "JDiveLog", "jdivelog2subsurface.xslt" },
|
|
|
|
{ NULL, }
|
|
|
|
};
|
|
|
|
|
2011-11-05 10:39:17 +00:00
|
|
|
xmlDoc *test_xslt_transforms(xmlDoc *doc)
|
|
|
|
{
|
2011-11-16 05:12:43 +00:00
|
|
|
struct xslt_files *info = xslt_files;
|
2011-11-05 10:39:17 +00:00
|
|
|
xmlDoc *transformed;
|
|
|
|
xsltStylesheetPtr xslt = NULL;
|
|
|
|
xmlNode *root_element = xmlDocGetRootElement(doc);
|
2011-11-16 05:12:43 +00:00
|
|
|
|
|
|
|
while ((info->root) && (strcasecmp(root_element->name, info->root) != 0)) {
|
|
|
|
info++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (info->root) {
|
2011-11-05 10:39:17 +00:00
|
|
|
xmlSubstituteEntitiesDefault(1);
|
2011-11-16 05:12:43 +00:00
|
|
|
xslt = get_stylesheet(info->file);
|
2011-11-05 10:39:17 +00:00
|
|
|
if (xslt == NULL)
|
|
|
|
return doc;
|
|
|
|
transformed = xsltApplyStylesheet(xslt, doc, NULL);
|
|
|
|
xmlFreeDoc(doc);
|
|
|
|
xsltFreeStylesheet(xslt);
|
|
|
|
return transformed;
|
|
|
|
}
|
|
|
|
return doc;
|
|
|
|
}
|
|
|
|
#endif
|