Merge branch 'adsbfi' into darken

This commit is contained in:
Mark Bumiller 2023-01-27 08:49:29 -05:00
commit 6e63409842
6 changed files with 38 additions and 16 deletions

View file

@ -1,6 +1,6 @@
# ADS-B.FI feed client
# ADSB.fi feed client
- These scripts aid in setting up your current ADS-B receiver to feed ADS-B.FI.
- These scripts aid in setting up your current ADS-B receiver to feed ADSB.fi.
- They will not disrupt any existing feed clients already present
## 1: Find coordinates / elevation:
@ -19,6 +19,26 @@ sudo bash /tmp/axfeed.sh
- <https://www.adsb.fi/myip>
- <https://map.adsb.fi/mlat-map>
## 4: Optional: Install the stats package for an online map that shows only planes received by you:
```
curl -L -o /tmp/axstats.sh https://raw.githubusercontent.com/d4rken/adsb-fi-scripts/master/stats.sh
sudo bash /tmp/axstats.sh
adsbfi-showurl
```
### Optional: local interface for your data http://192.168.X.XX/adsbx
Install / Update:
```
sudo bash /usr/local/share/adsbfi/git/install-or-update-interface.sh
```
Remove:
```
sudo bash /usr/local/share/tar1090/uninstall.sh adsbx
```
### Update the feed client without reconfiguring
```

View file

@ -1,7 +1,7 @@
#!/bin/bash
#####################################################################################
# ADS-B.FI SETUP SCRIPT #
# ADSB.fi SETUP SCRIPT #
#####################################################################################
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# #
@ -43,9 +43,9 @@ function abort() {
## WHIPTAIL DIALOGS
BACKTITLETEXT="ADS-B.FI Setup Script"
BACKTITLETEXT="ADSB.fi Setup Script"
whiptail --backtitle "$BACKTITLETEXT" --title "$BACKTITLETEXT" --yesno "Thanks for choosing to share your data with ADS-B.FI!\n\nadsb.fi is a co-op of ADS-B/Mode S/MLAT feeders from around the world. This script will configure your current your ADS-B receiver to share your feeders data with ADS-B.FI.\n\nADS-B.FI will not be sold to big corp (Source: Trust me bro)\n\nWould you like to continue setup?" 13 78 || abort
whiptail --backtitle "$BACKTITLETEXT" --title "$BACKTITLETEXT" --yesno "Thanks for choosing to share your data with ADSB.fi!\n\nADSBexchange.com is a co-op of ADS-B/Mode S/MLAT feeders from around the world. This script will configure your current your ADS-B receiver to share your feeders data with ADSB.fi.\n\nWould you like to continue setup?" 13 78 || abort
ADSBFIUSERNAME=$(whiptail --backtitle "$BACKTITLETEXT" --title "Feeder MLAT Name" --nocancel --inputbox "\nPlease enter a unique name to be shown on the MLAT map (map.adsb.fi/mlat-map)(the pin will be offset for privacy)\n\nExample: \"william34-london\", \"william34-jersey\", etc.\nDisable MLAT: enter a zero: 0" 12 78 3>&1 1>&2 2>&3) || abort
@ -138,7 +138,7 @@ PRIVACY=""
INPUT_TYPE="$INPUT_TYPE"
MLATSERVER="feed.adsb.fi:31090"
TARGET="--net-connector feed.adsb.fi,30004,beast_reduce_out,feed.adsb.fi,64004"
TARGET="--net-connector feed1.adsb.fi,30004,beast_reduce_out,feed2.adsb.fi,64004"
NET_OPTIONS="--net-heartbeat 60 --net-ro-size 1280 --net-ro-interval 0.2 --net-ro-port 0 --net-sbs-port 0 --net-bi-port 30154 --net-bo-port 0 --net-ri-port 0 --write-json-every 1"
JSON_OPTIONS="--max-range 450 --json-location-accuracy 2 --range-outline-hours 24"
EOF

View file

@ -1,6 +1,6 @@
[Unit]
Description=adsb.fi-feed
Description=adsbfi-feed
Wants=network.target
After=network.target

View file

@ -6,6 +6,7 @@ After=network.target
[Service]
User=adsbfi
RuntimeDirectory=adsbfi-mlat
ExecStart=/usr/local/share/adsbfi/adsbfi-mlat.sh
Type=simple
Restart=always

View file

@ -1,7 +1,7 @@
#!/bin/bash
#####################################################################################
# ADS-B.FI SETUP SCRIPT #
# ADSB.fi SETUP SCRIPT #
#####################################################################################
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# #
@ -57,7 +57,7 @@ fi
bash "$IPATH/git/configure.sh"
whiptail --backtitle "$BACKTITLETEXT" --title "$BACKTITLETEXT" --yesno "We are now ready to begin setting up your receiver to feed ADS-B.FI.\n\nDo you wish to proceed?" 9 78 || exit 1
whiptail --backtitle "$BACKTITLETEXT" --title "$BACKTITLETEXT" --yesno "We are now ready to begin setting up your receiver to feed ADSB.fi.\n\nDo you wish to proceed?" 9 78 || exit 1
bash "$IPATH/git/update.sh"

View file

@ -1,7 +1,7 @@
#!/bin/bash
#####################################################################################
# ADS-B.FI SETUP SCRIPT #
# ADSB.fi SETUP SCRIPT #
#####################################################################################
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# #
@ -184,8 +184,9 @@ then
rm -rf "$VENV"
fi
MLAT_REPO="https://github.com/adsbxchange/mlat-client"
MLAT_BRANCH="master"
MLAT_REPO="https://github.com/makrsmark/mlat-client.git"
MLAT_BRANCH="adsbfi"
MLAT_VERSION="$(git ls-remote $MLAT_REPO $MLAT_BRANCH | cut -f1 || echo $RANDOM-$RANDOM )"
if [[ $REINSTALL != yes ]] && grep -e "$MLAT_VERSION" -qs $IPATH/mlat_version \
&& grep -qs -e '#!' "$VENV/bin/mlat-client" && { systemctl is-active adsbfi-mlat &>/dev/null || [[ "${MLAT_DISABLED}" == "1" ]]; }
@ -261,7 +262,7 @@ fi
echo 70
# SETUP FEEDER TO SEND DUMP1090 DATA TO ADS-B.FI
# SETUP FEEDER TO SEND DUMP1090 DATA TO ADSB.fi
READSB_REPO="https://github.com/wiedehopf/readsb.git"
READSB_BRANCH="master"
@ -366,7 +367,7 @@ if grep -qs 'SERVER_HOSTPORT.*feed.adsb.fi' /etc/default/mlat-client &>/dev/null
fi
if [[ -f /etc/default/adsbfi ]]; then
sed -i -e 's/feed.adsb.fi,30004,beast_reduce_out,feed.adsb.fi,64004/feed.adsb.fi,30004,beast_reduce_out,feed.adsb.fi,64004/' /etc/default/adsbfi || true
sed -i -e 's/feed.adsb.fi,30004,beast_reduce_out,feed.adsb.fi,64004/feed1.adsb.fi,30004,beast_reduce_out,feed2.adsb.fi,64004/' /etc/default/adsbfi || true
fi
@ -422,10 +423,10 @@ https://github.com/wiedehopf/adsb-scripts/wiki/Automatic-installation-for-readsb
fi
if ! timeout 5 nc -z "$INPUT_IP" "$INPUT_PORT" && command -v nc &>/dev/null; then
#whiptail --title "ADS-B.FI Setup Script" --msgbox "$ENDTEXT2" 24 73
#whiptail --title "ADSB.fi Setup Script" --msgbox "$ENDTEXT2" 24 73
echo -e "$ENDTEXT2"
else
# Display the thank you message box.
#whiptail --title "ADS-B.FI Setup Script" --msgbox "$ENDTEXT" 24 73
#whiptail --title "ADSB.fi Setup Script" --msgbox "$ENDTEXT" 24 73
echo -e "$ENDTEXT"
fi