summaryrefslogtreecommitdiffstats
path: root/dive.h
diff options
context:
space:
mode:
Diffstat (limited to 'dive.h')
-rw-r--r--dive.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/dive.h b/dive.h
index af5049fab..694817b44 100644
--- a/dive.h
+++ b/dive.h
@@ -123,6 +123,7 @@ extern int units_to_sac(double volume);
extern int gas_volume(cylinder_t *cyl, pressure_t p);
extern int wet_volume(double cuft, pressure_t p);
+
static inline int get_o2(const struct gasmix *mix)
{
return mix->o2.permille ?: O2_IN_AIR;
@@ -135,10 +136,10 @@ static inline int get_he(const struct gasmix *mix)
struct gas_pressures {
double o2, n2, he;
- double sensor[3];
- double setpoint;
};
+extern void fill_pressures(struct gas_pressures *pressures, const double amb_pressure, const struct gasmix *mix, double po2);
+
extern void sanitize_gasmix(struct gasmix *mix);
extern int gasmix_distance(const struct gasmix *a, const struct gasmix *b);
extern struct gasmix *get_gasmix_from_event(struct event *ev);
@@ -261,10 +262,6 @@ struct divecomputer {
struct divecomputer *next;
};
-
-extern void fill_pressures(struct gas_pressures *pressures, const double amb_pressure, const struct gasmix *mix, double po2, const struct divecomputer *dc);
-
-
#define MAX_CYLINDERS (8)
#define MAX_WEIGHTSYSTEMS (6)
#define W_IDX_PRIMARY 0