From 4ed90013c55390be291a1024247a32cfd1eb9da3 Mon Sep 17 00:00:00 2001 From: Joe Prochazka Date: Wed, 20 Jan 2016 15:37:02 -0500 Subject: [PATCH] Added dump978 installation option. --- README.md | 14 +++++++--- bash/decoders/dump978.sh | 7 +++++ install.sh | 58 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 75 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4578e92..850c0f7 100644 --- a/README.md +++ b/README.md @@ -30,9 +30,10 @@ display bandwidth usage for a wireless connections. https://github.com/jprochazk At this time the following software can be installed using these scripts. -**Mode S Decoders** +**Decoders** -* Dump1090 (mutability): https://github.com/mutability/dump1090 +* Dump1090 (mutability): https://github.com/mutability/dump1090 +* Dump978: https://github.com/mutability/dump978 **Site Feeders** @@ -43,7 +44,7 @@ At this time the following software can be installed using these scripts. **Additional Features** * Web accessable Dump1090 and system performance graphs. -* Add navigation to the stock Dump1090 map. +* Matching website site navigation layout. ### Supported Operating Systems @@ -54,3 +55,10 @@ The scripts and packages have been tested on the following operating systems. - [X] Debian 8.0 Jessie - [X] Ubuntu 15.04 Vivid Vervet - [X] Ubuntu 14.04 LTS Trusty Tahr + +#### Dump978 + +In order to utilize dump978 a second RTL-SDR device is required. + +Please review the dump978 wiki page before installation. +https://github.com/jprochazka/adsb-feeder/wiki/dump978 diff --git a/bash/decoders/dump978.sh b/bash/decoders/dump978.sh index 5e32b7a..a3ea252 100644 --- a/bash/decoders/dump978.sh +++ b/bash/decoders/dump978.sh @@ -45,6 +45,13 @@ echo "-------------------------------------------" echo -e "\033[33mDump 978 is an experimental demodulator/decoder for 978MHz UAT signals.." echo "" echo "https://github.com/mutability/dump978" +echo "" +echo -e "\033[31mBEFORE CONTINUING:\033[33m" +echo "It is recommended before continuing with the dump978 setup you read the wiki page" +echo "related to the installation of dump978. Doing so will help you through configuring" +echo "dump978 properly using this script." +echo "" +echo "https://github.com/jprochazka/adsb-feeder/wiki/dump978" echo -e "\033[37m" read -p "Press enter to continue..." CONTINUE diff --git a/install.sh b/install.sh index dc4a0cc..e6aa619 100755 --- a/install.sh +++ b/install.sh @@ -78,6 +78,17 @@ function InstallDump1090() { cd $BASEDIR } +# Download and build dump978. +function InstallDump978() { + clear + cd $BUILDDIR + echo -e "\033[33mExecuting the dump978 installation script..." + echo -e "\033[37m" + chmod +x $BASHDIR/decoders/dump978.sh + $BASHDIR/decoders/dump978.sh + cd $BASEDIR +} + # Download, build and then install the PiAware package. function InstallPiAware() { clear @@ -157,7 +168,8 @@ EOF read -d '' DUMP1090INSTALLED <<"EOF" The dump1090-mutability package appears to be installed on your device However... -The dump1090-mutability v1.15~dev source code is updated regularly without a change made to the version numbering. In order to insure you are running the latest version of dump1090-mutability you may opt to rebuild and reinstall this package. +The dump1090-mutability v1.15~dev source code is updated regularly without a change made to the version numbering. In order to insure you are running the latest version of +dump1090-mutability you may opt to rebuild and reinstall this package. Download, build, and reinstall this package? EOF @@ -170,6 +182,22 @@ Do you wish to continue setup? Answering no will exit this script with no actions taken. EOF +# Message displayed if dump978 is installed. +read -d '' DUMP978INSTALLED <<"EOF" +Dump978 appears to be installed on your device However... + +The dump978 source code may have been updated since it was built last. In order to insure you are running the latest version of dump978 you may opt to rebuild the binaries making up dump978. + +Download and rebuild the dump978 binaries? +EOF + +# Message displayed if dump978 is not installed. +read -d '' DUMP978NOTINSTALLED <<"EOF" +Dump978 is an experimental demodulator/decoder for 978MHz UAT signals. These scripts are able to setup dump978 for you. However keep in mind a second RTL-SDR device will be required in order to feed data to it. + +Do you wish to install dump978? +EOF + # Message displayed above feeder selection check list. FEEDERSAVAILABLE="The following feeders are available for installation. Choose the feeders you wish to install." @@ -243,6 +271,22 @@ else fi fi +DUMP978CHOICE=1 +DUMP978REINSTALL=1 +# Check if the dump978 has been built. +if [ -f $BUILDDIR/dump978/dump978 ] && [ -f $BUILDDIR/dump978/uat2text ] && [ -f $BUILDDIR/dump978/uat2esnt ] && [ -f $BUILDDIR/dump978/uat2json ]; then + # Dump978 appears to have been built already. + whiptail --backtitle "$BACKTITLE" --title "Dump978 Installed" --yesno "$DUMP978INSTALLED" 16 65 + DUMP978REINSTALL=$? + if [ $DUMP978REINSTALL = 0 ]; then + DUMP1090CHOICE=0 + fi +else + # Dump978 does not appear to have been built yet. + whiptail --backtitle "$BACKTITLE" --title "Dump978 Not Installed" --yesno "$DUMP978NOTINSTALLED" 10 65 + DUMP978CHOICE=$? +fi + ## FEEDER OPTIONS declare array FEEDERLIST @@ -344,6 +388,14 @@ if [ $DUMP1090CHOICE = 0 ] || [ $DOINSTALLWEBPORTAL = 0 ] || [ -s FEEDERCHOICES fi fi + if [ $DUMP978CHOICE = 0 ]; then + if [ $DUMP978REINSTALL -eq 0 ]; then + CONFIRMATION="${CONFIRMATION}\n * dump978 (reinstall)" + else + CONFIRMATION="${CONFIRMATION}\n * dump978" + fi + fi + if [ -s FEEDERCHOICES ]; then while read FEEDERCHOICE do @@ -408,6 +460,10 @@ if [ $DUMP1090CHOICE = 0 ]; then InstallDump1090 fi +if [ $DUMP978CHOICE = 0 ]; then + InstallDump978 +fi + ## Feeders. # Moved execution of functions outside of while loop.