From 226bc45fde4515e63b6615d731b7ab5857c54466 Mon Sep 17 00:00:00 2001 From: cyoung Date: Wed, 14 Feb 2018 11:31:46 -0500 Subject: [PATCH] Use GPSHeightAboveEllipsoid for altitude in mlat-client arguments. --- main/adsbexchange.go | 2 +- main/gen_gdl90.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main/adsbexchange.go b/main/adsbexchange.go index a8e8c3ed..a7cd106a 100644 --- a/main/adsbexchange.go +++ b/main/adsbexchange.go @@ -150,7 +150,7 @@ func feederProcessMonitor() { if (mlatclientRelay == nil) && globalStatus.GPS_satellites_locked > 0 && globalStatus.GPS_position_accuracy < 15.0 { //FIXME: 15m accuracy - set a minimum based on network requirements. // Check "mlat-client". //FIXME: mlatClientRelay never is re-set to nil if it crashes. - mlatclientRelay = makeRelayProc(RELAY_TYPE_MLAT_CLIENT, "/usr/bin/mlat-client", "--input-type", "dump1090", "--input-connect", "localhost:30005", "--lat", strconv.FormatFloat(float64(mySituation.GPSLatitude), 'f', 5, 32), "--lon", strconv.FormatFloat(float64(mySituation.GPSLongitude), 'f', 5, 32), "--alt", strconv.FormatFloat(float64(mySituation.GPSAltitudeMSL), 'f', 1, 32), "--user", globalSettings.ADSBExchangeUser, "--server", "feed.adsbexchange.com:31090", "--no-udp", "--results", "beast,connect,localhost:30104") + mlatclientRelay = makeRelayProc(RELAY_TYPE_MLAT_CLIENT, "/usr/bin/mlat-client", "--input-type", "dump1090", "--input-connect", "localhost:30005", "--lat", strconv.FormatFloat(float64(mySituation.GPSLatitude), 'f', 5, 32), "--lon", strconv.FormatFloat(float64(mySituation.GPSLongitude), 'f', 5, 32), "--alt", strconv.FormatFloat(float64(mySituation.GPSHeightAboveEllipsoid), 'f', 1, 32)+"ft", "--user", globalSettings.ADSBExchangeUser, "--server", "feed.adsbexchange.com:31090", "--no-udp", "--results", "beast,connect,localhost:30104") } } } diff --git a/main/gen_gdl90.go b/main/gen_gdl90.go index b5b1c6d8..7e7c48e9 100644 --- a/main/gen_gdl90.go +++ b/main/gen_gdl90.go @@ -1342,8 +1342,8 @@ var sigs = make(chan os.Signal, 1) // Signal catch channel (shutdown). // Graceful shutdown. func gracefulShutdown() { // Shut down SDRs. - sdrKill() relayKill() + sdrKill() pingKill() // Shut down data logging.