Merge branch 'upstream'

This commit is contained in:
Oliver Jowett 2016-05-31 12:58:44 +01:00
commit 43e380912d
11 changed files with 38 additions and 1045 deletions

View file

@ -4,7 +4,7 @@
# TODO: This needs to be generated from piaware-config.txt
#RECEIVER_OPTIONS="--device-index 0 --gain -10 --ppm 0 --oversample --phase-enhance --net-bo-port 30005 --fix"
#RECEIVER_OPTIONS="--device-index 0 --gain -10 --ppm 0 --net-bo-port 30005 --fix"
RECEIVER_OPTIONS="--net-only --net-bo-port 0"
DECODER_OPTIONS="--max-range 300"
NET_OPTIONS="--net --net-heartbeat 60 --net-ro-size 1000 --net-ro-interval 1 --net-http-port 0 --net-ri-port 0 --net-ro-port 30002 --net-sbs-port 30003 --net-bi-port 30104 --net-fatsv-port 0"