Add settings section to XML file format and store dive computer IDs

We only store the model/deviceid/nickname for those dive computers that
are mentioned in the XML file. This should make the XML files nicely
selfcontained.

This also changes the code to consistently use model & deviceid to
identify a dive computer. The deviceid is NOT guaranteed to be collision
free between different libdivecomputer backends...

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/profile.c b/profile.c
index 566b64fc0..525843969 100644
--- a/profile.c
+++ b/profile.c
@@ -1879,7 +1879,7 @@ void plot(struct graphics_context *gc, struct dive *dive, scale_mode_t scale)
 	cairo_stroke(gc->cr);
 
 	/* Put the dive computer name in the lower left corner */
-	nickname = get_dc_nickname(dc->deviceid);
+	nickname = get_dc_nickname(dc->model, dc->deviceid);
 	if (!nickname || *nickname == '\0')
 		nickname = dc->model;
 	if (nickname) {