Skip to content

fix: correct AIRCRAFT_JSON_URL default and implement verticalRate display #63

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

Open
fix2015 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: correct AIRCRAFT_JSON_URL default and implement verticalRate display #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ geometry - turn off **Airport runways** if you've moved, or replace it in
| Env | Default | Meaning |
|---|---|---|
| `DATA_SOURCE` | `radio` | `radio` (dump1090) or `api` (airplanes.live) |
| `AIRCRAFT_JSON_URL` | `http://localhost:8080/aircraft.json` | dump1090 feed |
| `AIRCRAFT_JSON_URL` | `http://localhost:8080/data/aircraft.json` | dump1090 feed |
| `SUPPLEMENT_API` | `1` | When on radio, merge the API too (keeps landing aircraft alive) |
| `PORT` / `HOST` | `3000` / `0.0.0.0` | HTTP + WebSocket |
| `ALLOWED_HOSTS` | *(empty)* | Extra Host/Origin allowlist entries, comma-separated. Wildcards: `*.example.com`. Loopback, RFC1918 LAN, IPv6 ULA / link-local, and `*.local` are allowed by default. |
Expand Down
2 changes: 1 addition & 1 deletion pi-setup/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ LAT=37.6213 LON=-122.379 ./pi-setup/install-on-pi.sh # set your coord

Installs the rtl-sdr-blog V4 driver (+ DVB-T blacklist), dump1090-fa, Node + pnpm,
builds the app, and enables the `skylight-server` service. **Verify decode first** with
`rtl_test -t` and `curl -s localhost:8080/aircraft.json | head` before moving on.
`rtl_test -t` and `curl -s localhost:8080/data/aircraft.json | head` before moving on.

## 3. Kiosk display - on the Pi

Expand Down
2 changes: 1 addition & 1 deletion pi-setup/install-on-pi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,6 @@ echo
echo "Done."
echo " Display : http://localhost:3000/ (point Chromium kiosk here — see setup-kiosk.sh)"
echo " Control : http://$IP:3000/control (open on your phone)"
echo " Decoder : http://$IP:8080/aircraft.json (raw decoded feed)"
echo " Decoder : http://$IP:8080/data/aircraft.json (raw decoded feed)"
echo
echo "Verify decode first: rtl_test -t then curl -s localhost:8080/data/aircraft.json | head"
2 changes: 1 addition & 1 deletion pi-setup/skylight-server.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Environment=NODE_ENV=production
Environment=PORT=3000
Environment=HOST=0.0.0.0
Environment=DATA_SOURCE=radio
Environment=AIRCRAFT_JSON_URL=http://localhost:8080/aircraft.json
Environment=AIRCRAFT_JSON_URL=http://localhost:8080/data/aircraft.json
ExecStart=__PNPM__ -F server start
Restart=always
RestartSec=3
Expand Down
4 changes: 4 additions & 0 deletions web/src/display/renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,10 @@ export function labelLines(cfg: Config, ac: Aircraft): { text: string; kind: "ti
else if (alt != null) sub.push(formatAltitude(alt, cfg.altitudeUnit));
}
if (f.speed && ac.gs != null) sub.push(formatSpeed(ac.gs, cfg.speedUnit));
if (f.verticalRate && ac.baroRate != null) {
const sign = ac.baroRate > 0 ? "+" : "";
sub.push(`${sign}${ac.baroRate} fpm`);
}
if (sub.length) out.push({ text: sub.join(" "), kind: "sub" });

if (f.destination && ac.destination && routePlausible(ac, cfg)) {
Expand Down