Update libdivecomputer to Latest in Upstream.

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: jefdriesen
+custom: 'https://paypal.me/libdivecomputer'

.github/workflows/build.yml

@@ -19,7 +19,7 @@ jobs:
       CC: ${{ matrix.compiler }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Install dependencies
         run: |
           sudo apt-get update
@@ -32,10 +32,10 @@ jobs:
         run: |
           make install DESTDIR=$PWD/artifacts
           tar -czf ${{ github.job }}-${{ matrix.compiler }}.tar.gz -C artifacts usr/local
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
-          name: ${{ github.job }}-${{ matrix.compiler }}
           path: ${{ github.job }}-${{ matrix.compiler }}.tar.gz
+          archive: false
 
   mac:
 
@@ -52,7 +52,7 @@ jobs:
       CC: ${{ matrix.compiler }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Install dependencies
         run: brew install autoconf automake libtool hidapi libusb
       - run: autoreconf --install --force
@@ -63,10 +63,10 @@ jobs:
         run: |
           make install DESTDIR=$PWD/artifacts
           tar -czf ${{ github.job }}-${{ matrix.compiler }}.tar.gz -C artifacts usr/local
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
-          name: ${{ github.job }}-${{ matrix.compiler }}
           path: ${{ github.job }}-${{ matrix.compiler }}.tar.gz
+          archive: false
 
   windows:
 
@@ -80,7 +80,7 @@ jobs:
         arch: [i686, x86_64]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Install dependencies
         run: |
           sudo apt-get update
@@ -122,10 +122,10 @@ jobs:
         run: |
           make install DESTDIR=$PWD/artifacts
           tar -czf ${{ github.job }}-${{ matrix.arch }}.tar.gz -C artifacts usr/local
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
-          name: ${{ github.job }}-${{ matrix.arch }}
           path: ${{ github.job }}-${{ matrix.arch }}.tar.gz
+          archive: false
 
   msvc:
 
@@ -142,7 +142,7 @@ jobs:
       CONFIGURATION: Release
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: msys2/setup-msys2@v2
         with:
           install: autoconf automake libtool pkg-config make gcc
@@ -151,11 +151,11 @@ jobs:
           ./configure
           make -C src revision.h
         shell: msys2 {0}
-      - uses: microsoft/setup-msbuild@v2
+      - uses: microsoft/setup-msbuild@v3
       - run: msbuild -m -p:Platform=${{ matrix.platform }} -p:Configuration=${{ env.CONFIGURATION }} contrib/msvc/libdivecomputer.vcxproj
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
-          name: ${{ github.job }}-${{ matrix.platform }}
+          name: ${{ github.job }}-${{ matrix.platform }}.zip
           path: contrib/msvc/${{ matrix.platform }}/${{ env.CONFIGURATION }}/bin
 
   android:
@@ -165,13 +165,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - run: |
           autoreconf --install --force
           ./configure
           make -C src revision.h
       - run: $ANDROID_NDK/ndk-build -C contrib/android NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=Android.mk
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
-          name: ${{ github.job }}
+          name: ${{ github.job }}.zip
           path: contrib/android/libs

.github/workflows/release.yml

@@ -9,7 +9,7 @@ jobs:
     name: Release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Version number
         id: version

doc/man/dc_parser_samples_foreach.3

@@ -117,7 +117,6 @@ structure set to
 .Dv SAMPLE_EVENT_PO2 ,
 .Dv SAMPLE_EVENT_AIRTIME ,
 .Dv SAMPLE_EVENT_RGBM ,
-.Dv SAMPLE_EVENT_HEADING ,
 or
 .Dv SAMPLE_EVENT_TISSUELEVEL .
 .It Dv DC_SAMPLE_RBT

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,            0x11},
+	{"ostc3",       DC_FAMILY_HW_OSTC3,            0},
 	{"edy",         DC_FAMILY_CRESSI_EDY,          0x08},
 	{"leonardo",	DC_FAMILY_CRESSI_LEONARDO,     1},
 	{"goa",         DC_FAMILY_CRESSI_GOA,          2},

include/libdivecomputer/parser.h

@@ -99,7 +99,7 @@ typedef enum parser_sample_event_t {
 	SAMPLE_EVENT_PO2,
 	SAMPLE_EVENT_AIRTIME,
 	SAMPLE_EVENT_RGBM,
-	SAMPLE_EVENT_HEADING,
+	SAMPLE_EVENT_HEADING, /* Deprecated: replaced by DC_SAMPLE_BEARING. */
 	SAMPLE_EVENT_TISSUELEVEL,
 	SAMPLE_EVENT_GASCHANGE2, /* Deprecated: replaced by DC_SAMPLE_GASMIX. */
 	SAMPLE_EVENT_STRING,

src/deepsix_excursion_parser.c

@@ -743,14 +743,17 @@ deepsix_excursion_parser_samples_foreach_v1 (dc_parser_t *abstract, dc_sample_ca
 						sample.deco.type = DC_DECO_DECOSTOP;
 						sample.deco.depth = pressure_to_depth(deco_depth, atmospheric, density);
 						sample.deco.time = deco_time;
+						sample.deco.tts = deco_ndl_tts;
 					} else if (deco_flags & SAFETYSTOP) {
 						sample.deco.type = DC_DECO_SAFETYSTOP;
 						sample.deco.depth = pressure_to_depth(deco_depth, atmospheric, density);
 						sample.deco.time = deco_time;
+						sample.deco.tts = 0;
 					} else {
 						sample.deco.type = DC_DECO_NDL;
 						sample.deco.depth = 0;
 						sample.deco.time = deco_ndl_tts;
+						sample.deco.tts = 0;
 					}
 					sample.deco.tts = 0;
 					if (callback) callback (DC_SAMPLE_DECO, &sample, userdata);

src/descriptor.c

@@ -63,6 +63,7 @@ static int dc_filter_oceans (const dc_descriptor_t *descriptor, dc_transport_t t
 static int dc_filter_divesoft (const dc_descriptor_t *descriptor, dc_transport_t transport, const void *userdata);
 static int dc_filter_cressi (const dc_descriptor_t *descriptor, dc_transport_t transport, const void *userdata);
 static int dc_filter_halcyon (const dc_descriptor_t *descriptor, dc_transport_t transport, const void *userdata);
+static int dc_filter_seac (const dc_descriptor_t *descriptor, dc_transport_t transport, const void *userdata);
 
 // Not merged upstream yet
 static int dc_filter_garmin (dc_descriptor_t *descriptor, dc_transport_t transport, const void *userdata);
@@ -339,12 +340,12 @@ static const dc_descriptor_t g_descriptors[] = {
 	{"Heinrichs Weikamp", "OSTC 2",     DC_FAMILY_HW_OSTC3, 0x1B, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLUETOOTH | DC_TRANSPORT_BLE, dc_filter_hw},
 	/* Historic models */
 	{"Heinrichs Weikamp", "OSTC 4",     DC_FAMILY_HW_OSTC3, 0x3B43, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLUETOOTH | DC_TRANSPORT_BLE, dc_filter_hw},
-	{"Heinrichs Weikamp", "OSTC cR",    DC_FAMILY_HW_OSTC3, 0x05, DC_TRANSPORT_SERIAL, NULL},
-	{"Heinrichs Weikamp", "OSTC cR",    DC_FAMILY_HW_OSTC3, 0x07, DC_TRANSPORT_SERIAL, NULL},
+	{"Heinrichs Weikamp", "OSTC cR",    DC_FAMILY_HW_OSTC3, 0x05, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLUETOOTH | DC_TRANSPORT_BLE, dc_filter_hw},
+	{"Heinrichs Weikamp", "OSTC cR",    DC_FAMILY_HW_OSTC3, 0x07, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLUETOOTH | DC_TRANSPORT_BLE, dc_filter_hw},
 	{"Heinrichs Weikamp", "OSTC Sport", DC_FAMILY_HW_OSTC3, 0x12, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLUETOOTH | DC_TRANSPORT_BLE, dc_filter_hw},
 	{"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},
-	{"Heinrichs Weikamp", "OSTC 3",     DC_FAMILY_HW_OSTC3, 0x0A, DC_TRANSPORT_SERIAL, NULL},
+	{"Heinrichs Weikamp", "OSTC 3",     DC_FAMILY_HW_OSTC3, 0x0A, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLUETOOTH | DC_TRANSPORT_BLE, dc_filter_hw},
 	{"Heinrichs Weikamp", "OSTC 2N",  DC_FAMILY_HW_OSTC, 2, DC_TRANSPORT_SERIAL, NULL},
 	{"Heinrichs Weikamp", "OSTC 2C",  DC_FAMILY_HW_OSTC, 3, DC_TRANSPORT_SERIAL, NULL},
 	{"Heinrichs Weikamp", "OSTC Mk2", DC_FAMILY_HW_OSTC, 1, DC_TRANSPORT_SERIAL, NULL},
@@ -491,7 +492,7 @@ static const dc_descriptor_t g_descriptors[] = {
 	/* Seac Screen */
 	{"Seac", "Action", DC_FAMILY_SEAC_SCREEN, 0x01, DC_TRANSPORT_SERIAL, NULL},
 	{"Seac", "Screen", DC_FAMILY_SEAC_SCREEN, 0x02, DC_TRANSPORT_SERIAL, NULL},
-	{"Seac", "Tablet", DC_FAMILY_SEAC_SCREEN, 0x10, DC_TRANSPORT_SERIAL, NULL},
+	{"Seac", "Tablet", DC_FAMILY_SEAC_SCREEN, 0x10, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, dc_filter_seac},
 	/* Deepblu Cosmiq */
 	{"Deepblu", "Cosmiq+", DC_FAMILY_DEEPBLU_COSMIQ, 0, DC_TRANSPORT_BLE, dc_filter_deepblu},
 	/* Oceans S1 */
@@ -982,6 +983,20 @@ dc_filter_halcyon (const dc_descriptor_t *descriptor, dc_transport_t transport,
 	return 1;
 }
 
+static int
+dc_filter_seac (const dc_descriptor_t *descriptor, dc_transport_t transport, const void *userdata)
+{
+	static const char * const bluetooth[] = {
+		"Tablet",
+	};
+
+	if (transport == DC_TRANSPORT_BLE) {
+		return DC_FILTER_INTERNAL (userdata, bluetooth, 0, dc_match_prefix_with_number);
+	}
+
+	return 1;
+}
+
 dc_status_t
 dc_descriptor_iterator_new (dc_iterator_t **out, dc_context_t *context)
 {

src/divesoft_freedom_parser.c

@@ -949,12 +949,7 @@ divesoft_freedom_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callba
 				if (callback) callback(DC_SAMPLE_PPO2, &sample, userdata);
 			}
 
-			if (id == POINT_2) {
-				unsigned int orientation = array_uint32_le (data + offset + 8);
-				unsigned int heading = orientation & 0x1FF;
-				sample.bearing = heading;
-				if (callback) callback (DC_SAMPLE_BEARING, &sample, userdata);
-			} else if (id == POINT_1 || id == POINT_1_OLD) {
+			if (id == POINT_1 || id == POINT_1_OLD) {
 				unsigned int misc = array_uint32_le (data + offset + 8);
 				unsigned int ceiling = array_uint16_le (data + offset + 12);
 				unsigned int setpoint = data[offset + 15];
@@ -1019,8 +1014,14 @@ divesoft_freedom_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callba
 				sample.cns = array_uint16_le (data + offset + 6) / 100.0;
 				if (callback) callback(DC_SAMPLE_CNS, &sample, userdata);
 			} else if (event == EVENT_SETPOINT_MANUAL || event == EVENT_SETPOINT_AUTO) {
-				sample.setpoint = data[6] / 100.0;
+				sample.setpoint = data[offset + 6] / 100.0;
 				if (callback) callback(DC_SAMPLE_SETPOINT, &sample, userdata);
+			} else if (event == EVENT_WAYPOINT) {
+				unsigned int heading = array_uint16_le (data + offset + 8);
+				if ((heading & 0x8000) == 0) {
+					sample.bearing = heading;
+					if (callback) callback (DC_SAMPLE_BEARING, &sample, userdata);
+				}
 			}
 		} else if (type == LREC_MEASURE) {
 			// Measurement record.

src/halcyon_symbios.c

@@ -469,13 +469,15 @@ halcyon_symbios_device_foreach (dc_device_t *abstract, dc_dive_callback_t callba
 	// Emit a device info event.
 	dc_event_devinfo_t devinfo;
 	devinfo.model = info[5];
-	devinfo.firmware = 0;
+	devinfo.firmware = array_uint24_be (info + 16);
 	devinfo.serial = array_uint32_le (info);
 	device_event_emit (abstract, DC_EVENT_DEVINFO, &devinfo);
 
-	DEBUG (abstract->context, "Device: serial=%u, hw=%u, model=%u, bt=%u.%u, battery=%u, pressure=%u, errorbits=%u",
+	DEBUG (abstract->context, "Device: model=%u, serial=%u, firmware=%u.%u.%u, hw=%u, bt=%u.%u, battery=%u, pressure=%u, errorbits=%u",
+		info[5],
 		array_uint32_le (info),
-		info[4], info[5], info[6], info[7],
+		info[16], info[17], info[18],
+		info[4], info[6], info[7],
 		array_uint16_le (info + 8),
 		array_uint16_le (info + 10),
 		array_uint32_le (info + 12));

src/halcyon_symbios_parser.c

@@ -49,6 +49,8 @@
 #define ID_GAS_CONFIG      0x11
 #define ID_TANK_TRANSMITTER 0x12
 #define ID_GF_INFO          0x13
+#define ID_SGC             0x14
+#define ID_GF_DATA         0x15
 
 #define ISCONFIG(type) ( \
 	(type) == ID_LOG_VERSION || \
@@ -64,9 +66,10 @@
 #define EPOCH 1609459200 /* 2021-01-01 00:00:00 */
 
 #define OC        0
-#define CC        1
-#define GAUGE     2
+#define CCR       1
+#define CCR_FSP   2
 #define SIDEMOUNT 3
+#define GAUGE     4
 
 #define NGASMIXES 10
 #define NTANKS    10
@@ -248,7 +251,8 @@ halcyon_symbios_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, u
 			case SIDEMOUNT:
 				*((dc_divemode_t *) value) = DC_DIVEMODE_OC;
 				break;
-			case CC:
+			case CCR:
+			case CCR_FSP:
 				*((dc_divemode_t *) value) = DC_DIVEMODE_CCR;
 				break;
 			case GAUGE:
@@ -332,6 +336,8 @@ halcyon_symbios_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callbac
 		8,  /* ID_GAS_CONFIG */
 		8,  /* ID_TANK_TRANSMITTER */
 		6,  /* ID_GF_INFO */
+		4,  /* ID_SGC */
+		8,  /* ID_GF_DATA */
 	};
 
 	unsigned int logversion = 0;
@@ -372,6 +378,15 @@ halcyon_symbios_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callbac
 			return DC_STATUS_DATAFORMAT;
 		}
 
+		// Since log version 1.9, the ID_GF_INFO record has been deprecated and
+		// replaced with the larger ID_GF_DATA record. Unfortunately some
+		// earlier firmware versions produced records with the new type, but
+		// with the old size. This has been fixed in log version 1.12.
+		// Correct the record type to workaround this bug.
+		if (type == ID_GF_DATA && length == lengths[ID_GF_INFO]) {
+			type = ID_GF_INFO;
+		}
+
 		if (type < C_ARRAY_SIZE(lengths)) {
 			if (length != lengths[type]) {
 				ERROR (abstract->context, "Unexpected record size (%u %u).", length, lengths[type]);
@@ -416,12 +431,12 @@ halcyon_symbios_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callbac
 			unsigned int DC_ATTR_UNUSED battery = array_uint16_le(data + offset + 20);
 			time_start = array_uint32_le(data + offset + 24);
 			unsigned int serial = array_uint32_le(data + offset + 28);
-			DEBUG (abstract->context, "Device: model=%u, hw=%u.%u, fw=%u.%u.%u, deco=%u.%u, serial=%u",
+			DEBUG (abstract->context, "Device: model=%u, serial=%u, firmware=%u.%u.%u, hw=%u.%u, deco=%u.%u",
 				model,
-				hw_major, hw_minor,
+				serial,
 				fw_major, fw_minor, fw_bugfix,
-				deco_major, deco_minor,
-				serial);
+				hw_major, hw_minor,
+				deco_major, deco_minor);
 		} else if (type == ID_GAS_SWITCH) {
 			unsigned int id = UNDEFINED;
 			unsigned int o2 = data[offset + 2];
@@ -497,7 +512,7 @@ halcyon_symbios_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callbac
 
 				// Add a new tank if necessary.
 				if (idx >= ntanks) {
-					if (ngasmixes >= NTANKS) {
+					if (ntanks >= NTANKS) {
 						ERROR (abstract->context, "Maximum number of tanks reached.");
 						return DC_STATUS_NOMEMORY;
 					}
@@ -601,7 +616,7 @@ halcyon_symbios_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callbac
 
 				// Add a new tank if necessary.
 				if (idx >= ntanks) {
-					if (ngasmixes >= NTANKS) {
+					if (ntanks >= NTANKS) {
 						ERROR (abstract->context, "Maximum number of tanks reached.");
 						return DC_STATUS_NOMEMORY;
 					}
@@ -623,7 +638,7 @@ halcyon_symbios_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callbac
 			sample.pressure.value = pressure / 10.0;
 			if (callback) callback(DC_SAMPLE_PRESSURE, &sample, userdata);
 		} else if (type == ID_COMPASS) {
-			unsigned int heading = array_uint16_le (data + offset + 4);
+			unsigned int heading = array_uint16_le (data + offset + 2);
 			sample.bearing = heading;
 			if (callback) callback(DC_SAMPLE_BEARING, &sample, userdata);
 		} else if (type == ID_TRIM) {
@@ -682,7 +697,7 @@ halcyon_symbios_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callbac
 
 				// Add a new tank if necessary.
 				if (idx >= ntanks) {
-					if (ngasmixes >= NTANKS) {
+					if (ntanks >= NTANKS) {
 						ERROR (abstract->context, "Maximum number of tanks reached.");
 						return DC_STATUS_NOMEMORY;
 					}
@@ -703,11 +718,17 @@ halcyon_symbios_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callbac
 			sample.pressure.tank = tank_idx;
 			sample.pressure.value = pressure / 10.0;
 			if (callback) callback(DC_SAMPLE_PRESSURE, &sample, userdata);
-		} else if (type == ID_GF_INFO) {
+		} else if (type == ID_GF_INFO || type == ID_GF_DATA) {
 			unsigned int DC_ATTR_UNUSED gf_now  = array_uint16_le (data + offset + 2);
 			unsigned int DC_ATTR_UNUSED gf_surface  = array_uint16_le (data + offset + 4);
+			if (type == ID_GF_DATA) {
+				unsigned int DC_ATTR_UNUSED leading_tissue_gf_now = data[offset + 6];
+				unsigned int DC_ATTR_UNUSED leading_tissue_gf_surface = data[offset + 7];
+			}
+		} else if (type == ID_SGC) {
+			unsigned int DC_ATTR_UNUSED sgc = array_uint16_le (data + offset + 2);
 		} else {
-			WARNING (abstract->context, "Unknown record (type=%u, size=%u", type, length);
+			WARNING (abstract->context, "Unknown record (type=%u, size=%u)", type, length);
 		}
 
 		offset += length;