From dc214e41a11e9ec905a9ac1920291e2313f645fb Mon Sep 17 00:00:00 2001
From: Zilog80 <rs1729@users.noreply.github.com>
Date: Sun, 2 Oct 2016 14:01:00 +0200
Subject: [PATCH] DFM: clean-up

---
 dfm/dfm06.c |  56 +++++++++++++++++++++++++++++-----------------------
 dfm/dfm06s  | Bin 13972 -> 0 bytes
 2 files changed, 31 insertions(+), 25 deletions(-)
 delete mode 100755 dfm/dfm06s

diff --git a/dfm/dfm06.c b/dfm/dfm06.c
index 7f59357..ea06284 100644
--- a/dfm/dfm06.c
+++ b/dfm/dfm06.c
@@ -30,7 +30,8 @@ typedef unsigned int ui32_t;
 typedef struct {
     int frnr;
     int sonde_typ;
-    ui32_t sonde_id;
+    ui32_t SN6;
+    ui32_t SN9;
     int week; int gpssec;
     int jahr; int monat; int tag;
     int std; int min; float sek;
@@ -489,36 +490,42 @@ int dat_out(ui8_t *dat_bits) {
     return ret;
 }
 
+#define SNbit 0x0100
 int conf_out(ui8_t *conf_bits) {
     int conf_id;
     int ret = 0;
     int val, hl;
-    static int typ6, typ9, chAbit, chA[2];
+    static int chAbit, chA[2];
+    ui32_t SN6, SN9;
 
     conf_id = bits2val(conf_bits, 4);
-    if (gpx.sonde_typ < 9  &&  conf_id == 6) {
-        if (typ6 < 4) typ6 += 1;
-        else if (typ6 == 4) {
-            gpx.sonde_typ = 6;
-            typ6 += 1;
+
+    if ((gpx.sonde_typ & 0xFF) < 9  &&  conf_id == 6) {
+        SN6 = bits2val(conf_bits+4, 4*6);  // DFM-06: Kanal 6
+        if ( SN6 == gpx.SN6 ) {
+            gpx.sonde_typ = SNbit | 6;
+            ret = 6;
         }
-        gpx.sonde_id = bits2val(conf_bits+4, 4*6);  // DFM-06: Kanal 6
+        else {
+            gpx.sonde_typ = 0;
+        }
+        gpx.SN6 = SN6;
     }
-    if (conf_id == 0xA) {
-        if (typ9 < 4) {
-            typ9 += 1;
-            typ6 = 0;
-        }
-        else if (typ9 == 4) {
-            gpx.sonde_typ = 9;
-            typ9 += 1;
-        }
+    if (conf_id == 0xA) {  // 0xACxxxxy
         val = bits2val(conf_bits+8, 4*5);
         hl =  (val & 1) == 0;
         chA[hl] = (val >> 4) & 0xFFFF;
         chAbit |= 1 << hl;
         if (chAbit == 3) {  // DFM-09: Kanal A
-            gpx.sonde_id = (chA[1] << 16) | chA[0];
+            SN9 = (chA[1] << 16) | chA[0];
+            if ( SN9 == gpx.SN9 ) {
+                gpx.sonde_typ = SNbit | 9;
+                ret = 9;
+            }
+            else {
+                gpx.sonde_typ = 0;
+            }
+            gpx.SN9 = SN9;
             chAbit = 0;
         }
     }
@@ -553,15 +560,15 @@ void print_gpx() {
               printf(" dir: %5.1f ", gpx.dir);
               printf(" hV: %5.2f ", gpx.horiV);
               printf(" vV: %5.2f ", gpx.vertV);
-              if (option_verbose == 2  && gpx.sonde_id > 0)
+              if (option_verbose == 2  &&  (gpx.sonde_typ & SNbit))
               {
-                  if (gpx.sonde_typ == 6) {
-                      printf(" (ID%1d:%06X) ", gpx.sonde_typ % 10, gpx.sonde_id);
+                  if ((gpx.sonde_typ & 0xFF) == 6) {
+                      printf(" (ID%1d:%06X) ", gpx.sonde_typ & 0xF, gpx.SN6);
                   }
-                  if (gpx.sonde_typ == 9) {
-                      printf(" (ID%1d:%06d) ", gpx.sonde_typ % 10, gpx.sonde_id);
+                  if ((gpx.sonde_typ & 0xFF) == 9) {
+                      printf(" (ID%1d:%06d) ", gpx.sonde_typ & 0xF, gpx.SN9);
                   }
-                  gpx.sonde_id = 0;
+                  gpx.sonde_typ ^= SNbit;
               }
           }
       }
@@ -722,7 +729,6 @@ int main(int argc, char **argv) {
     }
 
 
-    gpx.sonde_id = -1;
     for (i = 0; i < 9; i++) {
         for (j = 0; j < 13; j++) dat_str[i][j] = ' ';
     }
diff --git a/dfm/dfm06s b/dfm/dfm06s
deleted file mode 100755
index b14820cc8e3854dcc11e5170a9469394e64e07d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13972
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