Merge pull request #8 from tmantti/adsb-fi-scripts

Multiple improvements and fixes
This commit is contained in:
Matthias Urhahn 2023-02-12 07:09:49 +01:00 • committed by GitHub
commit 3402ced035
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 53 deletions

View file

@ -1,21 +1,21 @@
# ADSB.fi feed client
# adsb.fi feed client
- 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
- These scripts aid in setting up your current ADS-B receiver to feed [adsb.fi](https://adsb.fi/).
- They will not disrupt any existing feed clients already present.
## 1: Find coordinates / elevation:
## 1: Find coordinates and elevation
<https://www.freemaptools.com/elevation-finder.htm>
## 2: Install the adsbfi feed client
## 2: Install the feed client
```
curl -L -o /tmp/axfeed.sh https://raw.githubusercontent.com/d4rken/adsb-fi-scripts/master/install.sh
sudo bash /tmp/axfeed.sh
curl -L -o /tmp/feed.sh https://raw.githubusercontent.com/d4rken/adsb-fi-scripts/master/install.sh
sudo bash /tmp/feed.sh
```
## 3: Check netstat to check if your feed is working
The feed IP for ADSB.fi is 65.109.2.208
## 3: Use netstat to check that your feed is working
The feed IP for adsb.fi is 65.109.2.208
```
netstat -t -n | grep -E '30004|31090'
@ -26,16 +26,7 @@ tcp 0 182 localhost:43530 65.109.2.208:31090 ESTABLISHED
tcp 0 410 localhost:47332 65.109.2.208:30004 ESTABLISHED
```
## 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/adsbfi
## 4: Optional: Install local interface for your data http://192.168.X.XX/adsbfi
Install / Update:
```
@ -49,19 +40,17 @@ sudo bash /usr/local/share/tar1090/uninstall.sh adsbfi
### Update the feed client without reconfiguring
```
curl -L -o /tmp/axupdate.sh https://raw.githubusercontent.com/d4rken/adsb-fi-scripts/master/update.sh
sudo bash /tmp/axupdate.sh
curl -L -o /tmp/update.sh https://raw.githubusercontent.com/d4rken/adsb-fi-scripts/master/update.sh
sudo bash /tmp/update.sh
```
### If you encounter issues, please do a reboot and then supply these logs on the forum (last 20 lines for each is sufficient):
### If you encounter issues, please do a reboot and then supply these logs on Discord (last 20 lines for each is sufficient):
```
sudo journalctl -u adsbfi-feed --no-pager
sudo journalctl -u adsbfi-mlat --no-pager
```
### Display the configuration
```
@ -75,8 +64,8 @@ If the client is up to date it should not take as long as the original installat
otherwise this will also update the client which will take a moment.
```
curl -L -o /tmp/axfeed.sh https://raw.githubusercontent.com/d4rken/adsb-fi-scripts/master/install.sh
sudo bash /tmp/axfeed.sh
curl -L -o /tmp/feed.sh https://raw.githubusercontent.com/d4rken/adsb-fi-scripts/master/install.sh
sudo bash /tmp/feed.sh
```
### Disable / Enable adsb.fi MLAT-results in your main decoder interface (readsb / dump1090-fa)
@ -94,31 +83,29 @@ sudo sed --follow-symlinks -i -e 's/RESULTS=.*/RESULTS="--results beast,connect,
sudo systemctl restart adsbfi-mlat
```
### Restart
### Restart the feed client
```
sudo systemctl restart adsbfi-feed
sudo systemctl restart adsbfi-mlat
```
### Systemd Status
### Show status
```
sudo systemctl status adsbfi-mlat
sudo systemctl status adsbfi-feed
sudo systemctl status adsbfi-mlat
```
### Removal / disabling the services:
### Removal / disabling the services
```
sudo bash /usr/local/share/adsbfi/uninstall.sh
```
If the above doesn't work, you may be using an old version that didn't have the uninstall script, just disable the services and the scripts won't run anymore:
If the above doesn't work, you can just disable the services and the scripts won't run anymore:
```
sudo systemctl disable --now adsbfi-feed
sudo systemctl disable --now adsbfi-mlat
```
```

View file

@ -1,7 +1,7 @@
#!/bin/bash
#####################################################################################
# ADSB.fi SETUP SCRIPT #
# adsb.fi SETUP SCRIPT #
#####################################################################################
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# #
@ -43,9 +43,9 @@ function abort() {
## WHIPTAIL DIALOGS
BACKTITLETEXT="ADSB.fi Setup Script"
BACKTITLETEXT="adsb.fi Setup Script"
whiptail --backtitle "$BACKTITLETEXT" --title "$BACKTITLETEXT" --yesno "Thanks for choosing to share your data with ADSB.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 ADSB.fi.\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\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 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 (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,8 +138,8 @@ PRIVACY=""
INPUT_TYPE="$INPUT_TYPE"
MLATSERVER="feed.adsb.fi:31090"
TARGET="--net-connector feed.adsb.fi,30004,beast_reduce_out,feed.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 30169 --net-bo-port 0 --net-ri-port 0 --write-json-every 1"
TARGET="--net-connector feed.adsb.fi,30004,beast_reduce_plus_out,feed.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 30169 --net-bo-port 0 --net-ri-port 0 --write-json-every 1 --uuid-file /usr/local/share/adsbfi/adsbfi-uuid"
JSON_OPTIONS="--max-range 450 --json-location-accuracy 2 --range-outline-hours 24"
EOF

View file

@ -1,7 +1,7 @@
#!/bin/bash
#####################################################################################
# ADSB.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 ADSB.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
#####################################################################################
# ADSB.fi SETUP SCRIPT #
# adsb.fi SETUP SCRIPT #
#####################################################################################
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# #
@ -230,7 +230,7 @@ else
echo "--------------------"
echo "Installing mlat-client failed, if there was an old version it has been restored."
echo "Will continue installation to try and get at least the feed client working."
echo "Please repot this error to the adsbfi forums or discord."
echo "Please report this error on Discord."
echo "--------------------"
fi
fi
@ -245,7 +245,7 @@ echo 60
if ls -l /etc/systemd/system/adsbfi-mlat.service 2>&1 | grep '/dev/null' &>/dev/null; then
echo "--------------------"
echo "CAUTION, adsbfi-mlat is masked and won't run!"
echo "If this is unexpected for you, please report this issue"
echo "If this is unexpected for you, please report this issue."
echo "--------------------"
sleep 3
else
@ -262,7 +262,7 @@ fi
echo 70
# SETUP FEEDER TO SEND DUMP1090 DATA TO ADSB.fi
# SETUP FEEDER TO SEND DUMP1090 DATA TO adsb.fi
READSB_REPO="https://github.com/wiedehopf/readsb.git"
READSB_BRANCH="master"
@ -319,7 +319,7 @@ if ! ls -l /etc/systemd/system/adsbfi-feed.service 2>&1 | grep '/dev/null' &>/de
else
echo "--------------------"
echo "CAUTION, adsbfi-feed.service is masked and won't run!"
echo "If this is unexpected for you, please report this issue"
echo "If this is unexpected for you, please report this issue."
echo "--------------------"
sleep 3
fi
@ -331,7 +331,7 @@ systemctl is-active adsbfi-feed &>/dev/null || {
echo "---------------------------------"
journalctl -u adsbfi-feed | tail -n10
echo "---------------------------------"
echo "adsbfi-feed service couldn't be started, please report this error to the adsbfi forum or discord."
echo "adsbfi-feed service couldn't be started, please report this error on Discord."
echo "Try an copy as much of the output above and include it in your report, thank you!"
echo "---------------------------------"
exit 1
@ -343,7 +343,7 @@ echo 96
echo "---------------------------------"
journalctl -u adsbfi-mlat | tail -n10
echo "---------------------------------"
echo "adsbfi-mlat service couldn't be started, please report this error to the adsb.fi discord."
echo "adsbfi-mlat service couldn't be started, please report this error on Discord."
echo "Try an copy as much of the output above and include it in your report, thank you!"
echo "---------------------------------"
exit 1
@ -378,15 +378,15 @@ echo "---------------------"
## SETUP COMPLETE
ENDTEXT="
Thanks for choosing to share your data with ADS-B.FI!
Thanks for choosing to share your data with adsb.fi!
Your feed should be active within 5 minutes, you can confirm by running the following command and looking for the IP address 65.109.2.208
netstat -t -n | grep -E '30004|31090'
Question? Issues? Go here:
https://discord.gg/n9dGbkTtZm
https://discord.gg/jfVRF2XRwF
Webinterface to show the data transmitted? Run this command:
Web interface to show the data transmitted? Run this command:
sudo bash /usr/local/share/adsbfi/git/install-or-update-interface.sh
"
@ -421,10 +421,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 "ADSB.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 "ADSB.fi Setup Script" --msgbox "$ENDTEXT" 24 73
#whiptail --title "adsb.fi Setup Script" --msgbox "$ENDTEXT" 24 73
echo -e "$ENDTEXT"
fi