From 46bb02e8fc2878bc94f4f2543db74e20104eb6f2 Mon Sep 17 00:00:00 2001
From: willem ferguson <willemferguson@zoology.up.ac.za>
Date: Sat, 11 Oct 2014 09:49:48 +0200
Subject: CCR patch: Import and store oxygen sensor data

This patch allows the importing of oxygen sensor and setpoint data from
Poseidon CCR dive logs.
1) Change parse-xml.c to read up to three oxygen sensor values from xml.
   and to store the information in sample structures
2) Change parse-xml.c to read o2 setpoint values fro xml and to store
   it in sample structures
3) Change dive.c to delete all sensor and setpoint values where
   subsequent samples have sensor/setpoint values that are the same.
4) Change profile.c to store the sensor/setpoint values from the samples
   into plotinfo.
5) Change the sample Poseidon xml log in the dives directory to ensure
   the correct order and hierarchy of the dive and divecomputer nodes.

[Dirk Hohndel: minor cleanup, removed debug code, whitespace]

Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 dives/Poseidon_MkVI_6-14_import.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'dives/Poseidon_MkVI_6-14_import.xml')

diff --git a/dives/Poseidon_MkVI_6-14_import.xml b/dives/Poseidon_MkVI_6-14_import.xml
index 559aa2eba..6c92a3449 100644
--- a/dives/Poseidon_MkVI_6-14_import.xml
+++ b/dives/Poseidon_MkVI_6-14_import.xml
@@ -1,9 +1,6 @@
 <divelog program="subsurface-import" version="2">
   <dives>
-    <dive tags="rebreather" date="2011-06-14" time="11:20">
-      <cylinder size='3.0 l' workpressure='200.0 bar' description='3l Mk6' o2='100.0%' start='184 bar' end='141.0 bar'/>
-      <cylinder size='3.0 l' workpressure='200.0 bar' description='3l Mk6' o2='21.0%' start='181 bar' end='137.0 bar'/>
-      <divecomputer model="Poseidon MkVI Discovery" dctype="CCR" no_o2sensors="2">
+    <dive tags="CCR" date="2011-06-14" time="11:20">
       <notes>
 MkVI_Config v1.08
 Dive started at            : 2011-06-14 11:20:36
@@ -47,6 +44,9 @@ Helium tension 8           : 0.0000
 Helium tension 9           : 0.0000
 ---
 	  </notes>
+      <cylinder size='3.0 l' workpressure='200.0 bar' description='3l Mk6' o2='100.0%' start='184 bar' end='141.0 bar'/>
+      <cylinder size='3.0 l' workpressure='200.0 bar' description='3l Mk6' o2='21.0%' start='181 bar' end='137.0 bar'/>
+      <divecomputer model="Poseidon MkVI Discovery" dctype="CCR" no_o2sensors="2">
       <sample time="0:00" depth="1 m" battery="" sensor1="0.34 bar" sensor2="NaN bar" pressure=" bar" pdiluent=" bar" setpoint="0.41 bar" temp="NaN C"/>
       <sample time="0:01" depth="1 m" battery="" sensor1="0.35 bar" sensor2="0.32 bar" pressure=" bar" pdiluent=" bar" setpoint="0.41 bar" temp="NaN C"/>
       <sample time="0:02" depth="0.5 m" battery="" sensor1="0.36 bar" sensor2="0.32 bar" pressure=" bar" pdiluent=" bar" setpoint="0.41 bar" temp="NaN C"/>
-- 
cgit v1.2.3-70-g09d2