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

Add pressures to cylinder declaration for MK6 import

Browse source 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia 2014-11-01 10:06:46 +02:00 • committed by Dirk Hohndel
parent 9e2ce3d99a
commit dd73f422e0
1 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
file.c
View file

@ -449,6 +449,7 @@ int parse_txt_file(const char *filename, const char *csv)
int prev_depth = 0, cur_sampletime = 0, prev_setpoint = -1; int prev_depth = 0, cur_sampletime = 0, prev_setpoint = -1;
bool has_depth = false, has_setpoint = false; bool has_depth = false, has_setpoint = false;
char *lineptr; char *lineptr;
static int diluent_pressure = 0, cylinder_pressure = 0;
struct dive *dive; struct dive *dive;
struct divecomputer *dc; struct divecomputer *dc;
@ -545,9 +546,19 @@ int parse_txt_file(const char *filename, const char *csv)
break; break;
case 13: case 13:
add_sample_data(sample, POSEIDON_PRESSURE, value); add_sample_data(sample, POSEIDON_PRESSURE, value);
if (!cylinder_pressure) {
dive->cylinder[0].sample_start.mbar = value * 1000;
cylinder_pressure = value;
} else
cylinder_pressure = value;
break; break;
case 14: case 14:
add_sample_data(sample, POSEIDON_DILUENT, value); add_sample_data(sample, POSEIDON_DILUENT, value);
if (!diluent_pressure) {
dive->cylinder[1].sample_start.mbar = value * 1000;
diluent_pressure = value;
} else
diluent_pressure = value;
break; break;
case 20: case 20:
has_setpoint = true; has_setpoint = true;
@ -581,6 +592,10 @@ int parse_txt_file(const char *filename, const char *csv)
add_sample_data(sample, POSEIDON_DEPTH, prev_depth); add_sample_data(sample, POSEIDON_DEPTH, prev_depth);
if (!has_setpoint) if (!has_setpoint)
add_sample_data(sample, POSEIDON_SETPOINT, prev_setpoint); add_sample_data(sample, POSEIDON_SETPOINT, prev_setpoint);
if (cylinder_pressure)
dive->cylinder[0].sample_end.mbar = cylinder_pressure * 1000;
if (diluent_pressure)
dive->cylinder[1].sample_end.mbar = diluent_pressure * 1000;
finish_sample(dc); finish_sample(dc);
if (!lineptr || !*lineptr) if (!lineptr || !*lineptr)