kopia lustrzana https://github.com/dl9rdz/rdz_ttgo_sonde
Merge branch 'dl9rdz:devel' into devel
commit
027201838f
|
@ -3157,6 +3157,9 @@ void sondehub_station_update(WiFiClient *client, struct st_sondehub *conf) {
|
||||||
sprintf(w, "\"uploader_position\": [null,null,null]");
|
sprintf(w, "\"uploader_position\": [null,null,null]");
|
||||||
}
|
}
|
||||||
w += strlen(w);
|
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
|
// otherwise (in SH_LOC_NONE mode) we dont include any position info
|
||||||
|
@ -3354,8 +3357,7 @@ void sondehub_send_data(WiFiClient * client, SondeInfo * s, struct st_sondehub *
|
||||||
if (chase == SH_LOC_CHASE) {
|
if (chase == SH_LOC_CHASE) {
|
||||||
if (gpsPos.valid && gpsPos.lat != 0 && gpsPos.lon != 0) {
|
if (gpsPos.valid && gpsPos.lat != 0 && gpsPos.lon != 0) {
|
||||||
sprintf(w,
|
sprintf(w,
|
||||||
"\"uploader_position\": [%.6f,%.6f,%d],"
|
"\"uploader_position\": [%.6f,%.6f,%d]",
|
||||||
"\"mobile\": true",
|
|
||||||
gpsPos.lat, gpsPos.lon, gpsPos.alt);
|
gpsPos.lat, gpsPos.lon, gpsPos.alt);
|
||||||
} else {
|
} else {
|
||||||
sprintf(w, "\"uploader_position\": [null,null,null]");
|
sprintf(w, "\"uploader_position\": [null,null,null]");
|
||||||
|
@ -3372,6 +3374,9 @@ void sondehub_send_data(WiFiClient * client, SondeInfo * s, struct st_sondehub *
|
||||||
sprintf(w, "\"uploader_position\": [null,null,null]");
|
sprintf(w, "\"uploader_position\": [null,null,null]");
|
||||||
}
|
}
|
||||||
w += strlen(w);
|
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
|
// 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 v2 DB settings
|
||||||
sondehub.active=0
|
sondehub.active=0
|
||||||
sondehub.chase=2
|
sondehub.chase=3
|
||||||
sondehub.host=api.v2.sondehub.org
|
sondehub.host=api.v2.sondehub.org
|
||||||
sondehub.callsign=CHANGEME_RDZTTGO
|
sondehub.callsign=CHANGEME_RDZTTGO
|
||||||
sondehub.lat=
|
sondehub.lat=
|
||||||
|
|
Ładowanie…
Reference in New Issue