summaryrefslogtreecommitdiffstats
path: root/dive.h
diff options
context:
space:
mode:
authorGravatar willem ferguson <willemferguson@zoology.up.ac.za>2014-10-12 14:46:20 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-10-12 12:40:34 -0400
commit49c9ad199f22f379a93bbc625a9e0b6339cf8110 (patch)
tree03f51ace381383a56a034a87a69a8f9b99510a78 /dive.h
parent3b30009d7a6e5fe91af6109e72e4bfa04f577eef (diff)
downloadsubsurface-49c9ad199f22f379a93bbc625a9e0b6339cf8110.tar.gz
CCR patch: Oxygen partial pressures
This patch does three things: 1) A new function fill_o2_values() is added to profile.c. This fills all oxygen sesnsor and setpoint values that have been zeroed before in order to save space in the dive log. This recreates the full set of sensor values obtained from the original CCR xml log file. 2) Function fill_o2_values() is activated in function create_ plot_info_new() in profile.c 3) The calling parameters to function fill_pressures() in dive.c are changed. The last parameter is now a pointer to a structure of divecomputer. This will be needed in the last patch of the present series of three patches. [Dirk Hohndel: minor whitespace cleanup] Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'dive.h')
-rw-r--r--dive.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/dive.h b/dive.h
index 55396d8fe..68421fec1 100644
--- a/dive.h
+++ b/dive.h
@@ -137,7 +137,6 @@ struct gas_pressures {
double o2, n2, he;
};
-extern void fill_pressures(struct gas_pressures *pressures, const double amb_pressure, const struct gasmix *mix, double po2, const enum dive_comp_type type);
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);
@@ -260,6 +259,10 @@ 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