From 5f00d3b970f3c3fc652f3ab68e0139b92739a60f Mon Sep 17 00:00:00 2001 From: "Hansi, dl9rdz" Date: Wed, 14 Aug 2024 23:01:20 +0000 Subject: [PATCH] more status tab refinements --- RX_FSK/RX_FSK.ino | 9 +- RX_FSK/data/cfg.js | 7 +- RX_FSK/data/index.html | 81 +++++++++-------- RX_FSK/data/style.css | 27 ++++++ RX_FSK/src/Sonde.cpp | 12 +-- RX_FSK/src/Sonde.h | 16 ++-- RX_FSK/src/conn-aprs.cpp | 178 ++++++++++++++++++++++++------------- RX_FSK/src/conn-mqtt.cpp | 4 +- RX_FSK/src/conn-system.cpp | 4 +- RX_FSK/src/posinfo.cpp | 33 +++++++ RX_FSK/src/posinfo.h | 28 +++++- RX_FSK/version.h | 4 +- 12 files changed, 275 insertions(+), 128 deletions(-) diff --git a/RX_FSK/RX_FSK.ino b/RX_FSK/RX_FSK.ino index 5583aac..bdfa85d 100644 --- a/RX_FSK/RX_FSK.ino +++ b/RX_FSK/RX_FSK.ino @@ -57,6 +57,7 @@ #include "src/conn-system.h" Conn *connectors[] = { &connSystem, +&connGPS, #if FEATURE_APRS &connAPRS, #endif @@ -66,6 +67,9 @@ Conn *connectors[] = { &connSystem, #if FEATURE_CHASEMAPPER &connChasemapper, #endif +#if FEATURE_MQTT +&connMQTT, +#endif #if FEATURE_SDCARD &connSDCard, #endif @@ -648,13 +652,12 @@ struct st_configitems config_list[] = { /* AXUDP settings */ {"axudp.active", -3, &sonde.config.udpfeed.active}, {"axudp.host", 63, sonde.config.udpfeed.host}, - {"axudp.port", 0, &sonde.config.udpfeed.port}, - {"axudp.highrate", 0, &sonde.config.udpfeed.highrate}, + {"axudp.ratelimit", 0, &sonde.config.udpfeed.ratelimit}, /* APRS TCP settings */ {"tcp.active", -3, &sonde.config.tcpfeed.active}, {"tcp.timeout", 0, &sonde.config.tcpfeed.timeout}, {"tcp.host", 63, sonde.config.tcpfeed.host}, - {"tcp.port", 0, &sonde.config.tcpfeed.port}, + {"tcp.host2", 63, &sonde.config.tcpfeed.host2}, {"tcp.chase", 0, &sonde.config.chase}, {"tcp.comment", 30, sonde.config.comment}, {"tcp.objcall", 9, sonde.config.objcall}, diff --git a/RX_FSK/data/cfg.js b/RX_FSK/data/cfg.js index 22e7acf..33e5a7d 100644 --- a/RX_FSK/data/cfg.js +++ b/RX_FSK/data/cfg.js @@ -38,13 +38,12 @@ var cfgs = [ [ "passcode", "Passcode"], [ "kisstnc.active", "KISS TNC (port 14590) (needs reboot)"], [ "axudp.active", "AXUDP active"], -[ "axudp.host", "AXUDP host"], -[ "axudp.port", "AXUDP port"], +[ "axudp.host", "AXUDP host[:port]"], [ "axudp.highrate", "Rate limit"], [ "tcp.active", "APRS TCP active"], [ "tcp.timeout", "APRS TCP timeout [s] (0=off, 25=on)"], -[ "tcp.host", "APRS TCP host"], -[ "tcp.port", "APRS TCP port"], +[ "tcp.host", "APRS TCP host[:port] (default port 14580)"], +[ "tcp.host2", "APRS TCP host2[:port]"], [ "tcp.highrate", "Rate limit"], [ "tcp.objcall", "APRS object call"], [ "tcp.beaconsym", "APRS tracker symbol"], diff --git a/RX_FSK/data/index.html b/RX_FSK/data/index.html index ca2690c..31faba5 100755 --- a/RX_FSK/data/index.html +++ b/RX_FSK/data/index.html @@ -10,20 +10,60 @@
+
+
+
+

%VERSION_NAME% version %VERSION_ID%

+

Copyright © 2019-2024 by Hansi Reiser, DL9RDZ and contributors

+

+ This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + See https://github.com/dl9rdz/rdz_ttgo_sonde/ + for details, contributors, and license exceptions of third-party components. +

+


Check for update (requires TTGO internet connection via WiFi)

+ + + + + + + + + + + + +
ComponentStatus
TTGOAutodetect info: %AUTODETECT_INFO%
+
+
+

External Sites

+
+ wettersonde.net + radiosondy.info + sondehub.org +
+
+
+
rdzTTGOserver %VERSION_ID%
+ +
+
@@ -36,10 +76,6 @@
-
- -
-
@@ -48,35 +84,6 @@ -
-
-
-

%VERSION_NAME% version %VERSION_ID%

-

Autodetect info: %AUTODETECT_INFO%

-

Copyright © 2019-2024 by Hansi Reiser, DL9RDZ and contributors

-

- This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. - See https://github.com/dl9rdz/rdz_ttgo_sonde/ - for details, contributors, and license exceptions of third-party components. -

-

Check for update (requires TTGO internet connection via WiFi)

- - - - - - - - -
ComponentStatus
-
-
-
rdzTTGOserver %VERSION_ID%
- -