From 0d7c192e6edc1fba710632fd0844126e7c488599 Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Mon, 17 Nov 2014 12:25:00 +0100 Subject: For CCR dives, the diluent cylinder is the current cylinder Change the meaning that _the_ cylinder (as we treat it in OC dives) is the diluent cylinder (rather than the O2 cylinder). This eliminates special cases. Now, for CCR, we have to handle the O2 cylinder in addition (rather than the diluent in addition). Signed-off-by: Robert C. Helling Signed-off-by: Dirk Hohndel --- profile.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'profile.h') diff --git a/profile.h b/profile.h index 69de6d352..66be78789 100644 --- a/profile.h +++ b/profile.h @@ -25,7 +25,7 @@ struct plot_data { int pressure[2]; /* diluentpressure[0] is diluent pressure [CCR] * diluentpressure[1] is interpolated diluent pressure [CCR] */ - int diluentpressure[2]; + int o2cylinderpressure[2]; int temperature; /* Depth info */ int depth; @@ -40,7 +40,7 @@ struct plot_data { int smoothed; int sac; struct gas_pressures pressures; - double o2setpoint, o2sensor[3]; //for rebreathers with up to 3 PO2 sensors + double o2pressure, o2sensor[3]; //for rebreathers with up to 3 PO2 sensors double mod, ead, end, eadd; velocity_t velocity; int speed; @@ -91,9 +91,9 @@ int get_maxdepth(struct plot_info *pi); #define SENSOR_PR 0 #define INTERPOLATED_PR 1 #define SENSOR_PRESSURE(_entry) (_entry)->pressure[SENSOR_PR] -#define DILUENT_PRESSURE(_entry) (_entry)->diluentpressure[SENSOR_PR] +#define O2CYLINDER_PRESSURE(_entry) (_entry)->o2cylinderpressure[SENSOR_PR] #define INTERPOLATED_PRESSURE(_entry) (_entry)->pressure[INTERPOLATED_PR] -#define INTERPOLATED_DILUENT_PRESSURE(_entry) (_entry)->diluentpressure[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 SAC_WINDOW 45 /* sliding window in seconds for current SAC calculation */ -- cgit v1.2.3-70-g09d2