From c932c909102851c989f8bc8663e3d79e209edefc Mon Sep 17 00:00:00 2001
From: "Hansi, dl9rdz" <dl9rdz@darc.de>
Date: Sat, 30 Oct 2021 11:57:18 +0200
Subject: [PATCH] remove no longer used idformat config

---
 RX_FSK/RX_FSK.ino      | 3 ---
 RX_FSK/data/cfg.js     | 3 ---
 RX_FSK/data/config.txt | 9 +++++----
 RX_FSK/src/Sonde.cpp   | 2 --
 RX_FSK/src/Sonde.h     | 4 ----
 5 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/RX_FSK/RX_FSK.ino b/RX_FSK/RX_FSK.ino
index 21172b9..6e44033 100644
--- a/RX_FSK/RX_FSK.ino
+++ b/RX_FSK/RX_FSK.ino
@@ -758,12 +758,10 @@ struct st_configitems config_list[] = {
   {"passcode", 0, &sonde.config.passcode},
   /* KISS tnc settings */
   {"kisstnc.active", 0, &sonde.config.kisstnc.active},
-  {"kisstnc.idformat", -2, &sonde.config.kisstnc.idformat},
   /* AXUDP settings */
   {"axudp.active", -3, &sonde.config.udpfeed.active},
   {"axudp.host", 63, sonde.config.udpfeed.host},
   {"axudp.port", 0, &sonde.config.udpfeed.port},
-  {"axudp.idformat", -2, &sonde.config.udpfeed.idformat},
   {"axudp.highrate", 0, &sonde.config.udpfeed.highrate},
   /* APRS TCP settings, current not used */
   {"tcp.active", -3, &sonde.config.tcpfeed.active},
@@ -772,7 +770,6 @@ struct st_configitems config_list[] = {
   {"tcp.chase", 0, &sonde.config.chase},
   {"tcp.comment", 30, sonde.config.comment},
   {"tcp.bcall", 9, sonde.config.bcall},
-  {"tcp.idformat", -2, &sonde.config.tcpfeed.idformat},
   {"tcp.highrate", 0, &sonde.config.tcpfeed.highrate},
 #if FEATURE_CHASEMAPPER
   /* Chasemapper settings */
diff --git a/RX_FSK/data/cfg.js b/RX_FSK/data/cfg.js
index 1b28955..3032d5a 100644
--- a/RX_FSK/data/cfg.js
+++ b/RX_FSK/data/cfg.js
@@ -35,16 +35,13 @@ var cfgs = [
 [ "call", "Call"],
 [ "passcode", "Passcode"],
 [ "kisstnc.active", "KISS TNC (port 14590) (needs reboot)"],
-[ "kisstnc.idformat", "KISS TNC ID format"],
 [ "axudp.active", "AXUDP active"],
 [ "axudp.host", "AXUDP host"],
 [ "axudp.port", "AXUDP port"],
-[ "axudp.idformat", "DFM ID format"],
 [ "axudp.highrate", "Rate limit"],
 [ "tcp.active", "APRS TCP active"],
 [ "tcp.host", "APRS TCP host"],
 [ "tcp.port", "APRS TCP port"],
-[ "tcp.idformat", "DFM ID format"],
 [ "tcp.highrate", "Rate limit"],
 [ "tcp.bcall", "APRS location beacon call"],
 [ "tcp.chase", "APRS location reporting (0=off, 1=fixed, 2=chase/GPS, 3=auto)"],
diff --git a/RX_FSK/data/config.txt b/RX_FSK/data/config.txt
index 73f7250..55cd737 100644
--- a/RX_FSK/data/config.txt
+++ b/RX_FSK/data/config.txt
@@ -97,17 +97,18 @@ axudp.host=192.168.42.20
 axudp.port=9002
 axudp.symbol=/O
 axudp.highrate=1
-axudp.idformat=0
 #-------------------------------#
-# maybe some time in the future
+# connect to some aprs server
 #-------------------------------#
-# currently simply not implemented, no need to put anything here anyway
 tcp.active=0
 tcp.host=radiosondy.info
 tcp.port=14590
 tcp.symbol=/O
 tcp.highrate=20
-tcp.idformat=0
+# send beacon (possibly with different call or SSID)
+tcp.chase=0
+tcp.bcall=
+tcp.comment=
 #-------------------------------#
 # mqtt settings
 #-------------------------------#
diff --git a/RX_FSK/src/Sonde.cpp b/RX_FSK/src/Sonde.cpp
index 1edfd64..832d072 100644
--- a/RX_FSK/src/Sonde.cpp
+++ b/RX_FSK/src/Sonde.cpp
@@ -247,14 +247,12 @@ void Sonde::defaultConfig() {
 	strcpy(config.udpfeed.symbol, "/O");
 	config.udpfeed.port = 9002;
 	config.udpfeed.highrate = 1;
-	config.udpfeed.idformat = ID_DFMGRAW;
 	config.tcpfeed.active = 0;
 	config.tcpfeed.type = 1;
 	strcpy(config.tcpfeed.host, "radiosondy.info");
 	strcpy(config.tcpfeed.symbol, "/O");
 	config.tcpfeed.port = 12345;
 	config.tcpfeed.highrate = 10;
-	config.tcpfeed.idformat = ID_DFMDXL;
 	config.kisstnc.active = 0;
 	strcpy(config.ephftp,"igs.bkg.bund.de/IGS/BRDC/");
 
diff --git a/RX_FSK/src/Sonde.h b/RX_FSK/src/Sonde.h
index 8ea9b8d..350c877 100644
--- a/RX_FSK/src/Sonde.h
+++ b/RX_FSK/src/Sonde.h
@@ -182,8 +182,6 @@ struct st_mp3hconfig {
 };
 
 
-enum IDTYPE { ID_DFMDXL, ID_DFMGRAW, ID_DFMAUTO };
-
 struct st_feedinfo {
         bool active;
         int type;       // 0:UDP(axudp), 1:TCP(aprs.fi)
@@ -193,14 +191,12 @@ struct st_feedinfo {
         int lowrate;
         int highrate;
         int lowlimit;
-        int idformat;   // 0: dxl  1: real  2: auto
 };
 
 // maybe extend for external Bluetooth interface?
 // internal bluetooth consumes too much memory
 struct st_kisstnc {
         bool active;
-        int idformat;
 };
 
 struct st_mqtt {