Add support for the Cochran Commander and EMC.

Author: jvanostrand

examples/common.c

@@ -76,6 +76,7 @@ static const backend_table_t g_backends[] = {
 	{"nitekq",      DC_FAMILY_DIVERITE_NITEKQ},
 	{"aqualand",    DC_FAMILY_CITIZEN_AQUALAND},
 	{"idive",       DC_FAMILY_DIVESYSTEM_IDIVE},
+	{"cochran",     DC_FAMILY_COCHRAN_COMMANDER},
 };
 
 const char *

include/libdivecomputer/Makefile.am

@@ -53,4 +53,6 @@ libdivecomputer_HEADERS = 	\
 	citizen.h \
 	citizen_aqualand.h \
 	divesystem.h \
-	divesystem_idive.h
+	divesystem_idive.h \
+	cochran.h \
+	cochran_commander.h

include/libdivecomputer/cochran.h

@@ -0,0 +1,27 @@
+/*
+ * libdivecomputer
+ *
+ * Copyright (C) 2014 John Van Ostrand
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#ifndef COCHRAN_H
+#define COCHRAN_H
+
+#include "cochran_commander.h"
+
+#endif /* COCHRAN_H */

include/libdivecomputer/cochran_commander.h

@@ -0,0 +1,43 @@
+/*
+ * libdivecomputer
+ *
+ * Copyright (C) 2014 John Van Ostrand
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#ifndef COCHRAN_COMMANDER_H
+#define COCHRAN_COMMANDER_H
+
+#include "context.h"
+#include "device.h"
+#include "parser.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+dc_status_t
+cochran_commander_device_open (dc_device_t **device, dc_context_t *context, const char *name);
+
+dc_status_t
+cochran_commander_parser_create (dc_parser_t **parser, dc_context_t *context, unsigned int model);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* COCHRAN_COMMANDER_H */

include/libdivecomputer/common.h

@@ -88,6 +88,8 @@ typedef enum dc_family_t {
 	DC_FAMILY_CITIZEN_AQUALAND = (12 << 16),
 	/* DiveSystem */
 	DC_FAMILY_DIVESYSTEM_IDIVE = (13 << 16),
+	/* Cochran */
+	DC_FAMILY_COCHRAN_COMMANDER = (14 << 16),
 } dc_family_t;
 
 #ifdef __cplusplus

libdivecomputer.pc.in

@@ -8,4 +8,5 @@ Description: A library for communication with various dive computers.
 Version: @VERSION@
 Requires.private: @DEPENDENCIES@
 Libs: -L${libdir} -ldivecomputer
+Libs.private: -lm
 Cflags: -I${includedir}

msvc/libdivecomputer.vcproj

@@ -210,6 +210,14 @@
 				RelativePath="..\src\citizen_aqualand_parser.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\cochran_commander.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\cochran_commander_parser.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\common.c"
 				>
@@ -524,6 +532,14 @@
 				RelativePath="..\include\libdivecomputer\citizen_aqualand.h"
 				>
 			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\cochran.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\cochran_commander.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\common-private.h"
 				>

src/Makefile.am

@@ -3,7 +3,7 @@ AM_CFLAGS = $(LIBUSB_CFLAGS) -DENABLE_DEPRECATED
 
 lib_LTLIBRARIES = libdivecomputer.la
 
-libdivecomputer_la_LIBADD = $(LIBUSB_LIBS)
+libdivecomputer_la_LIBADD = $(LIBUSB_LIBS) -lm
 libdivecomputer_la_LDFLAGS = \
 	-version-info $(DC_VERSION_LIBTOOL) \
 	-no-undefined \
@@ -64,7 +64,9 @@ libdivecomputer_la_SOURCES = \
 	ringbuffer.h ringbuffer.c \
 	checksum.h checksum.c \
 	array.h array.c \
-	buffer.c
+	buffer.c \
+	cochran_commander.h cochran_commander.c \
+	cochran_commander_parser.c
 
 if OS_WIN32
 libdivecomputer_la_SOURCES += serial.h serial_win32.c