2011-09-12 16:19:21 +00:00
|
|
|
#include <stdio.h>
|
2011-09-16 05:58:02 +00:00
|
|
|
#include <pthread.h>
|
2011-11-27 17:10:37 +00:00
|
|
|
#include <unistd.h>
|
|
|
|
#include <inttypes.h>
|
2012-10-11 00:42:59 +00:00
|
|
|
#include <glib/gi18n.h>
|
2011-09-12 16:19:21 +00:00
|
|
|
|
2011-09-12 16:50:40 +00:00
|
|
|
#include "dive.h"
|
2011-09-12 20:25:05 +00:00
|
|
|
#include "divelist.h"
|
2011-09-12 16:19:21 +00:00
|
|
|
#include "display.h"
|
2011-09-20 19:40:34 +00:00
|
|
|
#include "display-gtk.h"
|
2011-09-12 16:19:21 +00:00
|
|
|
|
2011-09-20 19:40:34 +00:00
|
|
|
#include "libdivecomputer.h"
|
2012-12-01 21:02:30 +00:00
|
|
|
#include "libdivecomputer/version.h"
|
2011-09-15 04:00:49 +00:00
|
|
|
|
Make subsurface compile with current libdivecomputer git tree
libdivecomputer has the absolute worst interfaces to any library *ever*,
and randomly changes those crappy interfaces when it adds support for
new dive computers.
It would have been much better if the interface was just a "open this
device" with a device descriptor structure pointer, so that when Jef
adds support for new devices, the old descriptors still stay around and
work the same way - there's just a new descriptor structure that you
*can* use if you want. Along with a data structure to name the devices
and their descriptors, this would actually mean that users could just
support pretty much any random device that LD supports.
But no, that's not how libdivecomputer works. It has random enums and
crazy different ad-hoc interfaces for different dive computers. Or,
like in this case, crazy different ad-hoc interfaces for the *same*old*
dive computer.
Right now, for example, the support for the new Heinrichs Weikamp "Frog"
computer added a flag to the interface for the old OSTC_2 support.
Breaking any libdivecomputer users even if you didn't need Frog support.
And is there a version number in the header files to check for? Yes,
there's a version number. But no, it's not useful, since it doesn't
actually change with the interface changes. This time, Jef actually did
change the version number (from 0.1.0 to 0.2.0) as part of new
development version, but there's no reason to believe that it will
change in the future as the interfaces change - it never has before.
So it's actually safer - and easier to understand - to check for the
existence of the new header file inclusion mechanism. A new version of
libdivecomputer that supports the HW Frog computer will include the
"ostc_frog.h" header file when you include the libdivecomputer device.h
file, and that will result in HW_FROG_H being defined.
So we can check whether libdivecomputer has the new interface and
supports the Frog by doing an "#ifdef HW_FROG_H" hack. Ugh.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-05-02 16:36:55 +00:00
|
|
|
/* Christ. Libdivecomputer has the worst configuration system ever. */
|
|
|
|
#ifdef HW_FROG_H
|
|
|
|
#define NOT_FROG , 0
|
|
|
|
#define LIBDIVECOMPUTER_SUPPORTS_FROG
|
|
|
|
#else
|
|
|
|
#define NOT_FROG
|
|
|
|
#endif
|
|
|
|
|
2012-09-20 19:56:42 +00:00
|
|
|
static const char *progress_bar_text = "";
|
|
|
|
static double progress_bar_fraction = 0.0;
|
2012-12-08 22:02:31 +00:00
|
|
|
static int stoptime, stopdepth, ndl, po2, cns;
|
2012-09-20 19:56:42 +00:00
|
|
|
|
2012-05-02 19:49:03 +00:00
|
|
|
static GError *error(const char *fmt, ...)
|
2011-09-12 17:27:35 +00:00
|
|
|
{
|
|
|
|
va_list args;
|
|
|
|
GError *error;
|
|
|
|
|
|
|
|
va_start(args, fmt);
|
|
|
|
error = g_error_new_valist(
|
2011-09-15 16:43:14 +00:00
|
|
|
g_quark_from_string("subsurface"),
|
2011-09-12 17:27:35 +00:00
|
|
|
DIVE_ERROR_PARSE, fmt, args);
|
|
|
|
va_end(args);
|
2012-05-02 19:49:03 +00:00
|
|
|
return error;
|
2011-09-12 17:27:35 +00:00
|
|
|
}
|
|
|
|
|
2012-06-22 20:37:39 +00:00
|
|
|
static dc_status_t create_parser(device_data_t *devdata, dc_parser_t **parser)
|
2011-09-12 17:27:35 +00:00
|
|
|
{
|
2012-06-22 20:37:39 +00:00
|
|
|
return dc_parser_new(parser, devdata->device);
|
2011-09-12 17:27:35 +00:00
|
|
|
}
|
|
|
|
|
2012-12-28 16:53:16 +00:00
|
|
|
/* Atomics Aquatics Cobalt specific parsing of tank information
|
|
|
|
* realistically this REALLY needs to be done in libdivecomputer - but the
|
|
|
|
* current API doesn't even have the notion of tank size, so for now I do
|
|
|
|
* this here, but I need to work with Jef to make sure this gets added in
|
|
|
|
* the new libdivecomputer API */
|
|
|
|
#define COBALT_HEADER 228
|
|
|
|
struct atomics_gas_info {
|
|
|
|
uint8_t gas_nr;
|
|
|
|
uint8_t po2imit;
|
|
|
|
uint8_t tankspecmethod; /* 1: CF@psi 2: CF@bar 3: wet vol in deciliter */
|
|
|
|
uint8_t gasmixtype;
|
|
|
|
uint8_t fo2;
|
|
|
|
uint8_t fhe;
|
|
|
|
uint16_t startpressure; /* in psi */
|
|
|
|
uint16_t tanksize; /* CF or dl */
|
|
|
|
uint16_t workingpressure;
|
|
|
|
uint16_t sensorid;
|
|
|
|
uint16_t endpressure; /* in psi */
|
|
|
|
uint16_t totalconsumption; /* in liters */
|
|
|
|
};
|
|
|
|
#define COBALT_CFATPSI 1
|
|
|
|
#define COBALT_CFATBAR 2
|
|
|
|
#define COBALT_WETINDL 3
|
|
|
|
|
|
|
|
static void get_tanksize(device_data_t *devdata, const unsigned char *data, cylinder_t *cyl, int idx)
|
|
|
|
{
|
|
|
|
/* I don't like this kind of match... I'd love to have an ID and
|
|
|
|
* a firmware version or... something; and even better, just get
|
|
|
|
* this from libdivecomputer */
|
|
|
|
if (!strcmp(devdata->vendor, "Atomic Aquatics") &&
|
|
|
|
!strcmp(devdata->product, "Cobalt")) {
|
|
|
|
struct atomics_gas_info *atomics_gas_info;
|
|
|
|
double airvolume;
|
|
|
|
int mbar;
|
|
|
|
|
|
|
|
/* at least some quick sanity check to make sure this is the
|
|
|
|
* right data */
|
|
|
|
if (*(uint32_t *)data != 0xFFFEFFFE) {
|
|
|
|
printf("incorrect header for Atomics dive\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
atomics_gas_info = (void*)(data + COBALT_HEADER);
|
|
|
|
switch (atomics_gas_info[idx].tankspecmethod) {
|
|
|
|
case COBALT_CFATPSI:
|
|
|
|
airvolume = cuft_to_l(atomics_gas_info[idx].tanksize) * 1000.0;
|
|
|
|
mbar = psi_to_mbar(atomics_gas_info[idx].workingpressure);
|
|
|
|
cyl[idx].type.size.mliter = airvolume / bar_to_atm(mbar / 1000.0) + 0.5;
|
|
|
|
cyl[idx].type.workingpressure.mbar = mbar;
|
|
|
|
break;
|
|
|
|
case COBALT_CFATBAR:
|
|
|
|
airvolume = cuft_to_l(atomics_gas_info[idx].tanksize) * 1000.0;
|
|
|
|
mbar = atomics_gas_info[idx].workingpressure * 1000;
|
|
|
|
cyl[idx].type.size.mliter = airvolume / bar_to_atm(mbar / 1000.0) + 0.5;
|
|
|
|
cyl[idx].type.workingpressure.mbar = mbar;
|
|
|
|
break;
|
|
|
|
case COBALT_WETINDL:
|
|
|
|
cyl[idx].type.size.mliter = atomics_gas_info[idx].tanksize * 100;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int parse_gasmixes(device_data_t *devdata, struct dive *dive, dc_parser_t *parser, int ngases,
|
|
|
|
const unsigned char *data)
|
2011-09-12 18:05:32 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < ngases; i++) {
|
|
|
|
int rc;
|
2012-06-22 20:37:39 +00:00
|
|
|
dc_gasmix_t gasmix = {0};
|
2011-09-12 20:31:43 +00:00
|
|
|
int o2, he;
|
2011-09-12 18:05:32 +00:00
|
|
|
|
2012-06-22 20:37:39 +00:00
|
|
|
rc = dc_parser_get_field(parser, DC_FIELD_GASMIX, i, &gasmix);
|
|
|
|
if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED)
|
2011-09-12 18:05:32 +00:00
|
|
|
return rc;
|
|
|
|
|
2011-09-12 20:25:05 +00:00
|
|
|
if (i >= MAX_CYLINDERS)
|
|
|
|
continue;
|
|
|
|
|
2011-09-12 20:31:43 +00:00
|
|
|
o2 = gasmix.oxygen * 1000 + 0.5;
|
|
|
|
he = gasmix.helium * 1000 + 0.5;
|
|
|
|
|
|
|
|
/* Ignore bogus data - libdivecomputer does some crazy stuff */
|
2012-10-28 01:03:13 +00:00
|
|
|
if (o2 + he <= AIR_PERMILLE || o2 >= 1000)
|
2011-09-12 20:31:43 +00:00
|
|
|
o2 = 0;
|
|
|
|
if (he < 0 || he >= 800 || o2+he >= 1000)
|
|
|
|
he = 0;
|
|
|
|
|
|
|
|
dive->cylinder[i].gasmix.o2.permille = o2;
|
|
|
|
dive->cylinder[i].gasmix.he.permille = he;
|
2012-12-28 16:53:16 +00:00
|
|
|
|
|
|
|
get_tanksize(devdata, data, dive->cylinder, i);
|
2011-09-12 18:05:32 +00:00
|
|
|
}
|
2012-06-22 20:37:39 +00:00
|
|
|
return DC_STATUS_SUCCESS;
|
2011-09-12 18:05:32 +00:00
|
|
|
}
|
|
|
|
|
2012-11-24 02:51:27 +00:00
|
|
|
static void handle_event(struct divecomputer *dc, struct sample *sample, dc_sample_value_t value)
|
2011-09-12 18:05:32 +00:00
|
|
|
{
|
2011-09-22 23:55:55 +00:00
|
|
|
int type, time;
|
2012-10-21 18:34:11 +00:00
|
|
|
/* we mark these for translation here, but we store the untranslated strings
|
|
|
|
* and only translate them when they are displayed on screen */
|
2011-09-12 18:05:32 +00:00
|
|
|
static const char *events[] = {
|
2012-11-29 04:13:21 +00:00
|
|
|
N_("none"), N_("deco stop"), N_("rbt"), N_("ascent"), N_("ceiling"), N_("workload"),
|
2012-10-20 21:21:07 +00:00
|
|
|
N_("transmitter"), N_("violation"), N_("bookmark"), N_("surface"), N_("safety stop"),
|
|
|
|
N_("gaschange"), N_("safety stop (voluntary)"), N_("safety stop (mandatory)"),
|
|
|
|
N_("deepstop"), N_("ceiling (safety stop)"), N_("unknown"), N_("divetime"),
|
|
|
|
N_("maxdepth"), N_("OLF"), N_("PO2"), N_("airtime"), N_("rgbm"), N_("heading"),
|
2012-11-29 04:13:21 +00:00
|
|
|
N_("tissue level warning"), N_("gaschange"), N_("non stop time")
|
2011-09-22 23:55:55 +00:00
|
|
|
};
|
|
|
|
const int nr_events = sizeof(events) / sizeof(const char *);
|
|
|
|
const char *name;
|
|
|
|
/*
|
|
|
|
* Just ignore surface events. They are pointless. What "surface"
|
|
|
|
* means depends on the dive computer (and possibly even settings
|
|
|
|
* in the dive computer). It does *not* necessarily mean "depth 0",
|
|
|
|
* so don't even turn it into that.
|
|
|
|
*/
|
|
|
|
if (value.event.type == SAMPLE_EVENT_SURFACE)
|
|
|
|
return;
|
|
|
|
|
2012-12-11 15:43:11 +00:00
|
|
|
/* an early development version of libdivecomputer 0.3 provided us with deco / ndl information for
|
|
|
|
* a couple of dive computers through events; this got fixed later in the release cycle but for a
|
|
|
|
* short while I'll keep the code around that converts the events into our preferred sample format here */
|
|
|
|
#if 0
|
2012-12-01 21:02:30 +00:00
|
|
|
if (value.event.type == SAMPLE_EVENT_DECOSTOP) {
|
|
|
|
/* packed value - time in seconds in high 16 bit
|
|
|
|
* depth in m(!) in low 16 bits */
|
|
|
|
stoptime = value.event.value >> 16;
|
2012-12-05 22:35:49 +00:00
|
|
|
stopdepth = (value.event.value & 0xFFFF) * 1000;
|
2012-12-01 21:02:30 +00:00
|
|
|
ndl = 0;
|
|
|
|
}
|
|
|
|
if (value.event.type == SAMPLE_EVENT_NDL) {
|
|
|
|
stopdepth = 0;
|
|
|
|
stoptime = 0;
|
|
|
|
ndl = value.event.value;
|
|
|
|
}
|
2012-12-05 22:35:49 +00:00
|
|
|
if (value.event.type == SAMPLE_EVENT_DECOSTOP || value.event.type == SAMPLE_EVENT_NDL)
|
|
|
|
/* don't create a Subsurface event for these */
|
|
|
|
return;
|
2012-12-01 21:02:30 +00:00
|
|
|
#endif
|
|
|
|
|
2011-09-22 23:55:55 +00:00
|
|
|
/*
|
|
|
|
* Other evens might be more interesting, but for now we just print them out.
|
|
|
|
*/
|
|
|
|
type = value.event.type;
|
2012-10-21 18:34:11 +00:00
|
|
|
name = N_("invalid event number");
|
2011-09-22 23:55:55 +00:00
|
|
|
if (type < nr_events)
|
2012-10-21 18:34:11 +00:00
|
|
|
name = events[type];
|
2011-09-22 23:55:55 +00:00
|
|
|
|
|
|
|
time = value.event.time;
|
|
|
|
if (sample)
|
|
|
|
time += sample->time.seconds;
|
|
|
|
|
2012-11-24 02:51:27 +00:00
|
|
|
add_event(dc, time, type, value.event.flags, value.event.value, name);
|
2011-09-22 23:45:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2012-06-22 20:37:39 +00:00
|
|
|
sample_cb(dc_sample_type_t type, dc_sample_value_t value, void *userdata)
|
2011-09-22 23:45:28 +00:00
|
|
|
{
|
|
|
|
int i;
|
2012-11-24 02:51:27 +00:00
|
|
|
struct divecomputer *dc = userdata;
|
2011-09-12 20:25:05 +00:00
|
|
|
struct sample *sample;
|
|
|
|
|
|
|
|
/*
|
2012-06-22 20:37:39 +00:00
|
|
|
* We fill in the "previous" sample - except for DC_SAMPLE_TIME,
|
2011-09-12 20:25:05 +00:00
|
|
|
* which creates a new one.
|
|
|
|
*/
|
2012-11-24 02:51:27 +00:00
|
|
|
sample = dc->samples ? dc->sample+dc->samples-1 : NULL;
|
2011-09-12 18:05:32 +00:00
|
|
|
|
|
|
|
switch (type) {
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_SAMPLE_TIME:
|
2012-12-05 22:35:49 +00:00
|
|
|
if (sample) {
|
|
|
|
sample->ndl.seconds = ndl;
|
|
|
|
sample->stoptime.seconds = stoptime;
|
|
|
|
sample->stopdepth.mm = stopdepth;
|
2012-12-08 22:02:31 +00:00
|
|
|
sample->po2 = po2;
|
|
|
|
sample->cns = cns;
|
2012-12-05 22:35:49 +00:00
|
|
|
}
|
2012-11-24 02:51:27 +00:00
|
|
|
sample = prepare_sample(dc);
|
2011-09-12 20:25:05 +00:00
|
|
|
sample->time.seconds = value.time;
|
2012-11-24 02:51:27 +00:00
|
|
|
finish_sample(dc);
|
2011-09-12 18:05:32 +00:00
|
|
|
break;
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_SAMPLE_DEPTH:
|
2011-09-12 20:25:05 +00:00
|
|
|
sample->depth.mm = value.depth * 1000 + 0.5;
|
2011-09-12 18:05:32 +00:00
|
|
|
break;
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_SAMPLE_PRESSURE:
|
2011-09-12 20:25:05 +00:00
|
|
|
sample->cylinderindex = value.pressure.tank;
|
|
|
|
sample->cylinderpressure.mbar = value.pressure.value * 1000 + 0.5;
|
2011-09-12 18:05:32 +00:00
|
|
|
break;
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_SAMPLE_TEMPERATURE:
|
2011-09-12 20:25:05 +00:00
|
|
|
sample->temperature.mkelvin = (value.temperature + 273.15) * 1000 + 0.5;
|
2011-09-12 18:05:32 +00:00
|
|
|
break;
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_SAMPLE_EVENT:
|
2012-11-24 02:51:27 +00:00
|
|
|
handle_event(dc, sample, value);
|
2011-09-12 18:05:32 +00:00
|
|
|
break;
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_SAMPLE_RBT:
|
2011-09-12 18:05:32 +00:00
|
|
|
printf(" <rbt>%u</rbt>\n", value.rbt);
|
|
|
|
break;
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_SAMPLE_HEARTBEAT:
|
2011-09-12 18:05:32 +00:00
|
|
|
printf(" <heartbeat>%u</heartbeat>\n", value.heartbeat);
|
|
|
|
break;
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_SAMPLE_BEARING:
|
2011-09-12 18:05:32 +00:00
|
|
|
printf(" <bearing>%u</bearing>\n", value.bearing);
|
|
|
|
break;
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_SAMPLE_VENDOR:
|
2011-09-12 18:05:32 +00:00
|
|
|
printf(" <vendor type=\"%u\" size=\"%u\">", value.vendor.type, value.vendor.size);
|
|
|
|
for (i = 0; i < value.vendor.size; ++i)
|
|
|
|
printf("%02X", ((unsigned char *) value.vendor.data)[i]);
|
|
|
|
printf("</vendor>\n");
|
|
|
|
break;
|
2012-12-08 04:08:29 +00:00
|
|
|
#if DC_VERSION_CHECK(0, 3, 0)
|
|
|
|
case DC_SAMPLE_SETPOINT:
|
|
|
|
/* for us a setpoint means constant pO2 from here */
|
2012-12-08 22:02:31 +00:00
|
|
|
sample->po2 = po2 = value.setpoint * 1000 + 0.5;
|
2012-12-08 04:08:29 +00:00
|
|
|
break;
|
|
|
|
case DC_SAMPLE_PPO2:
|
2012-12-08 22:02:31 +00:00
|
|
|
sample->po2 = po2 = value.ppo2 * 1000 + 0.5;
|
2012-12-08 04:08:29 +00:00
|
|
|
break;
|
|
|
|
case DC_SAMPLE_CNS:
|
2012-12-08 22:02:31 +00:00
|
|
|
sample->cns = cns = value.cns * 100 + 0.5;
|
2012-12-08 04:08:29 +00:00
|
|
|
break;
|
2012-12-11 15:43:11 +00:00
|
|
|
case DC_SAMPLE_DECO:
|
|
|
|
if (value.deco.type == DC_DECO_NDL) {
|
|
|
|
ndl = value.deco.time;
|
|
|
|
} else if (value.deco.type == DC_DECO_DECOSTOP ||
|
|
|
|
value.deco.type == DC_DECO_DEEPSTOP) {
|
|
|
|
stopdepth = value.deco.depth * 1000.0 + 0.5;
|
|
|
|
stoptime = value.deco.time;
|
2012-12-29 02:39:01 +00:00
|
|
|
ndl = 0;
|
2012-12-11 15:43:11 +00:00
|
|
|
}
|
2012-12-08 04:08:29 +00:00
|
|
|
#endif
|
2011-09-12 18:05:32 +00:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-05-03 00:40:39 +00:00
|
|
|
static void dev_info(device_data_t *devdata, const char *fmt, ...)
|
|
|
|
{
|
2012-10-20 21:21:07 +00:00
|
|
|
static char buffer[256];
|
2012-05-03 00:40:39 +00:00
|
|
|
va_list ap;
|
|
|
|
|
|
|
|
va_start(ap, fmt);
|
|
|
|
vsnprintf(buffer, sizeof(buffer), fmt, ap);
|
|
|
|
va_end(ap);
|
2012-09-20 19:56:42 +00:00
|
|
|
progress_bar_text = buffer;
|
2012-05-03 00:40:39 +00:00
|
|
|
}
|
2011-09-12 18:05:32 +00:00
|
|
|
|
2012-05-03 00:40:39 +00:00
|
|
|
static int import_dive_number = 0;
|
|
|
|
|
2012-11-24 02:51:27 +00:00
|
|
|
static int parse_samples(device_data_t *devdata, struct divecomputer *dc, dc_parser_t *parser)
|
2011-09-12 18:05:32 +00:00
|
|
|
{
|
|
|
|
// Parse the sample data.
|
2012-11-24 02:51:27 +00:00
|
|
|
return dc_parser_samples_foreach(parser, sample_cb, dc);
|
2011-09-12 18:05:32 +00:00
|
|
|
}
|
|
|
|
|
2012-12-28 22:12:10 +00:00
|
|
|
static int might_be_same_dc(struct divecomputer *a, struct divecomputer *b)
|
|
|
|
{
|
|
|
|
if (!a->model || !b->model)
|
|
|
|
return 1;
|
|
|
|
if (strcasecmp(a->model, b->model))
|
|
|
|
return 0;
|
|
|
|
if (!a->deviceid || !b->deviceid)
|
|
|
|
return 1;
|
|
|
|
return a->deviceid == b->deviceid;
|
|
|
|
}
|
|
|
|
|
2012-12-16 18:40:17 +00:00
|
|
|
static int match_one_dive(struct divecomputer *a, struct dive *dive)
|
2012-11-25 03:06:06 +00:00
|
|
|
{
|
2012-12-16 18:40:17 +00:00
|
|
|
struct divecomputer *b = &dive->dc;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Walk the existing dive computer data,
|
|
|
|
* see if we have a match (or an anti-match:
|
|
|
|
* the same dive computer but a different
|
|
|
|
* dive ID).
|
|
|
|
*/
|
|
|
|
do {
|
|
|
|
int match = match_one_dc(a, b);
|
|
|
|
if (match)
|
|
|
|
return match > 0;
|
|
|
|
b = b->next;
|
|
|
|
} while (b);
|
|
|
|
|
|
|
|
/* Ok, no exact dive computer match. Does the date match? */
|
|
|
|
b = &dive->dc;
|
|
|
|
do {
|
2012-12-28 22:12:10 +00:00
|
|
|
if (a->when == b->when && might_be_same_dc(a, b))
|
2012-12-16 18:40:17 +00:00
|
|
|
return 1;
|
|
|
|
b = b->next;
|
|
|
|
} while (b);
|
|
|
|
|
|
|
|
return 0;
|
2012-11-25 03:06:06 +00:00
|
|
|
}
|
|
|
|
|
2011-09-26 20:04:14 +00:00
|
|
|
/*
|
|
|
|
* Check if this dive already existed before the import
|
|
|
|
*/
|
2012-11-25 03:06:06 +00:00
|
|
|
static int find_dive(struct divecomputer *match)
|
2011-09-26 20:04:14 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
2011-10-05 15:31:31 +00:00
|
|
|
for (i = 0; i < dive_table.preexisting; i++) {
|
2011-09-26 20:04:14 +00:00
|
|
|
struct dive *old = dive_table.dives[i];
|
|
|
|
|
2012-12-16 18:40:17 +00:00
|
|
|
if (match_one_dive(match, old))
|
2012-11-25 03:06:06 +00:00
|
|
|
return 1;
|
2011-09-26 20:04:14 +00:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-05-03 23:04:07 +00:00
|
|
|
static inline int year(int year)
|
|
|
|
{
|
|
|
|
if (year < 70)
|
|
|
|
return year + 2000;
|
|
|
|
if (year < 100)
|
|
|
|
return year + 1900;
|
|
|
|
return year;
|
|
|
|
}
|
|
|
|
|
2012-11-25 19:44:27 +00:00
|
|
|
/*
|
|
|
|
* Like g_strdup_printf(), but without the stupid g_malloc/g_free confusion.
|
|
|
|
* And we limit the string to some arbitrary size.
|
|
|
|
*/
|
|
|
|
static char *str_printf(const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list args;
|
|
|
|
char buf[80];
|
|
|
|
|
|
|
|
va_start(args, fmt);
|
|
|
|
vsnprintf(buf, sizeof(buf)-1, fmt, args);
|
|
|
|
va_end(args);
|
|
|
|
buf[sizeof(buf)-1] = 0;
|
|
|
|
return strdup(buf);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The dive ID for libdivecomputer dives is the first word of the
|
|
|
|
* SHA1 of the fingerprint, if it exists.
|
|
|
|
*
|
|
|
|
* NOTE! This is byte-order dependent, and I don't care.
|
|
|
|
*/
|
|
|
|
static uint32_t calculate_diveid(const unsigned char *fingerprint, unsigned int fsize)
|
|
|
|
{
|
|
|
|
uint32_t csum[5];
|
|
|
|
|
|
|
|
if (!fingerprint || !fsize)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
SHA1(fingerprint, fsize, (unsigned char *)csum);
|
|
|
|
return csum[0];
|
|
|
|
}
|
|
|
|
|
2011-09-12 17:27:35 +00:00
|
|
|
static int dive_cb(const unsigned char *data, unsigned int size,
|
|
|
|
const unsigned char *fingerprint, unsigned int fsize,
|
|
|
|
void *userdata)
|
|
|
|
{
|
|
|
|
int rc;
|
2012-06-22 20:37:39 +00:00
|
|
|
dc_parser_t *parser = NULL;
|
2011-09-12 17:27:35 +00:00
|
|
|
device_data_t *devdata = userdata;
|
|
|
|
dc_datetime_t dt = {0};
|
2011-09-12 20:25:05 +00:00
|
|
|
struct tm tm;
|
|
|
|
struct dive *dive;
|
2011-09-12 17:27:35 +00:00
|
|
|
|
2012-12-05 22:35:49 +00:00
|
|
|
/* reset the deco / ndl data */
|
|
|
|
ndl = stoptime = stopdepth = 0;
|
|
|
|
|
2011-09-12 17:27:35 +00:00
|
|
|
rc = create_parser(devdata, &parser);
|
2012-06-22 20:37:39 +00:00
|
|
|
if (rc != DC_STATUS_SUCCESS) {
|
2012-10-20 21:21:07 +00:00
|
|
|
dev_info(devdata, _("Unable to create parser for %s %s"), devdata->vendor, devdata->product);
|
2011-09-12 17:27:35 +00:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2012-06-22 20:37:39 +00:00
|
|
|
rc = dc_parser_set_data(parser, data, size);
|
|
|
|
if (rc != DC_STATUS_SUCCESS) {
|
2012-10-20 21:21:07 +00:00
|
|
|
dev_info(devdata, _("Error registering the data"));
|
2012-06-22 20:37:39 +00:00
|
|
|
dc_parser_destroy(parser);
|
2011-09-12 17:27:35 +00:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2012-05-03 00:40:39 +00:00
|
|
|
import_dive_number++;
|
2011-09-12 20:25:05 +00:00
|
|
|
dive = alloc_dive();
|
2012-06-22 20:37:39 +00:00
|
|
|
rc = dc_parser_get_datetime(parser, &dt);
|
|
|
|
if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) {
|
2012-10-20 21:21:07 +00:00
|
|
|
dev_info(devdata, _("Error parsing the datetime"));
|
2012-06-22 20:37:39 +00:00
|
|
|
dc_parser_destroy(parser);
|
2011-09-12 17:27:35 +00:00
|
|
|
return rc;
|
|
|
|
}
|
2012-11-25 19:44:27 +00:00
|
|
|
dive->dc.model = str_printf("%s %s", devdata->vendor, devdata->product);
|
|
|
|
dive->dc.deviceid = devdata->deviceid;
|
|
|
|
dive->dc.diveid = calculate_diveid(fingerprint, fsize);
|
2011-09-12 17:27:35 +00:00
|
|
|
|
2011-09-12 20:25:05 +00:00
|
|
|
tm.tm_year = dt.year;
|
|
|
|
tm.tm_mon = dt.month-1;
|
|
|
|
tm.tm_mday = dt.day;
|
|
|
|
tm.tm_hour = dt.hour;
|
|
|
|
tm.tm_min = dt.minute;
|
|
|
|
tm.tm_sec = dt.second;
|
2012-11-25 02:50:21 +00:00
|
|
|
dive->when = dive->dc.when = utc_mktime(&tm);
|
2011-09-12 17:27:35 +00:00
|
|
|
|
2011-09-12 18:05:32 +00:00
|
|
|
// Parse the divetime.
|
2012-10-20 21:21:07 +00:00
|
|
|
dev_info(devdata, _("Dive %d: %s %d %04d"), import_dive_number,
|
2012-05-03 23:04:07 +00:00
|
|
|
monthname(tm.tm_mon), tm.tm_mday, year(tm.tm_year));
|
2011-09-12 18:05:32 +00:00
|
|
|
unsigned int divetime = 0;
|
2012-06-22 20:37:39 +00:00
|
|
|
rc = dc_parser_get_field (parser, DC_FIELD_DIVETIME, 0, &divetime);
|
|
|
|
if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) {
|
2012-10-20 21:21:07 +00:00
|
|
|
dev_info(devdata, _("Error parsing the divetime"));
|
2012-06-22 20:37:39 +00:00
|
|
|
dc_parser_destroy(parser);
|
2011-09-12 18:05:32 +00:00
|
|
|
return rc;
|
|
|
|
}
|
2011-09-12 20:25:05 +00:00
|
|
|
dive->duration.seconds = divetime;
|
2011-09-12 18:05:32 +00:00
|
|
|
|
|
|
|
// Parse the maxdepth.
|
|
|
|
double maxdepth = 0.0;
|
2012-06-22 20:37:39 +00:00
|
|
|
rc = dc_parser_get_field(parser, DC_FIELD_MAXDEPTH, 0, &maxdepth);
|
|
|
|
if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) {
|
2012-10-20 21:21:07 +00:00
|
|
|
dev_info(devdata, _("Error parsing the maxdepth"));
|
2012-06-22 20:37:39 +00:00
|
|
|
dc_parser_destroy(parser);
|
2011-09-12 18:05:32 +00:00
|
|
|
return rc;
|
|
|
|
}
|
2011-09-12 20:25:05 +00:00
|
|
|
dive->maxdepth.mm = maxdepth * 1000 + 0.5;
|
2011-09-12 18:05:32 +00:00
|
|
|
|
|
|
|
// Parse the gas mixes.
|
|
|
|
unsigned int ngases = 0;
|
2012-06-22 20:37:39 +00:00
|
|
|
rc = dc_parser_get_field(parser, DC_FIELD_GASMIX_COUNT, 0, &ngases);
|
|
|
|
if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) {
|
2012-10-20 21:21:07 +00:00
|
|
|
dev_info(devdata, _("Error parsing the gas mix count"));
|
2012-06-22 20:37:39 +00:00
|
|
|
dc_parser_destroy(parser);
|
2011-09-12 18:05:32 +00:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2012-11-25 19:44:05 +00:00
|
|
|
#ifdef DC_FIELD_SALINITY
|
2012-11-10 18:18:10 +00:00
|
|
|
// Check if the libdivecomputer version already supports salinity
|
|
|
|
double salinity = 1.03;
|
|
|
|
rc = dc_parser_get_field(parser, DC_FIELD_SALINITY, 0, &salinity);
|
|
|
|
if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) {
|
|
|
|
dev_info(devdata, _("Error obtaining water salinity"));
|
|
|
|
dc_parser_destroy(parser);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
dive->salinity = salinity * 10000.0 + 0.5;
|
2012-11-25 19:44:05 +00:00
|
|
|
#endif
|
2012-11-10 18:18:10 +00:00
|
|
|
|
2012-12-28 16:53:16 +00:00
|
|
|
rc = parse_gasmixes(devdata, dive, parser, ngases, data);
|
2012-06-22 20:37:39 +00:00
|
|
|
if (rc != DC_STATUS_SUCCESS) {
|
2012-10-20 21:21:07 +00:00
|
|
|
dev_info(devdata, _("Error parsing the gas mix"));
|
2012-06-22 20:37:39 +00:00
|
|
|
dc_parser_destroy(parser);
|
2011-09-12 18:05:32 +00:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Initialize the sample data.
|
2012-11-24 02:51:27 +00:00
|
|
|
rc = parse_samples(devdata, &dive->dc, parser);
|
2012-06-22 20:37:39 +00:00
|
|
|
if (rc != DC_STATUS_SUCCESS) {
|
2012-10-20 21:21:07 +00:00
|
|
|
dev_info(devdata, _("Error parsing the samples"));
|
2012-06-22 20:37:39 +00:00
|
|
|
dc_parser_destroy(parser);
|
2011-09-12 18:05:32 +00:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2012-06-22 20:37:39 +00:00
|
|
|
dc_parser_destroy(parser);
|
2011-09-26 20:04:14 +00:00
|
|
|
|
|
|
|
/* If we already saw this dive, abort. */
|
2012-11-25 03:06:06 +00:00
|
|
|
if (!devdata->force_download && find_dive(&dive->dc))
|
2011-09-26 20:04:14 +00:00
|
|
|
return 0;
|
|
|
|
|
Add special download modes to force updates from the divecomputer
This will hopefully not be something we need often, but if we improve
support for a divecomputer (either in libdivecomputer or in our native
Uemis code or even in the way we handle (and potentially discard) events),
then it is extremely useful to be able to say "re-download things
from the divecomputer and for things that were not edited in Subsurface,
don't try to merge the data (which gives BAD results if for example you
fixed a bug in the depth calculation in libdivecomputer) but instead
simply take the samples, the events and some of the other unedited data
straight from the download".
This commit implements just that - a "force download" checkbox in the
download dialog that makes us reimport all dives from the dive computer,
even the ones we already have, and an "always prefer downloaded dive"
checkbox that then tells Subsurface not to merge but simply to take the
data from the downloaded dive - without overwriting the things we have
already edited in Subsurface (like location, buddy, equipment, etc).
This, as a precaution, refuses to merge dives that don't have identical
start times. So if you have edited the date / time of a dive or if you
have previously merged your dive with a different dive computer (and
therefore modified samples and events) you are out of luck.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-11 13:29:26 +00:00
|
|
|
dive->downloaded = TRUE;
|
2011-09-26 20:04:14 +00:00
|
|
|
record_dive(dive);
|
2012-11-17 20:52:33 +00:00
|
|
|
mark_divelist_changed(TRUE);
|
2011-09-12 18:05:32 +00:00
|
|
|
return 1;
|
2011-09-12 17:27:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-06-22 20:37:39 +00:00
|
|
|
static dc_status_t import_device_data(dc_device_t *device, device_data_t *devicedata)
|
2011-09-12 17:27:35 +00:00
|
|
|
{
|
2012-06-22 20:37:39 +00:00
|
|
|
return dc_device_foreach(device, dive_cb, devicedata);
|
2011-09-12 17:27:35 +00:00
|
|
|
}
|
|
|
|
|
2012-11-25 19:44:27 +00:00
|
|
|
/*
|
|
|
|
* The device ID for libdivecomputer devices is the first 32-bit word
|
|
|
|
* of the SHA1 hash of the model/firmware/serial numbers.
|
|
|
|
*
|
|
|
|
* NOTE! This is byte-order-dependent. And I can't find it in myself to
|
|
|
|
* care.
|
|
|
|
*/
|
|
|
|
static uint32_t calculate_sha1(unsigned int model, unsigned int firmware, unsigned int serial)
|
|
|
|
{
|
|
|
|
SHA_CTX ctx;
|
|
|
|
uint32_t csum[5];
|
|
|
|
|
|
|
|
SHA1_Init(&ctx);
|
|
|
|
SHA1_Update(&ctx, &model, sizeof(model));
|
|
|
|
SHA1_Update(&ctx, &firmware, sizeof(firmware));
|
|
|
|
SHA1_Update(&ctx, &serial, sizeof(serial));
|
|
|
|
SHA1_Final((unsigned char *)csum, &ctx);
|
|
|
|
return csum[0];
|
|
|
|
}
|
2012-05-03 00:40:39 +00:00
|
|
|
|
2012-06-22 20:37:39 +00:00
|
|
|
static void event_cb(dc_device_t *device, dc_event_type_t event, const void *data, void *userdata)
|
2011-09-12 16:50:40 +00:00
|
|
|
{
|
2012-06-22 20:37:39 +00:00
|
|
|
const dc_event_progress_t *progress = data;
|
|
|
|
const dc_event_devinfo_t *devinfo = data;
|
|
|
|
const dc_event_clock_t *clock = data;
|
2011-10-06 19:08:48 +00:00
|
|
|
device_data_t *devdata = userdata;
|
2011-09-12 17:37:54 +00:00
|
|
|
|
|
|
|
switch (event) {
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_EVENT_WAITING:
|
2012-10-20 21:21:07 +00:00
|
|
|
dev_info(devdata, _("Event: waiting for user action"));
|
2011-09-12 17:37:54 +00:00
|
|
|
break;
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_EVENT_PROGRESS:
|
2012-09-20 19:56:42 +00:00
|
|
|
if (!progress->maximum)
|
|
|
|
break;
|
|
|
|
progress_bar_fraction = (double) progress->current / (double) progress->maximum;
|
2011-09-12 17:37:54 +00:00
|
|
|
break;
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_EVENT_DEVINFO:
|
2012-10-20 21:21:07 +00:00
|
|
|
dev_info(devdata, _("model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"),
|
2011-09-12 17:37:54 +00:00
|
|
|
devinfo->model, devinfo->model,
|
|
|
|
devinfo->firmware, devinfo->firmware,
|
|
|
|
devinfo->serial, devinfo->serial);
|
2012-11-25 19:44:27 +00:00
|
|
|
devdata->deviceid = calculate_sha1(devinfo->model, devinfo->firmware, devinfo->serial);
|
2011-09-12 17:37:54 +00:00
|
|
|
break;
|
2012-06-22 20:37:39 +00:00
|
|
|
case DC_EVENT_CLOCK:
|
2012-10-20 21:21:07 +00:00
|
|
|
dev_info(devdata, _("Event: systime=%"PRId64", devtime=%u\n"),
|
2011-11-27 17:10:37 +00:00
|
|
|
(uint64_t)clock->systime, clock->devtime);
|
2011-09-12 17:37:54 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2011-09-12 16:50:40 +00:00
|
|
|
}
|
|
|
|
|
2011-09-16 05:58:02 +00:00
|
|
|
static int import_thread_done = 0, import_thread_cancelled;
|
|
|
|
|
2011-09-12 16:50:40 +00:00
|
|
|
static int
|
2011-09-12 18:41:26 +00:00
|
|
|
cancel_cb(void *userdata)
|
2011-09-12 16:50:40 +00:00
|
|
|
{
|
2011-09-16 05:58:02 +00:00
|
|
|
return import_thread_cancelled;
|
2011-09-12 16:50:40 +00:00
|
|
|
}
|
|
|
|
|
2012-08-27 22:06:58 +00:00
|
|
|
static const char *do_device_import(device_data_t *data)
|
2011-09-12 16:19:21 +00:00
|
|
|
{
|
2012-06-22 20:37:39 +00:00
|
|
|
dc_status_t rc;
|
2012-08-27 22:06:58 +00:00
|
|
|
dc_device_t *device = data->device;
|
2011-09-12 16:50:40 +00:00
|
|
|
|
|
|
|
// Register the event handler.
|
2012-06-22 20:37:39 +00:00
|
|
|
int events = DC_EVENT_WAITING | DC_EVENT_PROGRESS | DC_EVENT_DEVINFO | DC_EVENT_CLOCK;
|
|
|
|
rc = dc_device_set_events(device, events, event_cb, data);
|
2012-08-27 22:06:58 +00:00
|
|
|
if (rc != DC_STATUS_SUCCESS)
|
2012-10-20 21:21:07 +00:00
|
|
|
return _("Error registering the event handler.");
|
2011-09-12 16:50:40 +00:00
|
|
|
|
|
|
|
// Register the cancellation handler.
|
2012-06-22 20:37:39 +00:00
|
|
|
rc = dc_device_set_cancel(device, cancel_cb, data);
|
2012-08-27 22:06:58 +00:00
|
|
|
if (rc != DC_STATUS_SUCCESS)
|
2012-10-20 21:21:07 +00:00
|
|
|
return _("Error registering the cancellation handler.");
|
2011-09-12 16:50:40 +00:00
|
|
|
|
2011-09-12 18:41:26 +00:00
|
|
|
rc = import_device_data(device, data);
|
2012-08-27 22:06:58 +00:00
|
|
|
if (rc != DC_STATUS_SUCCESS)
|
2012-10-20 21:21:07 +00:00
|
|
|
return _("Dive data import error");
|
2011-09-12 17:27:35 +00:00
|
|
|
|
2012-08-27 22:06:58 +00:00
|
|
|
/* All good */
|
2011-09-16 05:58:02 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2012-08-27 22:06:58 +00:00
|
|
|
static const char *do_libdivecomputer_import(device_data_t *data)
|
|
|
|
{
|
|
|
|
dc_status_t rc;
|
|
|
|
const char *err;
|
|
|
|
|
|
|
|
import_dive_number = 0;
|
|
|
|
data->device = NULL;
|
|
|
|
data->context = NULL;
|
|
|
|
|
|
|
|
rc = dc_context_new(&data->context);
|
|
|
|
if (rc != DC_STATUS_SUCCESS)
|
2012-10-20 21:21:07 +00:00
|
|
|
return _("Unable to create libdivecomputer context");
|
2012-08-27 22:06:58 +00:00
|
|
|
|
2012-10-20 21:21:07 +00:00
|
|
|
err = _("Unable to open %s %s (%s)");
|
2012-08-27 22:06:58 +00:00
|
|
|
rc = dc_device_open(&data->device, data->context, data->descriptor, data->devname);
|
|
|
|
if (rc == DC_STATUS_SUCCESS) {
|
|
|
|
err = do_device_import(data);
|
|
|
|
dc_device_close(data->device);
|
|
|
|
}
|
|
|
|
dc_context_free(data->context);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2011-09-16 05:58:02 +00:00
|
|
|
static void *pthread_wrapper(void *_data)
|
|
|
|
{
|
|
|
|
device_data_t *data = _data;
|
|
|
|
const char *err_string = do_libdivecomputer_import(data);
|
|
|
|
import_thread_done = 1;
|
|
|
|
return (void *)err_string;
|
|
|
|
}
|
|
|
|
|
2012-11-19 22:11:08 +00:00
|
|
|
/* this simply ends the dialog without a response and asks not to be fired again
|
|
|
|
* as we set this function up in every loop while uemis_download is waiting for
|
|
|
|
* the download to finish */
|
|
|
|
static gboolean timeout_func(gpointer _data)
|
|
|
|
{
|
|
|
|
GtkDialog *dialog = _data;
|
|
|
|
if (!import_thread_cancelled)
|
|
|
|
gtk_dialog_response(dialog, GTK_RESPONSE_NONE);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2012-05-02 19:49:03 +00:00
|
|
|
GError *do_import(device_data_t *data)
|
2011-09-16 05:58:02 +00:00
|
|
|
{
|
|
|
|
pthread_t pthread;
|
|
|
|
void *retval;
|
2012-11-19 22:11:08 +00:00
|
|
|
GtkDialog *dialog = data->dialog;
|
2011-09-16 05:58:02 +00:00
|
|
|
|
2011-09-20 19:40:34 +00:00
|
|
|
/* I'm sure there is some better interface for waiting on a thread in a UI main loop */
|
2011-09-16 05:58:02 +00:00
|
|
|
import_thread_done = 0;
|
2012-09-20 19:56:42 +00:00
|
|
|
progress_bar_text = "";
|
|
|
|
progress_bar_fraction = 0.0;
|
2011-09-16 05:58:02 +00:00
|
|
|
pthread_create(&pthread, NULL, pthread_wrapper, data);
|
2012-11-19 22:11:08 +00:00
|
|
|
/* loop here until the import is done or was cancelled by the user;
|
|
|
|
* in order to get control back from gtk we register a timeout function
|
|
|
|
* that ends the dialog with no response every 100ms; we then update the
|
|
|
|
* progressbar and setup the timeout again - unless of course the user
|
|
|
|
* pressed cancel, in which case we just wait for the download thread
|
|
|
|
* to react to that and exit */
|
2011-09-16 05:58:02 +00:00
|
|
|
while (!import_thread_done) {
|
2012-11-19 22:11:08 +00:00
|
|
|
if (!import_thread_cancelled) {
|
|
|
|
int result;
|
|
|
|
g_timeout_add(100, timeout_func, dialog);
|
|
|
|
update_progressbar(&data->progress, progress_bar_fraction);
|
|
|
|
update_progressbar_text(&data->progress, progress_bar_text);
|
|
|
|
result = gtk_dialog_run(dialog);
|
|
|
|
switch (result) {
|
|
|
|
case GTK_RESPONSE_CANCEL:
|
|
|
|
import_thread_cancelled = TRUE;
|
|
|
|
progress_bar_text = "Cancelled...";
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* nothing */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
update_progressbar(&data->progress, progress_bar_fraction);
|
|
|
|
update_progressbar_text(&data->progress, progress_bar_text);
|
|
|
|
usleep(100000);
|
|
|
|
}
|
2011-09-16 05:58:02 +00:00
|
|
|
}
|
|
|
|
if (pthread_join(pthread, &retval) < 0)
|
2012-10-20 21:21:07 +00:00
|
|
|
retval = _("Odd pthread error return");
|
2011-09-16 05:58:02 +00:00
|
|
|
if (retval)
|
2012-06-22 20:37:39 +00:00
|
|
|
return error(retval, data->vendor, data->product, data->devname);
|
2012-05-02 19:49:03 +00:00
|
|
|
return NULL;
|
2011-09-12 16:19:21 +00:00
|
|
|
}
|