kopia lustrzana https://github.com/dl9rdz/rdz_ttgo_sonde
Merge branch 'eben80-patch-1' into devel
commit
4118a76a16
|
@ -1085,7 +1085,7 @@ void addSondeStatusKML(char *ptr, int i)
|
|||
return;
|
||||
}
|
||||
|
||||
sprintf(ptr + strlen(ptr), "<Placemark id=\"%s\"><name>%s</name><Point><coordinates>%.6f,%.6f,%.0f</coordinates></Point><description>%3.3f MHz, Type: %s, h=%.0fm</description></Placemark>",
|
||||
sprintf(ptr + strlen(ptr), "<Placemark id=\"%s\"><name>%s</name><Point><altitudeMode>absolute</altitudeMode><coordinates>%.6f,%.6f,%.0f</coordinates></Point><description>%3.3f MHz, Type: %s, h=%.0fm</description></Placemark>",
|
||||
s->id, s->id,
|
||||
s->lon, s->lat, s->alt,
|
||||
s->freq, sondeTypeStr[s->type], s->alt);
|
||||
|
@ -3161,6 +3161,9 @@ void sondehub_station_update(WiFiClient *client, struct st_sondehub *conf) {
|
|||
sprintf(w, "\"uploader_position\": [null,null,null]");
|
||||
}
|
||||
w += strlen(w);
|
||||
} else {
|
||||
sprintf(w, "\"uploader_position\": [null,null,null]");
|
||||
w += strlen(w);
|
||||
}
|
||||
|
||||
// otherwise (in SH_LOC_NONE mode) we dont include any position info
|
||||
|
@ -3358,8 +3361,7 @@ void sondehub_send_data(WiFiClient * client, SondeInfo * s, struct st_sondehub *
|
|||
if (chase == SH_LOC_CHASE) {
|
||||
if (gpsPos.valid && gpsPos.lat != 0 && gpsPos.lon != 0) {
|
||||
sprintf(w,
|
||||
"\"uploader_position\": [%.6f,%.6f,%d],"
|
||||
"\"mobile\": true",
|
||||
"\"uploader_position\": [%.6f,%.6f,%d]",
|
||||
gpsPos.lat, gpsPos.lon, gpsPos.alt);
|
||||
} else {
|
||||
sprintf(w, "\"uploader_position\": [null,null,null]");
|
||||
|
@ -3376,6 +3378,9 @@ void sondehub_send_data(WiFiClient * client, SondeInfo * s, struct st_sondehub *
|
|||
sprintf(w, "\"uploader_position\": [null,null,null]");
|
||||
}
|
||||
w += strlen(w);
|
||||
} else {
|
||||
sprintf(w, "\"uploader_position\": [null,null,null]");
|
||||
w += strlen(w);
|
||||
}
|
||||
|
||||
// otherwise (in SH_LOC_NONE mode) we dont include any position info
|
||||
|
|
|
@ -121,7 +121,7 @@ mqtt.prefix=rdz_sonde_server/
|
|||
#-------------------------------#
|
||||
# Sondehub v2 DB settings
|
||||
sondehub.active=0
|
||||
sondehub.chase=2
|
||||
sondehub.chase=3
|
||||
sondehub.host=api.v2.sondehub.org
|
||||
sondehub.callsign=CHANGEME_RDZTTGO
|
||||
sondehub.lat=
|
||||
|
|
Ładowanie…
Reference in New Issue