[PATCH 3/4] Divinglog import: added setpoint

Miika Turkia miika.turkia at gmail.com
Fri Jul 17 07:04:51 PDT 2015


Signed-off-by: Miika Turkia <miika.turkia at gmail.com>
---
 parse-xml.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/parse-xml.c b/parse-xml.c
index 1c384e3..5c6af49 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -2882,7 +2882,7 @@ extern int divinglog_profile(void *handle, int columns, char **data, char **colu
 {
 	int sinterval = 0;
 	unsigned long i, len, lenprofile2 = 0;
-	char *ptr, temp[4], pres[5], hbeat[4], stop[4], stime[4], ndl[4], ppo2_1[4], ppo2_2[4], ppo2_3[4], cns[5];
+	char *ptr, temp[4], pres[5], hbeat[4], stop[4], stime[4], ndl[4], ppo2_1[4], ppo2_2[4], ppo2_3[4], cns[5], setpoint[3];
 	short oldcyl = -1;
 
 	/* We do not have samples */
@@ -2991,6 +2991,7 @@ extern int divinglog_profile(void *handle, int columns, char **data, char **colu
 			memcpy(ppo2_2, &data[5][i * 19 + 3], 3);
 			memcpy(ppo2_3, &data[5][i * 19 + 6], 3);
 			memcpy(cns, &data[5][i * 19 + 13], 4);
+			memcpy(setpoint, &data[5][i * 19 + 17], 2);
 
 			if (atoi(ppo2_1) > 0)
 				cur_sample->o2sensor[0].mbar = atoi(ppo2_1) * 100;
@@ -3000,6 +3001,8 @@ extern int divinglog_profile(void *handle, int columns, char **data, char **colu
 				cur_sample->o2sensor[2].mbar = atoi(ppo2_3) * 100;
 			if (atoi(cns) > 0)
 				cur_sample->cns = rint(atoi(cns) / 10);
+			if (atoi(setpoint) > 0)
+				cur_sample->setpoint.mbar = atoi(setpoint) * 100;
 
 		}
 
-- 
2.1.4



More information about the subsurface mailing list