}
}
-static void update_pressure(pressure_t *pressure, int new)
-{
- if (new) {
- int old = pressure->mbar;
-
- if (abs(old - new) > 1000)
- pressure->mbar = new;
- }
-}
-
static void update_duration(duration_t *duration, int new)
{
if (new)
}
}
+static void fixup_pressure(struct dive *dive, struct sample *sample)
+{
+ unsigned int pressure, index;
+ cylinder_t *cyl;
+
+ pressure = sample->cylinderpressure.mbar;
+ if (!pressure)
+ return;
+ index = sample->cylinderindex;
+ if (index >= MAX_CYLINDERS)
+ return;
+ cyl = dive->cylinder + index;
+ if (!cyl->start.mbar)
+ cyl->start.mbar = pressure;
+ if (!cyl->end.mbar || pressure < cyl->end.mbar)
+ cyl->end.mbar = pressure;
+}
+
struct dive *fixup_dive(struct dive *dive)
{
int i;
double depthtime = 0;
int lasttime = 0;
int start = -1, end = -1;
- int startpress = 0, endpress = 0;
int maxdepth = 0, mintemp = 0;
int lastdepth = 0;
int lasttemp = 0;
struct sample *sample = dive->sample + i;
int time = sample->time.seconds;
int depth = sample->depth.mm;
- int press = sample->cylinderpressure.mbar;
int temp = sample->temperature.mkelvin;
if (lastdepth)
if (depth > maxdepth)
maxdepth = depth;
}
- if (press) {
- endpress = press;
- if (!startpress)
- startpress = press;
- }
+
+ fixup_pressure(dive, sample);
+
if (temp) {
/*
* If we have consecutive identical
depthtime /= (end - start);
update_depth(&dive->meandepth, depthtime);
- update_pressure(&dive->beginning_pressure, startpress);
- update_pressure(&dive->end_pressure, endpress);
update_temperature(&dive->watertemp, mintemp);
update_depth(&dive->maxdepth, maxdepth);
}
/* Don't pick a zero for MERGE_MIN() */
-#define MIN(a,b) ((a)<(b)?(a):(b))
-#define MAX(a,b) ((a)>(b)?(a):(b))
#define MERGE_MAX(res, a, b, n) res->n = MAX(a->n, b->n)
#define MERGE_MIN(res, a, b, n) res->n = (a->n)?(b->n)?MIN(a->n, b->n):(a->n):(b->n)
{
merge_cylinder_type(&res->type, &a->type, &b->type);
merge_cylinder_mix(&res->gasmix, &a->gasmix, &b->gasmix);
+ MERGE_MAX(res, a, b, start.mbar);
+ MERGE_MIN(res, a, b, end.mbar);
}
/*
MERGE_MAX(res, a, b, surfacetime.seconds);
MERGE_MAX(res, a, b, airtemp.mkelvin);
MERGE_MIN(res, a, b, watertemp.mkelvin);
- MERGE_MAX(res, a, b, beginning_pressure.mbar);
- MERGE_MAX(res, a, b, end_pressure.mbar);
for (i = 0; i < MAX_CYLINDERS; i++)
merge_cylinder_info(res->cylinder+i, a->cylinder + i, b->cylinder + i);