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

Create the correct ceiling events for Uemis Zurich

Browse source 
The hold_depth field is rather misleading as it normally gives the safety
stop depth and only when the p_amb_tol goes "below the surface" does it
switch to showing the first deco stop depth.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2012-11-10 09:28:02 +01:00
parent 7db08ae128
commit 4da3168768
2 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -252,7 +252,7 @@ gtk-gui.o: gtk-gui.c dive.h display.h divelist.h display-gtk.h libdivecomputer.h
-c gtk-gui.c -c gtk-gui.c
uemis.o: uemis.c dive.h uemis.h uemis.o: uemis.c dive.h uemis.h
$(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) -c uemis.c $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) $(LIBDIVECOMPUTERCFLAGS) -c uemis.c
uemis-downloader.o: uemis-downloader.c dive.h uemis.h uemis-downloader.o: uemis-downloader.c dive.h uemis.h
$(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) -c uemis-downloader.c $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) -c uemis-downloader.c

19
uemis.c
View file

@ -18,6 +18,7 @@
#include "dive.h" #include "dive.h"
#include "uemis.h" #include "uemis.h"
#include <libdivecomputer/parser.h>
/* /*
* following code is based on code found in at base64.sourceforge.net/b64.c * following code is based on code found in at base64.sourceforge.net/b64.c
@ -119,7 +120,9 @@ bail:
return datalen; return datalen;
} }
/* Create events from the flag bits; static gboolean in_deco;
/* Create events from the flag bits and other data in the sample;
* These bits basically represent what is displayed on screen at sample time. * These bits basically represent what is displayed on screen at sample time.
* Many of these 'warnings' are way hyper-active and seriously clutter the * Many of these 'warnings' are way hyper-active and seriously clutter the
* profile plot - so these are disabled by default * profile plot - so these are disabled by default
@ -175,6 +178,19 @@ void uemis_event(struct dive *dive, struct sample *sample, uemis_sample_t *u_sam
add_event(dive, sample->time.seconds, 0, 0, 0, N_("Low Battery Alert")); add_event(dive, sample->time.seconds, 0, 0, 0, N_("Low Battery Alert"));
/* flags[7] reflects the little on screen icons that remind of previous /* flags[7] reflects the little on screen icons that remind of previous
* warnings / alerts - not useful for events */ * warnings / alerts - not useful for events */
/* now add deco / ceiling events */
if (u_sample->p_amb_tol > 1013 && u_sample->hold_time && u_sample->hold_time < 99) {
add_event(dive, sample->time.seconds, SAMPLE_EVENT_CEILING, SAMPLE_FLAGS_BEGIN,
u_sample->hold_depth * 10, N_("ceiling"));
add_event(dive, sample->time.seconds, SAMPLE_EVENT_DECOSTOP, 0,
u_sample->hold_time, N_("deco"));
in_deco = TRUE;
} else if (in_deco) {
in_deco = FALSE;
add_event(dive, sample->time.seconds, SAMPLE_EVENT_CEILING, SAMPLE_FLAGS_END,
0, N_("ceiling"));
}
} }
/* /*
@ -190,6 +206,7 @@ void uemis_parse_divelog_binary(char *base64, void *datap) {
struct dive *dive = *divep; struct dive *dive = *divep;
int template, gasoffset; int template, gasoffset;
in_deco = FALSE;
datalen = uemis_convert_base64(base64, &data); datalen = uemis_convert_base64(base64, &data);
dive->airtemp.mkelvin = *(uint16_t *)(data + 45) * 100 + 273150; dive->airtemp.mkelvin = *(uint16_t *)(data + 45) * 100 + 273150;