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

Fix depth calculations in SDA import

Browse source 
stole and fixed Linus' code in the uemis XML importer

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Dirk Hohndel 2011-09-15 08:12:51 -07:00 • committed by Linus Torvalds
parent 9ddef6854e
commit fa76733d25
1 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
uemis.c
View file

@ -134,6 +134,24 @@ int matchit(FILE *infd, char *regex, char *typeregex, char **found) {
return 0; return 0;
} }
/*
* pressure_to_depth: In centibar. And when converting to
* depth, I'm just going to always use saltwater, because I
* think "true depth" is just stupid. From a diving standpoint,
* "true depth" is pretty much completely pointless, unless
* you're doing some kind of underwater surveying work.
*
* So I give water depths in "pressure depth", always assuming
* salt water. So one atmosphere per 10m.
*/
static int pressure_to_depth(uint16_t value)
{
double atm, cm;
atm = (value / 100.0) / 1.01325;
cm = 100 * atm + 0.5;
return( (cm > 0) ? 10 * (long)cm : 0);
}
/* /*
* convert the base64 data blog * convert the base64 data blog
@ -170,6 +188,7 @@ static void parse_divelog_binary(char *base64, struct dive **divep) {
int i; int i;
uint8_t *data; uint8_t *data;
struct sample *sample; struct sample *sample;
struct dive *dive = *divep;
datalen = uemis_convert_base64(base64, &data); datalen = uemis_convert_base64(base64, &data);
@ -177,15 +196,21 @@ static void parse_divelog_binary(char *base64, struct dive **divep) {
i = 0x123; i = 0x123;
while ((i < datalen) && (*(uint16_t *)(data+i))) { while ((i < datalen) && (*(uint16_t *)(data+i))) {
/* it seems that a dive_time of 0 indicates the end of the valid readings */ /* it seems that a dive_time of 0 indicates the end of the valid readings */
/* the SDA usually records more samples after the end of the dive --
* we want to discard those, but not cut the dive short; sadly the dive
* duration in the header is a) in minutes and b) up to 3 minutes short */
if (*(uint16_t *)(data+i) > dive->duration.seconds + 180)
break;
sample = prepare_sample(divep); sample = prepare_sample(divep);
sample->time.seconds = *(uint16_t *)(data+i); sample->time.seconds = *(uint16_t *)(data+i);
sample->depth.mm = (*(uint16_t *)(data+i+2) - 100) / 0.101428571 + 0.5; sample->depth.mm = pressure_to_depth(*(uint16_t *)(data+i+2));
sample->temperature.mkelvin = (*(uint16_t *)(data+i+4) * 100) + 273150; sample->temperature.mkelvin = (*(uint16_t *)(data+i+4) * 100) + 273150;
sample->cylinderpressure.mbar= *(uint16_t *)(data+i+23) * 10; sample->cylinderpressure.mbar= *(uint16_t *)(data+i+23) * 10;
sample->cylinderindex = *(uint8_t *)(data+i+22); sample->cylinderindex = *(uint8_t *)(data+i+22);
finish_sample(*divep, sample); finish_sample(*divep, sample);
i += 0x25; i += 0x25;
} }
dive->duration.seconds = sample->time.seconds - 1;
return; return;
} }
@ -217,7 +242,7 @@ parse_uemis_file(char *divelogfilename,GError **error) {
/* some error handling */ /* some error handling */
goto bail; goto bail;
} }
dive->maxdepth.mm = atof(found) / 0.10143 + 0.5; dive->maxdepth.mm = pressure_to_depth(atoi(found));
if (! matchit(divelogfile,"<val key=\"file_content\">", if (! matchit(divelogfile,"<val key=\"file_content\">",
">\\([a-zA-Z0-9+/]*\\)<", &found)) { ">\\([a-zA-Z0-9+/]*\\)<", &found)) {