*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(".cylinderendpressure", pressure, &dive->end_pressure))
+ if (MATCH(".cylinderstartpressure", pressure, &dive->cylinder[0].start))
+ return;
+ 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;
memset(&tm, 0, sizeof(tm));
}
-static char *generate_name(struct dive *dive)
-{
- int len;
- struct tm *tm;
- char buffer[256], *p;
-
- tm = gmtime(&dive->when);
-
- len = snprintf(buffer, sizeof(buffer),
- "%04d-%02d-%02d "
- "%02d:%02d:%02d "
- "(%d ft, %d min)",
- tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
- tm->tm_hour, tm->tm_min, tm->tm_sec,
- to_feet(dive->maxdepth), dive->duration.seconds / 60);
- p = malloc(len+1);
- if (!p)
- exit(1);
- memcpy(p, buffer, len+1);
- return p;
-}
-
static void sanitize_gasmix(gasmix_t *mix)
{
unsigned int o2, he;
memset(mix, 0, sizeof(*mix));
}
+/*
+ * See if the size/workingpressure looks like some standard cylinder
+ * size, eg "AL80".
+ */
+static void match_standard_cylinder(cylinder_type_t *type)
+{
+ int psi, cuft, len;
+ const char *fmt;
+ char buffer[20], *p;
+
+ /* Do we already have a cylinder description? */
+ if (type->description)
+ return;
+
+ cuft = type->size.mliter / 1000;
+ psi = type->workingpressure.mbar / 68.95;
+
+ switch (psi) {
+ case 2300 ... 2500: /* 2400 psi: LP tank */
+ fmt = "LP%d";
+ break;
+ case 2600 ... 2700: /* 2640 psi: LP+10% */
+ fmt = "LP%d+";
+ break;
+ case 2900 ... 3100: /* 3000 psi: ALx tank */
+ fmt = "AL%d";
+ break;
+ case 3400 ... 3500: /* 3442 psi: HP tank */
+ fmt = "HP%d";
+ break;
+ case 3700 ... 3850: /* HP+10% */
+ fmt = "HP%d+";
+ break;
+ default:
+ return;
+ }
+ len = snprintf(buffer, sizeof(buffer), fmt, cuft);
+ p = malloc(len+1);
+ if (!p)
+ return;
+ memcpy(p, buffer, len+1);
+ type->description = p;
+}
+
+
/*
* There are two ways to give cylinder size information:
* - total amount of gas in cuft (depends on working pressure and physical size)
*/
static void sanitize_cylinder_type(cylinder_type_t *type)
{
+ double volume_of_air, atm, volume;
+
/* If we have no working pressure, it had *better* be just a physical size! */
if (!type->workingpressure.mbar)
return;
- /*
- * 35l tanks? Do they exist?
- * Assume this is a "size in cuft" thing.
- */
- if (type->size.mliter > 35000) {
- double volume_of_air = type->size.mliter * 28.317; /* cu ft to milliliter */
- double atm = type->workingpressure.mbar / 1013.25; /* working pressure in atm */
- double volume = volume_of_air / atm; /* milliliters at 1 atm: "true size" */
- type->size.mliter = volume;
- }
+ /* No size either? Nothing to go on */
+ if (!type->size.mliter)
+ return;
+
+ /* Ok, we have both size and pressure: try to match a description */
+ match_standard_cylinder(type);
+
+ /* .. and let's assume that the 'size' was cu ft of air */
+ volume_of_air = type->size.mliter * 28.317; /* milli-cu ft to milliliter */
+ atm = type->workingpressure.mbar / 1013.25; /* working pressure in atm */
+ volume = volume_of_air / atm; /* milliliters at 1 atm: "true size" */
+ type->size.mliter = volume + 0.5;
}
static void sanitize_cylinder_info(struct dive *dive)
{
if (!dive)
return;
- if (!dive->name)
- dive->name = generate_name(dive);
sanitize_cylinder_info(dive);
record_dive(dive);
dive = NULL;
projects / ext / subsurface.git / blobdiff