subsurface · mikeller · Jun 10, 2025 · Mar 14, 2024 · Jun 8, 2025 · Jan 12, 2025
diff --git a/contrib/android/Android.mk b/contrib/android/Android.mk
@@ -39,6 +39,8 @@ LOCAL_SRC_FILES := \
 	src/divesoft_freedom_parser.c \
 	src/divesystem_idive.c \
 	src/divesystem_idive_parser.c \
+	src/halcyon_symbios.c \
+	src/halcyon_symbios_parser.c \
 	src/hdlc.c \
 	src/hw_frog.c \
 	src/hw_ostc3.c \

diff --git a/contrib/msvc/libdivecomputer.vcxproj b/contrib/msvc/libdivecomputer.vcxproj
@@ -207,6 +207,8 @@
     <ClCompile Include="..\..\src\divesoft_freedom_parser.c" />
     <ClCompile Include="..\..\src\divesystem_idive.c" />
     <ClCompile Include="..\..\src\divesystem_idive_parser.c" />
+    <ClCompile Include="..\..\src\halcyon_symbios.c" />
+    <ClCompile Include="..\..\src\halcyon_symbios_parser.c" />
     <ClCompile Include="..\..\src\hdlc.c" />
     <ClCompile Include="..\..\src\hw_frog.c" />
     <ClCompile Include="..\..\src\hw_ostc.c" />
@@ -337,6 +339,7 @@
     <ClInclude Include="..\..\src\diverite_nitekq.h" />
     <ClInclude Include="..\..\src\divesoft_freedom.h" />
     <ClInclude Include="..\..\src\divesystem_idive.h" />
+    <ClInclude Include="..\..\src\halcyon_symbios.h" />
     <ClInclude Include="..\..\src\hdlc.h" />
     <ClInclude Include="..\..\src\hw_frog.h" />
     <ClInclude Include="..\..\src\hw_ostc.h" />

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
@@ -18,7 +18,7 @@ MANPAGES = \
 	dc_descriptor_get_product.3 \
 	dc_descriptor_get_vendor.3 \
 	dc_descriptor_get_transports.3 \
-	dc_descriptor_iterator.3 \
+	dc_descriptor_iterator_new.3 \
 	dc_device_close.3 \
 	dc_device_foreach.3 \
 	dc_device_open.3 \

diff --git a/doc/man/dc_bluetooth_iterator_new.3 b/doc/man/dc_bluetooth_iterator_new.3
@@ -44,7 +44,7 @@ opened with
 and a
 .Fa descriptor
 usually found by searching through
-.Xr dc_descriptor_iterator 3 .
+.Xr dc_descriptor_iterator_new 3 .
 .Pp
 On returning
 .Dv DC_STATUS_SUCCESS

diff --git a/doc/man/dc_descriptor_free.3 b/doc/man/dc_descriptor_free.3
@@ -36,12 +36,12 @@
 Frees a descriptor usually returned with
 .Xr dc_iterator_next 3
 as created with
-.Xr dc_descriptor_iterator 3 .
+.Xr dc_descriptor_iterator_new 3 .
 It's safe to pass
 .Dv NULL
 to this function.
 .Sh SEE ALSO
-.Xr dc_descriptor_iterator 3 ,
+.Xr dc_descriptor_iterator_new 3 ,
 .Xr dc_iterator_free 3
 .Sh AUTHORS
 The

diff --git a/doc/man/dc_descriptor_get_model.3 b/doc/man/dc_descriptor_get_model.3
@@ -31,7 +31,7 @@
 .In libdivecomputer/descriptor.h
 .Ft "unsigned int"
 .Fo dc_descriptor_get_model
-.Fa "dc_descriptor_t *descriptor"
+.Fa "const dc_descriptor_t *descriptor"
 .Fc
 .Sh DESCRIPTION
 Gets the model number of a dive computer descriptor or 0 if none was
@@ -40,7 +40,7 @@ defined for the computer.
 .Sh RETURN VALUES
 This returns the model number or 0 if none exists.
 .Sh SEE ALSO
-.Xr dc_descriptor_iterator 3
+.Xr dc_descriptor_iterator_new 3
 .Sh AUTHORS
 The
 .Lb libdivecomputer

diff --git a/doc/man/dc_descriptor_get_product.3 b/doc/man/dc_descriptor_get_product.3
@@ -30,7 +30,7 @@
 .In libdivecomputer/descriptor.h
 .Ft "const char *"
 .Fo dc_descriptor_get_product
-.Fa "dc_descriptor_t *descriptor"
+.Fa "const dc_descriptor_t *descriptor"
 .Fc
 .Sh DESCRIPTION
 Gets the product

diff --git a/doc/man/dc_descriptor_get_transports.3 b/doc/man/dc_descriptor_get_transports.3
@@ -30,15 +30,15 @@
 .In libdivecomputer/descriptor.h
 .Ft "unsigned int"
 .Fo dc_descriptor_get_transports
-.Fa "dc_descriptor_t *descriptor"
+.Fa "const dc_descriptor_t *descriptor"
 .Fc
 .Sh DESCRIPTION
 Gets the transports supported by the given
 .Fa descriptor .
 The
 .Fa descriptor
 usually found by searching through
-.Xr dc_descriptor_iterator 3 .
+.Xr dc_descriptor_iterator_new 3 .
 .Sh RETURN VALUES
 Returns a union (bitwise OR) of the transports supported by the given
 .Fa descriptor .
@@ -59,7 +59,7 @@ if(transports & DC_TRANSPORT_USBHID) {
 }
 .Ed
 .Sh SEE ALSO
-.Xr dc_descriptor_iterator 3 .
+.Xr dc_descriptor_iterator_new 3 .
 .Sh AUTHORS
 The
 .Lb libdivecomputer

diff --git a/doc/man/dc_descriptor_get_vendor.3 b/doc/man/dc_descriptor_get_vendor.3
@@ -30,7 +30,7 @@
 .In libdivecomputer/descriptor.h
 .Ft "const char *"
 .Fo dc_descriptor_get_vendor
-.Fa "dc_descriptor_t *descriptor"
+.Fa "const dc_descriptor_t *descriptor"
 .Fc
 .Sh DESCRIPTION
 Gets the vendor

diff --git a/doc/man/dc_descriptor_iterator.3 → doc/man/dc_descriptor_iterator_new.3 b/doc/man/dc_descriptor_iterator.3 → doc/man/dc_descriptor_iterator_new.3
@@ -22,15 +22,16 @@
 .Dt DC_DESCRIPTOR_ITERATOR 3
 .Os
 .Sh NAME
-.Nm dc_descriptor_iterator
+.Nm dc_descriptor_iterator_new
 .Nd get all supported dive computers
 .Sh LIBRARY
 .Lb libdivecomputer
 .Sh SYNOPSIS
 .In libdivecomputer/descriptor.h
 .Ft dc_status_t
-.Fo dc_descriptor_iterator
+.Fo dc_descriptor_iterator_new
 .Fa "dc_iterator_t **iterator"
+.Fa "dc_descriptor_t *descriptor"
 .Fc
 .Sh DESCRIPTION
 Gets all descriptors available to
@@ -56,7 +57,7 @@ The following iterates over all descriptors, printing the vendor, then
 frees the iterator.
 It does no error checking.
 .Bd -literal
-dc_descriptor_iterator(&iter));
+dc_descriptor_iterator_new(&iter, context));
 while (dc_iterator_next(iter, &desc) == DC_STATUS_SUCCESS) {
 	printf("%s\en", dc_descriptor_get_vendor(desc));
 	dc_descriptor_free(desc);

diff --git a/doc/man/dc_device_open.3 b/doc/man/dc_device_open.3
@@ -44,7 +44,7 @@ opened with
 a dive computer
 .Fa descriptor
 usually found by searching through
-.Xr dc_descriptor_iterator 3 ,
+.Xr dc_descriptor_iterator_new 3 ,
 and a 
 .Fa iostream
 opened with a transport specific open function like
@@ -70,7 +70,7 @@ On success, the
 pointer is filled in with an open handle.
 .Sh SEE ALSO
 .Xr dc_context_new 3 ,
-.Xr dc_descriptor_iterator 3 ,
+.Xr dc_descriptor_iterator_new 3 ,
 .Xr dc_device_close 3
 .Sh AUTHORS
 The

diff --git a/doc/man/dc_irda_iterator_new.3 b/doc/man/dc_irda_iterator_new.3
@@ -44,7 +44,7 @@ opened with
 and a
 .Fa descriptor
 usually found by searching through
-.Xr dc_descriptor_iterator 3 .
+.Xr dc_descriptor_iterator_new 3 .
 .Pp
 On returning
 .Dv DC_STATUS_SUCCESS

diff --git a/doc/man/dc_iterator_free.3 b/doc/man/dc_iterator_free.3
@@ -36,7 +36,7 @@
 Frees the iterator
 .Fa iterator .
 It may be invoked on any iterator type, e.g., one created with
-.Xr dc_descriptor_iterator 3 .
+.Xr dc_descriptor_iterator_new 3 .
 .Sh RETURN VALUES
 This returns
 .Dv DC_STATUS_SUCCESS

diff --git a/doc/man/dc_serial_iterator_new.3 b/doc/man/dc_serial_iterator_new.3
@@ -44,7 +44,7 @@ opened with
 and a
 .Fa descriptor
 usually found by searching through
-.Xr dc_descriptor_iterator 3 .
+.Xr dc_descriptor_iterator_new 3 .
 .Pp
 On returning
 .Dv DC_STATUS_SUCCESS

diff --git a/doc/man/dc_usbhid_iterator_new.3 b/doc/man/dc_usbhid_iterator_new.3
@@ -44,7 +44,7 @@ opened with
 and a
 .Fa descriptor
 usually found by searching through
-.Xr dc_descriptor_iterator 3 .
+.Xr dc_descriptor_iterator_new 3 .
 .Pp
 On returning
 .Dv DC_STATUS_SUCCESS

diff --git a/doc/man/libdivecomputer.3 b/doc/man/libdivecomputer.3
@@ -48,7 +48,7 @@ and
 .Xr dc_context_set_loglevel 3 .
 .It
 Find a descriptor for their dive computer by iterating through
-.Xr dc_descriptor_iterator 3
+.Xr dc_descriptor_iterator_new 3
 and searching by name, vendor, or product family.
 .It
 Find the transport to use for the communication. To determine the supported transports use
@@ -145,7 +145,7 @@ return
 .El
 .Sh SEE ALSO
 .Xr dc_context_new 3 ,
-.Xr dc_descriptor_iterator 3
+.Xr dc_descriptor_iterator_new 3
 .Xr dc_device_open 3
 .Xr dc_parser_new 3
 .Sh AUTHORS

diff --git a/examples/common.c b/examples/common.c
@@ -79,7 +79,7 @@ static const backend_table_t g_backends[] = {
 	{"iconhd",      DC_FAMILY_MARES_ICONHD,        0x14},
 	{"ostc",        DC_FAMILY_HW_OSTC,             0},
 	{"frog",        DC_FAMILY_HW_FROG,             0},
-	{"ostc3",       DC_FAMILY_HW_OSTC3,            0x0A},
+	{"ostc3",       DC_FAMILY_HW_OSTC3,            0x11},
 	{"edy",         DC_FAMILY_CRESSI_EDY,          0x08},
 	{"leonardo",	DC_FAMILY_CRESSI_LEONARDO,     1},
 	{"goa",         DC_FAMILY_CRESSI_GOA,          2},
@@ -100,6 +100,7 @@ static const backend_table_t g_backends[] = {
 	{"cosmiq",      DC_FAMILY_DEEPBLU_COSMIQ,      0},
 	{"s1",          DC_FAMILY_OCEANS_S1,           0},
 	{"freedom",     DC_FAMILY_DIVESOFT_FREEDOM,    19},
+	{"symbios",     DC_FAMILY_HALCYON_SYMBIOS,     1},
 
 	// Not merged upstream yet
 	{"descentmk1",  DC_FAMILY_GARMIN,              0},
@@ -260,7 +261,7 @@ dctool_descriptor_search (dc_descriptor_t **out, const char *name, dc_family_t f
 	dc_status_t rc = DC_STATUS_SUCCESS;
 
 	dc_iterator_t *iterator = NULL;
-	rc = dc_descriptor_iterator (&iterator);
+	rc = dc_descriptor_iterator_new (&iterator, NULL);
 	if (rc != DC_STATUS_SUCCESS) {
 		ERROR ("Error creating the device descriptor iterator.");
 		return rc;

diff --git a/examples/dctool_list.c b/examples/dctool_list.c
@@ -76,7 +76,7 @@ dctool_list_run (int argc, char *argv[], dc_context_t *context, dc_descriptor_t
 
 	dc_iterator_t *iterator = NULL;
 	dc_descriptor_t *descriptor = NULL;
-	dc_descriptor_iterator (&iterator);
+	dc_descriptor_iterator_new (&iterator, context);
 	while (dc_iterator_next (iterator, &descriptor) == DC_STATUS_SUCCESS) {
 		printf ("%s %s\n",
 			dc_descriptor_get_vendor (descriptor),

diff --git a/include/libdivecomputer/common.h b/include/libdivecomputer/common.h
@@ -125,6 +125,8 @@ typedef enum dc_family_t {
 	DC_FAMILY_OCEANS_S1 = (22 << 16),
 	/* Divesoft Freedom */
 	DC_FAMILY_DIVESOFT_FREEDOM = (23 << 16),
+	/* Halcyon Symbios */
+	DC_FAMILY_HALCYON_SYMBIOS = (24 << 16),
 
 	// Not merged upstream yet
 	/* Garmin */

diff --git a/include/libdivecomputer/descriptor.h b/include/libdivecomputer/descriptor.h
@@ -23,6 +23,7 @@
 #define DC_DESCRIPTOR_H
 
 #include "common.h"
+#include "context.h"
 #include "iterator.h"
 
 #ifdef __cplusplus
@@ -38,11 +39,15 @@ typedef struct dc_descriptor_t dc_descriptor_t;
  * Create an iterator to enumerate the supported dive computers.
  *
  * @param[out] iterator  A location to store the iterator.
+ * @param[in]  context   A valid device descriptor.
  * @returns #DC_STATUS_SUCCESS on success, or another #dc_status_t code
  * on failure.
  */
 dc_status_t
-dc_descriptor_iterator (dc_iterator_t **iterator);
+dc_descriptor_iterator_new (dc_iterator_t **iterator, dc_context_t *context);
+
+/* For backwards compatibility */
-/* For backwards compatibility */
+/**
+ * Backward compatibility macro for creating an iterator to enumerate
+ * supported dive computers. This macro is a shorthand for calling
+ * dc_descriptor_iterator_new with the second parameter set to NULL.
+ *
+ * @param[out] iterator  A location to store the iterator.
+ * @note This macro is intended for legacy code and assumes that the
+ *       context parameter is not required. For new code, it is
+ *       recommended to use dc_descriptor_iterator_new directly to
+ *       explicitly specify the context parameter.
+ */
-/* For backwards compatibility */
+/**
+ * Backward compatibility macro for creating an iterator to enumerate
+ * supported dive computers. This macro is a shorthand for calling
+ * dc_descriptor_iterator_new with the second parameter set to NULL.
+ *
+ * @param[out] iterator  A location to store the iterator.
+ * @note This macro is intended for legacy code and assumes that the
+ *       context parameter is not required. For new code, it is
+ *       recommended to use dc_descriptor_iterator_new directly to
+ *       explicitly specify the context parameter.
+ */
+#define dc_descriptor_iterator(iterator) dc_descriptor_iterator_new(iterator, NULL)
 
 /**
  * Free the device descriptor.
@@ -59,7 +64,7 @@ dc_descriptor_free (dc_descriptor_t *descriptor);
  * @returns The vendor name of the dive computer on success, or NULL on failure.
  */
 const char *
-dc_descriptor_get_vendor (dc_descriptor_t *descriptor);
+dc_descriptor_get_vendor (const dc_descriptor_t *descriptor);
 
 /**
  * Get the product name of the dive computer.
@@ -69,7 +74,7 @@ dc_descriptor_get_vendor (dc_descriptor_t *descriptor);
  * failure.
  */
 const char *
-dc_descriptor_get_product (dc_descriptor_t *descriptor);
+dc_descriptor_get_product (const dc_descriptor_t *descriptor);
 
 /**
  * Get the family type of the dive computer.
@@ -79,7 +84,7 @@ dc_descriptor_get_product (dc_descriptor_t *descriptor);
  * on failure.
  */
 dc_family_t
-dc_descriptor_get_type (dc_descriptor_t *descriptor);
+dc_descriptor_get_type (const dc_descriptor_t *descriptor);
 
 /**
  * Get the model number of the dive computer.
@@ -89,7 +94,7 @@ dc_descriptor_get_type (dc_descriptor_t *descriptor);
  * failure.
  */
 unsigned int
-dc_descriptor_get_model (dc_descriptor_t *descriptor);
+dc_descriptor_get_model (const dc_descriptor_t *descriptor);
 
 /**
  * Get all transports supported by the dive computer.
@@ -99,7 +104,7 @@ dc_descriptor_get_model (dc_descriptor_t *descriptor);
  * success, or DC_TRANSPORT_NONE on failure.
  */
 unsigned int
-dc_descriptor_get_transports (dc_descriptor_t *descriptor);
+dc_descriptor_get_transports (const dc_descriptor_t *descriptor);
 
 /**
  * Check if a low-level I/O device matches a supported dive computer.
@@ -117,7 +122,7 @@ dc_descriptor_get_transports (dc_descriptor_t *descriptor);
  * there is no match.
  */
 int
-dc_descriptor_filter (dc_descriptor_t *descriptor, dc_transport_t transport, const void *userdata);
+dc_descriptor_filter (const dc_descriptor_t *descriptor, dc_transport_t transport, const void *userdata);
 
 #ifdef __cplusplus
 }

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -82,6 +82,7 @@ libdivecomputer_la_SOURCES = \
 	oceans_s1_common.h oceans_s1_common.c \
 	oceans_s1.h oceans_s1.c oceans_s1_parser.c \
 	divesoft_freedom.h divesoft_freedom.c divesoft_freedom_parser.c \
+	halcyon_symbios.h halcyon_symbios.c halcyon_symbios_parser.c \
 	hdlc.h hdlc.c \
 	packet.h packet.c \
 	socket.h socket.c \

diff --git a/src/array.c b/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)

diff --git a/src/array.h b/src/array.h
@@ -23,6 +23,7 @@
 #define ARRAY_H
 
 #define C_ARRAY_SIZE(a) (sizeof (a) / sizeof *(a))
+#define C_ARRAY_ITEMSIZE(a) (sizeof *(a))
 
 #ifdef __cplusplus
 extern "C" {
@@ -34,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);
 

diff --git a/src/atomics_cobalt.c b/src/atomics_cobalt.c
@@ -105,6 +105,8 @@ atomics_cobalt_device_open (dc_device_t **out, dc_context_t *context, dc_iostrea
 		goto error_free;
 	}
 
+	HEXDUMP (context, DC_LOGLEVEL_DEBUG, "Version", device->version, sizeof (device->version));
+
 	*out = (dc_device_t*) device;
 
 	return DC_STATUS_SUCCESS;