diff --git a/RX_FSK/RX_FSK.ino b/RX_FSK/RX_FSK.ino index 441120f..13b70fa 100644 --- a/RX_FSK/RX_FSK.ino +++ b/RX_FSK/RX_FSK.ino @@ -24,6 +24,9 @@ #include "src/aprs.h" #include "src/ShFreqImport.h" #include "src/RS41.h" +#if FEATURE_CHASEMAPPER +#include "src/Chasemapper.h" +#endif #if FEATURE_MQTT #include "src/mqtt.h" @@ -738,7 +741,12 @@ struct st_configitems config_list[] = { {"tcp.port", 0, &sonde.config.tcpfeed.port}, {"tcp.idformat", -2, &sonde.config.tcpfeed.idformat}, {"tcp.highrate", 0, &sonde.config.tcpfeed.highrate}, - +#if FEATURE_CHASEMAPPER + /* Chasemapper settings */ + {"cm.active", -3, &sonde.config.cm.active}, + {"cm.host", 63, &sonde.config.cm.host}, + {"cm.port", 0, &sonde.config.cm.port}, +#endif #if FEATURE_MQTT /* MQTT */ {"mqtt.active", 0, &sonde.config.mqtt.active}, @@ -2514,6 +2522,11 @@ void loopDecoder() { Serial.print("sending: "); Serial.println(raw); tncclient.write(raw, rawlen); } +#if FEATURE_CHASEMAPPER + if (sonde.config.cm.active) { + Chasemapper::send(udp, s); + } +#endif } #if FEATURE_SONDEHUB if (sonde.config.sondehub.active) { diff --git a/RX_FSK/data/cfg.js b/RX_FSK/data/cfg.js index 4e36234..c248b0f 100644 --- a/RX_FSK/data/cfg.js +++ b/RX_FSK/data/cfg.js @@ -54,6 +54,10 @@ var cfgs = [ [ "mqtt.username", "MQTT username"], [ "mqtt.password", "MQTT password"], [ "mqtt.prefix", "MQTT prefix"], +[ "", "Chasemapper settings"], +[ "cm.active", "Chasemapper active (0=disabled, 1=active)"], +[ "cm.host", "Chasemapper UDP host"], +[ "cm.port", "Chasemapper UDP port"], [ "", "SondeHub settings"], [ "sondehub.active", "SondeHub reporting (0=disabled, 1=active)"], [ "sondehub.chase", "SondeHub location reporting (0=off, 1=fixed, 2=chase/GPS, 3=auto)"], diff --git a/RX_FSK/features.h b/RX_FSK/features.h index fecf820..60341cf 100644 --- a/RX_FSK/features.h +++ b/RX_FSK/features.h @@ -5,7 +5,7 @@ /* data feed to sondehubv2 */ /* needs about 4k4 code, 200b data, 200b stack, 200b heap */ #define FEATURE_SONDEHUB 1 -#define FEaTURE_CHASEMAPPER 1 +#define FEATURE_CHASEMAPPER 1 #define FEATURE_MQTT 1 #define FEATURE_RS92 1 diff --git a/RX_FSK/src/Chasemapper.cpp b/RX_FSK/src/Chasemapper.cpp index d24ced4..6c98de9 100644 --- a/RX_FSK/src/Chasemapper.cpp +++ b/RX_FSK/src/Chasemapper.cpp @@ -14,7 +14,7 @@ int Chasemapper::send(WiFiUDP &udp, SondeInfo *si) { sprintf(buf, "{ \"type\": \"PAYLOAD_SUMMARY\"," "\"callsign\": \"%s\"," "\"latitude\": %g," - "\"longidude\": %g," + "\"longitude\": %g," "\"altitude\": %d," "\"speed\": %d," "\"heading\": %d," diff --git a/RX_FSK/version.h b/RX_FSK/version.h index ec175bc..9bd5aa5 100644 --- a/RX_FSK/version.h +++ b/RX_FSK/version.h @@ -1,4 +1,4 @@ const char *version_name = "rdzTTGOsonde"; -const char *version_id = "devel20210920"; +const char *version_id = "devel20210921"; const int SPIFFS_MAJOR=2; const int SPIFFS_MINOR=16;