From bded7d3ae072a25f31a5563f76f46324d743f200 Mon Sep 17 00:00:00 2001 From: Willem Ferguson Date: Tue, 26 Aug 2014 22:43:59 +0200 Subject: CCR patch: Create memory space to store cylinder pressures This patch creates memory space to store both the cylinder pressure of the diluent cylinder as well as the oxygen partial pressures of up to four oxygen sensors. This is accomplished within profile.h 1) To the plot_data structure, add: a) an array diluentpressure[2] to store diluent pressures b) create o2setpoint and o2sensor[4] to store oxygen partial pressures 2) Define a constant and prototypes to access the cylinder pressures and their corresponding interpolated values. Signed-off-by: willem ferguson Signed-off-by: Dirk Hohndel --- profile.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'profile.h') diff --git a/profile.h b/profile.h index 55bb396f6..d6f3f9cd8 100644 --- a/profile.h +++ b/profile.h @@ -20,9 +20,12 @@ struct plot_data { unsigned int in_deco : 1; int cylinderindex; int sec; - /* pressure[0] is sensor pressure + /* pressure[0] is sensor pressure [when CCR, the pressure of the oxygen cylinder] * pressure[1] is interpolated pressure */ int pressure[2]; + /* diluentpressure[0] is diluent pressure [CCR] + * diluentpressure[1] is interpolated diluent pressure [CCR] */ + int diluentpressure[2]; int temperature; /* Depth info */ int depth; @@ -36,6 +39,7 @@ struct plot_data { int smoothed; int sac; double po2, pn2, phe; + double o2setpoint, o2sensor[3]; //for rebreathers with up to 3 PO2 sensors double mod, ead, end, eadd; velocity_t velocity; int speed; @@ -81,10 +85,13 @@ int get_maxtime(struct plot_info *pi); * partial pressure graphs */ int get_maxdepth(struct plot_info *pi); +#define DILUENT_CYLINDER 1 #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 INTERPOLATED_PRESSURE(_entry) (_entry)->pressure[INTERPOLATED_PR] +#define INTERPOLATED_DILUENT_PRESSURE(_entry) (_entry)->diluentpressure[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