static struct dive *dive;
static struct sample *sample;
static struct tm tm;
-static int suunto, uemis;
static int event_index, cylinder_index;
+static enum import_source {
+ UNKNOWN,
+ LIBDIVECOMPUTER,
+ SUUNTO,
+ UEMIS,
+} import_source;
+
static time_t utc_mktime(struct tm *tm)
{
static const int mdays[] = {
if (MATCH(".sample.time", sampletime, &sample->time))
return;
- if (uemis) {
+ switch (import_source) {
+ case UEMIS:
if (uemis_fill_sample(sample, name, len, buf))
return;
+ break;
+
+ default:
+ break;
}
nonmatch("sample", name, buf);
*when += tz * 3600;
}
+/* 0 - air ; 1 - nitrox1 ; 2 - nitrox2 ; 3 = nitrox3 */
+static int uemis_gas_template;
+
+/*
+ * Christ. Uemis tank data is a total mess.
+ *
+ * We're passed a "virtual cylinder" (0 - 6) for the different
+ * Uemis tank cases ("air", "nitrox_1", "nitrox_2.{bottom,deco}"
+ * and "nitrox_3.{bottom,deco,travel}". We need to turn that
+ * into the actual cylinder data depending on the gas template,
+ * and ignore the ones that are irrelevant for that template.
+ *
+ * So for "template 2" (nitrox_2), we ignore virtual tanks 0-1
+ * (which are "air" and "nitrox_1" respectively), and tanks 4-6
+ * (which are the three "nitrox_3" tanks), and we turn virtual
+ * tanks 2/3 into actual tanks 0/1.
+ *
+ * Confused yet?
+ */
+static int uemis_cylinder_index(void *_cylinder)
+{
+ cylinder_t *cylinder = _cylinder;
+ unsigned int index = cylinder - dive->cylinder;
+
+ if (index > 6) {
+ fprintf(stderr, "Uemis cylinder pointer calculations broken\n");
+ return -1;
+ }
+ switch(uemis_gas_template) {
+ case 1: /* Dive uses tank 1 */
+ index -= 1;
+ /* Fallthrough */
+ case 0: /* Dive uses tank 0 */
+ if (index)
+ index = -1;
+ break;
+ case 2: /* Dive uses tanks 2-3 */
+ index -= 2;
+ if (index > 1)
+ index = -1;
+ break;
+ case 3: /* Dive uses tanks 4-6 */
+ index -= 4;
+ if (index > 2)
+ index = -1;
+ break;
+ }
+ return index;
+}
+
+static void uemis_cylindersize(char *buffer, void *_cylinder)
+{
+ int index = uemis_cylinder_index(_cylinder);
+ if (index >= 0)
+ cylindersize(buffer, &dive->cylinder[index].type.size);
+}
+
+static void uemis_percent(char *buffer, void *_cylinder)
+{
+ int index = uemis_cylinder_index(_cylinder);
+ if (index >= 0)
+ percent(buffer, &dive->cylinder[index].gasmix.o2);
+}
+
static int uemis_dive_match(struct dive *dive, const char *name, int len, char *buf)
{
return MATCH(".units.length", uemis_length_unit, &units) ||
MATCH(".date_time", uemis_date_time, &dive->when) ||
MATCH(".time_zone", uemis_time_zone, &dive->when) ||
MATCH(".ambient.temperature", decicelsius, &dive->airtemp) ||
+ MATCH(".gas.template", get_index, &uemis_gas_template) ||
+ MATCH(".air.bottom_tank.size", uemis_cylindersize, dive->cylinder + 0) ||
+ MATCH(".air.bottom_tank.oxygen", uemis_percent, dive->cylinder + 0) ||
+ MATCH(".nitrox_1.bottom_tank.size", uemis_cylindersize, dive->cylinder + 1) ||
+ MATCH(".nitrox_1.bottom_tank.oxygen", uemis_percent, dive->cylinder + 1) ||
+ MATCH(".nitrox_2.bottom_tank.size", uemis_cylindersize, dive->cylinder + 2) ||
+ MATCH(".nitrox_2.bottom_tank.oxygen", uemis_percent, dive->cylinder + 2) ||
+ MATCH(".nitrox_2.deco_tank.size", uemis_cylindersize, dive->cylinder + 3) ||
+ MATCH(".nitrox_2.deco_tank.oxygen", uemis_percent, dive->cylinder + 3) ||
+ MATCH(".nitrox_3.bottom_tank.size", uemis_cylindersize, dive->cylinder + 4) ||
+ MATCH(".nitrox_3.bottom_tank.oxygen", uemis_percent, dive->cylinder + 4) ||
+ MATCH(".nitrox_3.deco_tank.size", uemis_cylindersize, dive->cylinder + 5) ||
+ MATCH(".nitrox_3.deco_tank.oxygen", uemis_percent, dive->cylinder + 5) ||
+ MATCH(".nitrox_3.travel_tank.size", uemis_cylindersize, dive->cylinder + 6) ||
+ MATCH(".nitrox_3.travel_tank.oxygen", uemis_percent, dive->cylinder + 6) ||
0;
}
return;
if (MATCH(".meandepth", depth, &dive->meandepth))
return;
+ if (MATCH(".depth.max", depth, &dive->maxdepth))
+ return;
+ if (MATCH(".depth.mean", depth, &dive->meandepth))
+ return;
if (MATCH(".duration", duration, &dive->duration))
return;
if (MATCH(".divetime", duration, &dive->duration))
return;
if (MATCH(".watertemp", temperature, &dive->watertemp))
return;
- if (MATCH(".cylinderstartpressure", pressure, &dive->beginning_pressure))
+ if (MATCH(".temperature.air", temperature, &dive->airtemp))
+ return;
+ if (MATCH(".temperature.water", temperature, &dive->watertemp))
+ return;
+ if (MATCH(".cylinderstartpressure", pressure, &dive->cylinder[0].start))
return;
- if (MATCH(".cylinderendpressure", pressure, &dive->end_pressure))
+ if (MATCH(".cylinderendpressure", pressure, &dive->cylinder[0].end))
return;
if (MATCH(".location", utf8_string, &dive->location))
return;
return;
if (MATCH(".cylinder.workpressure", pressure, &dive->cylinder[cylinder_index].type.workingpressure))
return;
+ if (MATCH(".cylinder.description", utf8_string, &dive->cylinder[cylinder_index].type.description))
+ return;
+ if (MATCH(".cylinder.start", pressure, &dive->cylinder[cylinder_index].start))
+ return;
+ if (MATCH(".cylinder.end", pressure, &dive->cylinder[cylinder_index].end))
+ return;
if (MATCH(".o2", gasmix, &dive->cylinder[cylinder_index].gasmix.o2))
return;
if (MATCH(".he", gasmix, &dive->cylinder[cylinder_index].gasmix.he))
return;
- /* Suunto XML files are some crazy sh*t. */
- if (suunto && suunto_dive_match(dive, name, len, buf))
- return;
+ switch (import_source) {
+ case SUUNTO:
+ if (suunto_dive_match(dive, name, len, buf))
+ return;
+ break;
- if (uemis && uemis_dive_match(dive, name, len, buf))
- return;
+ case UEMIS:
+ if (uemis_dive_match(dive, name, len, buf))
+ return;
+ break;
+ default:
+ break;
+ }
nonmatch("dive", name, buf);
}
static void suunto_start(void)
{
- suunto++;
+ import_source = SUUNTO;
units = SI_units;
}
static void suunto_end(void)
{
- suunto--;
}
static void uemis_start(void)
{
- uemis++;
+ import_source = UEMIS;
units = SI_units;
}
* dive for that format.
*/
units = SI_units;
- suunto = 0;
- uemis = 0;
+ import_source = UNKNOWN;
}
void parse_xml_file(const char *filename)
projects / ext / subsurface.git / blobdiff