diff --git a/coaa1090.obj b/coaa1090.obj index 2d322f5..ea337ca 100644 Binary files a/coaa1090.obj and b/coaa1090.obj differ diff --git a/dump1090-win.1.09.1607.14.zip b/dump1090-win.1.09.0608.14.zip similarity index 80% rename from dump1090-win.1.09.1607.14.zip rename to dump1090-win.1.09.0608.14.zip index e8a664d..5bd3d84 100644 Binary files a/dump1090-win.1.09.1607.14.zip and b/dump1090-win.1.09.0608.14.zip differ diff --git a/dump1090.h b/dump1090.h index a89327d..77584bb 100644 --- a/dump1090.h +++ b/dump1090.h @@ -37,7 +37,7 @@ // MinorVer changes when additional features are added, but not for bug fixes (range 00-99) // DayDate & Year changes for all changes, including for bug fixes. It represent the release date of the update // -#define MODES_DUMP1090_VERSION "1.09.1607.14" +#define MODES_DUMP1090_VERSION "1.09.0608.14" // ============================= Include files ========================== @@ -346,7 +346,7 @@ struct { // Internal state // Histogram of fixed bit errors: index 0 for single bit erros, // index 1 for double bit errors etc. unsigned int stat_bit_fix[MODES_MAX_BITERRORS]; - + unsigned int stat_http_requests; unsigned int stat_sbs_connections; unsigned int stat_raw_connections; @@ -362,7 +362,7 @@ struct { // Internal state // Histogram of fixed bit errors: index 0 for single bit erros, // index 1 for double bit errors etc. unsigned int stat_ph_bit_fix[MODES_MAX_BITERRORS]; - + unsigned int stat_DF_Len_Corrected; unsigned int stat_DF_Type_Corrected; unsigned int stat_ModeAC; diff --git a/dump1090.sh b/dump1090.sh index e1c0351..d1b63e5 100644 --- a/dump1090.sh +++ b/dump1090.sh @@ -13,7 +13,7 @@ ## Fill in name of program here. PROG="dump1090" PROG_PATH="/home/pi/dump1090" -PROG_ARGS="--quiet --net --net-ro-size 500 --net-ro-rate 5" +PROG_ARGS="--quiet --net --net-ro-size 500 --net-ro-rate 5 --net-buffer 5" PIDFILE="/var/run/dump1090.pid" start() { diff --git a/ppup1090.sh b/ppup1090.sh new file mode 100644 index 0000000..8ed4ad3 --- /dev/null +++ b/ppup1090.sh @@ -0,0 +1,85 @@ +#!/bin/bash +### BEGIN INIT INFO +# +# Provides: dump1090 +# Required-Start: $remote_fs +# Required-Stop: $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: dump1090 initscript + +# +### END INIT INFO +## Fill in name of program here. +PROG="dump1090" +PROG_PATH="/home/pi/dump1090" +PROG_ARGS="--quiet --net --net-ro-size 500 --net-ro-rate 5 --net-buffer 5" +PIDFILE="/var/run/dump1090.pid" +PROG2="ppup1090" +PROG2_ARGS="--quiet --net-pp-addr 192.168.1.64" +PIDFILE2="/var/run/$PROG2.pid" +DELAY=5 + +start() { + if [ -e $PIDFILE ]; then + ## Program is running, exit with error. + echo "Error! $PROG is currently running!" 1>&2 + exit 1 + else + ## Change from /dev/null to something like /var/log/$PROG if you want to save output. + cd $PROG_PATH + ./$PROG $PROG_ARGS 2>&1 >/dev/null & + echo "$PROG started, waiting $DELAY seconds" + touch $PIDFILE + sleep $DELAY + echo "Attempting to start $PROG2.." + ./$PROG2 $PROG2_ARGS 2>1 >/dev/null & + echo "$PROG2 started" + touch $PIDFILE2 + fi +} + +stop() { + if [ -e $PIDFILE ]; then + ## Program is running, so stop it + echo "$PROG is running" + killall $PROG2 + killall $PROG + rm -f $PIDFILE2 + rm -f $PIDFILE + echo "$PROG stopped" + else + ## Program is not running, exit with error. + echo "Error! $PROG not started!" 1>&2 + exit 1 + fi +} + +## Check to see if we are running as root first. +## Found at http://www.cyberciti.biz/tips/shell-root-user-check-script.html +if [ "$(id -u)" != "0" ]; then + echo "This script must be run as root" 1>&2 + exit 1 +fi + +case "$1" in + start) + start + exit 0 + ;; + stop) + stop + exit 0 + ;; + reload|restart|force-reload) + stop + start + exit 0 + ;; + **) + echo "Usage: $0 {start|stop|reload}" 1>&2 + exit 1 + ;; +esac +# +