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

Liquivision import fixes

Browse source 
Fixed rounding of temperatures
Fixed compile warnings

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
John Van Ostrand 2014-11-07 12:51:01 -05:00 • committed by Dirk Hohndel
parent 8136306911
commit d4121fb42a
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
file.h
View file

@ -7,6 +7,7 @@ struct memblock {
}; };
extern int try_to_open_cochran(const char *filename, struct memblock *mem); extern int try_to_open_cochran(const char *filename, struct memblock *mem);
extern int try_to_open_liquivision(const char *filename, struct memblock *mem);
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

8
liquivision.c
View file

@ -215,15 +215,15 @@ parse_dives (int log_version, const unsigned char *buf, unsigned int buf_size) {
// Get sample times // Get sample times
sample_time = d * sample_interval; sample_time = d * sample_interval;
depth_mm = array_uint16_le(ds + d * 2) * 10; // cm->mm depth_mm = array_uint16_le(ds + d * 2) * 10; // cm->mm
temp_mk = C_to_mkelvin(array_uint16_le(ts + d * 2) / 10); // dC->mK temp_mk = C_to_mkelvin((float)array_uint16_le(ts + d * 2) / 10); // dC->mK
next_time = (d < sample_count - 1 ? (d + 1) * sample_interval : sample_time); next_time = (d < sample_count - 1 ? (d + 1) * sample_interval : sample_time);
last_time = (d ? (d - 1) * sample_interval : 0); last_time = (d ? (d - 1) * sample_interval : 0);
if (d == sample_count) { if (d == sample_count) {
// We still have events to record // We still have events to record
sample->time.seconds = event_time; sample->time.seconds = event_time;
sample->depth.mm == array_uint16_le(ds + (d - 1) * 2) * 10; // cm->mm sample->depth.mm = array_uint16_le(ds + (d - 1) * 2) * 10; // cm->mm
sample->temperature.mkelvin = C_to_mkelvin(array_uint16_le(ts + (d - 1) * 2) / 10); // dC->mK sample->temperature.mkelvin = C_to_mkelvin((float) array_uint16_le(ts + (d - 1) * 2) / 10); // dC->mK
sample->sensor = sensor; sample->sensor = sensor;
sample->cylinderpressure.mbar = mbar; sample->cylinderpressure.mbar = mbar;
finish_sample(dc); finish_sample(dc);
@ -257,7 +257,7 @@ parse_dives (int log_version, const unsigned char *buf, unsigned int buf_size) {
} else { } else {
// Extrapolate // Extrapolate
last_depth = array_uint16_le(ds + (d - 1) * 2) * 10; // cm->mm last_depth = array_uint16_le(ds + (d - 1) * 2) * 10; // cm->mm
last_temp = C_to_mkelvin(array_uint16_le(ts + (d - 1) * 2) / 10); // dC->mK last_temp = C_to_mkelvin((float) array_uint16_le(ts + (d - 1) * 2) / 10); // dC->mK
sample->depth.mm = last_depth + (depth_mm - last_depth) sample->depth.mm = last_depth + (depth_mm - last_depth)
* (event_time - last_time) / sample_interval; * (event_time - last_time) / sample_interval;
sample->temperature.mkelvin = last_temp + (temp_mk - last_temp) sample->temperature.mkelvin = last_temp + (temp_mk - last_temp)