#include <gtk/gtk.h>
#include "dive.h"
+#include "divelist.h"
#include "display.h"
/* libdivecomputer */
#include <atomics.h>
#include <utils.h>
+/* handling uemis Zurich SDA files */
+#include "uemis.h"
+
+/*
+ * I'd love to do a while-loop here for pending events, but
+ * that seems to screw up with the dive computer reading timing.
+ *
+ * I may need to spawn a new thread to do the computer
+ * reading stuff..
+ */
+static int run_gtk_mainloop(void)
+{
+ return gtk_main_iteration_do(0);
+}
+
static void error(const char *fmt, ...)
{
va_list args;
typedef struct device_data_t {
device_type_t type;
- const char *name;
+ const char *name, *devname;
+ GtkWidget *progressbar;
device_devinfo_t devinfo;
device_clock_t clock;
} device_data_t;
}
}
-static int parse_gasmixes(parser_t *parser, int ngases)
+static int parse_gasmixes(struct dive *dive, parser_t *parser, int ngases)
{
int i;
for (i = 0; i < ngases; i++) {
int rc;
gasmix_t gasmix = {0};
+ int o2, he;
rc = parser_get_field(parser, FIELD_TYPE_GASMIX, i, &gasmix);
if (rc != PARSER_STATUS_SUCCESS && rc != PARSER_STATUS_UNSUPPORTED)
return rc;
- printf("<gasmix>\n"
- " <he>%.1f</he>\n"
- " <o2>%.1f</o2>\n"
- " <n2>%.1f</n2>\n"
- "</gasmix>\n",
- gasmix.helium * 100.0,
- gasmix.oxygen * 100.0,
- gasmix.nitrogen * 100.0);
+ if (i >= MAX_CYLINDERS)
+ continue;
+
+ o2 = gasmix.oxygen * 1000 + 0.5;
+ he = gasmix.helium * 1000 + 0.5;
+
+ /* Ignore bogus data - libdivecomputer does some crazy stuff */
+ if (o2 < 210 || o2 >= 1000)
+ 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;
}
return PARSER_STATUS_SUCCESS;
}
void
-sample_cb (parser_sample_type_t type, parser_sample_value_t value, void *userdata)
+sample_cb(parser_sample_type_t type, parser_sample_value_t value, void *userdata)
{
int i;
static const char *events[] = {
"safety stop (voluntary)", "safety stop (mandatory)", "deepstop",
"ceiling (safety stop)", "unknown", "divetime", "maxdepth",
"OLF", "PO2", "airtime", "rgbm", "heading", "tissue level warning"};
+ struct dive **divep = userdata;
+ struct dive *dive = *divep;
+ struct sample *sample;
+
+ /*
+ * We fill in the "previous" sample - except for SAMPLE_TYPE_TIME,
+ * which creates a new one.
+ */
+ sample = dive->samples ? dive->sample+dive->samples-1 : NULL;
switch (type) {
case SAMPLE_TYPE_TIME:
- printf("<sample>\n");
- printf(" <time>%02u:%02u</time>\n", value.time / 60, value.time % 60);
+ sample = prepare_sample(divep);
+ sample->time.seconds = value.time;
+ finish_sample(*divep, sample);
break;
case SAMPLE_TYPE_DEPTH:
- printf(" <depth>%.2f</depth>\n", value.depth);
+ sample->depth.mm = value.depth * 1000 + 0.5;
break;
case SAMPLE_TYPE_PRESSURE:
- printf(" <pressure tank=\"%u\">%.2f</pressure>\n", value.pressure.tank, value.pressure.value);
+ sample->cylinderindex = value.pressure.tank;
+ sample->cylinderpressure.mbar = value.pressure.value * 1000 + 0.5;
break;
case SAMPLE_TYPE_TEMPERATURE:
- printf(" <temperature>%.2f</temperature>\n", value.temperature);
+ sample->temperature.mkelvin = (value.temperature + 273.15) * 1000 + 0.5;
break;
case SAMPLE_TYPE_EVENT:
printf(" <event type=\"%u\" time=\"%u\" flags=\"%u\" value=\"%u\">%s</event>\n",
}
-static int parse_samples(parser_t *parser)
+static int parse_samples(struct dive **divep, parser_t *parser)
{
// Parse the sample data.
printf("Parsing the sample data.\n");
- return parser_samples_foreach(parser, sample_cb, NULL);
+ return parser_samples_foreach(parser, sample_cb, divep);
}
static int dive_cb(const unsigned char *data, unsigned int size,
parser_t *parser = NULL;
device_data_t *devdata = userdata;
dc_datetime_t dt = {0};
+ struct tm tm;
+ struct dive *dive;
+
+ /* Christ, this is hacky */
+ run_gtk_mainloop();
rc = create_parser(devdata, &parser);
if (rc != PARSER_STATUS_SUCCESS) {
return rc;
}
+ dive = alloc_dive();
rc = parser_get_datetime(parser, &dt);
if (rc != PARSER_STATUS_SUCCESS && rc != PARSER_STATUS_UNSUPPORTED) {
error("Error parsing the datetime.");
return rc;
}
- printf("<datetime>%04i-%02i-%02i %02i:%02i:%02i</datetime>\n",
- dt.year, dt.month, dt.day,
- dt.hour, dt.minute, dt.second);
+ 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;
+ dive->when = utc_mktime(&tm);
// Parse the divetime.
printf("Parsing the divetime.\n");
parser_destroy(parser);
return rc;
}
-
- printf("<divetime>%02u:%02u</divetime>\n",
- divetime / 60, divetime % 60);
+ dive->duration.seconds = divetime;
// Parse the maxdepth.
printf("Parsing the maxdepth.\n");
parser_destroy(parser);
return rc;
}
-
- printf("<maxdepth>%.2f</maxdepth>\n", maxdepth);
+ dive->maxdepth.mm = maxdepth * 1000 + 0.5;
// Parse the gas mixes.
printf("Parsing the gas mixes.\n");
return rc;
}
- rc = parse_gasmixes(parser, ngases);
+ rc = parse_gasmixes(dive, parser, ngases);
if (rc != PARSER_STATUS_SUCCESS) {
error("Error parsing the gas mix.");
parser_destroy(parser);
}
// Initialize the sample data.
- rc = parse_samples(parser);
+ rc = parse_samples(&dive, parser);
if (rc != PARSER_STATUS_SUCCESS) {
error("Error parsing the samples.");
parser_destroy(parser);
return rc;
}
+ record_dive(dive);
parser_destroy(parser);
return 1;
}
static void
-event_cb (device_t *device, device_event_t event, const void *data, void *userdata)
+event_cb(device_t *device, device_event_t event, const void *data, void *userdata)
{
const device_progress_t *progress = (device_progress_t *) data;
const device_devinfo_t *devinfo = (device_devinfo_t *) data;
const device_clock_t *clock = (device_clock_t *) data;
device_data_t *devdata = (device_data_t *) userdata;
+ /* Christ, this is hacky */
+ run_gtk_mainloop();
+
switch (event) {
case DEVICE_EVENT_WAITING:
printf("Event: waiting for user action\n");
break;
case DEVICE_EVENT_PROGRESS:
- printf("Event: progress %3.2f%% (%u/%u)\n",
- 100.0 * (double) progress->current / (double) progress->maximum,
- progress->current, progress->maximum);
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(devdata->progressbar),
+ (double) progress->current / (double) progress->maximum);
break;
case DEVICE_EVENT_DEVINFO:
devdata->devinfo = *devinfo;
}
static int
-cancel_cb (void *userdata)
+cancel_cb(void *userdata)
{
- return 0;
+ return run_gtk_mainloop();
}
-static void do_import(const char *computer, device_type_t type)
+static void do_import(device_data_t *data)
{
- /* FIXME! Needs user input! */
- const char *devname = "/dev/ttyUSB0";
device_t *device = NULL;
device_status_t rc;
- device_data_t devicedata = {
- .type = type,
- .name = computer,
- };
- rc = device_open(devname, type, &device);
+ if (data->type == DEVICE_TYPE_UEMIS) {
+ return uemis_import();
+ }
+
+ rc = device_open(data->devname, data->type, &device);
if (rc != DEVICE_STATUS_SUCCESS) {
- error("Unable to open %s (%s)", computer, devname);
+ error("Unable to open %s (%s)", data->name, data->devname);
return;
}
// Register the event handler.
int events = DEVICE_EVENT_WAITING | DEVICE_EVENT_PROGRESS | DEVICE_EVENT_DEVINFO | DEVICE_EVENT_CLOCK;
- rc = device_set_events(device, events, event_cb, &devicedata);
+ rc = device_set_events(device, events, event_cb, data);
if (rc != DEVICE_STATUS_SUCCESS) {
error("Error registering the event handler.");
device_close(device);
}
// Register the cancellation handler.
- rc = device_set_cancel(device, cancel_cb, &devicedata);
+ rc = device_set_cancel(device, cancel_cb, data);
if (rc != DEVICE_STATUS_SUCCESS) {
error("Error registering the cancellation handler.");
device_close(device);
return;
}
- rc = import_device_data(device, &devicedata);
+ rc = import_device_data(device, data);
if (rc != DEVICE_STATUS_SUCCESS) {
error("Dive data import error");
device_close(device);
{ "Cressi Edy", DEVICE_TYPE_CRESSI_EDY },
{ "Zeagle N2iTiON 3", DEVICE_TYPE_ZEAGLE_N2ITION3 },
{ "Atomics Cobalt", DEVICE_TYPE_ATOMICS_COBALT },
+ { "Uemis Zurich SDA", DEVICE_TYPE_UEMIS },
{ NULL }
};
GtkCellRenderer *renderer;
hbox = gtk_hbox_new(FALSE, 6);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, FALSE, 3);
model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
fill_computer_list(model);
void import_dialog(GtkWidget *w, gpointer data)
{
int result;
- GtkWidget *dialog;
+ GtkWidget *dialog, *hbox;
GtkComboBox *computer;
+ device_data_t devicedata = {
+ .devname = "/dev/ttyUSB0",
+ };
dialog = gtk_dialog_new_with_buttons("Import from dive computer",
GTK_WINDOW(main_window),
computer = dive_computer_selector(dialog);
+ hbox = gtk_hbox_new(FALSE, 6);
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, TRUE, 3);
+ devicedata.progressbar = gtk_progress_bar_new();
+ gtk_container_add(GTK_CONTAINER(hbox), devicedata.progressbar);
+
gtk_widget_show_all(dialog);
result = gtk_dialog_run(GTK_DIALOG(dialog));
switch (result) {
0, &comp,
1, &type,
-1);
- do_import(comp, type);
+ devicedata.type = type;
+ devicedata.name = comp;
+ do_import(&devicedata);
break;
default:
break;
}
gtk_widget_destroy(dialog);
-}
+ report_dives();
+ dive_list_update_dives(dive_list);
+}
projects / ext / subsurface.git / blobdiff