Subject: [PATCH 2/2] Subject: [PATCH] CCR patch: adapt code for diluent
cylinder pressures (4)
This is the fourth patch in a series of four, dealing with the
calculation of cylinder pressures of diluent gas in CCR dives.
1) Do whitespace cleanup on CCR PATCH commit
3e9260c09bb5e09946b5edaf2a2c68960fbd5e13
I hope this is better!!??
2) In function create_plot_info_new() in profile.c, two statements
specific to oxygen calculations in CCR dives are commented
out. They wil be activated in the following patch in this CCR series.
Signed-off-by: willem ferguson <willemfergu...@zoology.up.ac.za>
>From 3e9260c09bb5e09946b5edaf2a2c68960fbd5e13 Mon Sep 17 00:00:00 2001
From: willem ferguson <willemfergu...@zoology.up.ac.za>
Date: Fri, 5 Sep 2014 18:30:56 +0200
Subject: [PATCH 2/2] Subject: [PATCH] CCR patch: adapt code for diluent
cylinder pressures (3)
This patch implements the cylinder pressure calculations for diluent
gas in CCR dive computers. This is the third patch for achieving this.
The following was performed:
1) Add two lines to try_to_fill_sample() in parse-xml so that
diluent cylinder pressures are stored from XML dive log file
into structures of sample.
2) Add one line to populate_plot_entries() in profile.c so that
the diluent cylinder pressures are copied from structures of
sample to structures of plot_info.
3) add three constant #defines in profile.h
4) change populate_pressure_information() in gaspressures.c in
order to take into account pressure calculations for the
diluent cylinder, calling subordinate functions in the
appropriate way.
5) change create_plot_info_new() in profile.c in order to initiate
the pressure calculations for the diluent cylinder.
6) Inplement two debugging functions (one in profile.c, another
in gaspressures.c). These debugging functions are activated
by means of #defines.
7) In function create_plot_info_new() in profile.c, two statements
specific to oxygen calculations in CCR dives have been commented
out. It is envisaged that they wil be activated in the
following patch in this CCR series.
Signed-off-by: willem ferguson <willemfergu...@zoology.up.ac.za>
---
gaspressures.c | 2 +-
parse-xml.c | 2 +-
profile.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gaspressures.c b/gaspressures.c
index dfd6b6a..c653f08 100644
--- a/gaspressures.c
+++ b/gaspressures.c
@@ -376,7 +376,7 @@ void populate_pressure_information(struct dive *dive, struct divecomputer *dc, s
}
if (!pressure) {
- missing_pr = 1;
+ missing_pr = 1;
continue;
}
current->end = pressure;
diff --git a/parse-xml.c b/parse-xml.c
index b1b40fc..02cf9f7 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -836,7 +836,7 @@ static void try_to_fill_sample(struct sample *sample, const char *name, char *bu
if (MATCH("cylpress.sample", pressure, &sample->cylinderpressure))
return;
if (MATCH("pdiluent.sample", pressure, &sample->diluentpressure))
- return;
+ return;
if (MATCH("cylinderindex.sample", get_cylinderindex, &sample->sensor))
return;
if (MATCH("sensor.sample", get_sensor, &sample->sensor))
diff --git a/profile.c b/profile.c
index 0d8b5b6..32b914b 100644
--- a/profile.c
+++ b/profile.c
@@ -867,7 +867,7 @@ static void calculate_gas_information_new(struct dive *dive, struct plot_info *p
static void debug_print_profiledata(struct plot_info *pi)
{
FILE *f1;
- struct plot_data *entry;
+ struct plot_data *entry;
int i;
if(!(f1 = fopen("debug_print_profiledata.dat","w"))) printf("File open error for: debug_print_profiledata.dat\n");
else {
--
1.9.1
_______________________________________________
subsurface mailing list
subsurface@hohndel.org
http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface
