1 files changed, 3 insertions, 9 deletions
diff --git a/uemis.c b/uemis.c
index 198d90358..3c5bef082 100644
--- a/uemis.c
+++ b/uemis.c
@@ -199,16 +199,10 @@ void uemis_parse_divelog_binary(char *base64, void *datap) {
 	else
 		dive->salinity = 10000; /* grams per 10l fresh water */
 
+	/* this will allow us to find the last dive read so far from this computer */
 	dc->model = strdup("Uemis Zurich");
-
-	/*
-	 * FIXME:
-	 *  - make the deive ID  the first word of the SHA1 sum of the deviceid string
-	 *  - do we want to have a dive ID? Without one, we'll just use the dive date,
-	 *    which is likely fine.
-	 */
-	dc->deviceid = 0;
-	dc->diveid = 0;
+	dc->deviceid = *(uint32_t *)(data + 9);
+	dc->diveid = *(uint16_t *)(data + 7);
 
 	/* dive template in use:
 	   0 = air