}
union int_or_float {
- long i;
double fp;
};
enum number_type {
NEITHER,
- INTEGER,
FLOAT
};
}
}
- res->i = val;
- return INTEGER;
+ res->fp = val;
+ return FLOAT;
}
static void pressure(char *buffer, void *_press)
{
+ double mbar;
pressure_t *pressure = _press;
union int_or_float val;
switch (integer_or_float(buffer, &val)) {
case FLOAT:
- /* Maybe it's in Bar? */
- if (val.fp < 500.0) {
- pressure->mbar = val.fp * 1000 + 0.5;
+ /* Just ignore zero values */
+ if (!val.fp)
+ break;
+ switch (units.pressure) {
+ case BAR:
+ /* Assume mbar, but if it's really small, it's bar */
+ mbar = val.fp;
+ if (mbar < 5000)
+ mbar = mbar * 1000;
+ break;
+ case PSI:
+ mbar = val.fp * 68.95;
break;
}
- printf("Unknown fractional pressure reading %s\n", buffer);
- break;
-
- case INTEGER:
- /*
- * Random integer? Maybe in PSI? Or millibar already?
- *
- * We assume that 5 bar is a ridiculous tank pressure,
- * so if it's smaller than 5000, it's in PSI..
- */
- if (val.i < 5000) {
- pressure->mbar = val.i * 68.95;
+ if (mbar > 5 && mbar < 500000) {
+ pressure->mbar = mbar + 0.5;
break;
}
- pressure->mbar = val.i;
- break;
+ /* fallthrough */
default:
printf("Strange pressure reading %s\n", buffer);
}
union int_or_float val;
switch (integer_or_float(buffer, &val)) {
- /* All values are probably in meters */
- case INTEGER:
- val.fp = val.i;
- /* fallthrough */
case FLOAT:
- depth->mm = val.fp * 1000 + 0.5;
+ switch (units.length) {
+ case METERS:
+ depth->mm = val.fp * 1000 + 0.5;
+ break;
+ case FEET:
+ depth->mm = val.fp * 304.8 + 0.5;
+ break;
+ }
break;
default:
printf("Strange depth reading %s\n", buffer);
union int_or_float val;
switch (integer_or_float(buffer, &val)) {
- /* C or F? Who knows? Let's default to Celsius */
- case INTEGER:
- val.fp = val.i;
- /* Fallthrough */
case FLOAT:
/* Ignore zero. It means "none" */
if (!val.fp)
break;
/* Celsius */
- if (val.fp < 50.0) {
+ switch (units.temperature) {
+ case CELSIUS:
temperature->mkelvin = (val.fp + 273.15) * 1000 + 0.5;
break;
- }
- /* Fahrenheit */
- if (val.fp < 212.0) {
+ case FAHRENHEIT:
temperature->mkelvin = (val.fp + 459.67) * 5000/9;
break;
}
- /* Kelvin or already millikelvin */
- if (val.fp < 1000.0)
- val.fp *= 1000;
- temperature->mkelvin = val.fp;
break;
default:
printf("Strange temperature reading %s\n", buffer);
union int_or_float val;
switch (integer_or_float(buffer, &val)) {
- /* C or F? Who knows? Let's default to Celsius */
- case INTEGER:
- val.fp = val.i;
- /* Fallthrough */
case FLOAT:
if (val.fp <= 100.0)
fraction->permille = val.fp * 10 + 0.5;
{
depth_t *depth = _depth;
union int_or_float val;
- float atm;
+ double atm, cm;
switch (integer_or_float(buffer, &val)) {
- case INTEGER:
- val.fp = val.i;
- /* Fallthrough */
case FLOAT:
- switch (units.pressure) {
- case BAR:
- /* It's actually centibar! */
- atm = (val.fp / 100) / 1.01325;
+ if (!val.fp)
break;
- case PSI:
- /* I think it's centiPSI too. Crazy. */
- atm = (val.fp / 100) * 0.0680459639;
+ /* cbar to atm */
+ atm = (val.fp / 100) / 1.01325;
+ /*
+ * atm to cm. Why not mm? The precision just isn't
+ * there.
+ */
+ cm = 100 * (atm - 1) + 0.5;
+ if (cm > 0) {
+ depth->mm = 10 * (long)cm;
break;
}
- /* 10 m per atm */
- depth->mm = 10000 * atm;
- break;
default:
fprintf(stderr, "Strange water pressure '%s'\n", buffer);
}
#define MATCH(pattern, fn, dest) \
match(pattern, strlen(pattern), name, len, fn, buf, dest)
+static void get_index(char *buffer, void *_i)
+{
+ int *i = _i;
+ *i = atoi(buffer);
+ free(buffer);
+}
+
+static void centibar(char *buffer, void *_pressure)
+{
+ pressure_t *pressure = _pressure;
+ union int_or_float val;
+
+ switch (integer_or_float(buffer, &val)) {
+ case FLOAT:
+ pressure->mbar = val.fp * 10 + 0.5;
+ break;
+ default:
+ fprintf(stderr, "Strange centibar pressure '%s'\n", buffer);
+ }
+ free(buffer);
+}
+
+static void decicelsius(char *buffer, void *_temp)
+{
+ temperature_t *temp = _temp;
+ union int_or_float val;
+
+ switch (integer_or_float(buffer, &val)) {
+ case FLOAT:
+ temp->mkelvin = (val.fp/10 + 273.15) * 1000 + 0.5;
+ break;
+ default:
+ fprintf(stderr, "Strange julian date: %s", buffer);
+ }
+ free(buffer);
+}
+
static int uemis_fill_sample(struct sample *sample, const char *name, int len, char *buf)
{
return MATCH(".reading.dive_time", sampletime, &sample->time) ||
- MATCH(".reading.water_pressure", water_pressure, &sample->depth);
+ MATCH(".reading.water_pressure", water_pressure, &sample->depth) ||
+ MATCH(".reading.active_tank", get_index, &sample->tankindex) ||
+ MATCH(".reading.tank_pressure", centibar, &sample->tankpressure) ||
+ MATCH(".reading.dive_temperature", decicelsius, &sample->temperature) ||
+ 0;
}
/* We're in samples - try to convert the random xml value to something useful */
static void uemis_pressure_unit(char *buffer, void *_unused)
{
+#if 0
units.pressure = buffer_value(buffer) ? PSI : BAR;
+#endif
}
static void uemis_temperature_unit(char *buffer, void *_unused)
union int_or_float val;
switch (integer_or_float(buffer, &val)) {
- case INTEGER:
- val.fp = val.i;
- /* Fallthrough */
case FLOAT:
*when = (val.fp - 40587.5) * 86400;
break;
MATCH(".units.time", uemis_time_unit, &units) ||
MATCH(".units.date", uemis_date_unit, &units) ||
MATCH(".date_time", uemis_date_time, &dive->when) ||
- MATCH(".time_zone", uemis_time_zone, &dive->when);
+ MATCH(".time_zone", uemis_time_zone, &dive->when) ||
+ MATCH(".ambient.temperature", decicelsius, &dive->airtemp) ||
+ 0;
}
/* We're in the top-level dive xml. Try to convert whatever value to a dive value */
projects / ext / subsurface.git / blobdiff