Merge pull request #65 from rmultan/Subsurface-DS9

subsurface · Jul 24, 2024 · 710fc40 · 710fc40
2 parents 9641883 + aa3d0bc
commit 710fc40
Show file tree

Hide file tree

Showing 5 changed files with 495 additions and 240 deletions.
diff --git a/src/descriptor.c b/src/descriptor.c
@@ -307,6 +307,10 @@ static const dc_descriptor_t g_descriptors[] = {
 	{"Mares", "Smart Air",         DC_FAMILY_MARES_ICONHD , 0x24, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, dc_filter_mares},
 	{"Mares", "Quad",              DC_FAMILY_MARES_ICONHD , 0x29, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLE, dc_filter_mares},
 	{"Mares", "Horizon",           DC_FAMILY_MARES_ICONHD , 0x2C, DC_TRANSPORT_SERIAL, NULL},
+	{"Mares", "Puck Air 2",        DC_FAMILY_MARES_ICONHD , 0x2D, DC_TRANSPORT_BLE, dc_filter_mares},
+	{"Mares", "Sirius",            DC_FAMILY_MARES_ICONHD , 0x2F, DC_TRANSPORT_BLE, dc_filter_mares},
+	{"Mares", "Quad Ci",           DC_FAMILY_MARES_ICONHD , 0x31, DC_TRANSPORT_BLE, dc_filter_mares},
+	{"Mares", "Puck 4",            DC_FAMILY_MARES_ICONHD , 0x35, DC_TRANSPORT_BLE, dc_filter_mares},
 	/* Heinrichs Weikamp */
 	{"Heinrichs Weikamp", "OSTC",     DC_FAMILY_HW_OSTC, 0, DC_TRANSPORT_SERIAL, NULL},
 	{"Heinrichs Weikamp", "OSTC Mk2", DC_FAMILY_HW_OSTC, 1, DC_TRANSPORT_SERIAL, NULL},
@@ -715,6 +719,9 @@ dc_filter_mares (dc_descriptor_t *descriptor, dc_transport_t transport, const vo
 	static const char * const bluetooth[] = {
 		"Mares bluelink pro",
 		"Mares Genius",
+		"Sirius",
+		"Quad Ci",
+		"Puck4",
 	};
 
 	if (transport == DC_TRANSPORT_BLE) {

diff --git a/src/device.c b/src/device.c
@@ -175,7 +175,7 @@ dc_device_open (dc_device_t **out, dc_context_t *context, dc_descriptor_t *descr
 		rc = mares_darwin_device_open (&device, context, iostream, dc_descriptor_get_model (descriptor));
 		break;
 	case DC_FAMILY_MARES_ICONHD:
-		rc = mares_iconhd_device_open (&device, context, iostream);
+		rc = mares_iconhd_device_open (&device, context, iostream, dc_descriptor_get_model (descriptor));
 		break;
 	case DC_FAMILY_HW_OSTC:
 		rc = hw_ostc_device_open (&device, context, iostream);