From c95ab19e6a4151f307a3db9bcda78e5c08fff3e2 Mon Sep 17 00:00:00 2001
From: Jef Driesen <jefdriesen@users.sourceforge.net>
Date: Wed, 5 Nov 2014 10:08:47 +0100
Subject: [PATCH] Use symbolic constants for the dive mode.

---
 src/mares_common.c      |  9 +++++++--
 src/mares_nemo_parser.c | 19 ++++++++++++-------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/mares_common.c b/src/mares_common.c
index b7042c8..7f0655e 100644
--- a/src/mares_common.c
+++ b/src/mares_common.c
@@ -46,6 +46,11 @@
 #define NEMOAPNEIST 18
 #define PUCKAIR     19
 
+#define AIR      0
+#define NITROX   1
+#define FREEDIVE 2
+#define GAUGE    3
+
 void
 mares_common_device_init (mares_common_device_t *device, dc_context_t *context, const dc_device_vtable_t *vtable)
 {
@@ -212,9 +217,9 @@ mares_common_extract_dives (dc_context_t *context, const mares_common_layout_t *
 
 	// Get the freedive mode for this model.
 	unsigned int model = data[1];
-	unsigned int freedive = 2;
+	unsigned int freedive = FREEDIVE;
 	if (model == NEMOWIDE || model == NEMOAIR || model == PUCK || model == PUCKAIR)
-		freedive = 3;
+		freedive = GAUGE;
 
 	// Get the end of the profile ring buffer.
 	unsigned int eop = array_uint16_le (data + 0x6B);
diff --git a/src/mares_nemo_parser.c b/src/mares_nemo_parser.c
index e226ce6..03a88ee 100644
--- a/src/mares_nemo_parser.c
+++ b/src/mares_nemo_parser.c
@@ -39,6 +39,11 @@
 #define NEMOAPNEIST 18
 #define PUCKAIR     19
 
+#define AIR      0
+#define NITROX   1
+#define FREEDIVE 2
+#define GAUGE    3
+
 typedef struct mares_nemo_parser_t mares_nemo_parser_t;
 
 struct mares_nemo_parser_t {
@@ -87,14 +92,14 @@ mares_nemo_parser_create (dc_parser_t **out, dc_context_t *context, unsigned int
 	parser_init (&parser->base, context, &mares_nemo_parser_vtable);
 
 	// Get the freedive mode for this model.
-	unsigned int freedive = 2;
+	unsigned int freedive = FREEDIVE;
 	if (model == NEMOWIDE || model == NEMOAIR || model == PUCK || model == PUCKAIR)
-		freedive = 3;
+		freedive = GAUGE;
 
 	// Set the default values.
 	parser->model = model;
 	parser->freedive = freedive;
-	parser->mode = 0;
+	parser->mode = AIR;
 	parser->length = 0;
 	parser->sample_count = 0;
 	parser->sample_size = 0;
@@ -125,7 +130,7 @@ mares_nemo_parser_set_data (dc_parser_t *abstract, const unsigned char *data, un
 	// Clear the previous state.
 	parser->base.data = NULL;
 	parser->base.size = 0;
-	parser->mode = 0;
+	parser->mode = AIR;
 	parser->length = 0;
 	parser->sample_count = 0;
 	parser->sample_size = 0;
@@ -234,17 +239,17 @@ mares_nemo_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsign
 				*((double *) value) = array_uint16_le (p + 53 - 10) / 10.0;
 				break;
 			case DC_FIELD_GASMIX_COUNT:
-				if (parser->mode == 0 || parser->mode == 1)
+				if (parser->mode == AIR || parser->mode == NITROX)
 					*((unsigned int *) value) = 1;
 				else
 					*((unsigned int *) value) = 0;
 				break;
 			case DC_FIELD_GASMIX:
 				switch (parser->mode) {
-				case 0: // Air
+				case AIR:
 					gasmix->oxygen = 0.21;
 					break;
-				case 1: // Nitrox
+				case NITROX:
 					gasmix->oxygen = p[53 - 43] / 100.0;
 					break;
 				default: