DM4 import pressure detection fix

Seems that the database can contain either null or empty string when
there is no pressure data available. Changing the pressureblob
validation to reflect this new information.

Since the temperature profile is binary data, we most likely should
accept 0 as a valid value. My samples have null in this blob if there is
no data so it seems to be different than the pressure blob. But of
course there are no guarantees...

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia 2013-03-07 06:40:28 +02:00 committed by Dirk Hohndel
parent 3e27e49415
commit 27ab7c7707

View file

@ -1707,9 +1707,9 @@ extern int dm4_dive(void *param, int columns, char **data, char **column)
else
cur_sample->depth.mm = cur_dive->maxdepth.mm;
if (tempBlob && tempBlob[i])
if (tempBlob)
cur_sample->temperature.mkelvin = (tempBlob[i] + 273.15) * 1000;
if (pressureBlob)
if (data[19] && data[19][0])
cur_sample->cylinderpressure.mbar = pressureBlob[i] ;
sample_end();
}