summaryrefslogtreecommitdiffstats
path: root/profile.h
diff options
context:
space:
mode:
authorGravatar Robert C. Helling <helling@atdotde.de>2014-11-17 17:39:40 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-11-17 18:02:42 +0000
commitd5d7fdc9af98756cd8b241502f6493c518d6fa0f (patch)
treed5d6695cbeea4ae2a311f57803c19a59c72442fc /profile.h
parent992e58eaf255973bcaeda1572c9bb86d16ed4adf (diff)
downloadsubsurface-d5d7fdc9af98756cd8b241502f6493c518d6fa0f.tar.gz
For CCR dives, show plot for diluent and O2 cylinder pressures
Also fixes a bug in the diluent pressure interpolation Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'profile.h')
-rw-r--r--profile.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/profile.h b/profile.h
index 66be78789..196a88126 100644
--- a/profile.h
+++ b/profile.h
@@ -92,9 +92,11 @@ int get_maxdepth(struct plot_info *pi);
#define INTERPOLATED_PR 1
#define SENSOR_PRESSURE(_entry) (_entry)->pressure[SENSOR_PR]
#define O2CYLINDER_PRESSURE(_entry) (_entry)->o2cylinderpressure[SENSOR_PR]
+#define CYLINDER_PRESSURE(_o2, _entry) (_o2 ? O2CYLINDER_PRESSURE(_entry) : SENSOR_PRESSURE(_entry))
#define INTERPOLATED_PRESSURE(_entry) (_entry)->pressure[INTERPOLATED_PR]
#define INTERPOLATED_O2CYLINDER_PRESSURE(_entry) (_entry)->o2cylinderpressure[INTERPOLATED_PR]
#define GET_PRESSURE(_entry) (SENSOR_PRESSURE(_entry) ? SENSOR_PRESSURE(_entry) : INTERPOLATED_PRESSURE(_entry))
+#define GET_O2CYLINDER_PRESSURE(_entry) (O2CYLINDER_PRESSURE(_entry) ? O2CYLINDER_PRESSURE(_entry) : INTERPOLATED_O2CYLINDER_PRESSURE(_entry))
#define SAC_WINDOW 45 /* sliding window in seconds for current SAC calculation */
#ifdef __cplusplus