[PATCH 2/2] Use 12 liter default on DM5 import

Miika Turkia miika.turkia at gmail.com
Thu Feb 19 13:02:32 PST 2015


As the comment says, default to 12 liters if cylinder size is zero.
This is done only when cylinder has start pressure given.

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

diff --git a/parse-xml.c b/parse-xml.c
index de51c3e..fcd61eb 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -2074,7 +2074,13 @@ extern int dm5_cylinders(void *handle, int columns, char **data, char **column)
 	if (data[8] && atoi(data[8]) > 0 && atoi(data[8]) < 350000)
 		cur_dive->cylinder[cur_cylinder_index].end.mbar = (atoi(data[8]));
 	if (data[6])
-		cur_dive->cylinder[cur_cylinder_index].type.size.mliter = (atof(data[6])) * 1000;
+		/* DM5 shows tank size of 12 liters when the actual
+		 * value is 0 (and using metric units). So we just use
+		 * the same 12 liters when size is not available */
+		if (atof(data[6]) == 0.0 && cur_dive->cylinder[cur_cylinder_index].start.mbar)
+			cur_dive->cylinder[cur_cylinder_index].type.size.mliter = 12000;
+		else
+			cur_dive->cylinder[cur_cylinder_index].type.size.mliter = (atof(data[6])) * 1000;
 	if (data[2])
 		cur_dive->cylinder[cur_cylinder_index].gasmix.o2.permille = atoi(data[2]) * 10;
 	if (data[3])
-- 
2.1.0



More information about the subsurface mailing list