Subject: [PATCH] CCR patch: Create memory space to store cylinder pressures
This ADDS TO a previous patch with the same title.
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 <willemfergu...@zoology.up.ac.za>
This patch should be read with the first patch that was sent under this
title, today.
I am pretty sure I followed the correct procedure in creating the patch
file, but I am not
convinced the two diff files (present patch and previous patch under the
same title)
add up to what the present profile.h looks like on my computer (e.g.
variable tts).
Therefore I include the file profile.h as a reference. This is what the
file looks
like at the moment on my system.
Please let me know if I can make anything more clear.
wf
>From 1c3ae92922545f024129216f2fdc280e4717ae8d Mon Sep 17 00:00:00 2001
From: Willem Ferguson <willemfergu...@zoology.up.ac.za>
Date: Tue, 26 Aug 2014 17:12:26 +0200
Subject: [PATCH] CCR patch: Create memory space to store cylinder pressures
This CORRECTS a previous patch with the same title.
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 <willemfergu...@zoology.up.ac.za>
---
profile.h | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/profile.h b/profile.h
index abbb73b..617c005 100644
--- a/profile.h
+++ b/profile.h
@@ -32,13 +32,14 @@ struct plot_data {
int ceiling;
int ceilings[16];
int ndl;
+ int tts;
int stoptime;
int stopdepth;
int cns;
int smoothed;
int sac;
double fo2, po2, pn2, phe;
- double o2setpoint, o2sensor[4]; // for rebreathers with up to 3 PO2 sensors
+ double o2setpoint, o2sensor[3]; // for rebreathers with up to 3 PO2 sensors
double mod, ead, end, eadd;
velocity_t velocity;
int speed;
@@ -55,6 +56,12 @@ struct plot_data {
int heartbeat;
int bearing;
};
+
+struct ev_select {
+ char *ev_name;
+ bool plot_ev;
+};
+
struct plot_info calculate_max_limits_new(struct dive *dive, struct divecomputer *dc);
void compare_samples(struct plot_data *e1, struct plot_data *e2, char *buf, int bufsize, int sum);
struct plot_data *populate_plot_entries(struct dive *dive, struct divecomputer *dc, struct plot_info *pi);
@@ -63,11 +70,6 @@ void create_plot_info_new(struct dive *dive, struct divecomputer *dc, struct plo
void calculate_deco_information(struct dive *dive, struct divecomputer *dc, struct plot_info *pi, bool print_mode);
void get_plot_details_new(struct plot_info *pi, int time, struct membuffer *);
-struct ev_select {
- char *ev_name;
- bool plot_ev;
-};
-
/*
* When showing dive profiles, we scale things to the
* current dive. However, we don't scale past less than
--
1.9.1
#ifndef PROFILE_H
#define PROFILE_H
#ifdef __cplusplus
extern "C" {
#endif
typedef enum {
STABLE,
SLOW,
MODERATE,
FAST,
CRAZY
} velocity_t;
struct membuffer;
struct divecomputer;
struct plot_info;
struct plot_data {
unsigned int in_deco : 1;
int cylinderindex;
int sec;
/* pressure[0] is sensor pressure [in case of CCR this is oxygen tank pressure]
* 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;
int ceiling;
int ceilings[16];
int ndl;
int tts;
int stoptime;
int stopdepth;
int cns;
int smoothed;
int sac;
double fo2, 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;
struct plot_data *min[3];
struct plot_data *max[3];
int avg[3];
/* values calculated by us */
unsigned int in_deco_calc : 1;
int ndl_calc;
int tts_calc;
int stoptime_calc;
int stopdepth_calc;
int pressure_time;
int heartbeat;
int bearing;
};
struct ev_select {
char *ev_name;
bool plot_ev;
};
struct plot_info calculate_max_limits_new(struct dive *dive, struct divecomputer *dc);
void compare_samples(struct plot_data *e1, struct plot_data *e2, char *buf, int bufsize, int sum);
struct plot_data *populate_plot_entries(struct dive *dive, struct divecomputer *dc, struct plot_info *pi);
struct plot_info *analyze_plot_info(struct plot_info *pi);
void create_plot_info_new(struct dive *dive, struct divecomputer *dc, struct plot_info *pi);
void calculate_deco_information(struct dive *dive, struct divecomputer *dc, struct plot_info *pi, bool print_mode);
void get_plot_details_new(struct plot_info *pi, int time, struct membuffer *);
/*
* When showing dive profiles, we scale things to the
* current dive. However, we don't scale past less than
* 30 minutes or 90 ft, just so that small dives show
* up as such unless zoom is enabled.
* We also need to add 180 seconds at the end so the min/max
* plots correctly
*/
int get_maxtime(struct plot_info *pi);
/* get the maximum depth to which we want to plot
* take into account the additional verical space needed to plot
* 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 */
#ifdef __cplusplus
}
#endif
#endif // PROFILE_H
_______________________________________________
subsurface mailing list
subsurface@hohndel.org
http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface
