Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

readme and bias t updates #71

Merged
merged 3 commits into from
Sep 7, 2023
Merged

readme and bias t updates #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20a211e
readme and bias t updates
fredclausen Sep 4, 2023
a2d868b
Update Dockerfile
fredclausen Sep 4, 2023
96caf96
remove influx from ultra part of the config
fredclausen Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,16 @@ RUN set -x && \
# grab the bias t scripts
curl -o /etc/s6-overlay/scripts/05-rtlsdr-biastee-init https://raw.githubusercontent.com/sdr-enthusiasts/sdre-bias-t-common/main/09-rtlsdr-biastee-init && \
curl -o /etc/s6-overlay/scripts/05-rtlsdr-biastee-down https://raw.githubusercontent.com/sdr-enthusiasts/sdre-bias-t-common/main/09-rtlsdr-biastee-down && \
# fix bias t init
sed -i 's/READSB_DEVICE_TYPE/DUMP978_DEVICE_TYPE/g' /etc/s6-overlay/scripts/05-rtlsdr-biastee-init && \
sed -i 's/READSB_RTLSDR_DEVICE/DUMP978_RTLSDR_DEVICE/g' /etc/s6-overlay/scripts/05-rtlsdr-biastee-init && \
sed -i 's/READSB_ENABLE_BIASTEE/DUMP978_ENABLE_BIASTEE/g' /etc/s6-overlay/scripts/05-rtlsdr-biastee-init && \
sed -i 's/09-rtlsdr-biastee/05-rtlsdr-biastee/g' /etc/s6-overlay/scripts/05-rtlsdr-biastee-init && \
# fix bias t down
sed -i 's/READSB_DEVICE_TYPE/DUMP978_DEVICE_TYPE/g' /etc/s6-overlay/scripts/05-rtlsdr-biastee-down && \
sed -i 's/READSB_RTLSDR_DEVICE/DUMP978_RTLSDR_DEVICE/g' /etc/s6-overlay/scripts/05-rtlsdr-biastee-down && \
sed -i 's/READSB_ENABLE_BIASTEE/DUMP978_ENABLE_BIASTEE/g' /etc/s6-overlay/scripts/05-rtlsdr-biastee-down && \
sed -i 's/09-rtlsdr-biastee/05-rtlsdr-biastee/g' /etc/s6-overlay/scripts/05-rtlsdr-biastee-down && \
chmod +x /etc/s6-overlay/scripts/05-rtlsdr-biastee-init && \
chmod +x /etc/s6-overlay/scripts/05-rtlsdr-biastee-down && \
git config --global advice.detachedHead false && \
Expand Down
23 changes: 11 additions & 12 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
- [Container Options](#container-options)
- [`dump978-fa` General Options](#dump978-fa-general-options)
- [`dump978-fa` RTL-SDR Options](#dump978-fa-rtl-sdr-options)
- [General SDR Options](#general-sdr-options)
- [Auto-Gain Options](#auto-gain-options)
- [InfluxDB Options](#influxdb-options)
- [Prometheus Options](#prometheus-options)
Expand Down Expand Up @@ -107,9 +108,8 @@ Here is an example `docker-compose.yml`:
- 'c 189:* rwm'
environment:
- TZ=${FEEDER_TZ}
- READSB_RTLSDR_DEVICE=${ADSB_SDR_SERIAL}
- READSB_RTLSDR_PPM=${ADSB_SDR_PPM}
- READSB_GAIN=${ADSB_SDR_GAIN}
- DUMP978_SDR_PPM=${ADSB_SDR_PPM}
- DUMP978_SDR_GAIN=${ADSB_SDR_GAIN}
- DUMP978_RTLSDR_DEVICE=${UAT_SDR_SERIAL}
- DUMP978_SDR_GAIN=${UAT_SDR_GAIN}
- DUMP978_SDR_PPM=${UAT_SDR_PPM}
Expand Down Expand Up @@ -170,7 +170,7 @@ Here is an example `docker-compose.yml`:
mlathub,piaware,30105,beast_in;
mlathub,rbfeeder,30105,beast_in;
mlathub,radarvirtuel,30105,beast_in
# If you really want to feed ADSBExchange, you can do so by adding this above:
# If you really want to feed ADSBExchange, you can do so by adding this above:
# adsb,feed1.adsbexchange.com,30004,beast_reduce_plus_out,uuid=${ADSBX_UUID};
# mlat,feed.adsbexchange.com,31090,39005,uuid=${ADSBX_UUID}
#
Expand Down Expand Up @@ -202,13 +202,6 @@ Here is an example `docker-compose.yml`:
# The two 978 related parameters should only be included if you are running dump978 for UAT reception (USA only)
- GRAPHS1090_DARKMODE=true
- URL_978=http://dump978/skyaware978
#
# --------------------------------------------------
# Prometheus and InfluxDB connection parameters:
- INFLUXDBV2_URL=${INFLUX_URL}
- INFLUXDBV2_TOKEN=${INFLUX_TOKEN}
- INFLUXDBV2_BUCKET=${INFLUX_BUCKET}
- PROMETHEUS_ENABLE=true
volumes:
- /opt/adsb/ultrafeeder/globe_history:/var/globe_history
- /opt/adsb/ultrafeeder/graphs1090:/var/lib/collectd
Expand All @@ -220,7 +213,7 @@ Here is an example `docker-compose.yml`:
- /var/log:size=32M

piaware:
# piaware feeds ADS-B and UAT data (from ultrafeeder) to FlightAware. It also includes a GUI Radar website and a status website
# piaware feeds ADS-B and UAT data (from ultrafeeder) to FlightAware. It also includes a GUI Radar website and a status website
# If you're not capturing UAT data with the dump978 container, remove or comment out the UAT_RECEIVER_TYPE and UAT_RECEIVER_HOST lines in the environment section below.
image: ghcr.io/sdr-enthusiasts/docker-piaware
# profiles:
Expand Down Expand Up @@ -307,6 +300,12 @@ Where the default value is "Unset", `dump978-fa`'s default will be used.
|----------|-------------|--------------------------------|---------|
| `DUMP978_RTLSDR_DEVICE` | If using Select device by serial number. | `--sdr driver=rtlsdr,serial=` | Unset |

### General SDR Options

| Variable | Description | Default |
|----------|-------------|--------------------------------|---------|
| `DUMP978_ENABLE_BIASTEE` | Set to any value to enable bias-tee on your RTL-SDR. | Unset |

### Auto-Gain Options

These variables control the auto-gain system (explained further below). These should rarely need changing from the defaults.
Expand Down
Loading