From 14dbbfc8bb62ee72354b119eaaf74992a7f31279 Mon Sep 17 00:00:00 2001
From: Uskompuf <22492406+Uskompuf@users.noreply.github.com>
Date: Fri, 14 May 2021 18:57:43 +1000
Subject: [PATCH] add email field support, null position default

---
 RX_FSK/RX_FSK.ino            |  6 +++---
 RX_FSK/data/config.txt       | 11 ++++++-----
 libraries/SondeLib/Sonde.cpp |  2 ++
 libraries/SondeLib/Sonde.h   |  1 +
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/RX_FSK/RX_FSK.ino b/RX_FSK/RX_FSK.ino
index f6b9b18..286826e 100644
--- a/RX_FSK/RX_FSK.ino
+++ b/RX_FSK/RX_FSK.ino
@@ -594,7 +594,7 @@ struct st_configitems config_list[] = {
   {"sondehub.lon", "Longitude", 19, &sonde.config.sondehub.lon},
   {"sondehub.alt", "Altitude", 19, &sonde.config.sondehub.alt},
   {"sondehub.antenna", "Antenna", 63, &sonde.config.sondehub.antenna},
-  
+  {"sondehub.email", "Sondehub email", 63, &sonde.config.sondehub.email},
 
 };
 const static int N_CONFIG = (sizeof(config_list) / sizeof(struct st_configitems));
@@ -2928,10 +2928,10 @@ void sondehub_station_update(WiFiClient *client, struct st_sondehub *conf) {
 		"\"software_name\": \"%s\","
 		"\"software_version\": \"%s\","
 		"\"uploader_callsign\": \"%s\","
-    //TODO only send position + antenna if set
+    "\"uploader_contact_email\": \"%s\","
 		"\"uploader_position\": [%s,%s,%s],"
 		"\"uploader_antenna\": \"%s\""
-		"}", version_name, version_id, conf->callsign, conf->lat, conf->lon, conf->alt, conf->antenna);
+		"}", version_name, version_id, conf->callsign, conf->email, conf->lat, conf->lon, conf->alt, conf->antenna);
 	client->println(strlen(data));
     client->println();
     client->println(data);
diff --git a/RX_FSK/data/config.txt b/RX_FSK/data/config.txt
index 3147aa1..c50d637 100644
--- a/RX_FSK/data/config.txt
+++ b/RX_FSK/data/config.txt
@@ -124,11 +124,12 @@ mqtt.prefix=rdz_sonde_server/
 # Sondehub v2 DB settings
 sondehub.active=1
 sondehub.host=api.v2.sondehub.org
-sondehub.callsign=OH3BSG
-sondehub.lat=61.570242
-sondehub.lon=23.518801
-sondehub.alt=160.0
-sondehub.antenna=Discone + LNA
+sondehub.callsign=CHANGEME_BSG_TTGO
+sondehub.lat=null
+sondehub.lon=null
+sondehub.alt=null
+sondehub.antenna=
+sondehub.email=
 #-------------------------------#
 # EOF
 #-------------------------------#
diff --git a/libraries/SondeLib/Sonde.cpp b/libraries/SondeLib/Sonde.cpp
index 05bcde7..aba6785 100644
--- a/libraries/SondeLib/Sonde.cpp
+++ b/libraries/SondeLib/Sonde.cpp
@@ -388,6 +388,8 @@ void Sonde::setConfig(const char *cfg) {
 		strncpy(config.sondehub.alt, val, 19);
 	} else if(strcmp(cfg, "sondehub.antenna")==0) {
 		strncpy(config.sondehub.antenna, val, 63);
+	} else if(strcmp(cfg, "sondehub.email")==0) {
+		strncpy(config.sondehub.email, val, 63);
 	} else {
 		Serial.printf("Invalid config option '%s'=%s \n", cfg, val);
 	}
diff --git a/libraries/SondeLib/Sonde.h b/libraries/SondeLib/Sonde.h
index 93bd0b2..e20e4df 100644
--- a/libraries/SondeLib/Sonde.h
+++ b/libraries/SondeLib/Sonde.h
@@ -189,6 +189,7 @@ struct st_sondehub {
 	char lon[20];
 	char alt[20];
 	char antenna[64];
+	char email[64];
 };
 
 typedef struct st_rdzconfig {