mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

For CCR dives, the diluent cylinder is the current cylinder

Browse source 
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 <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Robert C. Helling 2014-11-17 12:25:00 +01:00 • committed by Dirk Hohndel
parent 5ed4876ad2
commit 0d7c192e6e
9 changed files with 1772 additions and 1773 deletions
Download patch file Download diff file Expand all files Collapse all files

8
profile.h
View file

@ -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 */