<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Thu, Aug 10, 2017 at 10:55 AM, Jef Driesen <span dir="ltr"><<a href="mailto:jef@libdivecomputer.org" target="_blank">jef@libdivecomputer.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">On 2017-07-15 22:39, John Van Ostrand wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
-#define COCHRAN_MODEL_COMMANDER_PRE210<wbr>00 0<br>
-#define COCHRAN_MODEL_COMMANDER_AIR_NI<wbr>TROX 1<br>
-#define COCHRAN_MODEL_EMC_14 2<br>
-#define COCHRAN_MODEL_EMC_16 3<br>
-#define COCHRAN_MODEL_EMC_20 4<br>
+#define COCHRAN_MODEL_COMMANDER_TM 0<br>
+#define COCHRAN_MODEL_COMMANDER_PRE210<wbr>00 1<br>
+#define COCHRAN_MODEL_COMMANDER_AIR_NI<wbr>TROX 2<br>
+#define COCHRAN_MODEL_EMC_14 3<br>
+#define COCHRAN_MODEL_EMC_16 4<br>
+#define COCHRAN_MODEL_EMC_20 5<br>
</blockquote>
<br></span>
These values are now out of sync with the ones in src/descriptor.c:<span class=""><br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
--- a/src/descriptor.c<br>
+++ b/src/descriptor.c<br>
@@ -297,6 +297,7 @@ static const dc_descriptor_t g_descriptors[] = {<br>
        {"Cochran", "EMC-14",           DC_FAMILY_COCHRAN_COMMANDER, 2},<br>
        {"Cochran", "EMC-16",           DC_FAMILY_COCHRAN_COMMANDER, 3},<br>
        {"Cochran", "EMC-20H",          DC_FAMILY_COCHRAN_COMMANDER, 4},<br>
+       {"Cochran", "Commander TM",     DC_FAMILY_COCHRAN_COMMANDER, 5},<br>
 };<br>
</blockquote>
<br></span>
That's not only confusing but also breaks the parser side when using the dc_parser_new2() function. That function obtains the model number from the descriptor, while the dc_parser_new() gets it from the devinfo event.</blockquote><div><br></div><div>Okay, I did a re-arrangement, the wrong way again, based on the assumption that no Cochran users are storing dive blobs for later processing. </div></div><br clear="all"><div><br></div>-- <br><div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div>John Van Ostrand<br></div><div>At large on sabbatical<br></div><br></div></div>
</div></div>