Merge remote-tracking branch 'libdivecomputer/master' into update_libdivecomputer_202608

Author: mikeller

configure.ac

@@ -62,7 +62,7 @@ AM_CONDITIONAL([ENABLE_DOC], [test "x$enable_doc" = "xyes"])
 
 # Checks for programs.
 AC_PROG_CC
-AC_PROG_CC_C99
+m4_version_prereq([2.70], [], [AC_PROG_CC_C99])
 AC_CHECK_PROGS([DOXYGEN], [doxygen])
 AC_CHECK_PROGS([MANDOC], [mandoc])
 

contrib/android/Android.mk

@@ -42,7 +42,6 @@ LOCAL_SRC_FILES := \
 	src/halcyon_symbios.c \
 	src/halcyon_symbios_parser.c \
 	src/hdlc.c \
-	src/hw_frog.c \
 	src/hw_ostc3.c \
 	src/hw_ostc.c \
 	src/hw_ostc_parser.c \

contrib/msvc/libdivecomputer.vcxproj

@@ -213,7 +213,6 @@
     <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" />
     <ClCompile Include="..\..\src\hw_ostc3.c" />
     <ClCompile Include="..\..\src\hw_ostc_parser.c" />
@@ -305,7 +304,6 @@
     <ClInclude Include="..\..\include\libdivecomputer\descriptor.h" />
     <ClInclude Include="..\..\include\libdivecomputer\device.h" />
     <ClInclude Include="..\..\include\libdivecomputer\divesystem_idive.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\hw_frog.h" />
     <ClInclude Include="..\..\include\libdivecomputer\hw_ostc.h" />
     <ClInclude Include="..\..\include\libdivecomputer\hw_ostc3.h" />
     <ClInclude Include="..\..\include\libdivecomputer\ioctl.h" />
@@ -348,7 +346,6 @@
     <ClInclude Include="..\..\src\garmin.h" />
     <ClInclude Include="..\..\src\halcyon_symbios.h" />
     <ClInclude Include="..\..\src\hdlc.h" />
-    <ClInclude Include="..\..\src\hw_frog.h" />
     <ClInclude Include="..\..\src\hw_ostc.h" />
     <ClInclude Include="..\..\src\hw_ostc3.h" />
     <ClInclude Include="..\..\src\ihex.h" />

examples/output_xml.c

@@ -179,6 +179,17 @@ sample_cb (dc_sample_type_t type, const dc_sample_value_t *value, void *userdata
 	case DC_SAMPLE_GASMIX:
 		fprintf (sampledata->ostream, "   <gasmix>%u</gasmix>\n", value->gasmix);
 		break;
+	case DC_SAMPLE_LOCATION:
+		fprintf (sampledata->ostream,
+			"   <location>\n"
+			"      <latitude>%.6f</latitude>\n"
+			"      <longitude>%.6f</longitude>\n"
+			"      <altitude>%.3f</altitude>\n"
+			"   </location>\n",
+			value->location.latitude,
+			value->location.longitude,
+			value->location.altitude);
+		break;
 	default:
 		break;
 	}
@@ -503,9 +514,9 @@ dctool_xml_output_write (dctool_output_t *abstract, dc_parser_t *parser, const u
 	if (status != DC_STATUS_UNSUPPORTED) {
 		fprintf (output->ostream,
 			"<location>\n"
-			"   <latitude>%.6f<latitude>\n"
+			"   <latitude>%.6f</latitude>\n"
 			"   <longitude>%.6f</longitude>\n"
-			"   <altitude>%.2f<altitude>\n"
+			"   <altitude>%.2f</altitude>\n"
 			"</location>\n",
 			location.latitude,
 			location.longitude,

include/libdivecomputer/Makefile.am

@@ -29,7 +29,6 @@ libdivecomputer_HEADERS = 	\
 	oceanic_veo250.h \
 	oceanic_vtpro.h \
 	hw_ostc.h \
-	hw_frog.h \
 	hw_ostc3.h \
 	atomics_cobalt.h \
 	divesystem_idive.h

include/libdivecomputer/hw_frog.h

@@ -35,6 +35,9 @@ extern "C" {
 #define HW_OSTC3_DISPLAY_SIZE    16
 #define HW_OSTC3_CUSTOMTEXT_SIZE 60
 
+#define HW_FROG_DISPLAY_SIZE     15
+#define HW_FROG_CUSTOMTEXT_SIZE  13
+
 dc_status_t
 hw_ostc3_device_version (dc_device_t *device, unsigned char data[], unsigned int size);
 

include/libdivecomputer/hw_ostc3.h

@@ -331,6 +331,7 @@ typedef union dc_sample_value_t {
 		unsigned int tts;
 	} deco;
 	unsigned int gasmix; /* Gas mix index */
+	dc_location_t location;
 } dc_sample_value_t;
 
 typedef struct dc_parser_t dc_parser_t;

include/libdivecomputer/parser.h

@@ -51,7 +51,6 @@ libdivecomputer_la_SOURCES = \
 	mares_iconhd.h mares_iconhd.c mares_iconhd_parser.c \
 	ihex.h ihex.c \
 	hw_ostc.h hw_ostc.c hw_ostc_parser.c \
-	hw_frog.h hw_frog.c \
 	hw_ostc3.h hw_ostc3.c \
 	aes.h aes.c \
 	cressi_edy.h cressi_edy.c cressi_edy_parser.c \

src/Makefile.am

@@ -325,6 +325,7 @@ static const dc_descriptor_t g_descriptors[] = {
 	{"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", "Quad 2",            DC_FAMILY_MARES_ICONHD , 0x32, DC_TRANSPORT_BLE, dc_filter_mares},
+	{"Mares", "Sirius L",          DC_FAMILY_MARES_ICONHD , 0x33, DC_TRANSPORT_BLE, dc_filter_mares},
 	{"Mares", "Puck 4",            DC_FAMILY_MARES_ICONHD , 0x35, DC_TRANSPORT_BLE, dc_filter_mares},
 	{"Mares", "Puck Lite",         DC_FAMILY_MARES_ICONHD , 0x35, DC_TRANSPORT_BLE, dc_filter_mares},
 	{"Mares", "Puck Pro EZ",       DC_FAMILY_MARES_ICONHD , 0x35, DC_TRANSPORT_BLE, dc_filter_mares},
@@ -800,6 +801,7 @@ dc_filter_mares (const dc_descriptor_t *descriptor, dc_transport_t transport, co
 		"Mares bluelink pro",
 		"Mares Genius",
 		"Sirius",
+		"Sirius L",
 		"Quad Ci",
 		"Quad2",
 		"Puck4",