From 4a0c0d440df2bd6724f793da0f90e145d13f3a8c Mon Sep 17 00:00:00 2001
From: Zilog80 <rs1729@users.noreply.github.com>
Date: Mon, 16 Dec 2019 18:07:17 +0100
Subject: [PATCH] DFM: json: serial number + dfm-subtype

---
 demod/mod/dfm09mod.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/demod/mod/dfm09mod.c b/demod/mod/dfm09mod.c
index e960179..e5d21c7 100644
--- a/demod/mod/dfm09mod.c
+++ b/demod/mod/dfm09mod.c
@@ -476,14 +476,12 @@ static int conf_out(gpx_t *gpx, ui8_t *conf_bits, int ec) {
                 gpx->sonde_typ = SNbit | 6;
                 gpx->ptu_out = 6; // <-> DFM-06
                 sprintf(gpx->sonde_id, "ID06:%6X", gpx->SN6);
-                //sprintf(json_sonde_id, "DFM06-%6X", gpx->SN6);
             }
             else { // reset
                 gpx->sonde_typ = 0;
-                //sprintf(json_sonde_id, "DFMxx-xxxxxxxx"); //json_sonde_id[0] = '\0';
             }
             gpx->SN6 = SN6;
-        }
+        }                                    // SN in last pck/channel, #{pcks} depends on (sensor) config; observed:
         else if (   (sn2_ch & 0xF) == 0xC    // 0xsCaaaab, s==sn_ch , s: 0xA=DFM-09 , 0xC=DFM-09P , 0xB=DFM-17 , 0xD=DFM-17P?
                  || (sn2_ch & 0xF) == 0x0 )  // 0xs0aaaab, s==sn_ch , s: 0x7,0x8: pilotsonde PS-15?
         {
@@ -510,22 +508,19 @@ static int conf_out(gpx_t *gpx, ui8_t *conf_bits, int ec) {
                         gpx->ptu_out = 0;
                         if (sn_ch == 0xA /*&& (sn2_ch & 0xF) == 0xC*/) gpx->ptu_out = sn_ch; // <+> DFM-09
                         if (sn_ch == 0xB /*&& (sn2_ch & 0xF) == 0xC*/) gpx->ptu_out = sn_ch; // <-> DFM-17
-                        if (sn_ch == 0xC) gpx->ptu_out = sn_ch; // <+> DFM-09P
+                        if (sn_ch == 0xC) gpx->ptu_out = sn_ch; // <+> DFM-09P(?)
                         if (sn_ch == 0xD) gpx->ptu_out = sn_ch; // <-> DFM-17P?
                         // PS-15 ? (sn2_ch & 0xF) == 0x0 :  gpx->ptu_out = 0 // <-> PS-15
 
                         if ( (gpx->sonde_typ & 0xF) == 0xA) {
                             sprintf(gpx->sonde_id, "ID09:%6u", gpx->SN);
-                            //sprintf(json_sonde_id, "DFM09-%6u", gpx->SN);
                         }
                         else {
                             sprintf(gpx->sonde_id, "ID-%1X:%6u", gpx->sonde_typ & 0xF, gpx->SN);
-                            //sprintf(json_sonde_id, "DFMx%1X-%6u", gpx->sonde_typ & 0xF,gpx->SN);
                         }
                     }
                     else { // reset
                         gpx->sonde_typ = 0;
-                        //sprintf(json_sonde_id, "DFMxx-xxxxxxxx"); //json_sonde_id[0] = '\0';
                     }
                     gpx->snc.SN_X = SN;
                     gpx->snc.chXbit = 0;
@@ -662,13 +657,14 @@ static void print_gpx(gpx_t *gpx) {
         if (gpx->option.jsn && jsonout)
         {
             // JSON Buffer to store sonde ID
-            char json_sonde_id[] = "DFMxx-xxxxxxxx\0\0";
-            switch (gpx->sonde_typ & 0xF) {
-                case   0: sprintf(json_sonde_id, "DFMxx-xxxxxxxx"); break; //json_sonde_id[0] = '\0';
-                case   6: sprintf(json_sonde_id, "DFM06-%6X", gpx->SN6); break;
-                case 0xA: sprintf(json_sonde_id, "DFM09-%6u", gpx->SN); break;
+            char json_sonde_id[] = "DFM-xxxxxxxx\0\0";
+            ui8_t dfm_typ = (gpx->sonde_typ & 0xF);
+            switch ( dfm_typ ) {
+                case   0: sprintf(json_sonde_id, "DFM-xxxxxxxx"); break; //json_sonde_id[0] = '\0';
+                case   6: sprintf(json_sonde_id, "DFM-%6X", gpx->SN6); break; // DFM-06
+                case 0xA: sprintf(json_sonde_id, "DFM-%6u", gpx->SN); break;  // DFM-09
                 // 0x7:PS-15?, 0xB:DFM-17? 0xC:DFM-09P? 0xD:DFM-17P?
-                default : sprintf(json_sonde_id, "DFMx%1X-%6u", gpx->sonde_typ & 0xF,gpx->SN);
+                default : sprintf(json_sonde_id, "DFM-%6u", gpx->SN);
             }
 
             // Print JSON blob     // valid sonde_ID?
@@ -678,6 +674,7 @@ static void print_gpx(gpx_t *gpx) {
                 float t = get_Temp(gpx); // ecc-valid temperature?
                 if (t > -270.0) printf(", \"temp\": %.1f", t);
             }
+            if (dfm_typ > 0) printf(", \"subtype\": \"0x%1X\"", dfm_typ);
             printf(" }\n");
             printf("\n");
         }