[hamradio-commits] [dump1090] 316/373: Version 1.09.0608.14

[Matthew Ernisse]

This is an automated email from the git hooks/post-receive script.

mernisse-guest pushed a commit to branch backport
in repository dump1090.

commit a82df07c0c0a750d58610bf3c3ece77482f3a58c
Author: Malcolm Robb <Support at ATTAvionics.com>
Date:   Wed Aug 6 15:26:05 2014 +0100

    Version 1.09.0608.14
    
    Release of COAA PlanePlotter MLAT and SMU support for RPi
    
    ppup1090 now supports Ground Stations functions required for MLAT and
    SMU operation. This is *ONLY* available for RPi and similar linux
    hardware.
    
    Also included are sample startup scripts for dump1090 only and
    dump1090+ppup1090 together.
---
 coaa1090.obj                                       | Bin 32844 -> 33004 bytes
 ...09.1607.14.zip => dump1090-win.1.09.0608.14.zip | Bin 614694 -> 614488 bytes
 dump1090.h                                         |   6 +++---
 dump1090.sh                                        |   2 +-
 dump1090.sh => ppup1090.sh                         |  15 +++++++++++++--
 5 files changed, 17 insertions(+), 6 deletions(-)

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/dump1090.sh b/ppup1090.sh
similarity index 77%
copy from dump1090.sh
copy to ppup1090.sh
index e1c0351..8ed4ad3 100644
--- a/dump1090.sh
+++ b/ppup1090.sh
@@ -13,8 +13,12 @@
 ## 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"
+PROG2="ppup1090"
+PROG2_ARGS="--quiet --net-pp-addr 192.168.1.64"
+PIDFILE2="/var/run/$PROG2.pid"
+DELAY=5
 
 start() {
       if [ -e $PIDFILE ]; then
@@ -25,8 +29,13 @@ start() {
           ## 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"
+          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
 }
 
@@ -34,7 +43,9 @@ 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/dump1090.git