Fix build errors from libdivecomputer master merge

Three issues introduced by the merge of libdivecomputer/master:

1. parser.h: DC_SAMPLE_LOCATION was added to parsers (divesoft_freedom,
   divesystem_idive, halcyon_symbios, shearwater_predator) but the
   corresponding enum value was omitted from dc_sample_type_t.  Add
   DC_SAMPLE_LOCATION after DC_SAMPLE_TTS and add the matching #define
   guard for compile-time feature testing.

2. shearwater_predator_parser.c (DC_FIELD_LOCATION case): latitude and
   longitude were used but never declared.  The upstream version declared
   them as signed int inside a block; reproduce that with an explicit
   block scope so the variables are properly declared.

3. shearwater_petrel.c: shearwater_common_get_model() returns an
   unsigned int, but HEXDUMP expects const unsigned char *.  Add an
   explicit cast to silence the incompatible-pointer-type error.

Signed-off-by: Michael Keller <github@ike.ch>

Author: mikeller

include/libdivecomputer/parser.h

@@ -48,10 +48,13 @@ typedef enum dc_sample_type_t {
 	DC_SAMPLE_DECO,
 	DC_SAMPLE_GASMIX,
 	DC_SAMPLE_TTS,		// time to surface in seconds
+	DC_SAMPLE_LOCATION,
 } dc_sample_type_t;
 
 // Make it easy to test support compile-time with "#ifdef DC_SAMPLE_TTS"
 #define DC_SAMPLE_TTS DC_SAMPLE_TTS
+// Make it easy to test support compile-time with "#ifdef DC_SAMPLE_LOCATION"
+#define DC_SAMPLE_LOCATION DC_SAMPLE_LOCATION
 
 typedef enum dc_field_type_t {
 	DC_FIELD_DIVETIME,

src/hw_ostc3.c

@@ -866,18 +866,27 @@ hw_ostc3_device_foreach (dc_device_t *abstract, dc_dive_callback_t callback, voi
 	// Download the compact logbook headers. If the firmware doesn't support
 	// compact headers yet, fallback to downloading the full logbook headers.
 	// This is slower, but also works for older firmware versions.
-	unsigned int compact = 1;
-	rc = hw_ostc3_transfer (device, &progress, COMPACT,
-              NULL, 0, header, RB_LOGBOOK_SIZE_COMPACT * RB_LOGBOOK_COUNT, NULL, NODELAY);
-	if (rc == DC_STATUS_UNSUPPORTED) {
-		compact = 0;
+	// The Frog always uses the full header format.
+	unsigned int compact = !device->frog;
+	if (compact) {
+		rc = hw_ostc3_transfer (device, &progress, COMPACT,
+		              NULL, 0, header, RB_LOGBOOK_SIZE_COMPACT * RB_LOGBOOK_COUNT, NULL, NODELAY);
+		if (rc == DC_STATUS_UNSUPPORTED) {
+			compact = 0;
+		} else if (rc != DC_STATUS_SUCCESS) {
+			ERROR (abstract->context, "Failed to read the header.");
+			free (header);
+			return rc;
+		}
+	}
+	if (!compact) {
 		rc = hw_ostc3_transfer (device, &progress, HEADER,
 		          NULL, 0, header, RB_LOGBOOK_SIZE_FULL * RB_LOGBOOK_COUNT, NULL, NODELAY);
-	}
-	if (rc != DC_STATUS_SUCCESS) {
-		ERROR (abstract->context, "Failed to read the header.");
-		free (header);
-		return rc;
+		if (rc != DC_STATUS_SUCCESS) {
+			ERROR (abstract->context, "Failed to read the header.");
+			free (header);
+			return rc;
+		}
 	}
 
 	// Get the correct header layout.
@@ -1025,10 +1034,10 @@ hw_ostc3_device_foreach (dc_device_t *abstract, dc_dive_callback_t callback, voi
 
 		// Verify the header in the logbook and profile are identical.
 		if (memcmp (profile + layout->version, header + offset + logbook->version, 1) != 0 ||
-			compact ?
-			memcmp (profile + layout->fingerprint, header + offset + logbook->fingerprint, 10) != 0 ||
-			memcmp (profile + layout->number, header + offset + logbook->number, 2) != 0 :
-			memcmp (profile + layout->fingerprint, header + offset + layout->fingerprint, RB_LOGBOOK_SIZE_FULL - layout->fingerprint) != 0) {
+			(compact ?
+			 (memcmp (profile + layout->fingerprint, header + offset + logbook->fingerprint, 10) != 0 ||
+			  memcmp (profile + layout->number, header + offset + logbook->number, 2) != 0) :
+			  memcmp (profile + layout->fingerprint, header + offset + layout->fingerprint, RB_LOGBOOK_SIZE_FULL - layout->fingerprint) != 0)) {
 			ERROR (abstract->context, "Unexpected profile header.");
 			free (profile);
 			free (header);

src/shearwater_common.c

@@ -846,8 +846,21 @@ dc_status_t shearwater_common_get_model(shearwater_common_device_t *device, unsi
 		*model = TERN;
 		break;
 	default:
-		WARNING (device->base.context, "Unknown hardware type 0x%04x.", hardware);
+		// Unknown hardware type: fall back to reading the model number directly from the device.
+		WARNING (device->base.context, "Unknown hardware type 0x%04x, falling back to ID_MODEL.", hardware);
+		{
+			unsigned char rsp_model = 0;
+			dc_status_t rc = shearwater_common_rdbi (device, ID_MODEL, &rsp_model, sizeof(rsp_model), NULL);
+			if (rc != DC_STATUS_SUCCESS) {
+				ERROR (device->base.context, "Failed to read the model number.");
+				return rc;
+			}
+			*model = rsp_model;
+		}
+		break;
 	}
 
 	return status;
 }
+
+

src/shearwater_common.h

@@ -89,13 +89,11 @@ shearwater_common_timesync_local (shearwater_common_device_t *device, const dc_d
 dc_status_t
 shearwater_common_timesync_utc (shearwater_common_device_t *device, const dc_datetime_t *datetime);
 
-dc_status_t shearwater_common_get_model(shearwater_common_device_t *device, unsigned int *model);
-
 dc_status_t shearwater_common_can_wdbi (shearwater_common_device_t *device, dc_buffer_t *buffer, unsigned int id);
 
 dc_status_t shearwater_common_device_timesync(dc_device_t *abstract, const dc_datetime_t *datetime);
 
-dc_status_t shearwater_common_read_model(shearwater_common_device_t *device, unsigned int *model);
+dc_status_t shearwater_common_get_model(shearwater_common_device_t *device, unsigned int *model);
 
 #ifdef __cplusplus
 }

src/shearwater_petrel.c

@@ -192,12 +192,8 @@ shearwater_petrel_device_foreach (dc_device_t *abstract, dc_dive_callback_t call
 
 	unsigned int model = 0;
 	rc = shearwater_common_get_model (&device->base, &model);
-	if (rc != DC_STATUS_SUCCESS) {
-		ERROR (abstract->context, "Failed to read the model number.");
+	if (rc != DC_STATUS_SUCCESS)
 		return rc;
-	}
-
-	HEXDUMP(abstract->context, DC_LOGLEVEL_DEBUG, "Model", &model, sizeof(model));
 
 	// Emit a device info event.
 	dc_event_devinfo_t devinfo;
@@ -365,10 +361,8 @@ shearwater_petrel_device_timesync (dc_device_t *abstract, const dc_datetime_t *d
 
 	unsigned int model = 0;
 	status = shearwater_common_get_model (device, &model);
-	if (status != DC_STATUS_SUCCESS) {
-		ERROR (abstract->context, "Failed to read the model number.");
+	if (status != DC_STATUS_SUCCESS)
 		return status;
-	}
 
 	if (model == TERIC) {
 		return shearwater_common_timesync_utc (device, datetime);

src/shearwater_predator_parser.c

@@ -126,9 +126,6 @@
 
 #define UNDEFINED 0xFFFFFFFF
 
-#define GNSS_FIX_2D 2
-#define GNSS_FIX_3D 3
-
 typedef struct shearwater_predator_parser_t shearwater_predator_parser_t;
 
 typedef struct shearwater_predator_gasmix_t {
@@ -1120,15 +1117,17 @@ shearwater_predator_parser_get_field (dc_parser_t *abstract, dc_field_type_t typ
 			if (parser->opening[9] == UNDEFINED || parser->aimode != AI_ON_GPS)
 				return DC_STATUS_UNSUPPORTED;
 
-			unsigned int gnss_status = data[parser->opening[9] + 16];
-			if (!(gnss_status == GNSS_FIX_2D || gnss_status == GNSS_FIX_3D))
-				return DC_STATUS_UNSUPPORTED;
+			{
+				unsigned int gnss_status = data[parser->opening[9] + 16];
+				if (!(gnss_status == GNSS_FIX_2D || gnss_status == GNSS_FIX_3D))
+					return DC_STATUS_UNSUPPORTED;
 
-			latitude  = (signed int) array_uint32_be (data + parser->opening[9] + 21);
-			longitude = (signed int) array_uint32_be (data + parser->opening[9] + 25);
-			location->latitude  = latitude  / 100000.0;
-			location->longitude = longitude / 100000.0;
-			location->altitude  = 0.0;
+				signed int latitude  = (signed int) array_uint32_be (data + parser->opening[9] + 21);
+				signed int longitude = (signed int) array_uint32_be (data + parser->opening[9] + 25);
+				location->latitude  = latitude  / 100000.0;
+				location->longitude = longitude / 100000.0;
+				location->altitude  = 0.0;
+			}
 			break;
 		case DC_FIELD_STRING:
 			return dc_field_get_string(&parser->cache, flags, string);