Add support for the Cressi Archimede

The Cressi Archimede protocol is very similar to the existing Edy
protocol, with a few smaller differences:

 - No init3 command and baudrate change
 - Smaller packet size (32 instead of 128 bytes)
 - Modified read command with a 1 byte address

The most curious change is the fact that the nibbles of all bytes are
reversed (little endian). To simplify the processing of the data, the
nibbles are swapped again immediately after downloading.

Author: jefdriesen

src/array.c

@@ -51,6 +51,14 @@ array_reverse_bits (unsigned char data[], unsigned int size)
 	}
 }
 
+void
+array_reverse_nibbles (unsigned char data[], unsigned int size)
+{
+	for (unsigned int i = 0; i < size; ++i) {
+		unsigned char tmp = data[i];
+		data[i] = ((tmp & 0xF0) >> 4) | ((tmp & 0x0F) << 4);
+	}
+}
 
 int
 array_isequal (const unsigned char data[], unsigned int size, unsigned char value)

src/array.h

@@ -35,6 +35,9 @@ array_reverse_bytes (unsigned char data[], unsigned int size);
 void
 array_reverse_bits (unsigned char data[], unsigned int size);
 
+void
+array_reverse_nibbles (unsigned char data[], unsigned int size);
+
 int
 array_isequal (const unsigned char data[], unsigned int size, unsigned char value);
 

src/cressi_edy.c

@@ -35,11 +35,11 @@
 
 #define MAXRETRIES        4
 
-#define SZ_PACKET         0x80
-#define SZ_PAGE           (SZ_PACKET / 4)
+#define SZ_PAGE           32
 
 #define SZ_HEADER 32
 
+#define ARCHIMEDE 0x01
 #define IQ700 0x05
 #define EDY   0x08
 
@@ -60,6 +60,7 @@ typedef struct cressi_edy_device_t {
 	const cressi_edy_layout_t *layout;
 	unsigned char fingerprint[SZ_PAGE / 2];
 	unsigned int model;
+	unsigned int packetsize;
 } cressi_edy_device_t;
 
 static dc_status_t cressi_edy_device_set_fingerprint (dc_device_t *abstract, const unsigned char data[], unsigned int size);
@@ -247,6 +248,7 @@ cressi_edy_device_open (dc_device_t **out, dc_context_t *context, dc_iostream_t
 	device->iostream = iostream;
 	device->layout = NULL;
 	device->model = 0;
+	device->packetsize = 0;
 	memset (device->fingerprint, 0, sizeof (device->fingerprint));
 
 	// Set the serial communication protocol (1200 8N1).
@@ -284,19 +286,26 @@ cressi_edy_device_open (dc_device_t **out, dc_context_t *context, dc_iostream_t
 	// Send the init commands.
 	cressi_edy_init1 (device);
 	cressi_edy_init2 (device);
-	cressi_edy_init3 (device);
+	if (device->model != ARCHIMEDE) {
+		cressi_edy_init3 (device);
+	}
+
+	device->packetsize = device->model == ARCHIMEDE ?
+		SZ_PAGE : SZ_PAGE * 4;
 
-	if (device->model == IQ700) {
+	if (device->model == IQ700 || device->model == ARCHIMEDE) {
 		device->layout = &tusa_iq700_layout;
 	} else {
 		device->layout = &cressi_edy_layout;
 	}
 
-	// Set the serial communication protocol (4800 8N1).
-	status = dc_iostream_configure (device->iostream, 4800, 8, DC_PARITY_NONE, DC_STOPBITS_ONE, DC_FLOWCONTROL_NONE);
-	if (status != DC_STATUS_SUCCESS) {
-		ERROR (context, "Failed to set the terminal attributes.");
-		goto error_free;
+	if (device->model != ARCHIMEDE) {
+		// Set the serial communication protocol (4800 8N1).
+		status = dc_iostream_configure (device->iostream, 4800, 8, DC_PARITY_NONE, DC_STOPBITS_ONE, DC_FLOWCONTROL_NONE);
+		if (status != DC_STATUS_SUCCESS) {
+			ERROR (context, "Failed to set the terminal attributes.");
+			goto error_free;
+		}
 	}
 
 	// Make sure everything is in a sane state.
@@ -337,22 +346,33 @@ cressi_edy_device_read (dc_device_t *abstract, unsigned int address, unsigned ch
 	cressi_edy_device_t *device = (cressi_edy_device_t*) abstract;
 
 	if ((address % SZ_PAGE != 0) ||
-		(size    % SZ_PACKET != 0))
+		(size    % device->packetsize != 0))
 		return DC_STATUS_INVALIDARGS;
 
 	unsigned int nbytes = 0;
 	while (nbytes < size) {
 		// Read the package.
 		unsigned int number = address / SZ_PAGE;
-		unsigned char command[3] = {0x52,
-				(number >> 8) & 0xFF, // high
-				(number     ) & 0xFF}; // low
-		status = cressi_edy_transfer (device, command, sizeof (command), data + nbytes, SZ_PACKET, 1);
+		unsigned char command[3] = {0};
+		if (device->model == ARCHIMEDE) {
+			command[0] = 0x45;
+			command[1] = 0x52;
+			command[2] = number & 0xFF;
+		} else {
+			command[0] = 0x52;
+			command[1] = (number >> 8) & 0xFF; // high;
+			command[2] = (number     ) & 0xFF; // low
+		}
+		status = cressi_edy_transfer (device, command, sizeof (command), data + nbytes, device->packetsize, 1);
 		if (status != DC_STATUS_SUCCESS)
 			return status;
 
-		nbytes += SZ_PACKET;
-		address += SZ_PACKET;
+		nbytes += device->packetsize;
+		address += device->packetsize;
+	}
+
+	if (device->model == ARCHIMEDE) {
+		array_reverse_nibbles (data, size);
 	}
 
 	return status;
@@ -395,7 +415,7 @@ cressi_edy_device_dump (dc_device_t *abstract, dc_buffer_t *buffer)
 	device_event_emit (abstract, DC_EVENT_DEVINFO, &devinfo);
 
 	return device_dump_read (abstract, 0, dc_buffer_get_data (buffer),
-		dc_buffer_get_size (buffer), SZ_PACKET);
+		dc_buffer_get_size (buffer), device->packetsize);
 }
 
 
@@ -407,7 +427,7 @@ cressi_edy_device_foreach (dc_device_t *abstract, dc_dive_callback_t callback, v
 
 	// Enable progress notifications.
 	dc_event_progress_t progress = EVENT_PROGRESS_INITIALIZER;
-	progress.maximum = SZ_PACKET +
+	progress.maximum = 4 * SZ_PAGE +
 		(layout->rb_profile_end - layout->rb_profile_begin);
 	device_event_emit (abstract, DC_EVENT_PROGRESS, &progress);
 
@@ -419,7 +439,7 @@ cressi_edy_device_foreach (dc_device_t *abstract, dc_dive_callback_t callback, v
 	device_event_emit (abstract, DC_EVENT_DEVINFO, &devinfo);
 
 	// Read the logbook data.
-	unsigned char logbook[SZ_PACKET] = {0};
+	unsigned char logbook[4 * SZ_PAGE] = {0};
 	dc_status_t rc = cressi_edy_device_read (abstract, layout->rb_logbook_offset, logbook, sizeof (logbook));
 	if (rc != DC_STATUS_SUCCESS) {
 		ERROR (abstract->context, "Failed to read the logbook data.");
@@ -481,13 +501,13 @@ cressi_edy_device_foreach (dc_device_t *abstract, dc_dive_callback_t callback, v
 	}
 
 	// Update and emit a progress event.
-	progress.current += SZ_PACKET;
-	progress.maximum = SZ_PACKET + total;
+	progress.current += 4 * SZ_PAGE;
+	progress.maximum = 4 * SZ_PAGE + total;
 	device_event_emit (abstract, DC_EVENT_PROGRESS, &progress);
 
 	// Create the ringbuffer stream.
 	dc_rbstream_t *rbstream = NULL;
-	rc = dc_rbstream_new (&rbstream, abstract, SZ_PAGE, SZ_PACKET, layout->rb_profile_begin, layout->rb_profile_end, eop, DC_RBSTREAM_BACKWARD);
+	rc = dc_rbstream_new (&rbstream, abstract, SZ_PAGE, device->packetsize, layout->rb_profile_begin, layout->rb_profile_end, eop, DC_RBSTREAM_BACKWARD);
 	if (rc != DC_STATUS_SUCCESS) {
 		ERROR (abstract->context, "Failed to create the ringbuffer stream.");
 		return rc;

src/cressi_edy_parser.c

@@ -28,6 +28,7 @@
 
 #define ISINSTANCE(parser) dc_parser_isinstance((parser), &cressi_edy_parser_vtable)
 
+#define ARCHIMEDE 0x01
 #define IQ700 0x05
 #define EDY   0x08
 
@@ -80,6 +81,17 @@ static const cressi_edy_layout_t edy = {
 	46, 3, /* gasmix */
 };
 
+static const cressi_edy_layout_t archimede = {
+	 2, /* datetime_y */
+	 5, /* datetime_md */
+	25, /* datetime_hm */
+	22, /* avgdepth */
+	 9, /* maxdepth */
+	45, /* temperature */
+	29, /* divetime */
+	43, 1, /* gasmix */
+};
+
 static unsigned int
 decode (const unsigned char data[], unsigned int offset, unsigned int n)
 {
@@ -136,7 +148,12 @@ cressi_edy_parser_create (dc_parser_t **out, dc_context_t *context, const unsign
 
 	// Set the default values.
 	parser->model = model;
-	parser->layout = &edy;
+
+	if (model == ARCHIMEDE) {
+		parser->layout = &archimede;
+	} else {
+		parser->layout = &edy;
+	}
 
 	*out = (dc_parser_t*) parser;
 
@@ -260,7 +277,7 @@ cressi_edy_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t c
 		// Current gasmix
 		if (ngasmixes) {
 			unsigned int idx = (data[offset + 0] & 0x60) >> 5;
-			if (parser->model == IQ700)
+			if (parser->model == IQ700 || parser->model == ARCHIMEDE)
 				idx = 0; /* FIXME */
 			if (idx >= ngasmixes) {
 				ERROR (abstract->context, "Invalid gas mix index.");

src/descriptor.c

@@ -344,6 +344,7 @@ static const dc_descriptor_t g_descriptors[] = {
 	{"Heinrichs Weikamp", "OSTC Sport", DC_FAMILY_HW_OSTC3, 0x13, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLUETOOTH | DC_TRANSPORT_BLE, dc_filter_hw},
 	{"Heinrichs Weikamp", "OSTC 2 TR",  DC_FAMILY_HW_OSTC3, 0x33, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLUETOOTH | DC_TRANSPORT_BLE, dc_filter_hw},
 	/* Cressi Edy */
+	{"Cressi", "Archimede", DC_FAMILY_CRESSI_EDY, 0x01, DC_TRANSPORT_SERIAL, NULL},
 	{"Tusa",   "IQ-700", DC_FAMILY_CRESSI_EDY, 0x05, DC_TRANSPORT_SERIAL, NULL},
 	{"Cressi", "Edy",    DC_FAMILY_CRESSI_EDY, 0x08, DC_TRANSPORT_SERIAL, NULL},
 	/* Cressi Leonardo */