Merge 848aaad7ae into 881123575b

RX_FSK/RX_FSK.ino

@@ -42,6 +42,9 @@
 
 
 /* Data exchange connectors */
+#if FEATURE_SONDESEEKER
+#include "src/conn-sondeseeker.h"
+#endif
 #if FEATURE_CHASEMAPPER
 #include "src/conn-chasemapper.h"
 #endif
@@ -71,6 +74,9 @@ Conn *connectors[] = { &connSystem,
 #if FEATURE_CHASEMAPPER
 &connChasemapper,
 #endif
+#if FEATURE_SONDESEEKER
+&connSondeseeker,
+#endif
 #if FEATURE_MQTT
 &connMQTT,
 #endif
@@ -689,6 +695,7 @@ void setupConfigData() {
   while (file.available()) {
     String line = readLine(file);  //file.readStringUntil('\n');
     sonde.setConfig(line.c_str());
+    LOG_D(TAG, "Processing a=%s",line.c_str());
   }
   sonde.checkConfig(); // eliminate invalid entries
 }
@@ -753,6 +760,12 @@ struct st_configitems config_list[] = {
   {"cm.host", 63, &sonde.config.cm.host},
   {"cm.port", 0, &sonde.config.cm.port},
 #endif
+#if FEATURE_SONDESEEKER
+  /* Sondeseeker settings */
+  {"ss.active", -3, &sonde.config.ss.active},
+  {"ss.host", 63, &sonde.config.ss.host},
+  {"ss.port", 0, &sonde.config.ss.port},
+#endif
 #if FEATURE_MQTT
   /* MQTT */
   {"mqtt.active", 0, &sonde.config.mqtt.active},
@@ -2311,6 +2324,9 @@ void loopDecoder() {
 #endif
 #if FEATURE_CHASEMAPPER
       connChasemapper.updateSonde( s );
+#endif
+#if FEATURE_SONDESEEKER
+      connSondeseeker.updateSonde( s );
 #endif
     }
 #if FEATURE_SONDEHUB

RX_FSK/data/cfg.js

@@ -63,12 +63,16 @@ var cfgs = [
 [ "cm.active", "Chasemapper active (0=disabled, 1=active)"],
 [ "cm.host", "Chasemapper UDP host"],
 [ "cm.port", "Chasemapper UDP port"],
+[ "", "SondeSeeker settings", "https://github.com/dl9rdz/rdz_ttgo_sonde/wiki/Sondeseeker-configuration"],
+[ "ss.active", "Sondeseeker active (0=disabled, 1=active)"],
+[ "ss.host", "Sondeseeker UDP host"],
+[ "ss.port", "Sondeseeker UDP port"],
 [ "", "SondeHub settings", "https://github.com/dl9rdz/rdz_ttgo_sonde/wiki/SondeHub-settings"],
 [ "sondehub.active", "SondeHub reporting (0=disabled, 1=active)"],
 [ "sondehub.chase", "SondeHub location reporting (0=off, 1=fixed, 2=chase/GPS, 3=auto)"],
 [ "sondehub.host", "SondeHub host (DO NOT CHANGE)"],
 [ "sondehub.callsign", "Callsign"],
-[ "sondehub.antenna", "Antenna (optional, visisble on SondeHub tracker)"],
+[ "sondehub.antenna", "Antenna (optional, visible on SondeHub tracker)"],
 [ "sondehub.email", "SondeHub email (optional, only used to contact in case of upload errors)"],
 [ "", "SondeHub frequency import", "https://github.com/dl9rdz/rdz_ttgo_sonde/wiki/SondeHub-import" ],
 [ "sondehub.fiactive", "SondeHub frequency import active (0=disabled, 1=active)" ],
@@ -97,7 +101,7 @@ var cfgs = [
 [ "power_pout", "Power control port"],
 [ "led_pout", "LED output port"],
 [ "gps_rxd", "GPS RXD pin (-1 to disable)"],
-[ "gps_txd", "GPS TXD pin (optional, only for GSP reset)"],
+[ "gps_txd", "GPS TXD pin (optional, only for GPS reset)"],
 [ "batt_adc", "Battery measurement pin"],
 [ "sx1278_ss", "SX1278 SS"],
 [ "sx1278_miso", "SX1278 MISO"],

RX_FSK/data/config.txt

@@ -147,5 +147,11 @@ sondehub.fiinterval=60
 sondehub.fimaxdist=150
 sondehub.fimaxage=6
 #-------------------------------#
+# Sondeseeker settings
+#-------------------------------#
+ss.active=0
+ss.host=224.0.0.0
+ss.port=62655
+#-------------------------------#
 # EOF
 #-------------------------------#

RX_FSK/features.h

@@ -11,6 +11,7 @@
 #define FEATURE_MQTT 1
 #define FEATURE_SDCARD 1
 #define FEATURE_APRS 1
+#define FEATURE_SONDESEEKER 1
 
 
 // Additional optional components

RX_FSK/src/Sonde.cpp

@@ -301,7 +301,7 @@ void Sonde::defaultConfig() {
 	}
 	//
 	config.noisefloor = -125;
-	strcpy(config.call,"NOCALL");
+	strcpy(config.call,"N0CALL");
 	config.passcode = -1;
 	strcpy(config.mdnsname, "rdzsonde");
 	config.maxsonde=15;
@@ -343,6 +343,10 @@ void Sonde::defaultConfig() {
 	strcpy(config.mqtt.password, "/0");
 	strcpy(config.mqtt.prefix, "rdz_sonde_server/");
 	config.mqtt.report_interval = 60000;
+
+	config.ss.active = 1;
+	strcpy(config.ss.host, "255.255.255.255");
+	config.ss.port = 62655;
 }
 
 extern struct st_configitems config_list[];

RX_FSK/src/Sonde.h

@@ -229,6 +229,12 @@ struct st_cm {
 	int port;
 };
 
+struct st_ss {
+	int active;
+	char host[64];
+	int port;
+};
+
 struct st_sondehub {
 	int active;
 	int chase;
@@ -236,7 +242,7 @@ struct st_sondehub {
 	char callsign[64];
 	char antenna[64];
 	char email[64];
-        int fiactive;
+    int fiactive;
 	int fiinterval;
 	int fimaxdist;
 	double fimaxage;
@@ -299,7 +305,7 @@ typedef struct st_rdzconfig {
 	int noisefloor;			// for spectrum display
 	char mdnsname[15];		// mDNS-Name, defaults to rdzsonde
 	// receiver configuration
-	int freqofs;			// frequency offset (tuner config = rx frequency + freqofs) in Hz
+	int freqofs;				// frequency offset (tuner config = rx frequency + freqofs) in Hz
 	struct st_rs41config rs41;	// configuration options specific for RS41 receiver
 	struct st_rs92config rs92;
 	struct st_dfmconfig dfm;
@@ -309,17 +315,18 @@ typedef struct st_rdzconfig {
 	// data feed configuration
 	// for now, one feed for each type is enough, but might get extended to more?
 	char call[10];			// APRS callsign
-	int passcode;		// APRS passcode
+	int passcode;			// APRS passcode
 	int chase;
 	char objcall[10];		// APRS object call (for wettersonde.net)
 	char beaconsym[5];		// APRS beacon symbol
 	char comment[32];
 	struct st_axudpinfo udpfeed;	// target for AXUDP messages
-	struct st_aprsinfo tcpfeed;	// target for APRS-IS TCP connections
+	struct st_aprsinfo tcpfeed;		// target for APRS-IS TCP connections
-	struct st_kisstnc kisstnc;	// target for KISS TNC (via TCP, mainly for APRSdroid)
+	struct st_kisstnc kisstnc;		// target for KISS TNC (via TCP, mainly for APRSdroid)
 	struct st_mqtt mqtt;
 	struct st_sondehub sondehub;
 	struct st_cm cm;
+	struct st_ss ss;
 	struct st_sdcard sd;
 } RDZConfig;
 
@@ -335,7 +342,6 @@ struct st_configitems {
 extern struct st_configitems config_list[];
 extern const int N_CONFIG;
 
-
 #define MAXSONDE 50
 
 extern int fingerprintValue[];
@@ -391,13 +397,12 @@ public:
 	void updateDisplayIP();
 	void updateDisplay();
 	void clearDisplay();
-        void dispsavectlON();
+    void dispsavectlON();
-        void dispsavectlOFF(int rxactive);
+	void dispsavectlOFF(int rxactive);
 
 	void setIP(String ip, bool isAP);
 };
 
 extern Sonde sonde;
 
-#endif
+#endif
-

RX_FSK/src/conn-sondeseeker.cpp

@@ -0,0 +1,50 @@
+#include "../features.h"
+#if FEATURE_SONDESEEKER
+
+#include "conn-sondeseeker.h"
+#include <WiFiUdp.h>
+#include "posinfo.h"
+#include "json.h"
+
+extern const char *sondeTypeStrSH[];
+extern WiFiUDP udp;
+
+void ConnSondeseeker::init() {
+}
+
+void ConnSondeseeker::netsetup() {
+}
+
+void ConnSondeseeker::netshutdown() {
+}
+
+void ConnSondeseeker::updateSonde(SondeInfo *si) {
+	char buf[1024];
+
+	strcpy(buf, "{\"sonde\": {");
+	sonde2json(buf + strlen(buf), 1024, si);
+	strcat(buf, "}}");
+
+	Serial.printf("Sending SondeSeeker json: %s\n", buf);
+	udp.beginPacket(sonde.config.ss.host, sonde.config.ss.port);
+	udp.write((const uint8_t *)buf, strlen(buf));
+	udp.endPacket();
+
+}
+
+void ConnSondeseeker::updateStation(PosInfo *pi) {
+}
+
+String ConnSondeseeker::getStatus() {
+        if(!sonde.config.ss.active) return String("disabled");
+        char info[100];
+	snprintf(info, 100, "active [%s:%d]", sonde.config.ss.host, sonde.config.ss.port);
+	return String(info);
+}
+
+String ConnSondeseeker::getName() {
+	return String("SondeSeeker");
+}
+
+ConnSondeseeker connSondeseeker;
+#endif

RX_FSK/src/conn-sondeseeker.h

@@ -0,0 +1,20 @@
+#ifndef _SONDESEEKER_H
+#define _SONDESEEKER_H
+
+#include "Sonde.h"
+#include "conn.h"
+
+class ConnSondeseeker : public Conn {
+public:
+	void init();
+	void netsetup();
+	void netshutdown();
+	void updateSonde( SondeInfo *si );
+	void updateStation( PosInfo *pi );
+        String getStatus();
+	String getName();
+};
+
+extern ConnSondeseeker connSondeseeker;
+
+#endif