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

Merge branch 'patch-3' of https://github.com/LukePrior/rdz_ttgo_sonde into LukePrior-patch-3

pull/180/head
Hansi, dl9rdz 2021-09-19 19:55:20 +02:00
rodzic eb769e6d12 387d3c059d
commit c50a2d1138
1 zmienionych plików z 12 dodań i 20 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

32
RX_FSK/RX_FSK.ino
Wyświetl plik

@ -3409,17 +3409,13 @@ void sondehub_station_update(WiFiClient *client, struct st_sondehub *conf) {
// Only send email if provided
if (strlen(conf->email) != 0) {
sprintf(w,
"\"uploader_contact_email\": \"%s\",",
conf->email);
sprintf(w, "\"uploader_contact_email\": \"%s\",", conf->email);
w += strlen(w);
}
// Only send antenna if provided
if (strlen(conf->antenna) != 0) {
sprintf(w,
"\"uploader_antenna\": \"%s\",",
conf->antenna);
sprintf(w, "\"uploader_antenna\": \"%s\",", conf->antenna);
w += strlen(w);
}
@ -3698,36 +3694,32 @@ void sondehub_send_data(WiFiClient * client, SondeInfo * s, struct st_sondehub *
// Only send temp if provided
if ((int)s->temperature != 0) {
sprintf(w,
"\"temp\": %.3f,",
float(s->temperature)
);
sprintf(w, "\"temp\": %.3f,", float(s->temperature));
w += strlen(w);
}
// Only send humidity if provided
if ((int)s->relativeHumidity != 0) {
sprintf(w,
"\"humidity\": %.3f,",
float(s->relativeHumidity)
);
sprintf(w, "\"humidity\": %.3f,", float(s->relativeHumidity));
w += strlen(w);
}
// Only send burst timer if RS41 and not 0
if ((realtype == STYPE_RS41) && ((int)s->burstKT != 0)) {
sprintf(w, "\"burst_timer\": %d,", (int)s->burstKT);
w += strlen(w);
}
// Only send antenna if provided
if (strlen(conf->antenna) != 0) {
sprintf(w,
"\"uploader_antenna\": \"%s\",",
conf->antenna);
sprintf(w, "\"uploader_antenna\": \"%s\",", conf->antenna);
w += strlen(w);
}
// We send GPS position: (a) in CHASE mode, (b) in AUTO mode if no fixed location has been specified in config
if (chase == SH_LOC_CHASE) {
if (gpsPos.valid && gpsPos.lat != 0 && gpsPos.lon != 0) {
sprintf(w,
"\"uploader_position\": [%.6f,%.6f,%d]",
gpsPos.lat, gpsPos.lon, gpsPos.alt);
sprintf(w, "\"uploader_position\": [%.6f,%.6f,%d]", gpsPos.lat, gpsPos.lon, gpsPos.alt);
} else {
sprintf(w, "\"uploader_position\": [null,null,null]");
}