mirror
/
rdz_ttgo_sonde
kopia lustrzana https://github.com/dl9rdz/rdz_ttgo_sonde
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

add email field support, null position default

pull/80/head
Uskompuf 2021-05-14 18:57:43 +10:00
rodzic b56842c9dc
commit 14dbbfc8bb
4 zmienionych plików z 12 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
RX_FSK/RX_FSK.ino
Wyświetl plik

@ -594,7 +594,7 @@ struct st_configitems config_list[] = {
{"sondehub.lon", "Longitude", 19, &sonde.config.sondehub.lon}, {"sondehub.lon", "Longitude", 19, &sonde.config.sondehub.lon},
{"sondehub.alt", "Altitude", 19, &sonde.config.sondehub.alt}, {"sondehub.alt", "Altitude", 19, &sonde.config.sondehub.alt},
{"sondehub.antenna", "Antenna", 63, &sonde.config.sondehub.antenna}, {"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)); 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_name\": \"%s\","
"\"software_version\": \"%s\"," "\"software_version\": \"%s\","
"\"uploader_callsign\": \"%s\"," "\"uploader_callsign\": \"%s\","
//TODO only send position + antenna if set "\"uploader_contact_email\": \"%s\","
"\"uploader_position\": [%s,%s,%s]," "\"uploader_position\": [%s,%s,%s],"
"\"uploader_antenna\": \"%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(strlen(data));
client->println(); client->println();
client->println(data); client->println(data);

11
RX_FSK/data/config.txt
Wyświetl plik

@ -124,11 +124,12 @@ mqtt.prefix=rdz_sonde_server/
# Sondehub v2 DB settings # Sondehub v2 DB settings
sondehub.active=1 sondehub.active=1
sondehub.host=api.v2.sondehub.org sondehub.host=api.v2.sondehub.org
sondehub.callsign=OH3BSG sondehub.callsign=CHANGEME_BSG_TTGO
sondehub.lat=61.570242 sondehub.lat=null
sondehub.lon=23.518801 sondehub.lon=null
sondehub.alt=160.0 sondehub.alt=null
sondehub.antenna=Discone + LNA sondehub.antenna=
sondehub.email=
#-------------------------------# #-------------------------------#
# EOF # EOF
#-------------------------------# #-------------------------------#

2
libraries/SondeLib/Sonde.cpp
Wyświetl plik

@ -388,6 +388,8 @@ void Sonde::setConfig(const char *cfg) {
strncpy(config.sondehub.alt, val, 19); strncpy(config.sondehub.alt, val, 19);
} else if(strcmp(cfg, "sondehub.antenna")==0) { } else if(strcmp(cfg, "sondehub.antenna")==0) {
strncpy(config.sondehub.antenna, val, 63); strncpy(config.sondehub.antenna, val, 63);
} else if(strcmp(cfg, "sondehub.email")==0) {
strncpy(config.sondehub.email, val, 63);
} else { } else {
Serial.printf("Invalid config option '%s'=%s \n", cfg, val); Serial.printf("Invalid config option '%s'=%s \n", cfg, val);
} }

1
libraries/SondeLib/Sonde.h
Wyświetl plik

@ -189,6 +189,7 @@ struct st_sondehub {
char lon[20]; char lon[20];
char alt[20]; char alt[20];
char antenna[64]; char antenna[64];
char email[64];
}; };
typedef struct st_rdzconfig { typedef struct st_rdzconfig {