Merge remote-tracking branch 'refs/remotes/origin/master' into admin

pull/67/head
Joe Prochazka 2016-01-23 14:36:37 -05:00
commit 4cffc6f747
2 zmienionych plików z 15 dodań i 1 usunięć

Wyświetl plik

@ -145,6 +145,20 @@ echo "Configuring dump1090-mutability to listen for BEAST input on port 30104...
echo -e "\033[37m"
ChangeConfig "BEAST_INPUT_PORT" "30104" "/etc/default/dump1090-mutability"
echo -e "\033[33m"
printf "Setting PiAware to send MLAT results on port 30104..."
ORIGINALFORMAT=`sudo piaware-config -show | grep mlatResultsFormat | sed 's/mlatResultsFormat //g'`
MLATRESULTS=`sed 's/[{}]//g' <<< $ORIGINALFORMAT`
CLEANFORMAT=`sed 's/beast,connect,localhost:30104//g' <<< $MLATRESULTS`
FINALFORMAT="${CLEANFORMAT} beast,connect,localhost:30104" | sed -e 's/^[ \t]*//'
# Make sure that the mlatResultsFormat setting is not left blank if no other settings exist..
if [ -n "$FINALFORMAT" ]; then
sudo piaware-config -mlatResultsFormat "${FINALFORMAT}"
else
sudo piaware-config -mlatResultsFormat "beast,connect,localhost:30104"
fi
echo -e "\033[32m [OK]"
## HEYWHATSTHAT.COM TERRAIN LIMIT RINGS
# Check if the heywhatsthis.com range position file has already been downloaded.

Wyświetl plik

@ -125,7 +125,7 @@ sudo tee -a $DUMP978DIR/dump978-maint.sh > /dev/null <<EOF
# Start with logging.
#rtl_sdr -d ${DUMP978DEVICE} -f 978000000 -s 2083334 -g 48 - | ${DUMP978DIR}/dump978 > /tmp/dump978.out &
#while true; do
# tail -n0 -f /tmp/dump978.out | ${DUMP978DIR}/uat2json /var/www/html/dump978/data | ${DUMP978DIR}/uat2esnt | /bin/nc -q1 127.0.0.1 30001
# tail -n0 -f /tmp/dump978.out | ${DUMP978DIR}/uat2esnt | /bin/nc -q1 127.0.0.1 30001
# sleep 15
#done