return;
if (MATCH(".flags", get_index, &event.flags))
return;
+ if (MATCH(".value", get_index, &event.value))
+ return;
nonmatch("event", name, buf);
}
return;
cuft = type->size.mliter / 28317.0;
- cuft *= type->workingpressure.mbar / 1013.25;
+ cuft *= to_ATM(type->workingpressure);
psi = type->workingpressure.mbar / 68.95;
switch (psi) {
if (input_units.volume == CUFT || import_source == SUUNTO) {
volume_of_air = type->size.mliter * 28.317; /* milli-cu ft to milliliter */
- atm = type->workingpressure.mbar / 1013.25; /* working pressure in atm */
+ atm = to_ATM(type->workingpressure); /* working pressure in atm */
volume = volume_of_air / atm; /* milliliters at 1 atm: "true size" */
type->size.mliter = volume + 0.5;
}
static void event_end(void)
{
- if (event.name)
+ if (event.name && strcmp(event.name, "surface") != 0)
add_event(dive, event.time.seconds, event.type, event.flags, event.value, event.name);
event.active = 0;
}