Add support for the Cressi Leonardo 2.0

The Cressi Leonardo 2.0 switched from the older 'leonardo' protocol to
the newer 'goa' protocol. At the same time, the device firmware also
uses a new V5 variant of the data format.

Some of the other models, like the Donatello, also received a firmware
update which uses this new V5 data format.

Author: jefdriesen

src/cressi_goa.c

@@ -548,6 +548,8 @@ cressi_goa_device_foreach (dc_device_t *abstract, dc_dive_callback_t callback, v
 			version = 3;
 		} else if (firmware >= 200 && firmware <= 205) {
 			version = 4;
+		} else if (firmware >= 300) {
+			version = 5;
 		} else {
 			ERROR (abstract->context, "Unknown firmware version (%u).", firmware);
 			status = DC_STATUS_DATAFORMAT;

src/cressi_goa_parser.c

@@ -40,7 +40,7 @@
 #define FREEDIVE_ADV 5
 
 #define NGASMIXES  3
-#define NVERSIONS  5
+#define NVERSIONS  6
 #define NDIVEMODES 6
 
 #define UNDEFINED 0xFFFFFFFF
@@ -136,6 +136,19 @@ static const cressi_goa_layout_t scuba_nitrox_layout_v4 = {
 	70, /* temperature */
 };
 
+static const cressi_goa_layout_t scuba_nitrox_layout_v5 = {
+	83, /* headersize */
+	2, /* nsamples */
+	UNDEFINED, /* samplerate */
+	4, /* datetime */
+	11, /* divetime */
+	{ 17, 19, 21 }, /* gasmix */
+	23, /* atmospheric */
+	66, /* maxdepth */
+	68, /* avgdepth */
+	70, /* temperature */
+};
+
 static const cressi_goa_layout_t freedive_layout_v0 = {
 	34, /* headersize */
 	10, /* nsamples */
@@ -268,6 +281,14 @@ static const cressi_goa_layout_t * const layouts[NVERSIONS][NDIVEMODES] = {
 		NULL, /* UNUSED */
 		&advanced_freedive_layout_v4, /* FREEDIVE_ADV */
 	},
+	{
+		&scuba_nitrox_layout_v5, /* SCUBA */
+		&scuba_nitrox_layout_v5, /* NITROX */
+		&freedive_layout_v4, /* FREEDIVE */
+		&gauge_layout_v4, /* GAUGE */
+		NULL, /* UNUSED */
+		NULL, /* FREEDIVE_ADV */
+	},
 };
 
 static dc_status_t
@@ -313,6 +334,8 @@ cressi_goa_init(cressi_goa_parser_t *parser)
 			version = 3;
 		} else if (firmware >= 200 && firmware <= 205) {
 			version = 4;
+		} else if (firmware >= 300) {
+			version = 5;
 		} else {
 			ERROR (abstract->context, "Unknown firmware version (%u).", firmware);
 			return DC_STATUS_DATAFORMAT;

src/descriptor.c

@@ -343,6 +343,7 @@ static const dc_descriptor_t g_descriptors[] = {
 	/* Cressi Goa */
 	{"Cressi", "Cartesio", DC_FAMILY_CRESSI_GOA, 1, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, dc_filter_cressi},
 	{"Cressi", "Goa",      DC_FAMILY_CRESSI_GOA, 2, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, dc_filter_cressi},
+	{"Cressi", "Leonardo 2.0", DC_FAMILY_CRESSI_GOA, 3, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, dc_filter_cressi},
 	{"Cressi", "Donatello",    DC_FAMILY_CRESSI_GOA, 4, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, dc_filter_cressi},
 	{"Cressi", "Michelangelo", DC_FAMILY_CRESSI_GOA, 5, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, dc_filter_cressi},
 	{"Cressi", "Neon",     DC_FAMILY_CRESSI_GOA, 9, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, dc_filter_cressi},
@@ -911,6 +912,7 @@ dc_filter_cressi (dc_descriptor_t *descriptor, dc_transport_t transport, const v
 	static const unsigned int model[] = {
 		1,  // Cartesio
 		2,  // Goa
+		3,  // Leonardo 2.0
 		4,  // Donatello
 		5,  // Michelangelo
 		9,  // Neon