ua1zbe
/
rdz_ttgo_sonde_dl9rdz
mirror of https://github.com/dl9rdz/rdz_ttgo_sonde
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

send more values to SondeHub

This commit is contained in:
Uskompuf 2021-05-14 15:42:56 +10:00
parent 30483560ba
commit b56842c9dc
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
RX_FSK/RX_FSK.ino
View File

@ -2928,6 +2928,7 @@ 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_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->lat, conf->lon, conf->alt, conf->antenna);
@ -2953,6 +2954,7 @@ void sondehub_send_data(WiFiClient *client, SondeInfo *s, struct st_sondehub *co
time_t t = s->time; time_t t = s->time;
ts = *gmtime(&t); ts = *gmtime(&t);
//TODO convert back to GPS time from UTC time +18s
memset(rs_msg, 0, 450); memset(rs_msg, 0, 450);
w=rs_msg; w=rs_msg;
@ -2970,19 +2972,13 @@ void sondehub_send_data(WiFiClient *client, SondeInfo *s, struct st_sondehub *co
"\"lat\": %02d.%06d," "\"lat\": %02d.%06d,"
"\"lon\": %d.%06d," "\"lon\": %d.%06d,"
"\"alt\": %d.%02d," "\"alt\": %d.%02d,"
// "\"subtype\": \"RS41-SG\"," "\"frequency\": %.2f,"
// "\"frequency\": 0," "\"vel_h\": %.1f,"
// "\"temp\": 0," "\"vel_v\": %.1f,"
// "\"humidity\": 0," "\"heading\": %.1f,"
// "\"vel_h\": 0," "\"sats\": %d,"
// "\"vel_v\": 0," "\"rssi\": %.1f,"
// "\"pressure\": 0," //TODO only send position + antenna if set
// "\"heading\": 0,"
// "\"batt\": 0,"
// "\"sats\": 0,"
// "\"xdata\": \"string\","
// "\"snr\": 0,"
// "\"rssi\": %d"
"\"uploader_position\": [ %s, %s, %s ]," "\"uploader_position\": [ %s, %s, %s ],"
"\"uploader_antenna\": \"%s\"" "\"uploader_antenna\": \"%s\""
"}]", "}]",
@ -2992,7 +2988,7 @@ void sondehub_send_data(WiFiClient *client, SondeInfo *s, struct st_sondehub *co
ts.tm_year + 1900, ts.tm_mon + 1, ts.tm_mday, ts.tm_hour, ts.tm_min, ts.tm_sec + s->sec, ts.tm_year + 1900, ts.tm_mon + 1, ts.tm_mday, ts.tm_hour, ts.tm_min, ts.tm_sec + s->sec,
(int)s->lat, (int)((s->lat - (int)s->lat)*1000000), (int)s->lat, (int)((s->lat - (int)s->lat)*1000000),
(int)s->lon, (int)((s->lon - (int)s->lon)*1000000), (int)s->alt, (int)((s->alt - (int)s->alt)*100), (int)s->lon, (int)((s->lon - (int)s->lon)*1000000), (int)s->alt, (int)((s->alt - (int)s->alt)*100),
conf->lat, conf->lon, conf->alt, conf->antenna (float)s->freq, (float)s->hs, (float)s->vs, (float)s->dir, (int)s->sats, (float)s->rssi, conf->lat, conf->lon, conf->alt, conf->antenna
); );
if (!client->connected()) { if (!client->connected()) {