From b6a3c9b2372180fd7401749ea24ad79d9d59c01c Mon Sep 17 00:00:00 2001
From: Jef Driesen <jefdriesen@users.sourceforge.net>
Date: Thu, 8 Jan 2015 08:26:30 +0100
Subject: [PATCH] Add support for the Scubapro Chromis.

---
 src/descriptor.c          | 1 +
 src/uwatec_smart_parser.c | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/descriptor.c b/src/descriptor.c
index 187d92e..3ec02eb 100644
--- a/src/descriptor.c
+++ b/src/descriptor.c
@@ -112,6 +112,7 @@ static const dc_descriptor_t g_descriptors[] = {
 #endif
 	/* Scubapro/Uwatec Meridian */
 	{"Scubapro", "Meridian",    DC_FAMILY_UWATEC_MERIDIAN, 0x20},
+	{"Scubapro", "Chromis",     DC_FAMILY_UWATEC_MERIDIAN, 0x24},
 	/* Reefnet */
 	{"Reefnet", "Sensus",       DC_FAMILY_REEFNET_SENSUS, 1},
 	{"Reefnet", "Sensus Pro",   DC_FAMILY_REEFNET_SENSUSPRO, 2},
diff --git a/src/uwatec_smart_parser.c b/src/uwatec_smart_parser.c
index 37cfa1b..c2a09cf 100644
--- a/src/uwatec_smart_parser.c
+++ b/src/uwatec_smart_parser.c
@@ -45,6 +45,7 @@
 #define GALILEOTRIMIX 0x19
 #define SMARTZ        0x1C
 #define MERIDIAN      0x20
+#define CHROMIS       0x24
 
 #define UNSUPPORTED 0xFFFFFFFF
 
@@ -284,6 +285,7 @@ uwatec_smart_parser_create (dc_parser_t **out, dc_context_t *context, unsigned i
 	case GALILEOTRIMIX:
 	case ALADIN2G:
 	case MERIDIAN:
+	case CHROMIS:
 		parser->headersize = 152;
 		parser->header = &uwatec_smart_galileo_header;
 		parser->samples = uwatec_smart_galileo_samples;
@@ -553,7 +555,8 @@ uwatec_smart_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t
 		// Process the type bits in the bitstream.
 		unsigned int id = 0;
 		if (parser->model == GALILEO || parser->model == GALILEOTRIMIX ||
-			parser->model == ALADIN2G || parser->model == MERIDIAN) {
+			parser->model == ALADIN2G || parser->model == MERIDIAN ||
+			parser->model == CHROMIS) {
 			// Uwatec Galileo
 			id = uwatec_galileo_identify (data[offset]);
 		} else {