Compare commits
30
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
84bdf2593c | ||
|
|
c527f20a88 | ||
|
|
9f495021f0 | ||
|
|
33aa7b807c | ||
|
|
2c56d82a81 | ||
|
|
0fc2115973 | ||
|
|
2c1df75d19 | ||
|
|
aefd36c4b1 | ||
|
|
25b9c31c9b | ||
|
|
d68a84f7f9 | ||
|
|
4fa191e9b6 | ||
|
|
c073d03ffb | ||
|
|
730f129404 | ||
|
|
f95f3d0104 | ||
|
|
e70e82c8c0 | ||
|
|
23cc0db1fa | ||
|
|
657f952a2c | ||
|
|
1f256cbb68 | ||
|
|
92fbdb692c | ||
|
|
b2fbcb318d | ||
|
|
44721b579c | ||
|
|
889d00007d | ||
|
|
6f53592041 | ||
|
|
709939f60b | ||
|
|
5b7dd493d4 | ||
|
|
02fe492dbf | ||
|
|
1bc2c88e2f | ||
|
|
863a6d8fd4 | ||
|
|
b252717f6b | ||
|
|
92697b11c5 |
@@ -0,0 +1,434 @@
|
||||
APRS symbol set (https://github.com/hessu/aprs-symbols)
|
||||
=========================================================
|
||||
|
||||
Verbatim copy of the upstream COPYRIGHT.md, retrieved 2026-08-03 from
|
||||
https://github.com/hessu/aprs-symbols. The set has no single SPDX license:
|
||||
individual symbols carry different terms, summarized below. Attribution
|
||||
requirement from the upstream README: "If you use this symbol set, please
|
||||
provide a pointer to the source (http://github.com/hessu/aprs-symbols/)."
|
||||
|
||||
---
|
||||
|
||||
|
||||
Copyright and licensing information
|
||||
======================================
|
||||
|
||||
This is a collection of vectorized symbols for use on the APRS system.
|
||||
|
||||
The copyright status of this collection is a bit complicated, since the
|
||||
symbols come from various sources, each having different copyright owners.
|
||||
|
||||
Most of the vectorized symbols are loosely based on the low-resolution
|
||||
"standard" bitmap symbol set as distributed by Stephen Smith, WA8LMF. That
|
||||
set is used by most APRS software around the world. The low resolution of
|
||||
those symbols does not allow direct vector conversion, so I've drawn new
|
||||
symbols in a similar layout. The vector versions try to mimic the original
|
||||
appearance and colours, with the intention of keeping the set recognizable
|
||||
and familiar to existing users. In some cases the vector versions are
|
||||
probably similar enough to the originals, so that they cannot be considered
|
||||
"original work" by myself. In some of these cases, the originals are
|
||||
probably also mimicking someone else's design.
|
||||
|
||||
The original symbols do not come with any information on their licensing.
|
||||
They've been distributed with a lot of APRS software over time, but I don't
|
||||
know who designed which symbol originally. Most likely all of them are
|
||||
drawn by one of:
|
||||
|
||||
* Roger Barker, G4IDE, "original set provided with UI-View" (SK)
|
||||
* Steve Dimse, KH4G, "U.S. customary set"
|
||||
* Stephen Smith, WA8LMF
|
||||
|
||||
The Adobe Illustrator (.ai) file contains a copy of the original bitmaps
|
||||
as a hidden layer, just for reference.
|
||||
|
||||
Some symbols I obtained from other sources, such as Wikipedia. In those
|
||||
cases I picked SVG versions which allow commercial reuse (source known, and
|
||||
the work is placed on public domain, or with a CC license which allows
|
||||
adaptation and commercial reuse).
|
||||
|
||||
Some symbols are vectorized versions of product or brand logos. The
|
||||
copyright of those is owned by the respective companies (Apple, Microsoft,
|
||||
Kenwood), and each of those may have some opinions on how the logos are
|
||||
used. Please check for yourself if you can use them or not.
|
||||
|
||||
In the list below I try to summarize the licensing status for each symbol.
|
||||
|
||||
|
||||
Shorthand notation for common licensing status
|
||||
-------------------------------------------------
|
||||
|
||||
* *VEC-OH7LZB* - Vectorized by OH7LZB, based on original APRS symbol set
|
||||
* Source of original bitmap: http://wa8lmf.net/aprs/APRS_symbols.htm
|
||||
* Original designer of individual symbol unknown at this time, but one of:
|
||||
* Roger Barker, G4IDE
|
||||
* Steve Dimse, KH4G
|
||||
* Stephen Smith, WA8LMF
|
||||
* Vectorized versions are designed to look similar
|
||||
* Licensing: Unknown
|
||||
* *OH7LZB* - Original vector design by Heikki Hannikainen, OH7LZB
|
||||
* Different enough (by author's opinion) to make it a new original work,
|
||||
instead of a copy of the old symbol
|
||||
* License: CC BY-SA 2.0
|
||||
* https://creativecommons.org/licenses/by-sa/2.0/
|
||||
|
||||
|
||||
Primary table
|
||||
----------------
|
||||
|
||||
* /! - Police station
|
||||
* VEC-OH7LZB
|
||||
* /# - Digipeater / Green star with D in middle
|
||||
* VEC-OH7LZB
|
||||
* /$ - Telephone
|
||||
* VEC-OH7LZB
|
||||
* /% - DX cluster
|
||||
* VEC-OH7LZB
|
||||
* /& - HF gateway
|
||||
* VEC-OH7LZB
|
||||
* /' - Small aircraft
|
||||
* https://openclipart.org/detail/27182/topdown-airplane-view
|
||||
* Author: Wirelizard (Brian Burger)
|
||||
* With color and some other small tuning added by OH7LZB
|
||||
* PD: https://openclipart.org/share
|
||||
* /( - Mobile satellite station
|
||||
* OH7LZB
|
||||
* /) - Wheelchair, handicapped
|
||||
* PD wheelchair symbol
|
||||
* Vectorized from bitmap by OH7LZB
|
||||
* /* - Snowmobile
|
||||
* https://openclipart.org/detail/15849/snowmobile
|
||||
* Author: Mystica (https://openclipart.org/user-detail/mystica)
|
||||
* PD: https://openclipart.org/share
|
||||
* /+ - Red Cross
|
||||
* VEC-OH7LZB
|
||||
* /, - Boy Scouts
|
||||
* VEC-OH7LZB
|
||||
* /- - House
|
||||
* VEC-OH7LZB
|
||||
* /. - Red X
|
||||
* VEC-OH7LZB
|
||||
* // - Red dot
|
||||
* VEC-OH7LZB
|
||||
* /0 to /9 - Numbered circles
|
||||
* VEC-OH7LZB
|
||||
* Fire
|
||||
* http://commons.wikimedia.org/wiki/File:FireIcon.svg
|
||||
* Author: Piotr Jaworski
|
||||
* PD: I, the copyright holder of this work, release this work into the public domain. This applies worldwide.
|
||||
* Tent
|
||||
* https://openclipart.org/detail/174933/green-tent-by-stamps-174933
|
||||
* Author: stamps
|
||||
* PD: https://openclipart.org/share
|
||||
* Motorcycle
|
||||
* http://commons.wikimedia.org/wiki/File:MUTCD_W8-15P.svg
|
||||
* This file is in the public domain because it comes from the Manual on
|
||||
Uniform Traffic Control Devices, sign number W8-15P, which states
|
||||
specifically on page I-1 that: Any traffic control device design or
|
||||
application provision contained in this Manual shall be considered to
|
||||
be in the public domain. Traffic control devices contained in this
|
||||
Manual shall not be protected by a patent, trademark, or copyright,
|
||||
except for the Interstate Shield and any other items owned by FHWA.
|
||||
* Colour version by OH7LZB
|
||||
* /= - Railroad engine
|
||||
* http://commons.wikimedia.org/wiki/File:Icon_train.svg
|
||||
* Author: http://en.wikipedia.org/wiki/User:Richtom80
|
||||
* CC-BY-SA-2.5,2.0,1.0
|
||||
* /> - Car
|
||||
* OH7LZB
|
||||
* /? - File server
|
||||
* https://openclipart.org/detail/163717/file-server-by-lyte
|
||||
* Author: lyte
|
||||
* PD: https://openclipart.org/share
|
||||
* /@ - Hurricane predicted path
|
||||
* VEC-OH7LZB
|
||||
* /A - Aid station
|
||||
* VEC-OH7LZB
|
||||
* Mail (BBS)
|
||||
* https://openclipart.org/detail/29268/yellow-mail-by-rg1024-29268
|
||||
* Author: rg1024
|
||||
* PD: https://openclipart.org/share
|
||||
* /C - Canoe
|
||||
* https://openclipart.org/detail/179047/red-canoe-by-rambo-tribble-179047
|
||||
* https://openclipart.org/detail/179041/canoe-paddle-by-rambo-tribble-179041
|
||||
* Author: Rambo Tribble
|
||||
* PD: I, the copyright holder of this work, release this work into the public domain. This applies worldwide.
|
||||
* /E - Eyeball
|
||||
* http://commons.wikimedia.org/wiki/File:Blue_eye.svg
|
||||
* PD: "This file is from the Open Clip Art Library, which released it explicitly into the public domain"
|
||||
* PD: https://openclipart.org/share
|
||||
* /F - Tractor
|
||||
* https://openclipart.org/detail/191654/farm-tractor-by-tmjbeary-191654
|
||||
* Author: tmjbeary
|
||||
* PD: https://openclipart.org/share
|
||||
* /G - Grid square, 3 by 3
|
||||
* VEC-OH7LZB
|
||||
* /H - Hotel
|
||||
* VEC-OH7LZB
|
||||
* /I - TCP/IP
|
||||
* VEC-OH7LZB
|
||||
* /K - School
|
||||
* OH7LZB
|
||||
* /L - PC user
|
||||
* OH7LZB
|
||||
* /M - Mac apple
|
||||
* Apple
|
||||
* /N - NTS
|
||||
* VEC-OH7LZB
|
||||
* /O - Hot air balloon
|
||||
* OH7LZB
|
||||
* /P - Police
|
||||
* OH7LZB
|
||||
* /R - RV
|
||||
* OH7LZB
|
||||
* /S - Space Shuttle
|
||||
* https://openclipart.org/detail/814/space-shuttle-by-johnny_automatic
|
||||
* PD: Published by the NASA, in "The Brain in Space"
|
||||
* /T - SSTV
|
||||
* https://openclipart.org/detail/48997/flat-screen-by-rg1024
|
||||
* Author: rg1024
|
||||
* Adjusted by OH7LZB
|
||||
* PD: https://openclipart.org/share
|
||||
* /U - Bus
|
||||
* OH7LZB
|
||||
* /V - ATV, amateur television
|
||||
* https://openclipart.org/detail/48997/flat-screen-by-rg1024
|
||||
* Author: rg1024
|
||||
* Adjusted by OH7LZB
|
||||
* PD: https://openclipart.org/share
|
||||
* /W - Wx, Weather service site
|
||||
* VEC-OH7LZB
|
||||
* /X - Helicopter
|
||||
* OH7LZB
|
||||
* /Y - Sailboat
|
||||
* OH7LZB
|
||||
* /Z - Windows flag
|
||||
* Microsoft
|
||||
* /[ - Human
|
||||
* VEC-OH7LZB
|
||||
* /\ - DF triangle
|
||||
* VEC-OH7LZB
|
||||
* /] - Mailbox, post office, letter
|
||||
* /^ - Large aircraft
|
||||
* https://openclipart.org/detail/183204/plane-red-by-sketchartist-183204
|
||||
* Author: SketchArtist
|
||||
* PD: https://openclipart.org/share
|
||||
* /_ - Weather station
|
||||
* VEC-OH7LZB
|
||||
* /` - Satellite dish
|
||||
* OH7LZB
|
||||
* /a - Ambulance
|
||||
* OH7LZB
|
||||
* /b - Bicycle
|
||||
* http://commons.wikimedia.org/wiki/File:Bicycle_evolution-numbers.svg
|
||||
* Author: Wikipedia user: Al2
|
||||
* CC BY 3.0
|
||||
* /c - Incident command post
|
||||
* VEC-OH7LZB
|
||||
* /d - Fire station
|
||||
* VEC-OH7LZB
|
||||
* /e - Horse, equestrian
|
||||
* https://openclipart.org/detail/142627/horse-riding-lesson-by-olku
|
||||
* Author: OlKu
|
||||
* PD: https://openclipart.org/share
|
||||
* /f - Fire truck
|
||||
* OH7LZB
|
||||
* /g - Hang glider
|
||||
* OH7LZB
|
||||
* /h - Hospital
|
||||
* VEC-OH7LZB
|
||||
* /i - IOTA, islands on the air
|
||||
* http://commons.wikimedia.org/wiki/File:Palm_Island_R.svg
|
||||
* PI
|
||||
* /j - Jeep
|
||||
* OH7LZB
|
||||
* /k - Truck
|
||||
* OH7LZB
|
||||
* /l - Laptop
|
||||
* OH7LZB
|
||||
* /m - Mic-E repeater
|
||||
* VEC-OH7LZB
|
||||
* /n - Node, black bulls-eye
|
||||
* VEC-OH7LZB
|
||||
* /o - Emergency operations center
|
||||
* VEC-OH7LZB
|
||||
* /p - Dog(e)
|
||||
* OH7LZB
|
||||
* /q - Grid square, 2 by 2
|
||||
* VEC-OH7LZB
|
||||
* /r - Repeater tower
|
||||
* OH7LZB
|
||||
* /s - Ship, power boat
|
||||
* OH7LZB
|
||||
* /t - Truck stop
|
||||
* VEC-OH7LZB
|
||||
* /u - Semi-trailer truck, 18-wheeler
|
||||
* OH7LZB
|
||||
* /v - Van
|
||||
* OH7LZB
|
||||
* /w - Water station
|
||||
* VEC-OH7LZB
|
||||
* /x - X / Unix
|
||||
* https://commons.wikimedia.org/wiki/File:X11.svg
|
||||
* PD
|
||||
* /y - House, yagi antenna
|
||||
* VEC-OH7LZB
|
||||
* /z - Shelter
|
||||
* VEC-OH7LZB
|
||||
|
||||
|
||||
Secondary table
|
||||
------------------
|
||||
|
||||
* Emergency
|
||||
* VEC-OH7LZB
|
||||
* Numbered digipeater / Green star
|
||||
* VEC-OH7LZB
|
||||
* Bank
|
||||
* VEC-OH7LZB
|
||||
* Numbered gateway / Black diamond
|
||||
* VEC-OH7LZB
|
||||
* Crash site
|
||||
* OH7LZB
|
||||
* Cloudy
|
||||
* OH7LZB
|
||||
* MEO
|
||||
* VEC-OH7LZB
|
||||
* Snowflake
|
||||
* http://commons.wikimedia.org/wiki/File:Snowflake_01.svg
|
||||
* Author: Wikipedia user: Amada44
|
||||
* Public Domain
|
||||
* Church
|
||||
* VEC-OH7LZB
|
||||
* Girl Scout
|
||||
* VEC-OH7LZB
|
||||
* Looks slightly like the common USA girl scouts logos. Should be different
|
||||
enough to not infringe on "Girl Scouts of the USA" copyrights.
|
||||
* Home (HF antenna)
|
||||
* VEC-OH7LZB
|
||||
* Unknown position
|
||||
* VEC-OH7LZB
|
||||
* Destination
|
||||
* VEC-OH7LZB
|
||||
* Numbered circle
|
||||
* VEC-OH7LZB
|
||||
|
||||
* Petrol Station
|
||||
* OH7LZB
|
||||
* Hail
|
||||
* VEC-OH7LZB
|
||||
* Park
|
||||
* VEC-OH7LZB
|
||||
* Gale Flag
|
||||
* VEC-OH7LZB
|
||||
* Red car from above
|
||||
* OH7LZB
|
||||
* Info Kiosk
|
||||
* VEC-OH7LZB
|
||||
* Hurricane
|
||||
* OH7LZB
|
||||
|
||||
* Numbered white box
|
||||
* VEC-OH7LZB
|
||||
* Snow blowing
|
||||
* VEC-OH7LZB
|
||||
* Coast Guard
|
||||
* VEC-OH7LZB
|
||||
* Drizzle
|
||||
* VEC-OH7LZB
|
||||
* Smoke / Chimney
|
||||
* VEC-OH7LZB
|
||||
* Freezing rain
|
||||
* VEC-OH7LZB
|
||||
* Snow Shwr
|
||||
* VEC-OH7LZB
|
||||
* Haze
|
||||
* VEC-OH7LZB
|
||||
* Rain Shower
|
||||
* VEC-OH7LZB
|
||||
* Lightning
|
||||
* OH7LZB
|
||||
* "Kenwood radio"
|
||||
* Kenwood logo, vectorized
|
||||
* "Lighthouse"
|
||||
* CC BY-SA 2.0
|
||||
* http://wiki.openstreetmap.org/wiki/File:Lighthouse.svg
|
||||
* Nav Buoy
|
||||
* OH7LZB
|
||||
* Rocket
|
||||
* http://www.clker.com/clipart-gglkuglug.html
|
||||
* PD according to clker.com license
|
||||
* Parking
|
||||
* VEC-OH7LZB
|
||||
|
||||
* Earthquake, Restaurant
|
||||
* VEC-OH7LZB
|
||||
* Satellite
|
||||
* OH7LZB
|
||||
* Thunderstorm
|
||||
* OH7LZB
|
||||
* Sunny
|
||||
* OH7LZB
|
||||
* VORTAC, Numbered WXS
|
||||
* VEC-OH7LZB
|
||||
* Pharmacy Rx
|
||||
* OH7LZB
|
||||
* Wall Cloud
|
||||
* OH7LZB
|
||||
* Numbered plane
|
||||
* https://openclipart.org/detail/183204/plane-red-by-sketchartist-183204
|
||||
* Author: SketchArtist
|
||||
* PD: https://openclipart.org/share
|
||||
* Numbered WX Station
|
||||
* VEC-OH7LZB
|
||||
* Rain
|
||||
* Source: http://commons.wikimedia.org/wiki/File:Heavy-rain-shower-transparent.svg
|
||||
* Author: Wikipedia user: Peepo
|
||||
* Public Domain
|
||||
* With modifications by OH7LZB
|
||||
|
||||
* Numbered diamond
|
||||
* VEC-OH7LZB
|
||||
* Dust blowing
|
||||
* NA
|
||||
* Numbered civil defence
|
||||
* VEC-OH7LZB
|
||||
* DX spot
|
||||
* VEC-OH7LZB
|
||||
* Sleet
|
||||
* NA
|
||||
* Funnel Cloud
|
||||
* NA
|
||||
* Gale
|
||||
* VEC-OH7LZB
|
||||
* Store
|
||||
* https://openclipart.org/detail/89299/cart-medium-by-martins.bruvelis
|
||||
* Author: martins.bruvelis
|
||||
* Public Domain
|
||||
* Adjustments by OH7LZB
|
||||
* Numbered black box
|
||||
* VEC-OH7LZB
|
||||
* Work zone / Excavator
|
||||
* Based on http://www.clker.com/clipart-292480.html PNG version
|
||||
* Vectorized and colors adjusted by OH7LZB
|
||||
* PD according to clker.com documentation, uploader KURSVEIAL
|
||||
* SUV
|
||||
* OH7LZB
|
||||
* Milepost, Numbered triangle, Circle sm
|
||||
* VEC-OH7LZB
|
||||
* Partly cloudy
|
||||
* OH7LZB
|
||||
|
||||
* Restrooms, Numbered boat
|
||||
* VEC-OH7LZB
|
||||
* Tornado (also used in Funnel cloud, Skywarn)
|
||||
* https://openclipart.org/detail/104887/tornado-by-laabadon
|
||||
* Author: Laabadon
|
||||
* Public Domain
|
||||
* Numbered truck
|
||||
* OH7LZB
|
||||
* Numbered van
|
||||
* OH7LZB
|
||||
* Flooding
|
||||
* NA
|
||||
* Sky warn, Numbered shelter, fog
|
||||
* VEC-OH7LZB
|
||||
@@ -144,4 +144,7 @@ a unified set of frontends.
|
||||
GPL-2.0-or-later. See [`LICENSES`](LICENSES) for the full license text and
|
||||
bundled third-party license files. Bundled third-party components retain their
|
||||
original licenses: Leaflet is BSD-2-Clause, DSEG is OFL-1.1, and opus-decoder
|
||||
is MIT.
|
||||
is MIT. The APRS symbol sprites come from
|
||||
[hessu/aprs-symbols](https://github.com/hessu/aprs-symbols); their per-symbol
|
||||
copyright status is catalogued in
|
||||
[`LICENSES/LicenseRef-APRS-Symbols.txt`](LICENSES/LicenseRef-APRS-Symbols.txt).
|
||||
|
||||
+16
@@ -56,3 +56,19 @@ SPDX-License-Identifier = "OFL-1.1"
|
||||
path = ["src/trx-client/trx-frontend/trx-frontend-http/assets/web/vendor/opus-decoder-0.7.11.min.js"]
|
||||
SPDX-FileCopyrightText = "2021-2025 Ethan Halsall"
|
||||
SPDX-License-Identifier = "MIT"
|
||||
|
||||
# Vendored APRS symbol sprites (https://github.com/hessu/aprs-symbols), rev H.
|
||||
# The set has no single upstream license -- individual symbols carry different
|
||||
# terms, catalogued in LICENSES/LicenseRef-APRS-Symbols.txt. Upstream asks that
|
||||
# users point back to https://github.com/hessu/aprs-symbols/.
|
||||
[[annotations]]
|
||||
path = [
|
||||
"src/trx-client/trx-frontend/trx-frontend-http/assets/web/vendor/aprs-symbols-24-0.png",
|
||||
"src/trx-client/trx-frontend/trx-frontend-http/assets/web/vendor/aprs-symbols-24-1.png",
|
||||
"src/trx-client/trx-frontend/trx-frontend-http/assets/web/vendor/aprs-symbols-24-2.png",
|
||||
"src/trx-client/trx-frontend/trx-frontend-http/assets/web/vendor/aprs-symbols-24-0-2x.png",
|
||||
"src/trx-client/trx-frontend/trx-frontend-http/assets/web/vendor/aprs-symbols-24-1-2x.png",
|
||||
"src/trx-client/trx-frontend/trx-frontend-http/assets/web/vendor/aprs-symbols-24-2-2x.png",
|
||||
]
|
||||
SPDX-FileCopyrightText = "Heikki Hannikainen OH7LZB and the APRS symbol set authors (https://github.com/hessu/aprs-symbols)"
|
||||
SPDX-License-Identifier = "LicenseRef-APRS-Symbols"
|
||||
|
||||
@@ -743,7 +743,7 @@ function elementById(id) {
|
||||
const element = document.getElementById(id);
|
||||
if (element) body.appendChild(element);
|
||||
});
|
||||
tray.appendChild(details);
|
||||
tray.insertBefore(details, document.getElementById("audio-controls"));
|
||||
api.applyLayout(savedLayoutName(), { persist: false });
|
||||
}
|
||||
}
|
||||
@@ -810,14 +810,21 @@ function elementById(id) {
|
||||
});
|
||||
const barFits = () => {
|
||||
const bar = actions.closest(".tab-bar");
|
||||
if (!bar) return true;
|
||||
const identity = bar.querySelector(".header-main");
|
||||
const nav = bar.querySelector(".tab-bar-nav");
|
||||
const gutters = 48;
|
||||
const needed = (identity?.offsetWidth ?? 0) + (nav?.scrollWidth ?? 0) + actions.scrollWidth + gutters;
|
||||
return needed <= bar.clientWidth;
|
||||
const nav = bar?.querySelector(".tab-bar-nav");
|
||||
if (!bar || !nav) return true;
|
||||
const barRect = bar.getBoundingClientRect();
|
||||
const actionsRect = actions.getBoundingClientRect();
|
||||
if (actionsRect.right > barRect.right + 1) return false;
|
||||
const tabs = Array.from(nav.querySelectorAll(".tab")).filter((tab) => tab.offsetParent !== null);
|
||||
if (!tabs.length) return true;
|
||||
const tabsRight = Math.max(...tabs.map((tab) => tab.getBoundingClientRect().right));
|
||||
return tabsRight <= actionsRect.left - 1;
|
||||
};
|
||||
const reflowOverflow = () => {
|
||||
const nav = document.querySelector(".tab-bar-nav");
|
||||
const bar = actions.closest(".tab-bar");
|
||||
nav?.classList.remove("nav-icons-only");
|
||||
bar?.classList.remove("bar-tight");
|
||||
overflowOrder.forEach((selector) => {
|
||||
const element = menu.querySelector(selector);
|
||||
if (element) actions.insertBefore(element, wrap);
|
||||
@@ -830,11 +837,25 @@ function elementById(id) {
|
||||
wrap.hidden = false;
|
||||
menu.appendChild(element);
|
||||
}
|
||||
if (nav && !barFits()) nav.classList.add("nav-icons-only");
|
||||
if (bar && !barFits()) bar.classList.add("bar-tight");
|
||||
wrap.hidden = menu.children.length === 0;
|
||||
if (wrap.hidden) closeMenu();
|
||||
};
|
||||
reflowOverflow();
|
||||
window.addEventListener("resize", reflowOverflow);
|
||||
if (typeof ResizeObserver !== "undefined") {
|
||||
const bar = actions.closest(".tab-bar");
|
||||
const observer = new ResizeObserver(() => {
|
||||
reflowOverflow();
|
||||
});
|
||||
if (bar) observer.observe(bar);
|
||||
observer.observe(actions);
|
||||
}
|
||||
document.fonts?.ready.then(() => {
|
||||
reflowOverflow();
|
||||
}).catch(() => {
|
||||
});
|
||||
}
|
||||
function installMobileMore() {
|
||||
const nav = document.querySelector(".tab-bar-nav");
|
||||
@@ -1833,6 +1854,7 @@ function hideAuthGate() {
|
||||
});
|
||||
navigateToTab(tabFromPath2(), { updateHistory: false, replaceHistory: true });
|
||||
syncTopBarAccess();
|
||||
if (!bandplanData) void loadBandplanJson();
|
||||
}
|
||||
function showAuthError(msg) {
|
||||
const el = requiredElement("auth-error");
|
||||
@@ -2237,6 +2259,7 @@ function formatSigStrength(dbm) {
|
||||
return `${dbfs.toFixed(1)} ${sigUnit("dBFS")}`;
|
||||
}
|
||||
function refreshSigStrengthDisplay() {
|
||||
renderSdrSquelch();
|
||||
if (!sigStrengthEl) return;
|
||||
sigStrengthEl.innerHTML = formatSigStrength(sigLastDbm);
|
||||
}
|
||||
@@ -2290,6 +2313,7 @@ async function restorePreviousTuneState() {
|
||||
savePreviousTuneState();
|
||||
if (saved.mode && modeEl && modeEl.value !== saved.mode) {
|
||||
modeEl.value = saved.mode;
|
||||
syncModePicker();
|
||||
await postPath(`/set_mode?mode=${encodeURIComponent(saved.mode)}`);
|
||||
updateWfmControls();
|
||||
}
|
||||
@@ -2724,6 +2748,17 @@ if (headerStylePickSelect) {
|
||||
function readyText() {
|
||||
return lastClientCount !== null ? `Ready · ${lastClientCount} user${lastClientCount !== 1 ? "s" : ""}` : "Ready";
|
||||
}
|
||||
var HINT_ERROR_RE = /failed|missing|unavailable|unknown|lost|required/i;
|
||||
var HINT_BUSY_RE = /initializ|connecting|retrying|scanning|shifting|waiting|sending|switching|toggling|setting|not fully/i;
|
||||
function hintState(msg) {
|
||||
if (HINT_ERROR_RE.test(msg)) return "error";
|
||||
if (HINT_BUSY_RE.test(msg) || /[\u2026]$|\.\.\.$/.test(msg)) return "busy";
|
||||
return "ok";
|
||||
}
|
||||
function setPowerHint(msg) {
|
||||
powerHint.textContent = msg;
|
||||
powerHint.dataset.state = hintState(msg);
|
||||
}
|
||||
function rigBadgeColor(rigId) {
|
||||
const text = (rigId || "rx").toString();
|
||||
let hash = 0;
|
||||
@@ -2837,12 +2872,12 @@ function refreshOperatorLayoutCapabilities() {
|
||||
});
|
||||
}
|
||||
function showHint(msg, duration) {
|
||||
powerHint.textContent = msg;
|
||||
setPowerHint(msg);
|
||||
if (hintTimer) clearTimeout(hintTimer);
|
||||
if (duration) hintTimer = setTimeout(() => {
|
||||
powerHint.textContent = readyText();
|
||||
setPowerHint(readyText());
|
||||
}, duration);
|
||||
if (/failed|missing|unavailable|unknown|lost|required/i.test(msg)) {
|
||||
if (HINT_ERROR_RE.test(msg)) {
|
||||
window.trxUi?.notify(msg, { kind: "error" });
|
||||
}
|
||||
}
|
||||
@@ -4113,6 +4148,7 @@ function setDisabled(disabled) {
|
||||
[freqEl, centerFreqEl, modeEl, pttBtn, powerBtn, txLimitInput, txLimitBtn, lockBtn].forEach((el) => {
|
||||
if (el) el.disabled = disabled;
|
||||
});
|
||||
syncModePicker();
|
||||
}
|
||||
var serverVersion = null;
|
||||
var serverBuildDate = null;
|
||||
@@ -4405,13 +4441,13 @@ function render(update) {
|
||||
console.info("Rig initializing:", { manufacturer: manu, model, revision: rev });
|
||||
loadingEl.style.display = "";
|
||||
if (contentEl) contentEl.style.display = "none";
|
||||
powerHint.textContent = "Initializing rig…";
|
||||
setPowerHint("Initializing rig…");
|
||||
setDisabled(true);
|
||||
return;
|
||||
}
|
||||
loadingEl.style.display = "none";
|
||||
if (contentEl) contentEl.style.display = "";
|
||||
powerHint.textContent = "Rig not fully initialized yet";
|
||||
setPowerHint("Rig not fully initialized yet");
|
||||
} else {
|
||||
loadingEl.style.display = "none";
|
||||
if (contentEl) contentEl.style.display = "";
|
||||
@@ -4444,6 +4480,7 @@ function render(update) {
|
||||
opt.textContent = m;
|
||||
modeEl.appendChild(opt);
|
||||
});
|
||||
renderModePicker();
|
||||
}
|
||||
}
|
||||
if (update.info && update.info.capabilities) {
|
||||
@@ -4570,6 +4607,7 @@ function render(update) {
|
||||
const onVirtual = window.trx.modules.vchan?.isOnVirtual() === true;
|
||||
if (!onVirtual) {
|
||||
modeEl.value = modeUpper2;
|
||||
syncModePicker();
|
||||
if (modeUpper2 === "WFM" && lastModeName !== "WFM") {
|
||||
setJogDivisor(10);
|
||||
resetRdsDisplay();
|
||||
@@ -4704,6 +4742,7 @@ function render(update) {
|
||||
const sUnits = dbmToSUnits(update.status.rx.sig);
|
||||
sigLastSUnits = sUnits;
|
||||
sigLastDbm = update.status.rx.sig;
|
||||
recordSquelchMeterSample(update.status.rx.sig);
|
||||
const pct = sUnits <= 9 ? Math.max(0, Math.min(100, sUnits / 9 * 100)) : 100;
|
||||
signalBar.style.width = `${pct}%`;
|
||||
signalValue.innerHTML = formatSignal(sUnits);
|
||||
@@ -4730,7 +4769,7 @@ function render(update) {
|
||||
powerBtn.disabled = true;
|
||||
powerBtn.textContent = "Power unavailable";
|
||||
powerBtn.setAttribute("aria-pressed", "false");
|
||||
powerHint.textContent = "State unknown";
|
||||
setPowerHint("State unknown");
|
||||
}
|
||||
if (update.status && update.status.tx && typeof update.status.tx.limit === "number") {
|
||||
txLimitInput.value = String(update.status.tx.limit);
|
||||
@@ -4827,7 +4866,7 @@ function render(update) {
|
||||
if (Array.isArray(update.remotes)) {
|
||||
applyRigList(typeof update.active_remote === "string" ? update.active_remote : null, update.remotes);
|
||||
}
|
||||
powerHint.textContent = readyText();
|
||||
setPowerHint(readyText());
|
||||
lastLocked = update.status?.lock === true;
|
||||
window.trxUi?.setButtonState(lockBtn, {
|
||||
active: lastLocked,
|
||||
@@ -4905,11 +4944,11 @@ function connect() {
|
||||
render(data);
|
||||
lastEventAt = Date.now();
|
||||
if (data.server_connected === false) {
|
||||
powerHint.textContent = "trx-server connection lost";
|
||||
setPowerHint("trx-server connection lost");
|
||||
if (tabMainEl) tabMainEl.classList.add("server-disconnected");
|
||||
} else {
|
||||
if (tabMainEl) tabMainEl.classList.remove("server-disconnected");
|
||||
if (data.initialized) powerHint.textContent = readyText();
|
||||
if (data.initialized) setPowerHint(readyText());
|
||||
}
|
||||
} catch (e) {
|
||||
console.error("Bad event data", e);
|
||||
@@ -4932,7 +4971,7 @@ function connect() {
|
||||
});
|
||||
source.onerror = () => {
|
||||
if (source.readyState === EventSource.CLOSED) {
|
||||
powerHint.textContent = "trx-client connection lost, retrying…";
|
||||
setPowerHint("trx-client connection lost, retrying…");
|
||||
setConnLostOverlay(true, "trx-client connection lost", "Retrying…", true);
|
||||
source.close();
|
||||
void pollFreshSnapshot();
|
||||
@@ -4942,7 +4981,7 @@ function connect() {
|
||||
esHeartbeat = setInterval(() => {
|
||||
const now = Date.now();
|
||||
if (now - lastEventAt > 15e3) {
|
||||
powerHint.textContent = "trx-client connection lost, retrying…";
|
||||
setPowerHint("trx-client connection lost, retrying…");
|
||||
setConnLostOverlay(true, "trx-client connection lost", "Retrying…", true);
|
||||
source.close();
|
||||
void pollFreshSnapshot();
|
||||
@@ -5327,6 +5366,33 @@ if (jogMultEl) {
|
||||
}
|
||||
jogStep = Math.max(Math.round(jogUnit / jogMult), minFreqStepHz);
|
||||
}
|
||||
var modePickerEl = requiredElement("mode-picker");
|
||||
function renderModePicker() {
|
||||
modePickerEl.replaceChildren();
|
||||
for (const option of Array.from(modeEl.options)) {
|
||||
const btn = document.createElement("button");
|
||||
btn.type = "button";
|
||||
btn.dataset.mode = option.value;
|
||||
btn.textContent = option.textContent;
|
||||
btn.addEventListener("click", () => {
|
||||
if (btn.disabled || modeEl.value === option.value) return;
|
||||
modeEl.value = option.value;
|
||||
syncModePicker();
|
||||
void applyModeFromPicker();
|
||||
});
|
||||
modePickerEl.appendChild(btn);
|
||||
}
|
||||
syncModePicker();
|
||||
}
|
||||
function syncModePicker() {
|
||||
const active = (modeEl.value || "").toUpperCase();
|
||||
modePickerEl.querySelectorAll("button").forEach((btn) => {
|
||||
const selected = (btn.dataset.mode || "").toUpperCase() === active;
|
||||
btn.classList.toggle("active", selected);
|
||||
btn.disabled = modeEl.disabled;
|
||||
btn.setAttribute("aria-pressed", String(selected));
|
||||
});
|
||||
}
|
||||
async function applyModeFromPicker() {
|
||||
const mode = modeEl.value || "";
|
||||
if (!mode) {
|
||||
@@ -5335,6 +5401,7 @@ async function applyModeFromPicker() {
|
||||
}
|
||||
updateWfmControls();
|
||||
setControlPending(modeEl, true);
|
||||
syncModePicker();
|
||||
showHint("Setting mode…");
|
||||
try {
|
||||
if (await window.trx.modules.vchan?.interceptMode(mode)) {
|
||||
@@ -5352,6 +5419,7 @@ async function applyModeFromPicker() {
|
||||
console.error(err);
|
||||
} finally {
|
||||
setControlPending(modeEl, false);
|
||||
syncModePicker();
|
||||
}
|
||||
}
|
||||
modeEl.addEventListener("change", applyModeFromPicker);
|
||||
@@ -5548,6 +5616,39 @@ var _activeTab = "main";
|
||||
function tabFromPath2(pathname = window.location.pathname) {
|
||||
return tabFromPath(pathname);
|
||||
}
|
||||
var pendingMapTarget = null;
|
||||
function applyMapTarget(target) {
|
||||
const map = window.trx.modules.map;
|
||||
if (!map) return false;
|
||||
if (target.kind === "position") {
|
||||
map.focusMapPosition?.(target.lat, target.lon);
|
||||
} else {
|
||||
map.focusMapLocator?.(target.grid, target.preferredType);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
function requestMapTarget(target) {
|
||||
pendingMapTarget = target;
|
||||
navigateToTab("map");
|
||||
if (window.trx.modules.map) {
|
||||
requestAnimationFrame(() => {
|
||||
drainPendingMapTarget();
|
||||
});
|
||||
}
|
||||
}
|
||||
function drainPendingMapTarget() {
|
||||
const target = pendingMapTarget;
|
||||
if (!target) return;
|
||||
if (applyMapTarget(target)) pendingMapTarget = null;
|
||||
}
|
||||
window.navigateToAprsMap = (lat, lon) => {
|
||||
if (!isFiniteNumber(lat) || !isFiniteNumber(lon)) return;
|
||||
requestMapTarget({ kind: "position", lat, lon });
|
||||
};
|
||||
window.navigateToMapLocator = (grid, preferredType = null) => {
|
||||
if (!grid) return;
|
||||
requestMapTarget({ kind: "locator", grid, preferredType });
|
||||
};
|
||||
var _mapInitTimer = null;
|
||||
function _initMapWhenReady() {
|
||||
const loadingEl2 = document.getElementById("map-loading");
|
||||
@@ -5564,6 +5665,7 @@ function _initMapWhenReady() {
|
||||
requestAnimationFrame(() => {
|
||||
map.sizeAprsMapToViewport();
|
||||
map.aprsMap?.invalidateSize();
|
||||
drainPendingMapTarget();
|
||||
});
|
||||
});
|
||||
return;
|
||||
@@ -5592,6 +5694,11 @@ function navigateToTab(name, options = {}) {
|
||||
_activeTab = name;
|
||||
document.querySelectorAll(".tab-bar .tab").forEach((t) => t.classList.remove("active"));
|
||||
btn.classList.add("active");
|
||||
const toolsBtn = document.getElementById("mobile-more-btn");
|
||||
if (toolsBtn) {
|
||||
const inToolsMenu = !!document.querySelector(`#mobile-more-menu [data-navigate-tab="${name}"]`);
|
||||
toolsBtn.classList.toggle("active", inToolsMenu);
|
||||
}
|
||||
window.trxUi?.syncSelectedTab(document.querySelector(".tab-bar-nav"), btn);
|
||||
document.querySelectorAll(".tab-panel").forEach((p) => p.style.display = "none");
|
||||
const panel = document.getElementById(`tab-${name}`);
|
||||
@@ -5936,6 +6043,7 @@ var trxCore = Object.freeze({
|
||||
syncBandwidthInput,
|
||||
scheduleSpectrumDraw,
|
||||
onDecoderRegistryReady,
|
||||
syncModePicker,
|
||||
formatFreqForStep: formatFrequencyForStep,
|
||||
refreshFreqDisplay,
|
||||
setJogDivisor,
|
||||
@@ -6148,14 +6256,18 @@ var wfmCciValEl = document.getElementById("wfm-cci-val");
|
||||
var wfmAciFillEl = document.getElementById("wfm-aci-fill");
|
||||
var wfmAciValEl = document.getElementById("wfm-aci-val");
|
||||
var samControlsCol = document.getElementById("sam-controls-col");
|
||||
var modeControlsRow = document.getElementById("mode-controls-row");
|
||||
var samStereoWidthEl = document.getElementById("sam-stereo-width");
|
||||
var samCarrierSyncEl = document.getElementById("sam-carrier-sync");
|
||||
var sdrSquelchWrapEl = document.getElementById("sdr-squelch-wrap");
|
||||
var sdrSquelchEl = document.getElementById("sdr-squelch");
|
||||
var sdrSquelchPctEl = document.getElementById("sdr-squelch-pct");
|
||||
var sdrSquelchDbEl = document.getElementById("sdr-squelch-db");
|
||||
var sdrSquelchStateEl = document.getElementById("sdr-squelch-state");
|
||||
var sdrSquelchToggleBtn = document.getElementById("sdr-squelch-toggle");
|
||||
var squelchLineEl = document.getElementById("spectrum-squelch-line");
|
||||
var squelchGripEl = document.getElementById("spectrum-squelch-grip");
|
||||
var squelchLabelEl = document.getElementById("spectrum-squelch-label");
|
||||
var SDR_SQUELCH_MIN_DB = -120;
|
||||
var SDR_SQUELCH_MAX_DB = -30;
|
||||
var syncFromServerSdrSquelch = false;
|
||||
var sdrNbWrapEl = document.getElementById("sdr-nb-wrap");
|
||||
var sdrNbEnabledEl = document.getElementById("sdr-nb-enabled");
|
||||
var sdrNbThresholdControlsEl = document.getElementById("sdr-nb-threshold-controls");
|
||||
@@ -6244,89 +6356,191 @@ function normalizeWfmDenoiseLevel(value) {
|
||||
if (next === "off" || next === "auto" || next === "low" || next === "medium" || next === "high") return next;
|
||||
return "auto";
|
||||
}
|
||||
function clampSdrSquelchPercent(value) {
|
||||
if (!isFiniteNumber(value)) return 0;
|
||||
return Math.max(0, Math.min(100, Math.round(value)));
|
||||
var sdrSquelchEnabled = loadSetting("sdrSquelchEnabled", false);
|
||||
var sdrSquelchThresholdDb = clampSdrSquelchDb(Number(loadSetting("sdrSquelchThresholdDb", -95)));
|
||||
function clampSdrSquelchDb(value) {
|
||||
if (!isFiniteNumber(value)) return SDR_SQUELCH_MIN_DB;
|
||||
return Math.max(SDR_SQUELCH_MIN_DB, Math.min(SDR_SQUELCH_MAX_DB, Math.round(value)));
|
||||
}
|
||||
function sdrSquelchPercentToServer(percent) {
|
||||
const pct = clampSdrSquelchPercent(percent);
|
||||
if (pct <= 0) {
|
||||
return { enabled: false, thresholdDb: SDR_SQUELCH_MIN_DB };
|
||||
function sdrSquelchIsPassing() {
|
||||
if (!sdrSquelchEnabled) return true;
|
||||
if (!isFiniteNumber(sigLastDbm)) return false;
|
||||
return sigLastDbm >= sdrSquelchThresholdDb;
|
||||
}
|
||||
function renderSdrSquelch() {
|
||||
if (sdrSquelchDbEl && document.activeElement !== sdrSquelchDbEl) {
|
||||
sdrSquelchDbEl.value = String(sdrSquelchThresholdDb);
|
||||
}
|
||||
const ratio = pct / 100;
|
||||
const thresholdDb = SDR_SQUELCH_MIN_DB + ratio * (SDR_SQUELCH_MAX_DB - SDR_SQUELCH_MIN_DB);
|
||||
return { enabled: true, thresholdDb };
|
||||
if (sdrSquelchDbEl) sdrSquelchDbEl.disabled = !sdrSquelchSupported;
|
||||
if (sdrSquelchToggleBtn) {
|
||||
sdrSquelchToggleBtn.setAttribute("aria-pressed", String(sdrSquelchEnabled));
|
||||
sdrSquelchToggleBtn.title = sdrSquelchEnabled ? "Turn the squelch off" : "Turn the squelch on";
|
||||
}
|
||||
const state = !sdrSquelchEnabled ? "off" : sdrSquelchIsPassing() ? "open" : "closed";
|
||||
if (sdrSquelchStateEl) {
|
||||
sdrSquelchStateEl.dataset.state = state;
|
||||
sdrSquelchStateEl.parentElement?.setAttribute(
|
||||
"aria-label",
|
||||
state === "off" ? "Squelch off" : state === "open" ? "Squelch on, open" : "Squelch on, closed"
|
||||
);
|
||||
}
|
||||
if (squelchLabelEl) squelchLabelEl.textContent = String(sdrSquelchThresholdDb);
|
||||
if (squelchGripEl) squelchGripEl.setAttribute("aria-valuenow", String(sdrSquelchThresholdDb));
|
||||
if (squelchLineEl) squelchLineEl.dataset.state = state === "open" ? "open" : "closed";
|
||||
positionSquelchLine();
|
||||
}
|
||||
function sdrSquelchServerToPercent(enabled, thresholdDb) {
|
||||
if (!enabled) return 0;
|
||||
if (!isFiniteNumber(thresholdDb)) return 0;
|
||||
const ratio = (thresholdDb - SDR_SQUELCH_MIN_DB) / (SDR_SQUELCH_MAX_DB - SDR_SQUELCH_MIN_DB);
|
||||
return clampSdrSquelchPercent(ratio * 100);
|
||||
function positionSquelchLine() {
|
||||
if (!squelchLineEl) return;
|
||||
const mode = (modeEl && modeEl.value ? modeEl.value : "").toUpperCase();
|
||||
const canvas = document.getElementById("spectrum-canvas");
|
||||
const visible = sdrSquelchSupported && sdrSquelchEnabled && mode !== "WFM" && !!canvas && canvas.clientHeight > 0 && getComputedStyle(requiredElement("spectrum-panel")).display !== "none";
|
||||
if (!visible) {
|
||||
squelchLineEl.style.display = "none";
|
||||
return;
|
||||
}
|
||||
const dbMin = spectrumFloor;
|
||||
const dbMax = spectrumFloor + spectrumRange;
|
||||
const frac = Math.max(0, Math.min(1, (sdrSquelchThresholdDb - dbMin) / Math.max(1, dbMax - dbMin)));
|
||||
squelchLineEl.style.display = "";
|
||||
squelchLineEl.style.top = `${canvas.offsetTop + canvas.clientHeight * (1 - frac)}px`;
|
||||
}
|
||||
function updateSdrSquelchPctLabel() {
|
||||
if (!sdrSquelchEl || !sdrSquelchPctEl) return;
|
||||
const pct = clampSdrSquelchPercent(Number(sdrSquelchEl.value));
|
||||
sdrSquelchPctEl.textContent = pct <= 0 ? "Open" : `${pct}%`;
|
||||
function submitSdrSquelch() {
|
||||
if (!sdrSquelchSupported) return;
|
||||
saveSetting("sdrSquelchEnabled", sdrSquelchEnabled);
|
||||
saveSetting("sdrSquelchThresholdDb", sdrSquelchThresholdDb);
|
||||
postPath(
|
||||
`/set_sdr_squelch?enabled=${sdrSquelchEnabled ? "true" : "false"}&threshold_db=${encodeURIComponent(sdrSquelchThresholdDb.toFixed(2))}`
|
||||
).catch(() => {
|
||||
});
|
||||
}
|
||||
function setSdrSquelch(thresholdDb, enabled, options = {}) {
|
||||
sdrSquelchThresholdDb = clampSdrSquelchDb(thresholdDb);
|
||||
sdrSquelchEnabled = enabled;
|
||||
renderSdrSquelch();
|
||||
if (options.submit !== false) submitSdrSquelch();
|
||||
}
|
||||
var SQUELCH_NOISE_WINDOW_MS = 1e4;
|
||||
var SQUELCH_NOISE_MARGIN_DB = 5;
|
||||
var SQUELCH_MEASURE_MS = 1500;
|
||||
var squelchMeterSamples = [];
|
||||
function recordSquelchMeterSample(db) {
|
||||
if (!isFiniteNumber(db)) return;
|
||||
const now = Date.now();
|
||||
squelchMeterSamples.push({ t: now, v: db });
|
||||
while (squelchMeterSamples[0] && now - squelchMeterSamples[0].t > SQUELCH_NOISE_WINDOW_MS) {
|
||||
squelchMeterSamples.shift();
|
||||
}
|
||||
}
|
||||
function squelchNoiseFloorDb() {
|
||||
const now = Date.now();
|
||||
const values = squelchMeterSamples.filter((sample) => now - sample.t <= SQUELCH_NOISE_WINDOW_MS).map((sample) => sample.v).sort((a, b) => a - b);
|
||||
if (values.length < 4) return null;
|
||||
return values[Math.floor((values.length - 1) * 0.2)] ?? null;
|
||||
}
|
||||
function autoSquelchThresholdDb() {
|
||||
const noiseDb = squelchNoiseFloorDb();
|
||||
if (noiseDb == null) return null;
|
||||
return clampSdrSquelchDb(noiseDb + SQUELCH_NOISE_MARGIN_DB);
|
||||
}
|
||||
function updateSdrSquelchControlVisibility() {
|
||||
if (!sdrSquelchWrapEl) return;
|
||||
const mode = (modeEl && modeEl.value ? modeEl.value : "").toUpperCase();
|
||||
sdrSquelchWrapEl.style.display = sdrSquelchSupported && mode !== "WFM" ? "" : "none";
|
||||
renderSdrSquelch();
|
||||
}
|
||||
function syncSdrSquelchFromServer(enabled, thresholdDb) {
|
||||
if (!sdrSquelchEl) return;
|
||||
if (document.activeElement === sdrSquelchEl) return;
|
||||
const pct = sdrSquelchServerToPercent(enabled, thresholdDb);
|
||||
syncFromServerSdrSquelch = true;
|
||||
sdrSquelchEl.value = String(pct);
|
||||
updateSdrSquelchPctLabel();
|
||||
syncFromServerSdrSquelch = false;
|
||||
saveSetting("sdrSquelchPct", pct);
|
||||
if (squelchDragPointerId !== null) return;
|
||||
if (sdrSquelchDbEl && document.activeElement === sdrSquelchDbEl) return;
|
||||
sdrSquelchEnabled = enabled;
|
||||
if (isFiniteNumber(thresholdDb)) sdrSquelchThresholdDb = clampSdrSquelchDb(thresholdDb);
|
||||
saveSetting("sdrSquelchEnabled", sdrSquelchEnabled);
|
||||
saveSetting("sdrSquelchThresholdDb", sdrSquelchThresholdDb);
|
||||
renderSdrSquelch();
|
||||
}
|
||||
function submitSdrSquelchPercent(percent) {
|
||||
if (!sdrSquelchSupported) return;
|
||||
const { enabled, thresholdDb } = sdrSquelchPercentToServer(percent);
|
||||
postPath(
|
||||
`/set_sdr_squelch?enabled=${enabled ? "true" : "false"}&threshold_db=${encodeURIComponent(thresholdDb.toFixed(2))}`
|
||||
).catch(() => {
|
||||
var squelchDragPointerId = null;
|
||||
var squelchDragSubmitAt = 0;
|
||||
if (sdrSquelchDbEl) {
|
||||
sdrSquelchDbEl.addEventListener("change", () => {
|
||||
setSdrSquelch(Number(sdrSquelchDbEl.value), sdrSquelchEnabled);
|
||||
});
|
||||
sdrSquelchDbEl.addEventListener("blur", () => {
|
||||
renderSdrSquelch();
|
||||
});
|
||||
}
|
||||
if (sdrSquelchEl) {
|
||||
const savedPct = clampSdrSquelchPercent(Number(loadSetting("sdrSquelchPct", 0)));
|
||||
sdrSquelchEl.value = String(savedPct);
|
||||
updateSdrSquelchPctLabel();
|
||||
sdrSquelchEl.addEventListener("input", () => {
|
||||
const pct = clampSdrSquelchPercent(Number(sdrSquelchEl.value));
|
||||
sdrSquelchEl.value = String(pct);
|
||||
updateSdrSquelchPctLabel();
|
||||
saveSetting("sdrSquelchPct", pct);
|
||||
if (!syncFromServerSdrSquelch) {
|
||||
submitSdrSquelchPercent(pct);
|
||||
}
|
||||
if (sdrSquelchToggleBtn) {
|
||||
sdrSquelchToggleBtn.addEventListener("click", () => {
|
||||
if (!sdrSquelchSupported) return;
|
||||
setSdrSquelch(sdrSquelchThresholdDb, !sdrSquelchEnabled);
|
||||
});
|
||||
}
|
||||
function applyAutoSquelch(threshold) {
|
||||
setSdrSquelch(threshold, true);
|
||||
showHint(`Squelch ${threshold} dB`, 1500);
|
||||
}
|
||||
var sdrSquelchAutoBtn = document.getElementById("sdr-squelch-auto");
|
||||
if (sdrSquelchAutoBtn) {
|
||||
sdrSquelchAutoBtn.addEventListener("click", () => {
|
||||
if (!sdrSquelchSupported) return;
|
||||
let pct = 0;
|
||||
const data = lastSpectrumData || window.lastSpectrumData;
|
||||
if (data && isNumericBins(data.bins) && data.bins.length > 0) {
|
||||
const noiseDb = estimateNoiseFloorDb(data.bins);
|
||||
if (noiseDb != null && isFiniteNumber(noiseDb)) {
|
||||
const thresholdDb = noiseDb + 6;
|
||||
const clamped = Math.max(SDR_SQUELCH_MIN_DB, Math.min(SDR_SQUELCH_MAX_DB, thresholdDb));
|
||||
pct = clampSdrSquelchPercent(
|
||||
(clamped - SDR_SQUELCH_MIN_DB) / (SDR_SQUELCH_MAX_DB - SDR_SQUELCH_MIN_DB) * 100
|
||||
);
|
||||
const threshold = autoSquelchThresholdDb();
|
||||
if (threshold != null) {
|
||||
applyAutoSquelch(threshold);
|
||||
return;
|
||||
}
|
||||
sdrSquelchAutoBtn.disabled = true;
|
||||
showHint("Measuring the noise…");
|
||||
setTimeout(() => {
|
||||
sdrSquelchAutoBtn.disabled = false;
|
||||
const measured = autoSquelchThresholdDb();
|
||||
if (measured == null) {
|
||||
showHint("No meter to measure the noise from", 1800);
|
||||
return;
|
||||
}
|
||||
applyAutoSquelch(measured);
|
||||
}, SQUELCH_MEASURE_MS);
|
||||
});
|
||||
}
|
||||
if (squelchGripEl) {
|
||||
const dbFromClientY = (clientY) => {
|
||||
const canvas = document.getElementById("spectrum-canvas");
|
||||
if (!canvas || !canvas.clientHeight) return sdrSquelchThresholdDb;
|
||||
const rect = canvas.getBoundingClientRect();
|
||||
const frac = 1 - (clientY - rect.top) / rect.height;
|
||||
return clampSdrSquelchDb(spectrumFloor + frac * spectrumRange);
|
||||
};
|
||||
squelchGripEl.addEventListener("pointerdown", (event) => {
|
||||
if (!sdrSquelchSupported) return;
|
||||
squelchDragPointerId = event.pointerId;
|
||||
squelchGripEl.setPointerCapture(event.pointerId);
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
});
|
||||
squelchGripEl.addEventListener("pointermove", (event) => {
|
||||
if (squelchDragPointerId !== event.pointerId) return;
|
||||
sdrSquelchThresholdDb = dbFromClientY(event.clientY);
|
||||
renderSdrSquelch();
|
||||
const now = Date.now();
|
||||
if (now - squelchDragSubmitAt > 200) {
|
||||
squelchDragSubmitAt = now;
|
||||
submitSdrSquelch();
|
||||
}
|
||||
if (sdrSquelchEl) {
|
||||
sdrSquelchEl.value = String(pct);
|
||||
updateSdrSquelchPctLabel();
|
||||
saveSetting("sdrSquelchPct", pct);
|
||||
});
|
||||
const endDrag = (event) => {
|
||||
if (squelchDragPointerId !== event.pointerId) return;
|
||||
squelchDragPointerId = null;
|
||||
submitSdrSquelch();
|
||||
};
|
||||
squelchGripEl.addEventListener("pointerup", endDrag);
|
||||
squelchGripEl.addEventListener("pointercancel", endDrag);
|
||||
squelchGripEl.addEventListener("keydown", (event) => {
|
||||
const step = event.shiftKey ? 10 : 1;
|
||||
if (event.key === "ArrowUp" || event.key === "ArrowRight") {
|
||||
setSdrSquelch(sdrSquelchThresholdDb + step, sdrSquelchEnabled);
|
||||
} else if (event.key === "ArrowDown" || event.key === "ArrowLeft") {
|
||||
setSdrSquelch(sdrSquelchThresholdDb - step, sdrSquelchEnabled);
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
submitSdrSquelchPercent(pct);
|
||||
event.preventDefault();
|
||||
});
|
||||
}
|
||||
if (wfmAudioModeEl) {
|
||||
@@ -6455,6 +6669,7 @@ function updateWfmControls() {
|
||||
const mode = (modeEl && modeEl.value ? modeEl.value : "").toUpperCase();
|
||||
if (wfmControlsCol) wfmControlsCol.style.display = mode === "WFM" ? "" : "none";
|
||||
if (samControlsCol) samControlsCol.style.display = mode === "SAM" ? "" : "none";
|
||||
if (modeControlsRow) modeControlsRow.style.display = mode === "WFM" || mode === "SAM" ? "" : "none";
|
||||
}
|
||||
if (!hasWebCodecs) {
|
||||
rxAudioBtn.disabled = true;
|
||||
@@ -7185,15 +7400,10 @@ function volWheel(slider, pctEl, getGain, storageKey) {
|
||||
}
|
||||
volWheel(rxVolSlider, rxVolPct, () => rxGainNode, "rxVol");
|
||||
volWheel(txVolSlider, txVolPct, () => txGainNode, "txVol");
|
||||
if (sdrSquelchEl) {
|
||||
sdrSquelchEl.addEventListener("wheel", (e) => {
|
||||
e.preventDefault();
|
||||
const step = e.deltaY < 0 ? 2 : -2;
|
||||
const next = clampSdrSquelchPercent(Number(sdrSquelchEl.value) + step);
|
||||
sdrSquelchEl.value = String(next);
|
||||
updateSdrSquelchPctLabel();
|
||||
saveSetting("sdrSquelchPct", next);
|
||||
submitSdrSquelchPercent(next);
|
||||
if (sdrSquelchDbEl) {
|
||||
sdrSquelchDbEl.addEventListener("wheel", (event) => {
|
||||
event.preventDefault();
|
||||
setSdrSquelch(sdrSquelchThresholdDb + (event.deltaY < 0 ? 1 : -1), sdrSquelchEnabled);
|
||||
}, { passive: false });
|
||||
}
|
||||
requiredElement("copyright-year").textContent = String((/* @__PURE__ */ new Date()).getFullYear());
|
||||
@@ -7422,7 +7632,7 @@ function connectDecode() {
|
||||
return;
|
||||
}
|
||||
if (data.type === "group") {
|
||||
const messages = Array.isArray(data.messages) ? data.messages.filter((message) => isRecord2(message) && typeof message.type === "string") : [];
|
||||
const messages = Array.isArray(data.messages) ? data.messages.filter((message) => isRecord2(message)) : [];
|
||||
enqueueDecodeHistoryGroup(typeof data.kind === "string" ? data.kind : "", messages);
|
||||
return;
|
||||
}
|
||||
@@ -7936,6 +8146,7 @@ function flushMeterDom() {
|
||||
const sUnits = dbmToSUnits(dbm);
|
||||
sigLastSUnits = sUnits;
|
||||
sigLastDbm = dbm;
|
||||
recordSquelchMeterSample(dbm);
|
||||
const pct = sUnits <= 9 ? Math.max(0, Math.min(100, sUnits / 9 * 100)) : 100;
|
||||
if (signalBar) signalBar.style.width = `${pct}%`;
|
||||
if (signalValue) signalValue.innerHTML = formatSignal(sUnits);
|
||||
@@ -8240,6 +8451,7 @@ function drawSpectrum(data) {
|
||||
}
|
||||
spectrumGl.drawSegments(spectrumTmpGridSegments, cssColorToRgba(pal.spectrumGrid), 1);
|
||||
updateSpectrumDbAxis(DB_MIN, DB_MAX, gridStep, H, dpr);
|
||||
positionSquelchLine();
|
||||
function hzToX(hz) {
|
||||
return (hz - range.visLoHz) / range.visSpanHz * W;
|
||||
}
|
||||
@@ -8572,7 +8784,8 @@ function updateBookmarkAxis(range) {
|
||||
updateSideBookmarkStack(leftSideEl, leftBookmarks, colorMap);
|
||||
updateSideBookmarkStack(rightSideEl, rightBookmarks, colorMap);
|
||||
const hasVisible = visBookmarks.length > 0;
|
||||
axisEl.classList.toggle("bm-axis-visible", hasVisible);
|
||||
axisEl.classList.add("bm-axis-visible");
|
||||
axisEl.classList.toggle("bm-axis-empty", !hasVisible);
|
||||
if (!hasVisible) {
|
||||
if (axisEl.dataset.bmKey) {
|
||||
axisEl.replaceChildren();
|
||||
@@ -8867,31 +9080,15 @@ window.addEventListener("keydown", (event) => {
|
||||
}
|
||||
if (key === "q") {
|
||||
event.preventDefault();
|
||||
if (sdrSquelchSupported && sdrSquelchEl) {
|
||||
const current = clampSdrSquelchPercent(Number(sdrSquelchEl.value));
|
||||
let nextPct;
|
||||
if (current > 0) {
|
||||
nextPct = 0;
|
||||
if (sdrSquelchSupported) {
|
||||
if (sdrSquelchEnabled) {
|
||||
setSdrSquelch(sdrSquelchThresholdDb, false);
|
||||
showHint("Squelch off", 1200);
|
||||
} else {
|
||||
let auto = 30;
|
||||
const data = lastSpectrumData || window.lastSpectrumData;
|
||||
if (data && isNumericBins(data.bins) && data.bins.length > 0) {
|
||||
const noiseDb = estimateNoiseFloorDb(data.bins);
|
||||
if (noiseDb != null && isFiniteNumber(noiseDb)) {
|
||||
const thresholdDb = noiseDb + 6;
|
||||
const clamped = Math.max(SDR_SQUELCH_MIN_DB, Math.min(SDR_SQUELCH_MAX_DB, thresholdDb));
|
||||
auto = clampSdrSquelchPercent(
|
||||
(clamped - SDR_SQUELCH_MIN_DB) / (SDR_SQUELCH_MAX_DB - SDR_SQUELCH_MIN_DB) * 100
|
||||
);
|
||||
}
|
||||
}
|
||||
nextPct = auto;
|
||||
const threshold = sdrSquelchThresholdDb > SDR_SQUELCH_MIN_DB ? sdrSquelchThresholdDb : autoSquelchThresholdDb() ?? SDR_SQUELCH_MIN_DB + 25;
|
||||
setSdrSquelch(threshold, true);
|
||||
showHint(`Squelch ${clampSdrSquelchDb(threshold)} dB`, 1200);
|
||||
}
|
||||
sdrSquelchEl.value = String(nextPct);
|
||||
updateSdrSquelchPctLabel();
|
||||
saveSetting("sdrSquelchPct", nextPct);
|
||||
submitSdrSquelchPercent(nextPct);
|
||||
showHint(nextPct > 0 ? `Squelch ${nextPct}%` : "Squelch Off", 1200);
|
||||
} else {
|
||||
showHint("Squelch N/A", 1200);
|
||||
}
|
||||
@@ -9294,8 +9491,8 @@ var bandplanCacheKey = "";
|
||||
var bandplanStripEl = document.getElementById("spectrum-bandplan-strip");
|
||||
var bandplanRegionSelect = document.getElementById("bandplan-region-select");
|
||||
var bandplanLabelsCheck = document.getElementById("bandplan-labels-check");
|
||||
(function loadBandplanJson() {
|
||||
fetch("/bandplan.json").then(async (response) => {
|
||||
function loadBandplanJson() {
|
||||
return fetch("/bandplan.json").then(async (response) => {
|
||||
if (!response.ok) throw new Error(String(response.status));
|
||||
return await responseJsonUnknown(response);
|
||||
}).then((data) => {
|
||||
@@ -9303,9 +9500,12 @@ var bandplanLabelsCheck = document.getElementById("bandplan-labels-check");
|
||||
bandplanData = data;
|
||||
bandplanSegmentsCache = null;
|
||||
bandplanCacheKey = "";
|
||||
}).catch(() => {
|
||||
if (lastSpectrumData) scheduleSpectrumDraw();
|
||||
}).catch((err) => {
|
||||
console.warn("Band plan unavailable", err);
|
||||
});
|
||||
})();
|
||||
}
|
||||
void loadBandplanJson();
|
||||
if (bandplanRegionSelect) {
|
||||
bandplanRegionSelect.value = bandplanRegion;
|
||||
bandplanRegionSelect.addEventListener("change", () => {
|
||||
@@ -9367,24 +9567,28 @@ function bandplanVisibleSegments(region, loHz, hiHz) {
|
||||
}
|
||||
return result;
|
||||
}
|
||||
function _hideBandplanStrip() {
|
||||
function _clearBandplanStrip(reserveSpace) {
|
||||
if (!bandplanStripEl) return;
|
||||
bandplanStripEl.classList.remove("bp-visible");
|
||||
bandplanStripEl.replaceChildren();
|
||||
bandplanCacheKey = "";
|
||||
if (bandplanCacheKey) {
|
||||
bandplanStripEl.replaceChildren();
|
||||
bandplanCacheKey = "";
|
||||
}
|
||||
bandplanStripEl.classList.toggle("bp-visible", reserveSpace);
|
||||
bandplanStripEl.classList.toggle("bp-empty", reserveSpace);
|
||||
}
|
||||
function updateBandplanStrip(range) {
|
||||
if (!bandplanStripEl) return;
|
||||
if (!range || bandplanRegion === "off" || !bandplanData) {
|
||||
if (bandplanStripEl.classList.contains("bp-visible")) _hideBandplanStrip();
|
||||
_clearBandplanStrip(false);
|
||||
return;
|
||||
}
|
||||
const segments = bandplanVisibleSegments(bandplanRegion, range.visLoHz, range.visHiHz);
|
||||
if (segments.length === 0) {
|
||||
if (bandplanStripEl.classList.contains("bp-visible")) _hideBandplanStrip();
|
||||
_clearBandplanStrip(true);
|
||||
return;
|
||||
}
|
||||
bandplanStripEl.classList.add("bp-visible");
|
||||
bandplanStripEl.classList.remove("bp-empty");
|
||||
const newKey = bandplanRegion + ":" + (bandplanShowLabels ? "L" : "N") + ":" + segments.map((s) => s.low_hz + "-" + s.high_hz).join(",");
|
||||
const stripW = bandplanStripEl.clientWidth || 1;
|
||||
if (bandplanCacheKey !== newKey) {
|
||||
|
||||
@@ -7,7 +7,7 @@ import {
|
||||
normalizeAprsPacket,
|
||||
renderAprsInfo,
|
||||
renderLocalAprsSymbol
|
||||
} from "./chunk-M2I6DH4X.js";
|
||||
} from "./chunk-ROTCLFXS.js";
|
||||
import {
|
||||
hostCore,
|
||||
hostState
|
||||
|
||||
@@ -328,6 +328,7 @@ function bmApply(bm) {
|
||||
const modeEl = document.getElementById("mode");
|
||||
if (modeEl) {
|
||||
modeEl.value = (bm.mode || "").toUpperCase();
|
||||
hostCore.syncModePicker();
|
||||
}
|
||||
if (bm.bandwidth_hz) {
|
||||
hostState.currentBandwidthHz = bm.bandwidth_hz;
|
||||
|
||||
+44
@@ -75,8 +75,51 @@ function escapeAprsCharacter(character) {
|
||||
if (character === '"') return """;
|
||||
return character;
|
||||
}
|
||||
var APRS_SPRITE_COLUMNS = 16;
|
||||
var APRS_SPRITE_CELL_PX = 24;
|
||||
var APRS_SPRITE_FIRST_CODE = 33;
|
||||
var APRS_SPRITE_LAST_CODE = 126;
|
||||
function aprsSpriteOffset(code) {
|
||||
if (code.length !== 1) return null;
|
||||
const point = code.charCodeAt(0);
|
||||
if (point < APRS_SPRITE_FIRST_CODE || point > APRS_SPRITE_LAST_CODE) return null;
|
||||
const index = point - APRS_SPRITE_FIRST_CODE;
|
||||
const column = index % APRS_SPRITE_COLUMNS;
|
||||
const row = Math.floor(index / APRS_SPRITE_COLUMNS);
|
||||
return `${String(-column * APRS_SPRITE_CELL_PX)}px ${String(-row * APRS_SPRITE_CELL_PX)}px`;
|
||||
}
|
||||
function aprsSymbolSprite(symbolTable, symbolCode) {
|
||||
if (!symbolTable || !symbolCode) return null;
|
||||
const symbolOffset = aprsSpriteOffset(symbolCode);
|
||||
if (!symbolOffset) return null;
|
||||
if (symbolTable === "/") {
|
||||
return {
|
||||
className: "aprs-symbol-primary",
|
||||
backgroundPosition: symbolOffset,
|
||||
label: `Primary APRS symbol ${symbolTable}${symbolCode}`
|
||||
};
|
||||
}
|
||||
if (symbolTable === "\\") {
|
||||
return {
|
||||
className: "aprs-symbol-alternate",
|
||||
backgroundPosition: symbolOffset,
|
||||
label: `Alternate APRS symbol ${symbolTable}${symbolCode}`
|
||||
};
|
||||
}
|
||||
const overlayOffset = aprsSpriteOffset(symbolTable);
|
||||
if (!overlayOffset) return null;
|
||||
return {
|
||||
className: "aprs-symbol-overlaid",
|
||||
backgroundPosition: `${overlayOffset}, ${symbolOffset}`,
|
||||
label: `Alternate APRS symbol \\${symbolCode} with overlay ${symbolTable}`
|
||||
};
|
||||
}
|
||||
function renderLocalAprsSymbol(packet, escapeHtml) {
|
||||
if (!packet.symbolTable || !packet.symbolCode) return "";
|
||||
const sprite = aprsSymbolSprite(packet.symbolTable, packet.symbolCode);
|
||||
if (sprite) {
|
||||
return `<span class="aprs-symbol ${sprite.className}" role="img" style="background-position:${sprite.backgroundPosition}" title="${escapeHtml(sprite.label)}" aria-label="${escapeHtml(sprite.label)}"></span>`;
|
||||
}
|
||||
const symbol = escapeHtml(packet.symbolCode);
|
||||
const table = packet.symbolTable === "/" ? "Primary" : "Alternate";
|
||||
return `<span class="aprs-symbol aprs-symbol-local" title="${table} APRS symbol ${symbol}">${symbol}</span>`;
|
||||
@@ -107,6 +150,7 @@ export {
|
||||
collapseAprsDuplicates,
|
||||
aprsHexBytes,
|
||||
renderAprsInfo,
|
||||
aprsSymbolSprite,
|
||||
renderLocalAprsSymbol,
|
||||
normalizeAprsPacket
|
||||
};
|
||||
@@ -7,7 +7,7 @@ import {
|
||||
normalizeAprsPacket,
|
||||
renderAprsInfo,
|
||||
renderLocalAprsSymbol
|
||||
} from "./chunk-M2I6DH4X.js";
|
||||
} from "./chunk-ROTCLFXS.js";
|
||||
import {
|
||||
hostCore,
|
||||
hostState
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
import {
|
||||
aprsSymbolSprite
|
||||
} from "./chunk-ROTCLFXS.js";
|
||||
|
||||
// src/map-core.ts
|
||||
function mapEl(id) {
|
||||
const element = document.querySelector(`#${CSS.escape(id)}`);
|
||||
@@ -1643,42 +1647,29 @@ var mapWindow = window;
|
||||
return;
|
||||
}
|
||||
const mapRect = mapContainer.getBoundingClientRect();
|
||||
const width = mapContainer.clientWidth || mapRect.width;
|
||||
const footer = document.querySelector(".footer");
|
||||
let bottom = mapIsFullscreen() && stage ? stage.getBoundingClientRect().bottom : window.innerHeight;
|
||||
if (!mapIsFullscreen() && footer) {
|
||||
let bottom = window.innerHeight;
|
||||
if (footer) {
|
||||
const fr = footer.getBoundingClientRect();
|
||||
if (fr.top > mapRect.top + 50) bottom = fr.top;
|
||||
if (fr.top > mapRect.top + 50) bottom = Math.min(fr.top, bottom);
|
||||
}
|
||||
const available = Math.max(0, Math.floor(bottom - mapRect.top - 8));
|
||||
const widthDriven = width > 0 ? Math.floor(width / 1.55) : available;
|
||||
const viewportCap = mapIsFullscreen() ? Math.floor(window.innerHeight * 0.9) : Math.floor(window.innerHeight * 0.75);
|
||||
const minHeight = Math.min(260, available);
|
||||
const target = Math.max(minHeight, Math.min(available, viewportCap, widthDriven));
|
||||
const target = Math.max(0, Math.floor(bottom - mapRect.top - 8));
|
||||
mapContainer.style.height = `${target}px`;
|
||||
if (aprsMap) aprsMap.invalidateSize();
|
||||
}
|
||||
function aprsSymbolIcon(symbolTable, symbolCode) {
|
||||
if (!symbolTable || !symbolCode) return null;
|
||||
const table = symbolTable === "/" ? "primary" : "alternate";
|
||||
const sprite = aprsSymbolSprite(symbolTable, symbolCode);
|
||||
const html = sprite ? `<div class="aprs-symbol aprs-symbol-marker ${sprite.className}" role="img" style="background-position:${sprite.backgroundPosition}" title="${escapeMapHtml(sprite.label)}" aria-label="${escapeMapHtml(sprite.label)}"></div>` : `<div class="aprs-symbol aprs-symbol-marker aprs-symbol-local" title="${symbolTable === "/" ? "primary" : "alternate"} APRS symbol ${escapeMapHtml(symbolCode)}">${escapeMapHtml(symbolCode)}</div>`;
|
||||
return L.divIcon({
|
||||
className: "",
|
||||
html: `<div class="aprs-symbol-local" title="${table} APRS symbol ${escapeMapHtml(symbolCode)}">${escapeMapHtml(symbolCode)}</div>`,
|
||||
html,
|
||||
iconSize: [24, 24],
|
||||
iconAnchor: [12, 12],
|
||||
popupAnchor: [0, -12]
|
||||
});
|
||||
}
|
||||
mapWindow.navigateToAprsMap = function(lat, lon) {
|
||||
T._activeTab = "map";
|
||||
document.querySelectorAll(".tab-bar .tab").forEach((t) => {
|
||||
t.classList.remove("active");
|
||||
});
|
||||
const mapTabBtn = document.querySelector(".tab-bar .tab[data-tab='map']");
|
||||
if (mapTabBtn) mapTabBtn.classList.add("active");
|
||||
document.querySelectorAll(".tab-panel").forEach((p) => p.style.display = "none");
|
||||
const mapPanel = mapEl("tab-map");
|
||||
if (mapPanel) mapPanel.style.display = "";
|
||||
function focusMapPosition(lat, lon) {
|
||||
initAprsMap();
|
||||
sizeAprsMapToViewport();
|
||||
if (aprsMap) {
|
||||
@@ -1690,19 +1681,10 @@ var mapWindow = window;
|
||||
});
|
||||
});
|
||||
}
|
||||
};
|
||||
mapWindow.navigateToMapLocator = function(grid, preferredType = null) {
|
||||
}
|
||||
function focusMapLocator(grid, preferredType = null) {
|
||||
const normalizedGrid = String(grid || "").trim().toUpperCase();
|
||||
if (!/^[A-R]{2}\d{2}(?:[A-X]{2})?$/.test(normalizedGrid)) return false;
|
||||
T._activeTab = "map";
|
||||
document.querySelectorAll(".tab-bar .tab").forEach((t) => {
|
||||
t.classList.remove("active");
|
||||
});
|
||||
const mapTabBtn = document.querySelector(".tab-bar .tab[data-tab='map']");
|
||||
if (mapTabBtn) mapTabBtn.classList.add("active");
|
||||
document.querySelectorAll(".tab-panel").forEach((p) => p.style.display = "none");
|
||||
const mapPanel = mapEl("tab-map");
|
||||
if (mapPanel) mapPanel.style.display = "";
|
||||
initAprsMap();
|
||||
sizeAprsMapToViewport();
|
||||
if (!aprsMap) return false;
|
||||
@@ -1747,7 +1729,7 @@ var mapWindow = window;
|
||||
requestAnimationFrame(focusMarker);
|
||||
});
|
||||
return true;
|
||||
};
|
||||
}
|
||||
function buildReceiverPopupHtml(rigIds) {
|
||||
const call = T.serverCallsign || T.ownerCallsign || "Receiver";
|
||||
let meta = "";
|
||||
@@ -2332,7 +2314,7 @@ var mapWindow = window;
|
||||
selectedMapQsoKey = selectedMapQsoKey === entry.pathKey ? null : entry.pathKey ?? null;
|
||||
syncDecodeContactPathVisibility();
|
||||
if (selectedMapQsoKey && entry.sourceGrid) {
|
||||
mapWindow.navigateToMapLocator?.(entry.sourceGrid, entry.sourceType);
|
||||
focusMapLocator(entry.sourceGrid, entry.sourceType);
|
||||
}
|
||||
});
|
||||
const head = document.createElement("div");
|
||||
@@ -2438,7 +2420,7 @@ var mapWindow = window;
|
||||
card.className = "map-qso-card";
|
||||
if (entry.grid) {
|
||||
card.addEventListener("click", () => {
|
||||
mapWindow.navigateToMapLocator?.(entry.grid ?? "", entry.sourceType);
|
||||
focusMapLocator(entry.grid ?? "", entry.sourceType);
|
||||
});
|
||||
}
|
||||
const head = document.createElement("div");
|
||||
@@ -2544,7 +2526,7 @@ var mapWindow = window;
|
||||
card.className = "map-qso-card";
|
||||
if (entry.grid) {
|
||||
card.addEventListener("click", () => {
|
||||
mapWindow.navigateToMapLocator?.(entry.grid ?? "", entry.sourceType);
|
||||
focusMapLocator(entry.grid ?? "", entry.sourceType);
|
||||
});
|
||||
}
|
||||
const head = document.createElement("div");
|
||||
@@ -3049,6 +3031,8 @@ var mapWindow = window;
|
||||
}
|
||||
modules.map = {
|
||||
initAprsMap,
|
||||
focusMapPosition,
|
||||
focusMapLocator,
|
||||
sizeAprsMapToViewport,
|
||||
syncAprsReceiverMarker,
|
||||
updateMapRigFilter,
|
||||
|
||||
@@ -286,7 +286,10 @@ function vchanSyncModeDisplay() {
|
||||
if (!modeEl) return;
|
||||
if (vchanIsOnVirtual()) {
|
||||
const ch = vchanActiveChannel();
|
||||
if (ch && ch.mode) modeEl.value = ch.mode.toUpperCase();
|
||||
if (ch && ch.mode) {
|
||||
modeEl.value = ch.mode.toUpperCase();
|
||||
hostCore.syncModePicker();
|
||||
}
|
||||
}
|
||||
const modeUpper = (modeEl.value || "").toUpperCase();
|
||||
if (typeof hostState.lastModeName === "string") {
|
||||
|
||||
@@ -22,7 +22,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<svg xmlns="http://www.w3.org/2000/svg" style="display:none">
|
||||
<symbol id="icon-home" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M2.8 7 8 2.9 13.2 7"/><path d="M4.3 5.9V13h7.4V5.9"/><path d="M6.8 13V9.3h2.4V13"/></symbol>
|
||||
<symbol id="icon-bookmark" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M4 2h8v12l-4-2.5L4 14V2z"/></symbol>
|
||||
<symbol id="icon-signal" viewBox="0 0 16 16" fill="currentColor"><rect x="1" y="11" width="2.5" height="4" rx="0.5"/><rect x="4.75" y="8" width="2.5" height="7" rx="0.5"/><rect x="8.5" y="5" width="2.5" height="10" rx="0.5"/><rect x="12.25" y="2" width="2.5" height="13" rx="0.5"/></symbol>
|
||||
<symbol id="icon-digital" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M1 11.5h2.6V4.5h3.2v7h3.2v-7h3.2v7H15"/></symbol>
|
||||
<symbol id="icon-map" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M8 2a4 4 0 0 1 4 4c0 3-4 8-4 8S4 9 4 6a4 4 0 0 1 4-4z"/><circle cx="8" cy="6" r="1.2" fill="currentColor" stroke="none"/></symbol>
|
||||
<symbol id="icon-stats" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"><path d="M2 14h12"/><rect x="3" y="8" width="2" height="6" rx="0.4" fill="currentColor" stroke="none" opacity="0.6"/><rect x="7" y="5" width="2" height="9" rx="0.4" fill="currentColor" stroke="none" opacity="0.75"/><rect x="11" y="2" width="2" height="12" rx="0.4" fill="currentColor" stroke="none" opacity="0.9"/></symbol>
|
||||
<symbol id="icon-record" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><circle cx="8" cy="8" r="6"/><circle cx="8" cy="8" r="2.5" fill="currentColor" stroke="none"/></symbol>
|
||||
@@ -53,7 +53,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<span class="tab-label">Bookmarks</span>
|
||||
</button>
|
||||
<button class="tab" data-tab="digital-modes">
|
||||
<svg class="tab-icon" aria-hidden="true"><use href="#icon-signal"/></svg>
|
||||
<svg class="tab-icon" aria-hidden="true"><use href="#icon-digital"/></svg>
|
||||
<span class="tab-label">Digital modes</span>
|
||||
</button>
|
||||
<button class="tab" data-tab="map">
|
||||
@@ -142,6 +142,10 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<div id="spectrum-bookmark-side-left" class="spectrum-bookmark-side spectrum-bookmark-side-left" aria-hidden="true"></div>
|
||||
<canvas id="spectrum-canvas" tabindex="0" role="img" aria-label="Spectrum display" aria-describedby="spectrum-text-summary"></canvas>
|
||||
<p id="spectrum-text-summary" class="visually-hidden">Spectrum data is waiting for the receiver.</p>
|
||||
<div id="spectrum-squelch-line" class="spectrum-squelch-line" style="display:none;" data-state="closed">
|
||||
<span class="spectrum-squelch-grip" id="spectrum-squelch-grip" role="slider" tabindex="0"
|
||||
aria-label="Squelch threshold" aria-valuemin="-120" aria-valuemax="-30" aria-valuenow="-95">SQL <span id="spectrum-squelch-label">-95</span> dB</span>
|
||||
</div>
|
||||
<div id="spectrum-zoom-indicator" aria-hidden="true"></div>
|
||||
<div id="spectrum-minimap" aria-hidden="true"><div class="minimap-view"></div></div>
|
||||
<div id="spectrum-db-axis" aria-hidden="true"></div>
|
||||
@@ -212,31 +216,20 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<input class="status-input" id="center-freq" type="text" value="--" aria-describedby="center-freq-label" aria-label="SDR center frequency" />
|
||||
<div class="label" id="center-freq-label"><span>Center Frequency</span></div>
|
||||
</div>
|
||||
<div class="freq-field unit-col">
|
||||
<div class="jog-step" id="jog-step">
|
||||
<button type="button" data-step="1000000">MHz</button>
|
||||
<button type="button" data-step="1000" class="active">kHz</button>
|
||||
<button type="button" data-step="1">Hz</button>
|
||||
</div>
|
||||
<div class="label"><span>Unit</span></div>
|
||||
</div>
|
||||
<div class="freq-field mult-col">
|
||||
<div class="jog-mult" id="jog-mult">
|
||||
<button type="button" data-mult="1" class="active" aria-label="Use full tune step">1x</button>
|
||||
<button type="button" data-mult="10" aria-label="Use one tenth tune step">0.1x</button>
|
||||
</div>
|
||||
<div class="label"><span>Step Scale</span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="full-row controls-tray-shell">
|
||||
<div class="controls-tray-scroll">
|
||||
<div class="controls-tray">
|
||||
<div class="controls-row full-row">
|
||||
<div class="controls-col label-below-col">
|
||||
<div class="controls-col controls-col-mode label-below-col">
|
||||
<div class="label"><span>Mode</span></div>
|
||||
<div class="inline">
|
||||
<select class="status-input" id="mode" aria-label="Demodulation mode"></select>
|
||||
<!-- The select stays as the mode's value: a dozen call sites and
|
||||
several plugins read #mode.value. It is hidden from sight and
|
||||
from assistive tech; the buttons beside it are the control. -->
|
||||
<select class="visually-hidden" id="mode" tabindex="-1" aria-hidden="true"></select>
|
||||
<div id="mode-picker" class="mode-picker" role="group" aria-label="Demodulation mode"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="controls-col controls-col-center">
|
||||
@@ -248,6 +241,35 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<button id="jog-up" type="button" class="jog-btn">+</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="controls-col controls-col-step">
|
||||
<div class="inline step-controls-inline">
|
||||
<div class="freq-field unit-col">
|
||||
<div class="jog-step" id="jog-step">
|
||||
<button type="button" data-step="1000000">MHz</button>
|
||||
<button type="button" data-step="1000" class="active">kHz</button>
|
||||
<button type="button" data-step="1">Hz</button>
|
||||
</div>
|
||||
<div class="label"><span>Unit</span></div>
|
||||
</div>
|
||||
<div class="freq-field mult-col">
|
||||
<div class="jog-mult" id="jog-mult">
|
||||
<button type="button" data-mult="1" class="active" aria-label="Use full tune step">1x</button>
|
||||
<button type="button" data-mult="10" aria-label="Use one tenth tune step">0.1x</button>
|
||||
</div>
|
||||
<div class="label"><span>Step Scale</span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="controls-col controls-col-power label-below-col" id="tx-power-col">
|
||||
<div class="label"><span>Transmit / Power</span></div>
|
||||
<div class="btn-grid">
|
||||
<button id="ptt-btn" type="button" aria-pressed="false">Start TX</button>
|
||||
<button id="power-btn" type="button" aria-pressed="false">Power On</button>
|
||||
<button id="lock-btn" type="button" aria-pressed="false">Lock Tuning</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="controls-row controls-row-mode full-row" id="mode-controls-row" style="display:none">
|
||||
<div class="controls-col controls-col-wfm label-below-col" id="wfm-controls-col" style="display:none;">
|
||||
<div class="inline wfm-controls-inline">
|
||||
<label class="wfm-control">
|
||||
@@ -305,14 +327,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
</div>
|
||||
<div class="label"><span>SAM</span></div>
|
||||
</div>
|
||||
<div class="controls-col controls-col-power label-below-col" id="tx-power-col">
|
||||
<div class="label"><span>Transmit / Power</span></div>
|
||||
<div class="btn-grid">
|
||||
<button id="ptt-btn" type="button" aria-pressed="false">Start TX</button>
|
||||
<button id="power-btn" type="button" aria-pressed="false">Power On</button>
|
||||
<button id="lock-btn" type="button" aria-pressed="false">Lock Tuning</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="full-row label-below-row" id="vfo-row">
|
||||
<div class="label"><span>VFO</span></div>
|
||||
@@ -362,32 +376,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<div class="vchan-picker" id="vchan-picker"></div>
|
||||
</div>
|
||||
</div>
|
||||
<details id="scheduler-controls" class="advanced-radio-controls scheduler-controls-section">
|
||||
<summary>Scheduler controls</summary>
|
||||
<div class="advanced-radio-body">
|
||||
<div class="scheduler-control-row" style="display:none">
|
||||
<div class="scheduler-release-wrap">
|
||||
<button id="scheduler-release-btn" type="button">Release to Scheduler</button>
|
||||
<div class="scheduler-step-controls">
|
||||
<button id="scheduler-prev-btn" type="button">Previous Entry</button>
|
||||
<button id="scheduler-next-btn" type="button">Next Entry</button>
|
||||
</div>
|
||||
<div id="scheduler-release-status" class="scheduler-release-status">Scheduler is controlling the rig.</div>
|
||||
<div id="scheduler-cycle-status" class="interleave-ring-wrap" style="display:none;">
|
||||
<svg class="interleave-ring" viewBox="0 0 36 36">
|
||||
<circle class="interleave-ring-bg" cx="18" cy="18" r="15.915" />
|
||||
<circle class="interleave-ring-fill" id="interleave-ring-fill" cx="18" cy="18" r="15.915"
|
||||
stroke-dasharray="100" stroke-dashoffset="100" />
|
||||
</svg>
|
||||
<div class="interleave-ring-text">
|
||||
<div class="interleave-ring-label" id="interleave-active-name">--</div>
|
||||
<div class="interleave-ring-sub" id="interleave-countdown">--</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</details>
|
||||
<div class="full-row label-below-row">
|
||||
<div class="label"><span>Signal</span></div>
|
||||
<div class="signal" style="gap: 1rem;">
|
||||
@@ -425,13 +413,51 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<div class="inline" style="gap: 0.6rem; flex-wrap: wrap; align-items: center;">
|
||||
<button id="rx-audio-btn" type="button">Play Audio</button>
|
||||
<button id="tx-audio-btn" type="button">Transmit Audio</button>
|
||||
<label class="vol-label">RX<input type="range" id="rx-vol" min="0" max="100" value="80" class="vol-slider" /><small class="vol-pct" id="rx-vol-pct">80%</small></label>
|
||||
<label class="vol-label">TX<input type="range" id="tx-vol" min="0" max="100" value="80" class="vol-slider" /><small class="vol-pct" id="tx-vol-pct">80%</small></label>
|
||||
<label class="vol-label" id="sdr-squelch-wrap" style="display:none;">SQL<input type="range" id="sdr-squelch" min="0" max="100" value="0" class="vol-slider" /><small class="vol-pct" id="sdr-squelch-pct">Open</small><button id="sdr-squelch-auto" type="button" class="sql-auto-btn" title="Set squelch to current noise level">Auto</button></label>
|
||||
<div id="audio-level">
|
||||
<div id="audio-level-fill"></div>
|
||||
<span class="audio-group audio-volume-group">
|
||||
<span class="audio-group-label">Volume</span>
|
||||
<label class="vol-label">RX<input type="range" id="rx-vol" min="0" max="100" value="80" class="vol-slider" /><small class="vol-pct" id="rx-vol-pct">80%</small></label>
|
||||
<label class="vol-label">TX<input type="range" id="tx-vol" min="0" max="100" value="80" class="vol-slider" /><small class="vol-pct" id="tx-vol-pct">80%</small></label>
|
||||
</span>
|
||||
<span class="sql-control" id="sdr-squelch-wrap" style="display:none;">
|
||||
<button id="sdr-squelch-toggle" type="button" class="sql-toggle" aria-pressed="false" title="Turn the squelch on or off"><span class="sql-state" id="sdr-squelch-state" data-state="off" aria-hidden="true"></span>SQL</button>
|
||||
<label class="sql-db"><input type="number" id="sdr-squelch-db" min="-120" max="-30" step="1" value="-95" inputmode="numeric" aria-label="Squelch threshold in dB" /><span class="sql-db-unit">dB</span></label>
|
||||
<button id="sdr-squelch-auto" type="button" class="sql-auto-btn" title="Set the threshold just above the noise floor">Auto</button>
|
||||
</span>
|
||||
<span class="audio-group audio-level-group">
|
||||
<span class="audio-group-label">Level</span>
|
||||
<div id="audio-level">
|
||||
<div id="audio-level-fill"></div>
|
||||
</div>
|
||||
<small id="audio-status">Off</small>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</details>
|
||||
<details id="scheduler-controls" class="advanced-radio-controls scheduler-controls-section">
|
||||
<summary>Scheduler controls</summary>
|
||||
<div class="advanced-radio-body">
|
||||
<div class="scheduler-control-row" style="display:none">
|
||||
<div class="scheduler-release-wrap">
|
||||
<div class="scheduler-action-row">
|
||||
<div class="scheduler-step-controls">
|
||||
<button id="scheduler-prev-btn" type="button">Previous Entry</button>
|
||||
<button id="scheduler-next-btn" type="button">Next Entry</button>
|
||||
</div>
|
||||
<button id="scheduler-release-btn" type="button">Release to Scheduler</button>
|
||||
<div id="scheduler-cycle-status" class="interleave-ring-wrap" style="display:none;">
|
||||
<svg class="interleave-ring" viewBox="0 0 36 36">
|
||||
<circle class="interleave-ring-bg" cx="18" cy="18" r="15.915" />
|
||||
<circle class="interleave-ring-fill" id="interleave-ring-fill" cx="18" cy="18" r="15.915"
|
||||
stroke-dasharray="100" stroke-dashoffset="100" />
|
||||
</svg>
|
||||
<div class="interleave-ring-text">
|
||||
<div class="interleave-ring-label" id="interleave-active-name">--</div>
|
||||
<div class="interleave-ring-sub" id="interleave-countdown">--</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<small id="audio-status" style="min-width: 60px;">Off</small>
|
||||
<div id="scheduler-release-status" class="scheduler-release-status">Scheduler is controlling the rig.</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1594,10 +1620,13 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
</template>
|
||||
</div>
|
||||
<div class="footer">
|
||||
<div class="copyright">
|
||||
Built by <a href="https://www.qrzcq.com/call/SP2SJG" target="_blank" rel="noopener">SP2SJG</a> from <a href="https://haxx.space" target="_blank" rel="noopener">haxx.space</a> · <span class="gh-link-wrap"><a class="gh-link" href="https://git.haxx.space/sjg/trx-rs" target="_blank" rel="noopener" aria-label="Open trx-rs source repository"><svg class="gh-link-icon" viewBox="0 0 16 16" aria-hidden="true"><path d="M9.5 3.25a2.25 2.25 0 1 1 3 2.122V6A2.5 2.5 0 0 1 10 8.5H6a1 1 0 0 0-1 1v1.128a2.251 2.251 0 1 1-1.5 0V5.372a2.25 2.25 0 1 1 1.5 0v1.836A2.493 2.493 0 0 1 6 7h4a1 1 0 0 0 1-1v-.628A2.25 2.25 0 0 1 9.5 3.25Zm-6 0a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Zm8.25-.75a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5ZM4.25 12a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Z"></path></svg><span>trx-rs source</span></a></span> — <span id="copyright-year"></span>
|
||||
<div class="footer-meta">
|
||||
<span class="copyright">
|
||||
Built by <a href="https://www.qrzcq.com/call/SP2SJG" target="_blank" rel="noopener">SP2SJG</a> from <a href="https://haxx.space" target="_blank" rel="noopener">haxx.space</a> · © <span id="copyright-year"></span>
|
||||
</span>
|
||||
<span class="gh-link-wrap"><a class="gh-link" href="https://git.haxx.space/sjg/trx-rs" target="_blank" rel="noopener" aria-label="Open trx-rs source repository"><svg class="gh-link-icon" viewBox="0 0 16 16" aria-hidden="true"><path d="M9.5 3.25a2.25 2.25 0 1 1 3 2.122V6A2.5 2.5 0 0 1 10 8.5H6a1 1 0 0 0-1 1v1.128a2.251 2.251 0 1 1-1.5 0V5.372a2.25 2.25 0 1 1 1.5 0v1.836A2.493 2.493 0 0 1 6 7h4a1 1 0 0 0 1-1v-.628A2.25 2.25 0 0 1 9.5 3.25Zm-6 0a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Zm8.25-.75a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5ZM4.25 12a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Z"></path></svg><span>trx-rs source</span></a></span>
|
||||
</div>
|
||||
<div class="hint" id="power-hint" aria-live="polite">Connecting…</div>
|
||||
<div class="hint" id="power-hint" data-state="busy" aria-live="polite">Connecting…</div>
|
||||
</div>
|
||||
<div id="conn-lost-overlay" class="decode-history-overlay content-overlay is-hidden" aria-live="assertive" aria-atomic="true">
|
||||
<div class="decode-history-overlay-card">
|
||||
|
||||
@@ -18,6 +18,9 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
--accent-green: #c24b1a;
|
||||
--accent-yellow: #f0ad4e;
|
||||
--accent-red: #e55353;
|
||||
/* Healthy/on indicator. Distinct from --accent-green, which this theme
|
||||
family uses as the (orange) brand accent rather than a status colour. */
|
||||
--status-ok: #00d17f;
|
||||
--vchan-color: #38bdf8;
|
||||
--control-height: 2.6rem;
|
||||
--jog-hi: #243a5b;
|
||||
@@ -107,6 +110,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
--accent-green: #b04317;
|
||||
--accent-yellow: #b57600;
|
||||
--accent-red: #cf3f3f;
|
||||
/* Darker on light backgrounds: #00d17f as text/dots is barely legible there. */
|
||||
--status-ok: #0a9d63;
|
||||
--jog-hi: #e6edf8;
|
||||
--jog-lo: #cdd9eb;
|
||||
--jog-shadow: rgba(58, 79, 110, 0.18);
|
||||
@@ -267,11 +272,22 @@ input.status-input, select.status-input { width: 100%; padding: 0.45rem 0.5rem;
|
||||
-webkit-text-fill-color: currentColor;
|
||||
}
|
||||
#center-freq { color: var(--wavelength-fg); }
|
||||
/* Packs left. As a grid it held a track for every column, but the WFM, SAM and
|
||||
transmit columns are hidden on most rigs, so the row ended in a hole of dead
|
||||
space and the power buttons' label chip floated far from the buttons. */
|
||||
.controls-row {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(0, 1fr) auto auto minmax(0, 1fr);
|
||||
gap: 1rem;
|
||||
align-items: start;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: center;
|
||||
gap: 1rem 1.25rem;
|
||||
align-items: flex-start;
|
||||
}
|
||||
/* Whatever the current mode adds — WFM's deemphasis and interference meters,
|
||||
SAM's carrier sync — sits on its own line under the controls every rig has,
|
||||
instead of stretching the row sideways when one mode happens to be active. */
|
||||
.controls-row-mode {
|
||||
padding-top: 0.85rem;
|
||||
border-top: 1px solid color-mix(in srgb, var(--border-light) 45%, transparent);
|
||||
}
|
||||
.controls-col {
|
||||
min-width: 0;
|
||||
@@ -299,10 +315,74 @@ input.status-input, select.status-input { width: 100%; padding: 0.45rem 0.5rem;
|
||||
width: 100%;
|
||||
margin-top: calc((var(--jog-wheel-size) - var(--control-height)) / 2);
|
||||
}
|
||||
/* Mode: a segmented group sized by its content. As a full-width select it took
|
||||
483px of the row to show "FM"; the modes are all three or four characters and
|
||||
there are at most twelve of them, so they fit two rows in a third of that. */
|
||||
.controls-col-mode {
|
||||
flex: 0 1 auto;
|
||||
min-width: 0;
|
||||
}
|
||||
/* Specific enough to beat .controls-col.label-below-col .inline, whose offset
|
||||
assumes a --control-height field: the picker and the step groups are both
|
||||
3.35rem, so they line up with each other beside the wheel. */
|
||||
.controls-col-mode.label-below-col .inline {
|
||||
width: auto;
|
||||
margin-top: calc((var(--jog-wheel-size) - 3.35rem) / 2);
|
||||
}
|
||||
.mode-picker {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 1px;
|
||||
width: max-content;
|
||||
max-width: 22rem;
|
||||
border: 1px solid var(--border-light);
|
||||
border-radius: 6px;
|
||||
overflow: hidden;
|
||||
background: var(--border-light);
|
||||
}
|
||||
.mode-picker button {
|
||||
flex: 1 0 3.2rem;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
min-height: 1.65rem;
|
||||
height: auto;
|
||||
padding: 0.32rem 0.55rem;
|
||||
font-size: 0.82rem;
|
||||
font-weight: 600;
|
||||
background: var(--input-bg);
|
||||
color: var(--text-muted);
|
||||
cursor: pointer;
|
||||
}
|
||||
.mode-picker button:hover:not(:disabled):not(.active) {
|
||||
color: var(--text);
|
||||
background: var(--btn-hover-bg);
|
||||
}
|
||||
.mode-picker button.active {
|
||||
background: var(--btn-bg);
|
||||
color: var(--accent-green);
|
||||
}
|
||||
.mode-picker button:disabled {
|
||||
opacity: 0.55;
|
||||
cursor: default;
|
||||
}
|
||||
/* Tune step: the unit and the scale drive the wheel and the +/- beside it, so
|
||||
they sit with it rather than up in the frequency row. */
|
||||
.controls-col-step {
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
.step-controls-inline {
|
||||
display: flex;
|
||||
gap: 0.75rem;
|
||||
align-items: flex-start;
|
||||
margin-top: calc((var(--jog-wheel-size) - 3.35rem) / 2);
|
||||
}
|
||||
.step-controls-inline .label {
|
||||
justify-content: flex-start;
|
||||
}
|
||||
.controls-col-center {
|
||||
justify-self: center;
|
||||
width: auto;
|
||||
align-items: center;
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
.controls-col-wfm.label-below-col .label {
|
||||
justify-content: flex-start;
|
||||
@@ -444,12 +524,15 @@ input.status-input, select.status-input { width: 100%; padding: 0.45rem 0.5rem;
|
||||
align-self: stretch;
|
||||
}
|
||||
.controls-col .jog-container { align-self: center; }
|
||||
/* Sized by the buttons that are actually there. Three fixed tracks meant a rig
|
||||
without transmit or lock kept two empty ones, leaving its label chip stranded
|
||||
at the far edge of the group. */
|
||||
.btn-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(3, 1fr);
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 0.5rem;
|
||||
}
|
||||
.btn-grid button { width: 100%; height: var(--control-height); }
|
||||
.btn-grid button { flex: 0 1 auto; min-width: 6rem; height: var(--control-height); }
|
||||
.jog-container {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -570,6 +653,24 @@ input.status-input, select.status-input { width: 100%; padding: 0.45rem 0.5rem;
|
||||
border-color: var(--accent-yellow);
|
||||
color: var(--accent-yellow);
|
||||
}
|
||||
/* One row, read left to right: step through the entries, hand the rig back,
|
||||
then — fenced off — the entry actually on air. */
|
||||
.scheduler-action-row {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
gap: 0.35rem;
|
||||
}
|
||||
/* The rule belongs to the current-entry block, so it leaves with it: the
|
||||
block is display-toggled whenever fewer than two entries are active. */
|
||||
.scheduler-action-row #scheduler-cycle-status::before {
|
||||
content: "";
|
||||
align-self: stretch;
|
||||
width: 1px;
|
||||
min-height: 1.7rem;
|
||||
margin-inline: 0.3rem;
|
||||
background: color-mix(in srgb, var(--border-light) 70%, transparent);
|
||||
}
|
||||
.scheduler-step-controls {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
@@ -1539,25 +1640,67 @@ small { color: var(--text-muted); }
|
||||
}
|
||||
.tab-bar-nav .tab { flex: 0 0 auto; }
|
||||
/* Icons before scrolling: every tab already carries one, and four icons plus
|
||||
* More always fit, so the strip never has to hide a destination. */
|
||||
@media (max-width: 1360px) and (min-width: 701px) {
|
||||
.tab-bar-nav .tab .tab-label { display: none; }
|
||||
.tab-bar-nav .tab .tab-icon, .tab-bar-nav .tab .tab-more-icon { display: block; }
|
||||
.tab-bar-nav .tab { padding: 0.5rem 0.6rem; }
|
||||
* More always fit, so the strip never has to hide a destination. Applied by
|
||||
* measurement (ui-core's reflowOverflow) rather than at a viewport width: how
|
||||
* much fits depends on the rig name and on how wide the platform renders the
|
||||
* labels, so the same width fits on one machine and clips on another.
|
||||
* Bounded below 761px, where the strip becomes the bottom nav and keeps its
|
||||
* labels under the icons. */
|
||||
@media (min-width: 761px) {
|
||||
.tab-bar-nav.nav-icons-only .tab .tab-label { display: none; }
|
||||
.tab-bar-nav.nav-icons-only .tab .tab-icon,
|
||||
.tab-bar-nav.nav-icons-only .tab .tab-more-icon { display: block; }
|
||||
.tab-bar-nav.nav-icons-only .tab { padding: 0.45rem 0.55rem; }
|
||||
}
|
||||
/* Last resort, past icons: something in the bar has to absorb the shortfall,
|
||||
and by default that is the tab strip — it may shrink below its content, so
|
||||
its tabs keep full width and run under the controls, unreachable. The
|
||||
identity block takes it instead, ellipsised: a clipped station name is still
|
||||
readable, a destination hidden under the controls is not. */
|
||||
.tab-bar.bar-tight .header-main {
|
||||
flex-shrink: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
.tab-bar.bar-tight .header-text {
|
||||
min-width: 0;
|
||||
}
|
||||
.tab-bar.bar-tight .title,
|
||||
.tab-bar.bar-tight .subtitle {
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
.tab-bar.bar-tight .tab-bar-nav {
|
||||
flex-shrink: 0;
|
||||
}
|
||||
/* The selected destination is boxed, not underlined — the same treatment the
|
||||
mobile bottom nav already used, so one navigation model reads the same at
|
||||
every width. The transparent border is on the base so switching tabs moves
|
||||
no neighbours. */
|
||||
.tab {
|
||||
background: transparent;
|
||||
border: none;
|
||||
border-bottom: 2px solid transparent;
|
||||
border-radius: 0;
|
||||
padding: 0.5rem 0.95rem;
|
||||
border: 1px solid transparent;
|
||||
border-radius: var(--radius-md);
|
||||
padding: 0.45rem 0.9rem;
|
||||
color: var(--text-muted);
|
||||
cursor: pointer;
|
||||
font-size: 0.95rem;
|
||||
height: auto;
|
||||
transition: color var(--dur-fast) var(--ease-standard),
|
||||
background-color var(--dur-fast) var(--ease-standard),
|
||||
border-color var(--dur-fast) var(--ease-standard);
|
||||
}
|
||||
.tab.active {
|
||||
border-color: color-mix(in srgb, var(--accent-green) 50%, var(--border-light));
|
||||
background: color-mix(in srgb, var(--accent-green) 12%, transparent);
|
||||
color: var(--accent-text);
|
||||
font-weight: 600;
|
||||
}
|
||||
.tab:hover:not(.active) {
|
||||
color: var(--text);
|
||||
background: color-mix(in srgb, var(--btn-bg) 55%, transparent);
|
||||
border-color: color-mix(in srgb, var(--border-light) 40%, transparent);
|
||||
}
|
||||
.tab.active { border-bottom-color: var(--accent-green); color: var(--accent-text); font-weight: 600; }
|
||||
.tab:hover:not(.active) { color: var(--text); }
|
||||
/* Tab icons — hidden on desktop, shown on mobile bottom nav */
|
||||
.tab-icon {
|
||||
display: none;
|
||||
@@ -1575,15 +1718,88 @@ small { color: var(--text-muted); }
|
||||
.about-table td { padding: 0.4rem 0.75rem; border-bottom: 1px solid color-mix(in srgb, var(--border) 50%, transparent); font-size: 0.85rem; }
|
||||
.about-table tr:last-child td { border-bottom: none; }
|
||||
.about-table td:first-child { color: var(--text-muted); width: 40%; }
|
||||
.about-status-on { color: #00d17f; }
|
||||
.about-status-on { color: var(--status-ok); }
|
||||
.about-status-off { color: var(--text-muted); }
|
||||
.plugin-item { padding: 0.5rem 0.6rem; border-bottom: 1px solid var(--border); color: var(--text); }
|
||||
.plugin-item:last-child { border-bottom: none; }
|
||||
.footer { display: flex; justify-content: space-between; align-items: baseline; margin-top: auto; padding-top: 1rem; flex-shrink: 0; }
|
||||
/* ── Footer ───────────────────────────────────────────────────────────
|
||||
A hairline rule closes the page the way .tab-bar opens it; the two
|
||||
clusters (attribution + source pill, live status chip) sit on one
|
||||
baseline-free centre line so the pills don't hang off the text. */
|
||||
.footer {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
gap: var(--space-4);
|
||||
flex-wrap: wrap;
|
||||
margin-top: auto;
|
||||
padding: var(--space-3) 0 var(--space-1);
|
||||
border-top: 1px solid color-mix(in srgb, var(--border-light) 45%, transparent);
|
||||
flex-shrink: 0;
|
||||
}
|
||||
.footer-meta {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: var(--space-3);
|
||||
flex-wrap: wrap;
|
||||
min-width: 0;
|
||||
}
|
||||
.full-row { grid-column: 1 / -1; }
|
||||
.copyright { color: var(--text-muted); font-size: 0.75rem; opacity: 0.7; }
|
||||
/* No opacity: --text-muted is already the muted step, and stacking the
|
||||
two put the attribution below a readable contrast ratio. */
|
||||
.copyright { color: var(--text-muted); font-size: var(--fs-xs); }
|
||||
.copyright a { color: var(--accent-text); text-decoration: none; }
|
||||
.copyright a:hover { text-decoration: underline; }
|
||||
/* Live status: dot + text, colour driven by the data-state app.ts sets. */
|
||||
.footer .hint {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: var(--space-2);
|
||||
font-size: var(--fs-xs);
|
||||
color: var(--text-heading);
|
||||
padding: 0.2rem 0.6rem;
|
||||
border-radius: var(--radius-pill);
|
||||
border: 1px solid color-mix(in srgb, var(--border-light) 60%, transparent);
|
||||
background: color-mix(in srgb, var(--btn-bg) 55%, transparent);
|
||||
font-variant-numeric: tabular-nums;
|
||||
}
|
||||
.footer .hint::before {
|
||||
content: "";
|
||||
width: 0.45rem;
|
||||
height: 0.45rem;
|
||||
flex-shrink: 0;
|
||||
border-radius: 50%;
|
||||
background: var(--text-muted);
|
||||
box-shadow: 0 0 0 0.16rem color-mix(in srgb, var(--text-muted) 22%, transparent);
|
||||
transition: background var(--dur-base) var(--ease-standard),
|
||||
box-shadow var(--dur-base) var(--ease-standard);
|
||||
}
|
||||
.footer .hint[data-state="ok"]::before {
|
||||
background: var(--status-ok);
|
||||
box-shadow: 0 0 0 0.16rem color-mix(in srgb, var(--status-ok) 24%, transparent);
|
||||
}
|
||||
.footer .hint[data-state="busy"]::before {
|
||||
background: var(--accent-yellow);
|
||||
box-shadow: 0 0 0 0.16rem color-mix(in srgb, var(--accent-yellow) 24%, transparent);
|
||||
}
|
||||
.footer .hint[data-state="error"] {
|
||||
color: var(--accent-red);
|
||||
border-color: color-mix(in srgb, var(--accent-red) 45%, var(--border-light));
|
||||
}
|
||||
.footer .hint[data-state="error"]::before {
|
||||
background: var(--accent-red);
|
||||
box-shadow: 0 0 0 0.16rem color-mix(in srgb, var(--accent-red) 24%, transparent);
|
||||
}
|
||||
@media (prefers-reduced-motion: no-preference) {
|
||||
.footer .hint[data-state="busy"]::before,
|
||||
.footer .hint[data-state="error"]::before {
|
||||
animation: trx-status-pulse 1.8s var(--ease-standard) infinite;
|
||||
}
|
||||
}
|
||||
@keyframes trx-status-pulse {
|
||||
0%, 100% { opacity: 1; }
|
||||
50% { opacity: 0.45; }
|
||||
}
|
||||
.gh-link-wrap {
|
||||
display: inline-flex;
|
||||
vertical-align: middle;
|
||||
@@ -1592,6 +1808,8 @@ small { color: var(--text-muted); }
|
||||
.gh-link {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
text-decoration: none;
|
||||
font-size: var(--fs-xs);
|
||||
gap: 0.34rem;
|
||||
padding: 0.18rem 0.5rem;
|
||||
border-radius: 999px;
|
||||
@@ -1627,6 +1845,182 @@ small { color: var(--text-muted); }
|
||||
color: var(--text-muted);
|
||||
line-height: 1;
|
||||
}
|
||||
/* Squelch: a threshold in dB, the unit the spectrum's own axis is labelled in,
|
||||
with a dot showing whether the gate is passing audio right now. The old
|
||||
percentage was a number with nothing on screen to relate it to. */
|
||||
.sql-control {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.35rem;
|
||||
color: var(--text-muted);
|
||||
font-size: 0.82rem;
|
||||
white-space: nowrap;
|
||||
}
|
||||
/* The row carries three unrelated things — how loud, whether there is audio at
|
||||
all, and how much is arriving — so each is named and fenced from the next.
|
||||
Each rule belongs to the block that follows it, so it leaves when that block
|
||||
does (the squelch is absent on rigs without one). */
|
||||
.audio-group {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.5rem;
|
||||
min-width: 0;
|
||||
}
|
||||
.audio-volume-group {
|
||||
flex: 0 1 auto;
|
||||
}
|
||||
.audio-level-group {
|
||||
flex: 1 1 12rem;
|
||||
min-width: 8rem;
|
||||
}
|
||||
.audio-group-label {
|
||||
font-size: 0.68rem;
|
||||
font-weight: 700;
|
||||
letter-spacing: 0.04em;
|
||||
text-transform: uppercase;
|
||||
color: var(--text-muted);
|
||||
white-space: nowrap;
|
||||
}
|
||||
.audio-level-group #audio-status {
|
||||
min-width: 3.4rem;
|
||||
}
|
||||
.audio-level-group::before,
|
||||
.sql-control::before {
|
||||
content: "";
|
||||
align-self: stretch;
|
||||
width: 1px;
|
||||
min-height: 1.5rem;
|
||||
margin-inline: 0.5rem 0.6rem;
|
||||
background: color-mix(in srgb, var(--border-light) 65%, transparent);
|
||||
display: none;
|
||||
}
|
||||
/* Only while the row is one line. A rule divides what sits either side of it,
|
||||
so once a group wraps onto its own line the wrap is the division and the
|
||||
rule would just be a mark at the start of a line. Measured against the row,
|
||||
not the viewport: what fits depends on whether the rig transmits and whether
|
||||
it has a squelch at all. */
|
||||
#audio-row .inline {
|
||||
container-type: inline-size;
|
||||
container-name: audio-row;
|
||||
}
|
||||
@container audio-row (min-width: 57rem) {
|
||||
.audio-level-group::before,
|
||||
.sql-control::before {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
/* The name is the switch: one target instead of a label and a button that
|
||||
said the same thing twice, with the dot carrying the state. */
|
||||
.sql-toggle {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.3rem;
|
||||
height: 1.5rem;
|
||||
min-height: 0;
|
||||
padding: 0 0.4rem;
|
||||
border: 1px solid transparent;
|
||||
border-radius: 4px;
|
||||
background: transparent;
|
||||
color: var(--text-muted);
|
||||
font-size: 0.82rem;
|
||||
font-weight: 700;
|
||||
letter-spacing: 0.02em;
|
||||
cursor: pointer;
|
||||
}
|
||||
.sql-toggle:hover {
|
||||
border-color: color-mix(in srgb, var(--border-light) 60%, transparent);
|
||||
color: var(--text);
|
||||
}
|
||||
.sql-toggle[aria-pressed="true"] {
|
||||
border-color: color-mix(in srgb, var(--accent-green) 50%, var(--border-light));
|
||||
background: color-mix(in srgb, var(--accent-green) 10%, transparent);
|
||||
color: var(--accent-text);
|
||||
}
|
||||
.sql-state {
|
||||
width: 0.5rem;
|
||||
height: 0.5rem;
|
||||
border-radius: 50%;
|
||||
flex-shrink: 0;
|
||||
background: color-mix(in srgb, var(--text-muted) 45%, transparent);
|
||||
transition: background var(--dur-fast) var(--ease-standard),
|
||||
box-shadow var(--dur-fast) var(--ease-standard);
|
||||
}
|
||||
.sql-state[data-state="open"] {
|
||||
background: var(--status-ok);
|
||||
box-shadow: 0 0 0 0.14rem color-mix(in srgb, var(--status-ok) 25%, transparent);
|
||||
}
|
||||
.sql-state[data-state="closed"] {
|
||||
background: var(--accent-yellow);
|
||||
box-shadow: 0 0 0 0.14rem color-mix(in srgb, var(--accent-yellow) 22%, transparent);
|
||||
}
|
||||
.sql-db {
|
||||
display: inline-flex;
|
||||
align-items: baseline;
|
||||
gap: 0.2rem;
|
||||
}
|
||||
.sql-db input {
|
||||
width: 3.4rem;
|
||||
height: 1.5rem;
|
||||
min-height: 0;
|
||||
padding: 0 0.3rem;
|
||||
font-size: 0.78rem;
|
||||
font-variant-numeric: tabular-nums;
|
||||
text-align: right;
|
||||
border: 1px solid var(--border-light);
|
||||
border-radius: 4px;
|
||||
background: var(--input-bg);
|
||||
color: var(--text);
|
||||
}
|
||||
.sql-db-unit {
|
||||
font-size: 0.68rem;
|
||||
}
|
||||
.sql-control button[aria-pressed="true"] {
|
||||
border-color: color-mix(in srgb, var(--accent-green) 55%, var(--border-light));
|
||||
color: var(--accent-text);
|
||||
}
|
||||
/* The line is the control: it spans the plot at its threshold and carries its
|
||||
own grip, so the level is set where the noise it has to clear is visible. */
|
||||
.spectrum-squelch-line {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
right: 0;
|
||||
height: 0;
|
||||
/* Above the overlays that share the plot: the split control sits at the
|
||||
right edge on z-index 9 and would otherwise swallow the grip's pointer. */
|
||||
z-index: 10;
|
||||
border-top: 1px dashed color-mix(in srgb, var(--accent-yellow) 75%, transparent);
|
||||
pointer-events: none;
|
||||
}
|
||||
.spectrum-squelch-line[data-state="open"] {
|
||||
border-top-color: color-mix(in srgb, var(--status-ok) 80%, transparent);
|
||||
}
|
||||
.spectrum-squelch-grip {
|
||||
position: absolute;
|
||||
/* Clear of the split control's column so the two never sit on top of each
|
||||
other, whatever height the threshold is at. */
|
||||
right: 3.6rem;
|
||||
top: -0.72rem;
|
||||
padding: 0.05rem 0.35rem;
|
||||
border-radius: 3px;
|
||||
border: 1px solid color-mix(in srgb, var(--accent-yellow) 60%, var(--border-light));
|
||||
background: color-mix(in srgb, var(--card-bg) 88%, transparent);
|
||||
color: var(--text);
|
||||
font-size: 0.62rem;
|
||||
font-weight: 700;
|
||||
font-variant-numeric: tabular-nums;
|
||||
line-height: 1.3;
|
||||
cursor: ns-resize;
|
||||
pointer-events: auto;
|
||||
user-select: none;
|
||||
touch-action: none;
|
||||
}
|
||||
.spectrum-squelch-line[data-state="open"] .spectrum-squelch-grip {
|
||||
border-color: color-mix(in srgb, var(--status-ok) 60%, var(--border-light));
|
||||
}
|
||||
.spectrum-squelch-grip:focus-visible {
|
||||
outline: 2px solid var(--accent-text);
|
||||
outline-offset: 1px;
|
||||
}
|
||||
.sql-auto-btn {
|
||||
font-size: 0.68rem;
|
||||
padding: 0 5px;
|
||||
@@ -1682,6 +2076,61 @@ small { color: var(--text-muted); }
|
||||
}
|
||||
|
||||
.sub-tab-bar { display: flex; border-bottom: 1px solid var(--border); margin-bottom: 0.75rem; overflow-x: auto; -webkit-overflow-scrolling: touch; }
|
||||
/* ── Digital modes: sidebar + panel ───────────────────────────────────
|
||||
Thirteen decoders in a horizontal strip meant a scroller on anything but a
|
||||
wide window, and which one was open was a single underline in a row of
|
||||
thirteen. As a list down the side every decoder is visible at once, each
|
||||
with the state dot it already carried, and the panel gets the full width. */
|
||||
#tab-digital-modes {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(8.5rem, 11rem) minmax(0, 1fr);
|
||||
gap: 1rem;
|
||||
align-items: start;
|
||||
}
|
||||
#tab-digital-modes > .sub-tab-bar {
|
||||
flex-direction: column;
|
||||
align-items: stretch;
|
||||
gap: 0.12rem;
|
||||
margin-bottom: 0;
|
||||
padding-right: 0.85rem;
|
||||
border-bottom: none;
|
||||
border-right: 1px solid color-mix(in srgb, var(--border) 80%, transparent);
|
||||
overflow-x: hidden;
|
||||
/* Stays put while a long decode list scrolls past it. */
|
||||
position: sticky;
|
||||
top: 0.5rem;
|
||||
}
|
||||
#tab-digital-modes > .sub-tab-bar .sub-tab {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.4rem;
|
||||
width: 100%;
|
||||
padding: 0.42rem 0.6rem;
|
||||
border: 1px solid transparent;
|
||||
border-radius: var(--radius-md);
|
||||
text-align: left;
|
||||
font-size: 0.88rem;
|
||||
transition: color var(--dur-fast) var(--ease-standard),
|
||||
background-color var(--dur-fast) var(--ease-standard),
|
||||
border-color var(--dur-fast) var(--ease-standard);
|
||||
}
|
||||
#tab-digital-modes > .sub-tab-bar .sub-tab .decoder-state-dot {
|
||||
margin-left: auto;
|
||||
}
|
||||
#tab-digital-modes > .sub-tab-bar .sub-tab:hover:not(.active) {
|
||||
color: var(--text);
|
||||
background: color-mix(in srgb, var(--btn-bg) 55%, transparent);
|
||||
}
|
||||
#tab-digital-modes > .sub-tab-bar .sub-tab.active {
|
||||
border-color: color-mix(in srgb, var(--accent-green) 50%, var(--border-light));
|
||||
background: color-mix(in srgb, var(--accent-green) 12%, transparent);
|
||||
color: var(--accent-text);
|
||||
}
|
||||
#tab-digital-modes > .sub-tab-panel {
|
||||
grid-column: 2;
|
||||
grid-row: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
.sub-tab { flex-shrink: 0; background: transparent; border: none; border-bottom: 2px solid transparent; border-radius: 0; padding: 0.35rem 0.75rem; color: var(--text-muted); cursor: pointer; font-size: 0.85rem; height: auto; }
|
||||
.sub-tab.active { border-bottom-color: var(--accent-green); color: var(--accent-green); font-weight: 600; }
|
||||
.sub-tab:hover:not(.active) { color: var(--text); }
|
||||
@@ -1839,11 +2288,17 @@ small { color: var(--text-muted); }
|
||||
font-size: 0.82rem;
|
||||
color: var(--text-muted);
|
||||
}
|
||||
/* Full-bleed: break the map panel out of the centred .card column so the
|
||||
stage spans the whole viewport width. The negative inline margins cancel
|
||||
the card's centring offset plus its side padding, whatever they are. */
|
||||
#tab-map {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
min-height: 0;
|
||||
gap: 0.85rem;
|
||||
width: 100vw;
|
||||
max-width: 100vw;
|
||||
margin-inline: calc(50% - 50vw);
|
||||
}
|
||||
/* map-loading uses the shared .decode-history-overlay .content-overlay classes */
|
||||
#map-stage {
|
||||
@@ -1851,8 +2306,9 @@ small { color: var(--text-muted); }
|
||||
flex: 0 1 auto;
|
||||
min-height: 0;
|
||||
overflow: hidden;
|
||||
border-radius: 6px;
|
||||
border-radius: 0;
|
||||
border: 1px solid color-mix(in srgb, var(--border-light) 78%, transparent);
|
||||
border-inline: 0;
|
||||
background:
|
||||
linear-gradient(180deg, color-mix(in srgb, var(--card-bg) 86%, transparent), color-mix(in srgb, var(--card-bg) 64%, transparent)),
|
||||
color-mix(in srgb, var(--input-bg) 88%, transparent);
|
||||
@@ -2533,7 +2989,21 @@ body.map-fake-fullscreen-active {
|
||||
font-size: 0.75rem;
|
||||
word-break: break-all;
|
||||
}
|
||||
.aprs-symbol { display: inline-block; width: 24px; height: 24px; background-size: 384px 192px; vertical-align: middle; margin-right: 0.3rem; }
|
||||
/* APRS symbols are drawn from the vendored hessu/aprs-symbols sprite sheets:
|
||||
16x6 grids of 24px cells, indexed by `symbol code - 0x21`. The cell offset
|
||||
is set inline by the APRS/map bundles; the sheet URL stays here so retina
|
||||
displays can swap in the @2x variants. */
|
||||
.aprs-symbol { display: inline-block; width: 24px; height: 24px; background-repeat: no-repeat; background-size: 384px 144px; vertical-align: middle; margin-right: 0.3rem; }
|
||||
.aprs-symbol-marker { margin-right: 0; }
|
||||
.aprs-symbol-primary { background-image: url('/vendor/aprs-symbols-24-0.png'); }
|
||||
.aprs-symbol-alternate { background-image: url('/vendor/aprs-symbols-24-1.png'); }
|
||||
.aprs-symbol-overlaid { background-image: url('/vendor/aprs-symbols-24-2.png'), url('/vendor/aprs-symbols-24-1.png'); }
|
||||
@media (min-resolution: 2dppx) {
|
||||
.aprs-symbol-primary { background-image: url('/vendor/aprs-symbols-24-0-2x.png'); }
|
||||
.aprs-symbol-alternate { background-image: url('/vendor/aprs-symbols-24-1-2x.png'); }
|
||||
.aprs-symbol-overlaid { background-image: url('/vendor/aprs-symbols-24-2-2x.png'), url('/vendor/aprs-symbols-24-1-2x.png'); }
|
||||
}
|
||||
/* Fallback for symbol codes outside the sprite sheets: show the raw character. */
|
||||
.aprs-symbol-local { border: 1px solid var(--border); border-radius: 4px; background: var(--surface-raised); color: var(--text); font: 700 0.8rem/22px ui-monospace, monospace; text-align: center; }
|
||||
.aprs-pos { color: var(--accent-green); text-decoration: none; margin-left: 0.3rem; font-size: 0.8rem; }
|
||||
.aprs-pos:hover { text-decoration: underline; }
|
||||
@@ -3040,9 +3510,6 @@ body[data-operator-layout="broadcast"] #sam-controls-col,
|
||||
body[data-operator-layout="broadcast"] #advanced-radio-controls {
|
||||
display: none !important;
|
||||
}
|
||||
body[data-operator-layout="broadcast"] .controls-row {
|
||||
grid-template-columns: minmax(8rem, 0.65fr) auto minmax(20rem, 2fr);
|
||||
}
|
||||
body[data-operator-layout="broadcast"] #wfm-controls-col,
|
||||
body[data-operator-layout="broadcast"] #audio-row,
|
||||
body[data-operator-layout="broadcast"] #spectrum-bw-row {
|
||||
@@ -3073,8 +3540,7 @@ body[data-operator-layout="broadcast"] #cw-bar-overlay {
|
||||
display: none !important;
|
||||
}
|
||||
@media (max-width: 760px) {
|
||||
body[data-operator-layout="broadcast"] .controls-row { grid-template-columns: 1fr auto; }
|
||||
body[data-operator-layout="broadcast"] #wfm-controls-col { grid-column: 1 / -1; }
|
||||
body[data-operator-layout="broadcast"] #wfm-controls-col { flex-basis: 100%; }
|
||||
}
|
||||
/* One navigation model at every width. Statistics, Recorder, Settings and
|
||||
* About are occasional destinations: they live behind More rather than
|
||||
@@ -3199,9 +3665,8 @@ body[data-operator-layout="broadcast"] #cw-bar-overlay {
|
||||
height: 1rem;
|
||||
cursor: ew-resize;
|
||||
}
|
||||
.controls-row { grid-template-columns: 1fr auto; }
|
||||
.controls-col-wfm { grid-column: 1 / -1; }
|
||||
.controls-col-power { grid-column: 1 / -1; }
|
||||
.controls-col-wfm { flex-basis: 100%; }
|
||||
.controls-col-power { flex-basis: 100%; }
|
||||
.controls-col.label-below-col .inline,
|
||||
.controls-col.label-below-col .btn-grid { margin-top: 0; }
|
||||
.wfm-controls-inline { flex-wrap: wrap; }
|
||||
@@ -3260,7 +3725,6 @@ body[data-operator-layout="broadcast"] #cw-bar-overlay {
|
||||
min-height: 3.2rem;
|
||||
padding: 0.35rem 0.1rem 0.3rem;
|
||||
border: 1px solid transparent;
|
||||
border-bottom: none;
|
||||
border-radius: 0.75rem;
|
||||
white-space: nowrap;
|
||||
text-align: center;
|
||||
@@ -3313,7 +3777,15 @@ body[data-operator-layout="broadcast"] #cw-bar-overlay {
|
||||
font-weight: 600;
|
||||
box-shadow: inset 0 1px 0 color-mix(in srgb, #fff 5%, transparent);
|
||||
}
|
||||
/* The picker replaces the sidebar here, so the panel takes the full width.
|
||||
align-content keeps the two rows at their own height: the panel fills the
|
||||
tab, and stretching would otherwise hand the picker a third of it. */
|
||||
#tab-digital-modes {
|
||||
grid-template-columns: minmax(0, 1fr);
|
||||
align-content: start;
|
||||
}
|
||||
#tab-digital-modes > .sub-tab-bar { display: none; }
|
||||
#tab-digital-modes > .sub-tab-panel { grid-column: 1; grid-row: auto; }
|
||||
.toast-region { bottom: calc(5.7rem + env(safe-area-inset-bottom)); }
|
||||
.top-bar-actions {
|
||||
width: 100%;
|
||||
@@ -3834,6 +4306,11 @@ body[data-operator-layout="broadcast"] #cw-bar-overlay {
|
||||
overflow: hidden;
|
||||
border-bottom-color: var(--border-light, rgba(255,255,255,0.06));
|
||||
}
|
||||
/* No allocations in range. The height stays reserved — collapsing it moved
|
||||
every element below by 18px each time tuning left a band. */
|
||||
#spectrum-bandplan-strip.bp-empty {
|
||||
background: color-mix(in srgb, var(--border) 22%, transparent);
|
||||
}
|
||||
.bp-segment {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
@@ -3924,6 +4401,12 @@ body[data-operator-layout="broadcast"] #cw-bar-overlay {
|
||||
height: 38px;
|
||||
overflow: visible;
|
||||
}
|
||||
/* The rail sits over the top of the overview plot, so it must not swallow
|
||||
drags and clicks meant for it — only the chips themselves are targets. */
|
||||
#spectrum-bookmark-axis { pointer-events: none; }
|
||||
#spectrum-bookmark-axis .spectrum-bookmark-chip { pointer-events: auto; }
|
||||
/* Nothing bookmarked in range: the rail keeps its place but stays blank —
|
||||
no caption over the plot. */
|
||||
.spectrum-bookmark-chip {
|
||||
position: absolute;
|
||||
top: 2px;
|
||||
@@ -4172,11 +4655,12 @@ body[data-operator-layout="broadcast"] #cw-bar-overlay {
|
||||
@media (max-width: 520px) {
|
||||
/* Single-column controls: jog first, then mode, then power */
|
||||
.controls-row {
|
||||
grid-template-columns: 1fr;
|
||||
flex-direction: column;
|
||||
align-items: stretch;
|
||||
}
|
||||
.controls-col-center {
|
||||
order: -1;
|
||||
justify-self: center;
|
||||
align-self: center;
|
||||
width: auto;
|
||||
}
|
||||
.controls-col-center::after { display: none; }
|
||||
@@ -4188,6 +4672,11 @@ body[data-operator-layout="broadcast"] #cw-bar-overlay {
|
||||
|
||||
/* Wider volume sliders for touch */
|
||||
.vol-slider { width: 100%; flex: 1 1 auto; }
|
||||
.audio-group {
|
||||
flex-wrap: wrap;
|
||||
width: 100%;
|
||||
}
|
||||
.audio-group-label { width: 100%; }
|
||||
.vol-label {
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
@@ -4207,8 +4696,8 @@ body[data-operator-layout="broadcast"] #cw-bar-overlay {
|
||||
}
|
||||
#rx-audio-btn,
|
||||
#tx-audio-btn,
|
||||
#audio-level,
|
||||
#audio-status,
|
||||
.audio-volume-group,
|
||||
.audio-level-group,
|
||||
#sdr-squelch-wrap {
|
||||
grid-column: 1 / -1;
|
||||
}
|
||||
|
||||
BIN
Binary file not shown.
|
After Width: | Height: | Size: 105 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 52 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 93 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 43 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 24 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
@@ -12,7 +12,7 @@
|
||||
"typecheck": "tsc --project tsconfig.json && tsc --project tsconfig.worker.json",
|
||||
"lint": "eslint \"src/**/*.ts\" \"tests/**/*.mjs\" build.mjs --no-error-on-unmatched-pattern",
|
||||
"test": "node --test tests/*.test.mjs",
|
||||
"test:browser": "node tests/browser-smoke.mjs",
|
||||
"test:browser": "node tests/browser-smoke.mjs && node tests/spectrum-layout.mjs",
|
||||
"verify-generated": "npm run generate-types && npm run build && git diff --exit-code -- ../assets/web/generated src/api/generated.ts"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@@ -172,6 +172,8 @@ interface TrxModules {
|
||||
map?: {
|
||||
aprsMap?: { invalidateSize(): void } | null;
|
||||
initAprsMap(): void;
|
||||
focusMapPosition?(lat: number, lon: number): void;
|
||||
focusMapLocator?(grid: string, preferredType?: string | null): boolean;
|
||||
sizeAprsMapToViewport(): void;
|
||||
pruneMapHistory(): void;
|
||||
updateMapBaseLayerForTheme(theme: string): void;
|
||||
@@ -359,6 +361,10 @@ declare global {
|
||||
trx: { state: TrxState; core: Readonly<Record<string, unknown>>; modules: TrxModules };
|
||||
trxUi: TrxUi;
|
||||
trxPluginRuntime: TrxPluginRuntime;
|
||||
// Owned here, not by the lazy map module: decode rows link to the map long
|
||||
// before it has been loaded.
|
||||
navigateToAprsMap(lat: number, lon: number): void;
|
||||
navigateToMapLocator(grid: string, preferredType?: string | null): void;
|
||||
lastSpectrumData: SpectrumFrame | null;
|
||||
lastFreqHz: number | null;
|
||||
currentBandwidthHz: number;
|
||||
@@ -477,6 +483,8 @@ function hideAuthGate() {
|
||||
});
|
||||
navigateToTab(tabFromPath(), { updateHistory: false, replaceHistory: true });
|
||||
syncTopBarAccess();
|
||||
// The startup fetch may have run before there was a session to authorise it.
|
||||
if (!bandplanData) void loadBandplanJson();
|
||||
}
|
||||
|
||||
function showAuthError(msg: string) {
|
||||
@@ -944,6 +952,8 @@ function formatSigStrength(dbm: number | null) {
|
||||
}
|
||||
|
||||
function refreshSigStrengthDisplay() {
|
||||
// The squelch indicator reads the same meter, so it follows it here.
|
||||
renderSdrSquelch();
|
||||
if (!sigStrengthEl) return;
|
||||
sigStrengthEl.innerHTML = formatSigStrength(sigLastDbm);
|
||||
}
|
||||
@@ -1003,6 +1013,7 @@ async function restorePreviousTuneState() {
|
||||
savePreviousTuneState(); // save current as previous so B toggles back
|
||||
if (saved.mode && modeEl && modeEl.value !== saved.mode) {
|
||||
modeEl.value = saved.mode;
|
||||
syncModePicker();
|
||||
await postPath(`/set_mode?mode=${encodeURIComponent(saved.mode)}`);
|
||||
updateWfmControls();
|
||||
}
|
||||
@@ -1332,6 +1343,22 @@ function readyText() {
|
||||
return lastClientCount !== null ? `Ready \u00b7 ${lastClientCount} user${lastClientCount !== 1 ? "s" : ""}` : "Ready";
|
||||
}
|
||||
|
||||
// The footer hint is a status pill whose dot is coloured from data-state,
|
||||
// so the text has to be written through setPowerHint rather than assigned.
|
||||
const HINT_ERROR_RE = /failed|missing|unavailable|unknown|lost|required/i;
|
||||
const HINT_BUSY_RE = /initializ|connecting|retrying|scanning|shifting|waiting|sending|switching|toggling|setting|not fully/i;
|
||||
|
||||
function hintState(msg: string): "ok" | "busy" | "error" {
|
||||
if (HINT_ERROR_RE.test(msg)) return "error";
|
||||
if (HINT_BUSY_RE.test(msg) || /[\u2026]$|\.\.\.$/.test(msg)) return "busy";
|
||||
return "ok";
|
||||
}
|
||||
|
||||
function setPowerHint(msg: string) {
|
||||
powerHint.textContent = msg;
|
||||
powerHint.dataset.state = hintState(msg);
|
||||
}
|
||||
|
||||
function rigBadgeColor(rigId: string) {
|
||||
const text = (rigId || "rx").toString();
|
||||
let hash = 0;
|
||||
@@ -1461,10 +1488,10 @@ function refreshOperatorLayoutCapabilities() {
|
||||
}
|
||||
|
||||
function showHint(msg: string, duration?: number) {
|
||||
powerHint.textContent = msg;
|
||||
setPowerHint(msg);
|
||||
if (hintTimer) clearTimeout(hintTimer);
|
||||
if (duration) hintTimer = setTimeout(() => { powerHint.textContent = readyText(); }, duration);
|
||||
if (/failed|missing|unavailable|unknown|lost|required/i.test(msg)) {
|
||||
if (duration) hintTimer = setTimeout(() => { setPowerHint(readyText()); }, duration);
|
||||
if (HINT_ERROR_RE.test(msg)) {
|
||||
window.trxUi?.notify(msg, { kind: "error" });
|
||||
}
|
||||
}
|
||||
@@ -2947,6 +2974,7 @@ function setDisabled(disabled: boolean) {
|
||||
[freqEl, centerFreqEl, modeEl, pttBtn, powerBtn, txLimitInput, txLimitBtn, lockBtn].forEach((el) => {
|
||||
if (el) el.disabled = disabled;
|
||||
});
|
||||
syncModePicker();
|
||||
}
|
||||
|
||||
let serverVersion: string | null = null;
|
||||
@@ -3292,13 +3320,13 @@ function render(update: AppUpdate) {
|
||||
console.info("Rig initializing:", { manufacturer: manu, model, revision: rev });
|
||||
loadingEl.style.display = "";
|
||||
if (contentEl) contentEl.style.display = "none";
|
||||
powerHint.textContent = "Initializing rig…";
|
||||
setPowerHint("Initializing rig…");
|
||||
setDisabled(true);
|
||||
return;
|
||||
}
|
||||
loadingEl.style.display = "none";
|
||||
if (contentEl) contentEl.style.display = "";
|
||||
powerHint.textContent = "Rig not fully initialized yet";
|
||||
setPowerHint("Rig not fully initialized yet");
|
||||
} else {
|
||||
loadingEl.style.display = "none";
|
||||
if (contentEl) contentEl.style.display = "";
|
||||
@@ -3336,6 +3364,7 @@ function render(update: AppUpdate) {
|
||||
opt.textContent = m;
|
||||
modeEl.appendChild(opt);
|
||||
});
|
||||
renderModePicker();
|
||||
}
|
||||
}
|
||||
if (update.info && update.info.capabilities) {
|
||||
@@ -3481,6 +3510,7 @@ function render(update: AppUpdate) {
|
||||
// vchan.js will apply the correct mode via vchanSyncModeDisplay().
|
||||
if (!onVirtual) {
|
||||
modeEl.value = modeUpper;
|
||||
syncModePicker();
|
||||
if (modeUpper === "WFM" && lastModeName !== "WFM") {
|
||||
setJogDivisor(10);
|
||||
resetRdsDisplay();
|
||||
@@ -3623,6 +3653,7 @@ function render(update: AppUpdate) {
|
||||
const sUnits = dbmToSUnits(update.status.rx.sig);
|
||||
sigLastSUnits = sUnits;
|
||||
sigLastDbm = update.status.rx.sig;
|
||||
recordSquelchMeterSample(update.status.rx.sig);
|
||||
const pct = sUnits <= 9 ? Math.max(0, Math.min(100, (sUnits / 9) * 100)) : 100;
|
||||
signalBar.style.width = `${pct}%`;
|
||||
signalValue.innerHTML = formatSignal(sUnits);
|
||||
@@ -3649,7 +3680,7 @@ function render(update: AppUpdate) {
|
||||
powerBtn.disabled = true;
|
||||
powerBtn.textContent = "Power unavailable";
|
||||
powerBtn.setAttribute("aria-pressed", "false");
|
||||
powerHint.textContent = "State unknown";
|
||||
setPowerHint("State unknown");
|
||||
}
|
||||
|
||||
if (update.status && update.status.tx && typeof update.status.tx.limit === "number") {
|
||||
@@ -3760,7 +3791,7 @@ function render(update: AppUpdate) {
|
||||
if (Array.isArray(update.remotes)) {
|
||||
applyRigList(typeof update.active_remote === "string" ? update.active_remote : null, update.remotes);
|
||||
}
|
||||
powerHint.textContent = readyText();
|
||||
setPowerHint(readyText());
|
||||
lastLocked = update.status?.lock === true;
|
||||
window.trxUi?.setButtonState(lockBtn, {
|
||||
active: lastLocked,
|
||||
@@ -3847,11 +3878,11 @@ function connect() {
|
||||
render(data);
|
||||
lastEventAt = Date.now();
|
||||
if (data.server_connected === false) {
|
||||
powerHint.textContent = "trx-server connection lost";
|
||||
setPowerHint("trx-server connection lost");
|
||||
if (tabMainEl) tabMainEl.classList.add("server-disconnected");
|
||||
} else {
|
||||
if (tabMainEl) tabMainEl.classList.remove("server-disconnected");
|
||||
if (data.initialized) powerHint.textContent = readyText();
|
||||
if (data.initialized) setPowerHint(readyText());
|
||||
}
|
||||
} catch (e) {
|
||||
console.error("Bad event data", e);
|
||||
@@ -3874,7 +3905,7 @@ function connect() {
|
||||
source.onerror = () => {
|
||||
// Check if this is an auth error by looking at readyState
|
||||
if (source.readyState === EventSource.CLOSED) {
|
||||
powerHint.textContent = "trx-client connection lost, retrying\u2026";
|
||||
setPowerHint("trx-client connection lost, retrying\u2026");
|
||||
setConnLostOverlay(true, "trx-client connection lost", "Retrying\u2026", true);
|
||||
source.close();
|
||||
void pollFreshSnapshot();
|
||||
@@ -3885,7 +3916,7 @@ function connect() {
|
||||
esHeartbeat = setInterval(() => {
|
||||
const now = Date.now();
|
||||
if (now - lastEventAt > 15000) {
|
||||
powerHint.textContent = "trx-client connection lost, retrying\u2026";
|
||||
setPowerHint("trx-client connection lost, retrying\u2026");
|
||||
setConnLostOverlay(true, "trx-client connection lost", "Retrying\u2026", true);
|
||||
source.close();
|
||||
void pollFreshSnapshot();
|
||||
@@ -4315,6 +4346,39 @@ if (jogMultEl) {
|
||||
jogStep = Math.max(Math.round(jogUnit / jogMult), minFreqStepHz);
|
||||
}
|
||||
|
||||
// The mode buttons are a view of the <select>, which stays the value everything
|
||||
// else reads. Rebuilt when the rig's mode list changes, re-synced whenever
|
||||
// anything writes to the select — including the plugins, via trxCore.
|
||||
const modePickerEl = requiredElement("mode-picker");
|
||||
|
||||
function renderModePicker() {
|
||||
modePickerEl.replaceChildren();
|
||||
for (const option of Array.from(modeEl.options)) {
|
||||
const btn = document.createElement("button");
|
||||
btn.type = "button";
|
||||
btn.dataset.mode = option.value;
|
||||
btn.textContent = option.textContent;
|
||||
btn.addEventListener("click", () => {
|
||||
if (btn.disabled || modeEl.value === option.value) return;
|
||||
modeEl.value = option.value;
|
||||
syncModePicker();
|
||||
void applyModeFromPicker();
|
||||
});
|
||||
modePickerEl.appendChild(btn);
|
||||
}
|
||||
syncModePicker();
|
||||
}
|
||||
|
||||
function syncModePicker() {
|
||||
const active = (modeEl.value || "").toUpperCase();
|
||||
modePickerEl.querySelectorAll<HTMLButtonElement>("button").forEach((btn) => {
|
||||
const selected = (btn.dataset.mode || "").toUpperCase() === active;
|
||||
btn.classList.toggle("active", selected);
|
||||
btn.disabled = modeEl.disabled;
|
||||
btn.setAttribute("aria-pressed", String(selected));
|
||||
});
|
||||
}
|
||||
|
||||
async function applyModeFromPicker() {
|
||||
const mode = modeEl.value || "";
|
||||
if (!mode) {
|
||||
@@ -4323,6 +4387,7 @@ async function applyModeFromPicker() {
|
||||
}
|
||||
updateWfmControls();
|
||||
setControlPending(modeEl, true);
|
||||
syncModePicker();
|
||||
showHint("Setting mode…");
|
||||
try {
|
||||
if (await window.trx.modules.vchan?.interceptMode(mode)) {
|
||||
@@ -4341,6 +4406,7 @@ async function applyModeFromPicker() {
|
||||
console.error(err);
|
||||
} finally {
|
||||
setControlPending(modeEl, false);
|
||||
syncModePicker();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4551,6 +4617,54 @@ function tabFromPath(pathname = window.location.pathname) {
|
||||
return tabFromPathname(pathname);
|
||||
}
|
||||
|
||||
// Map links fire from decode rows — an AIS position, an APRS frame, an FT8
|
||||
// grid — that exist long before the Map tab has ever been opened, and the map
|
||||
// module is lazy. It used to install these two globals itself, so until
|
||||
// something had opened the tab the AIS links threw ("not a function") and the
|
||||
// APRS ones silently did nothing. The app owns them instead: it is the only
|
||||
// place that can materialise the panel, load the module and update history,
|
||||
// and the target waits here until the module is up.
|
||||
type PendingMapTarget =
|
||||
| { kind: "position"; lat: number; lon: number }
|
||||
| { kind: "locator"; grid: string; preferredType: string | null };
|
||||
let pendingMapTarget: PendingMapTarget | null = null;
|
||||
|
||||
function applyMapTarget(target: PendingMapTarget): boolean {
|
||||
const map = window.trx.modules.map;
|
||||
if (!map) return false;
|
||||
if (target.kind === "position") {
|
||||
map.focusMapPosition?.(target.lat, target.lon);
|
||||
} else {
|
||||
map.focusMapLocator?.(target.grid, target.preferredType);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function requestMapTarget(target: PendingMapTarget) {
|
||||
pendingMapTarget = target;
|
||||
navigateToTab("map");
|
||||
// Already loaded: the tab switch has shown the panel, so focus can happen
|
||||
// now. Otherwise _initMapWhenReady drains it once the module arrives.
|
||||
if (window.trx.modules.map) {
|
||||
requestAnimationFrame(() => { drainPendingMapTarget(); });
|
||||
}
|
||||
}
|
||||
|
||||
function drainPendingMapTarget() {
|
||||
const target = pendingMapTarget;
|
||||
if (!target) return;
|
||||
if (applyMapTarget(target)) pendingMapTarget = null;
|
||||
}
|
||||
|
||||
window.navigateToAprsMap = (lat: number, lon: number) => {
|
||||
if (!isFiniteNumber(lat) || !isFiniteNumber(lon)) return;
|
||||
requestMapTarget({ kind: "position", lat, lon });
|
||||
};
|
||||
window.navigateToMapLocator = (grid: string, preferredType: string | null = null) => {
|
||||
if (!grid) return;
|
||||
requestMapTarget({ kind: "locator", grid, preferredType });
|
||||
};
|
||||
|
||||
// Initialise the Leaflet map, waiting for both Leaflet (L) and map-core.js
|
||||
// (window.trx.modules.map) if they haven't loaded yet.
|
||||
let _mapInitTimer: ReturnType<typeof setInterval> | null = null;
|
||||
@@ -4570,6 +4684,7 @@ function _initMapWhenReady() {
|
||||
requestAnimationFrame(() => {
|
||||
map.sizeAprsMapToViewport();
|
||||
map.aprsMap?.invalidateSize();
|
||||
drainPendingMapTarget();
|
||||
});
|
||||
});
|
||||
return;
|
||||
@@ -4600,6 +4715,19 @@ function navigateToTab(name: TabName, options: { updateHistory?: boolean; replac
|
||||
_activeTab = name;
|
||||
document.querySelectorAll(".tab-bar .tab").forEach((t) => t.classList.remove("active"));
|
||||
btn.classList.add("active");
|
||||
// A destination the strip hides is reached through Tools, so mark that
|
||||
// button instead — otherwise the strip looks identical on all four of them.
|
||||
// Membership of the Tools menu is the test: it still reads from the grouping
|
||||
// ui-core installs rather than a second copy of it, but unlike the tab's
|
||||
// computed display it does not depend on anything being laid out. The first
|
||||
// route navigation runs while the card is still behind the loading state,
|
||||
// where every tab computes to display:none — which lit Tools up on every
|
||||
// refresh of every page.
|
||||
const toolsBtn = document.getElementById("mobile-more-btn");
|
||||
if (toolsBtn) {
|
||||
const inToolsMenu = !!document.querySelector(`#mobile-more-menu [data-navigate-tab="${name}"]`);
|
||||
toolsBtn.classList.toggle("active", inToolsMenu);
|
||||
}
|
||||
window.trxUi?.syncSelectedTab(document.querySelector(".tab-bar-nav"), btn);
|
||||
document.querySelectorAll<HTMLElement>(".tab-panel").forEach((p) => p.style.display = "none");
|
||||
const panel = document.getElementById(`tab-${name}`);
|
||||
@@ -4866,7 +4994,7 @@ const trxCore = Object.freeze({
|
||||
formatWavelength, formatBwLabel, formatUptime, formatSigStrength, formatSignal,
|
||||
postPath, scheduleUiFrameJob, navigateToTab, rigBadgeColor,
|
||||
setRigFrequency, applyLocalTunedFrequency, armOptimisticFrequency,
|
||||
syncBandwidthInput, scheduleSpectrumDraw, onDecoderRegistryReady,
|
||||
syncBandwidthInput, scheduleSpectrumDraw, onDecoderRegistryReady, syncModePicker,
|
||||
formatFreqForStep, refreshFreqDisplay, setJogDivisor, mwDefaultsForMode,
|
||||
resetRdsDisplay, positionRdsPsOverlay, updateWfmControls,
|
||||
updateSdrSquelchControlVisibility, startRxAudio, stopRxAudio,
|
||||
@@ -5077,14 +5205,18 @@ const wfmCciValEl = document.getElementById("wfm-cci-val");
|
||||
const wfmAciFillEl = document.getElementById("wfm-aci-fill");
|
||||
const wfmAciValEl = document.getElementById("wfm-aci-val");
|
||||
const samControlsCol = document.getElementById("sam-controls-col");
|
||||
const modeControlsRow = document.getElementById("mode-controls-row");
|
||||
const samStereoWidthEl = document.getElementById("sam-stereo-width") as HTMLInputElement | null;
|
||||
const samCarrierSyncEl = document.getElementById("sam-carrier-sync") as HTMLSelectElement | null;
|
||||
const sdrSquelchWrapEl = document.getElementById("sdr-squelch-wrap");
|
||||
const sdrSquelchEl = document.getElementById("sdr-squelch") as HTMLInputElement | null;
|
||||
const sdrSquelchPctEl = document.getElementById("sdr-squelch-pct");
|
||||
const sdrSquelchDbEl = document.getElementById("sdr-squelch-db") as HTMLInputElement | null;
|
||||
const sdrSquelchStateEl = document.getElementById("sdr-squelch-state");
|
||||
const sdrSquelchToggleBtn = document.getElementById("sdr-squelch-toggle") as HTMLButtonElement | null;
|
||||
const squelchLineEl = document.getElementById("spectrum-squelch-line");
|
||||
const squelchGripEl = document.getElementById("spectrum-squelch-grip");
|
||||
const squelchLabelEl = document.getElementById("spectrum-squelch-label");
|
||||
const SDR_SQUELCH_MIN_DB = -120;
|
||||
const SDR_SQUELCH_MAX_DB = -30;
|
||||
let syncFromServerSdrSquelch = false;
|
||||
const sdrNbWrapEl = document.getElementById("sdr-nb-wrap");
|
||||
const sdrNbEnabledEl = document.getElementById("sdr-nb-enabled") as HTMLInputElement | null;
|
||||
const sdrNbThresholdControlsEl = document.getElementById("sdr-nb-threshold-controls");
|
||||
@@ -5184,97 +5316,240 @@ function normalizeWfmDenoiseLevel(value: unknown) {
|
||||
return "auto";
|
||||
}
|
||||
|
||||
function clampSdrSquelchPercent(value: number) {
|
||||
if (!isFiniteNumber(value)) return 0;
|
||||
return Math.max(0, Math.min(100, Math.round(value)));
|
||||
// The threshold is held in dB, the scale the spectrum axis and the S-meter are
|
||||
// labelled in and the one the server compares against. It used to be a
|
||||
// percentage over that range, which left the operator no way to relate the
|
||||
// control to anything on screen — and 0% doubled as "disabled", so turning the
|
||||
// squelch off to listen threw the setting away.
|
||||
let sdrSquelchEnabled: boolean = loadSetting("sdrSquelchEnabled", false);
|
||||
let sdrSquelchThresholdDb = clampSdrSquelchDb(Number(loadSetting("sdrSquelchThresholdDb", -95)));
|
||||
|
||||
function clampSdrSquelchDb(value: number) {
|
||||
if (!isFiniteNumber(value)) return SDR_SQUELCH_MIN_DB;
|
||||
return Math.max(SDR_SQUELCH_MIN_DB, Math.min(SDR_SQUELCH_MAX_DB, Math.round(value)));
|
||||
}
|
||||
|
||||
function sdrSquelchPercentToServer(percent: number) {
|
||||
const pct = clampSdrSquelchPercent(percent);
|
||||
if (pct <= 0) {
|
||||
return { enabled: false, thresholdDb: SDR_SQUELCH_MIN_DB };
|
||||
/** Passing right now, as far as the meter can tell: the same comparison the
|
||||
* DSP makes, against the same number it reports. */
|
||||
function sdrSquelchIsPassing() {
|
||||
if (!sdrSquelchEnabled) return true;
|
||||
if (!isFiniteNumber(sigLastDbm)) return false;
|
||||
return sigLastDbm >= sdrSquelchThresholdDb;
|
||||
}
|
||||
|
||||
function renderSdrSquelch() {
|
||||
if (sdrSquelchDbEl && document.activeElement !== sdrSquelchDbEl) {
|
||||
sdrSquelchDbEl.value = String(sdrSquelchThresholdDb);
|
||||
}
|
||||
const ratio = pct / 100;
|
||||
const thresholdDb = SDR_SQUELCH_MIN_DB + ratio * (SDR_SQUELCH_MAX_DB - SDR_SQUELCH_MIN_DB);
|
||||
return { enabled: true, thresholdDb };
|
||||
if (sdrSquelchDbEl) sdrSquelchDbEl.disabled = !sdrSquelchSupported;
|
||||
if (sdrSquelchToggleBtn) {
|
||||
sdrSquelchToggleBtn.setAttribute("aria-pressed", String(sdrSquelchEnabled));
|
||||
sdrSquelchToggleBtn.title = sdrSquelchEnabled ? "Turn the squelch off" : "Turn the squelch on";
|
||||
}
|
||||
const state = !sdrSquelchEnabled ? "off" : (sdrSquelchIsPassing() ? "open" : "closed");
|
||||
if (sdrSquelchStateEl) {
|
||||
sdrSquelchStateEl.dataset.state = state;
|
||||
sdrSquelchStateEl.parentElement?.setAttribute(
|
||||
"aria-label",
|
||||
state === "off" ? "Squelch off" : (state === "open" ? "Squelch on, open" : "Squelch on, closed"),
|
||||
);
|
||||
}
|
||||
if (squelchLabelEl) squelchLabelEl.textContent = String(sdrSquelchThresholdDb);
|
||||
if (squelchGripEl) squelchGripEl.setAttribute("aria-valuenow", String(sdrSquelchThresholdDb));
|
||||
if (squelchLineEl) squelchLineEl.dataset.state = state === "open" ? "open" : "closed";
|
||||
positionSquelchLine();
|
||||
}
|
||||
|
||||
function sdrSquelchServerToPercent(enabled: boolean, thresholdDb: number | null) {
|
||||
if (!enabled) return 0;
|
||||
if (!isFiniteNumber(thresholdDb)) return 0;
|
||||
const ratio = (thresholdDb - SDR_SQUELCH_MIN_DB) / (SDR_SQUELCH_MAX_DB - SDR_SQUELCH_MIN_DB);
|
||||
return clampSdrSquelchPercent(ratio * 100);
|
||||
/** Places the line at its threshold on the spectrum's dB axis. */
|
||||
function positionSquelchLine() {
|
||||
if (!squelchLineEl) return;
|
||||
const mode = (modeEl && modeEl.value ? modeEl.value : "").toUpperCase();
|
||||
const canvas = document.getElementById("spectrum-canvas");
|
||||
const visible = sdrSquelchSupported && sdrSquelchEnabled && mode !== "WFM"
|
||||
&& !!canvas && canvas.clientHeight > 0
|
||||
&& getComputedStyle(requiredElement("spectrum-panel")).display !== "none";
|
||||
if (!visible) {
|
||||
squelchLineEl.style.display = "none";
|
||||
return;
|
||||
}
|
||||
const dbMin = spectrumFloor;
|
||||
const dbMax = spectrumFloor + spectrumRange;
|
||||
// Pinned to the plot edge when the threshold sits outside the visible dB
|
||||
// window rather than hidden: the grip is how it gets dragged back, and the
|
||||
// label still reads the real value.
|
||||
const frac = Math.max(0, Math.min(1, (sdrSquelchThresholdDb - dbMin) / Math.max(1, dbMax - dbMin)));
|
||||
squelchLineEl.style.display = "";
|
||||
squelchLineEl.style.top = `${canvas.offsetTop + canvas.clientHeight * (1 - frac)}px`;
|
||||
}
|
||||
|
||||
function updateSdrSquelchPctLabel() {
|
||||
if (!sdrSquelchEl || !sdrSquelchPctEl) return;
|
||||
const pct = clampSdrSquelchPercent(Number(sdrSquelchEl.value));
|
||||
sdrSquelchPctEl.textContent = pct <= 0 ? "Open" : `${pct}%`;
|
||||
function submitSdrSquelch() {
|
||||
if (!sdrSquelchSupported) return;
|
||||
saveSetting("sdrSquelchEnabled", sdrSquelchEnabled);
|
||||
saveSetting("sdrSquelchThresholdDb", sdrSquelchThresholdDb);
|
||||
postPath(
|
||||
`/set_sdr_squelch?enabled=${sdrSquelchEnabled ? "true" : "false"}`
|
||||
+ `&threshold_db=${encodeURIComponent(sdrSquelchThresholdDb.toFixed(2))}`,
|
||||
).catch(() => {});
|
||||
}
|
||||
|
||||
function setSdrSquelch(thresholdDb: number, enabled: boolean, options: { submit?: boolean } = {}) {
|
||||
sdrSquelchThresholdDb = clampSdrSquelchDb(thresholdDb);
|
||||
sdrSquelchEnabled = enabled;
|
||||
renderSdrSquelch();
|
||||
if (options.submit !== false) submitSdrSquelch();
|
||||
}
|
||||
|
||||
// Auto reads the meter, not the spectrum. The threshold is compared against
|
||||
// the channel level the meter reports, and that sits a long way from the
|
||||
// spectrum's per-bin noise floor — the gap is set by the FFT size and window,
|
||||
// the channel bandwidth, the decimation and peak-versus-mean statistics.
|
||||
// Measured across ordinary configurations it ranges from -1 dB to +22 dB, so
|
||||
// the old "noise floor + 6 dB" left the gate 16-22 dB below the noise on a
|
||||
// narrow span and it simply never closed. Reading the same number the DSP
|
||||
// compares needs no conversion at all.
|
||||
const SQUELCH_NOISE_WINDOW_MS = 10_000;
|
||||
const SQUELCH_NOISE_MARGIN_DB = 5;
|
||||
const SQUELCH_MEASURE_MS = 1_500;
|
||||
const squelchMeterSamples: SignalSample[] = [];
|
||||
|
||||
function recordSquelchMeterSample(db: number) {
|
||||
if (!isFiniteNumber(db)) return;
|
||||
const now = Date.now();
|
||||
squelchMeterSamples.push({ t: now, v: db });
|
||||
while (squelchMeterSamples[0] && now - squelchMeterSamples[0].t > SQUELCH_NOISE_WINDOW_MS) {
|
||||
squelchMeterSamples.shift();
|
||||
}
|
||||
}
|
||||
|
||||
/** The level the channel rests at, taken low enough down the distribution that
|
||||
* a burst of traffic inside the window cannot drag it up. */
|
||||
function squelchNoiseFloorDb(): number | null {
|
||||
const now = Date.now();
|
||||
const values = squelchMeterSamples
|
||||
.filter((sample) => now - sample.t <= SQUELCH_NOISE_WINDOW_MS)
|
||||
.map((sample) => sample.v)
|
||||
.sort((a, b) => a - b);
|
||||
if (values.length < 4) return null;
|
||||
return values[Math.floor((values.length - 1) * 0.2)] ?? null;
|
||||
}
|
||||
|
||||
/** Just clear of the noise the meter is actually reading. */
|
||||
function autoSquelchThresholdDb(): number | null {
|
||||
const noiseDb = squelchNoiseFloorDb();
|
||||
if (noiseDb == null) return null;
|
||||
return clampSdrSquelchDb(noiseDb + SQUELCH_NOISE_MARGIN_DB);
|
||||
}
|
||||
|
||||
function updateSdrSquelchControlVisibility() {
|
||||
if (!sdrSquelchWrapEl) return;
|
||||
const mode = (modeEl && modeEl.value ? modeEl.value : "").toUpperCase();
|
||||
sdrSquelchWrapEl.style.display = sdrSquelchSupported && mode !== "WFM" ? "" : "none";
|
||||
renderSdrSquelch();
|
||||
}
|
||||
|
||||
function syncSdrSquelchFromServer(enabled: boolean, thresholdDb: number | null) {
|
||||
if (!sdrSquelchEl) return;
|
||||
if (document.activeElement === sdrSquelchEl) return;
|
||||
const pct = sdrSquelchServerToPercent(enabled, thresholdDb);
|
||||
syncFromServerSdrSquelch = true;
|
||||
sdrSquelchEl.value = String(pct);
|
||||
updateSdrSquelchPctLabel();
|
||||
syncFromServerSdrSquelch = false;
|
||||
saveSetting("sdrSquelchPct", pct);
|
||||
// Not while the operator is on the control: dragging the line or typing a
|
||||
// level would fight the echo of the value the server last confirmed.
|
||||
if (squelchDragPointerId !== null) return;
|
||||
if (sdrSquelchDbEl && document.activeElement === sdrSquelchDbEl) return;
|
||||
sdrSquelchEnabled = enabled;
|
||||
if (isFiniteNumber(thresholdDb)) sdrSquelchThresholdDb = clampSdrSquelchDb(thresholdDb);
|
||||
saveSetting("sdrSquelchEnabled", sdrSquelchEnabled);
|
||||
saveSetting("sdrSquelchThresholdDb", sdrSquelchThresholdDb);
|
||||
renderSdrSquelch();
|
||||
}
|
||||
|
||||
function submitSdrSquelchPercent(percent: number) {
|
||||
if (!sdrSquelchSupported) return;
|
||||
const { enabled, thresholdDb } = sdrSquelchPercentToServer(percent);
|
||||
postPath(
|
||||
`/set_sdr_squelch?enabled=${enabled ? "true" : "false"}&threshold_db=${encodeURIComponent(thresholdDb.toFixed(2))}`,
|
||||
).catch(() => {});
|
||||
}
|
||||
let squelchDragPointerId: number | null = null;
|
||||
let squelchDragSubmitAt = 0;
|
||||
|
||||
if (sdrSquelchEl) {
|
||||
const savedPct = clampSdrSquelchPercent(Number(loadSetting("sdrSquelchPct", 0)));
|
||||
sdrSquelchEl.value = String(savedPct);
|
||||
updateSdrSquelchPctLabel();
|
||||
sdrSquelchEl.addEventListener("input", () => {
|
||||
const pct = clampSdrSquelchPercent(Number(sdrSquelchEl.value));
|
||||
sdrSquelchEl.value = String(pct);
|
||||
updateSdrSquelchPctLabel();
|
||||
saveSetting("sdrSquelchPct", pct);
|
||||
if (!syncFromServerSdrSquelch) {
|
||||
submitSdrSquelchPercent(pct);
|
||||
}
|
||||
if (sdrSquelchDbEl) {
|
||||
sdrSquelchDbEl.addEventListener("change", () => {
|
||||
setSdrSquelch(Number(sdrSquelchDbEl.value), sdrSquelchEnabled);
|
||||
});
|
||||
sdrSquelchDbEl.addEventListener("blur", () => { renderSdrSquelch(); });
|
||||
}
|
||||
|
||||
if (sdrSquelchToggleBtn) {
|
||||
sdrSquelchToggleBtn.addEventListener("click", () => {
|
||||
if (!sdrSquelchSupported) return;
|
||||
setSdrSquelch(sdrSquelchThresholdDb, !sdrSquelchEnabled);
|
||||
});
|
||||
}
|
||||
|
||||
function applyAutoSquelch(threshold: number) {
|
||||
setSdrSquelch(threshold, true);
|
||||
showHint(`Squelch ${threshold} dB`, 1500);
|
||||
}
|
||||
|
||||
const sdrSquelchAutoBtn = document.getElementById("sdr-squelch-auto") as HTMLButtonElement | null;
|
||||
if (sdrSquelchAutoBtn) {
|
||||
sdrSquelchAutoBtn.addEventListener("click", () => {
|
||||
if (!sdrSquelchSupported) return;
|
||||
let pct = 0; // default: Off
|
||||
const data = lastSpectrumData || window.lastSpectrumData;
|
||||
if (data && isBinsArray(data.bins) && data.bins.length > 0) {
|
||||
const noiseDb = estimateNoiseFloorDb(data.bins);
|
||||
if (noiseDb != null && isFiniteNumber(noiseDb)) {
|
||||
// Set threshold slightly above noise floor so squelch closes on noise
|
||||
const thresholdDb = noiseDb + 6;
|
||||
const clamped = Math.max(SDR_SQUELCH_MIN_DB, Math.min(SDR_SQUELCH_MAX_DB, thresholdDb));
|
||||
pct = clampSdrSquelchPercent(
|
||||
((clamped - SDR_SQUELCH_MIN_DB) / (SDR_SQUELCH_MAX_DB - SDR_SQUELCH_MIN_DB)) * 100,
|
||||
);
|
||||
const threshold = autoSquelchThresholdDb();
|
||||
if (threshold != null) {
|
||||
applyAutoSquelch(threshold);
|
||||
return;
|
||||
}
|
||||
// Nothing recorded yet — right after a connection or a rig switch. Listen
|
||||
// for a moment rather than refusing, which is what a radio does.
|
||||
sdrSquelchAutoBtn.disabled = true;
|
||||
showHint("Measuring the noise…");
|
||||
setTimeout(() => {
|
||||
sdrSquelchAutoBtn.disabled = false;
|
||||
const measured = autoSquelchThresholdDb();
|
||||
if (measured == null) {
|
||||
showHint("No meter to measure the noise from", 1800);
|
||||
return;
|
||||
}
|
||||
applyAutoSquelch(measured);
|
||||
}, SQUELCH_MEASURE_MS);
|
||||
});
|
||||
}
|
||||
|
||||
// Dragging the line, the same gesture as the bandwidth edges. Submits are
|
||||
// throttled so the gate follows the drag by ear without a request per pixel.
|
||||
if (squelchGripEl) {
|
||||
const dbFromClientY = (clientY: number) => {
|
||||
const canvas = document.getElementById("spectrum-canvas");
|
||||
if (!canvas || !canvas.clientHeight) return sdrSquelchThresholdDb;
|
||||
const rect = canvas.getBoundingClientRect();
|
||||
const frac = 1 - (clientY - rect.top) / rect.height;
|
||||
return clampSdrSquelchDb(spectrumFloor + frac * spectrumRange);
|
||||
};
|
||||
squelchGripEl.addEventListener("pointerdown", (event) => {
|
||||
if (!sdrSquelchSupported) return;
|
||||
squelchDragPointerId = event.pointerId;
|
||||
squelchGripEl.setPointerCapture(event.pointerId);
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
});
|
||||
squelchGripEl.addEventListener("pointermove", (event) => {
|
||||
if (squelchDragPointerId !== event.pointerId) return;
|
||||
sdrSquelchThresholdDb = dbFromClientY(event.clientY);
|
||||
renderSdrSquelch();
|
||||
const now = Date.now();
|
||||
if (now - squelchDragSubmitAt > 200) {
|
||||
squelchDragSubmitAt = now;
|
||||
submitSdrSquelch();
|
||||
}
|
||||
if (sdrSquelchEl) {
|
||||
sdrSquelchEl.value = String(pct);
|
||||
updateSdrSquelchPctLabel();
|
||||
saveSetting("sdrSquelchPct", pct);
|
||||
});
|
||||
const endDrag = (event: PointerEvent) => {
|
||||
if (squelchDragPointerId !== event.pointerId) return;
|
||||
squelchDragPointerId = null;
|
||||
submitSdrSquelch();
|
||||
};
|
||||
squelchGripEl.addEventListener("pointerup", endDrag);
|
||||
squelchGripEl.addEventListener("pointercancel", endDrag);
|
||||
squelchGripEl.addEventListener("keydown", (event) => {
|
||||
const step = event.shiftKey ? 10 : 1;
|
||||
if (event.key === "ArrowUp" || event.key === "ArrowRight") {
|
||||
setSdrSquelch(sdrSquelchThresholdDb + step, sdrSquelchEnabled);
|
||||
} else if (event.key === "ArrowDown" || event.key === "ArrowLeft") {
|
||||
setSdrSquelch(sdrSquelchThresholdDb - step, sdrSquelchEnabled);
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
submitSdrSquelchPercent(pct);
|
||||
event.preventDefault();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -5395,6 +5670,9 @@ function updateWfmControls() {
|
||||
const mode = (modeEl && modeEl.value ? modeEl.value : "").toUpperCase();
|
||||
if (wfmControlsCol) wfmControlsCol.style.display = mode === "WFM" ? "" : "none";
|
||||
if (samControlsCol) samControlsCol.style.display = mode === "SAM" ? "" : "none";
|
||||
// The row holds only these two, so it goes with them — an empty one would
|
||||
// still take a track and a gap in the tray, and draw its divider.
|
||||
if (modeControlsRow) modeControlsRow.style.display = (mode === "WFM" || mode === "SAM") ? "" : "none";
|
||||
}
|
||||
|
||||
// Show compatibility warning for non-Chromium browsers
|
||||
@@ -6102,15 +6380,10 @@ function volWheel(slider: HTMLInputElement, pctEl: HTMLElement, getGain: () => G
|
||||
}
|
||||
volWheel(rxVolSlider, rxVolPct, () => rxGainNode, "rxVol");
|
||||
volWheel(txVolSlider, txVolPct, () => txGainNode, "txVol");
|
||||
if (sdrSquelchEl) {
|
||||
sdrSquelchEl.addEventListener("wheel", (e) => {
|
||||
e.preventDefault();
|
||||
const step = e.deltaY < 0 ? 2 : -2;
|
||||
const next = clampSdrSquelchPercent(Number(sdrSquelchEl.value) + step);
|
||||
sdrSquelchEl.value = String(next);
|
||||
updateSdrSquelchPctLabel();
|
||||
saveSetting("sdrSquelchPct", next);
|
||||
submitSdrSquelchPercent(next);
|
||||
if (sdrSquelchDbEl) {
|
||||
sdrSquelchDbEl.addEventListener("wheel", (event) => {
|
||||
event.preventDefault();
|
||||
setSdrSquelch(sdrSquelchThresholdDb + (event.deltaY < 0 ? 1 : -1), sdrSquelchEnabled);
|
||||
}, { passive: false });
|
||||
}
|
||||
|
||||
@@ -6360,7 +6633,12 @@ function connectDecode() {
|
||||
}
|
||||
if (data.type === "group") {
|
||||
const messages = Array.isArray(data.messages)
|
||||
? data.messages.filter((message): message is DecodeMessage => isRecord(message) && typeof message.type === "string")
|
||||
// Stored records carry only decoder fields — an AIS entry has mmsi,
|
||||
// lat, lon and so on, and no `type`. That field identifies live SSE
|
||||
// frames; history is already grouped, and the group's kind is
|
||||
// delivered alongside these messages, so requiring it here discarded
|
||||
// every restored record silently.
|
||||
? data.messages.filter((message): message is DecodeMessage => isRecord(message))
|
||||
: [];
|
||||
enqueueDecodeHistoryGroup(typeof data.kind === "string" ? data.kind : "", messages);
|
||||
return;
|
||||
@@ -6973,6 +7251,7 @@ function flushMeterDom() {
|
||||
const sUnits = dbmToSUnits(dbm);
|
||||
sigLastSUnits = sUnits;
|
||||
sigLastDbm = dbm;
|
||||
recordSquelchMeterSample(dbm);
|
||||
const pct = sUnits <= 9 ? Math.max(0, Math.min(100, (sUnits / 9) * 100)) : 100;
|
||||
if (signalBar) signalBar.style.width = `${pct}%`;
|
||||
if (signalValue) signalValue.innerHTML = formatSignal(sUnits);
|
||||
@@ -7319,6 +7598,9 @@ function drawSpectrum(data: SpectrumFrame) {
|
||||
}
|
||||
spectrumGl.drawSegments(spectrumTmpGridSegments, cssColorToRgba(pal.spectrumGrid), 1);
|
||||
updateSpectrumDbAxis(DB_MIN, DB_MAX, gridStep, H, dpr);
|
||||
// The squelch line rides the same axis: reposition it whenever the axis or
|
||||
// the plot geometry moves under it.
|
||||
positionSquelchLine();
|
||||
|
||||
function hzToX(hz: number) {
|
||||
return ((hz - range.visLoHz) / range.visSpanHz) * W;
|
||||
@@ -7727,7 +8009,12 @@ function updateBookmarkAxis(range: SpectrumRange) {
|
||||
updateSideBookmarkStack(rightSideEl, rightBookmarks, colorMap);
|
||||
|
||||
const hasVisible = visBookmarks.length > 0;
|
||||
axisEl.classList.toggle("bm-axis-visible", hasVisible);
|
||||
// The rail is kept up with nothing in range — blank, no caption — so tuning
|
||||
// across bands only swaps its contents rather than taking the strip itself
|
||||
// away. This function only runs with a spectrum range in hand, so rigs
|
||||
// without a spectrum never get it.
|
||||
axisEl.classList.add("bm-axis-visible");
|
||||
axisEl.classList.toggle("bm-axis-empty", !hasVisible);
|
||||
|
||||
if (!hasVisible) {
|
||||
if (axisEl.dataset.bmKey) { axisEl.replaceChildren(); axisEl.dataset.bmKey = ""; }
|
||||
@@ -8041,35 +8328,21 @@ window.addEventListener("keydown", (event) => {
|
||||
return;
|
||||
}
|
||||
|
||||
// Q — toggle squelch (cycle 0 → auto → 0)
|
||||
// Q — gate on or off, keeping the threshold. Picks one off the noise floor
|
||||
// the first time, when there is nothing to keep.
|
||||
if (key === "q") {
|
||||
event.preventDefault();
|
||||
if (sdrSquelchSupported && sdrSquelchEl) {
|
||||
const current = clampSdrSquelchPercent(Number(sdrSquelchEl.value));
|
||||
let nextPct;
|
||||
if (current > 0) {
|
||||
nextPct = 0; // turn off
|
||||
if (sdrSquelchSupported) {
|
||||
if (sdrSquelchEnabled) {
|
||||
setSdrSquelch(sdrSquelchThresholdDb, false);
|
||||
showHint("Squelch off", 1200);
|
||||
} else {
|
||||
// Auto: estimate from noise floor
|
||||
let auto = 30;
|
||||
const data = lastSpectrumData || window.lastSpectrumData;
|
||||
if (data && isBinsArray(data.bins) && data.bins.length > 0) {
|
||||
const noiseDb = estimateNoiseFloorDb(data.bins);
|
||||
if (noiseDb != null && isFiniteNumber(noiseDb)) {
|
||||
const thresholdDb = noiseDb + 6;
|
||||
const clamped = Math.max(SDR_SQUELCH_MIN_DB, Math.min(SDR_SQUELCH_MAX_DB, thresholdDb));
|
||||
auto = clampSdrSquelchPercent(
|
||||
((clamped - SDR_SQUELCH_MIN_DB) / (SDR_SQUELCH_MAX_DB - SDR_SQUELCH_MIN_DB)) * 100,
|
||||
);
|
||||
}
|
||||
}
|
||||
nextPct = auto;
|
||||
const threshold = sdrSquelchThresholdDb > SDR_SQUELCH_MIN_DB
|
||||
? sdrSquelchThresholdDb
|
||||
: (autoSquelchThresholdDb() ?? SDR_SQUELCH_MIN_DB + 25);
|
||||
setSdrSquelch(threshold, true);
|
||||
showHint(`Squelch ${clampSdrSquelchDb(threshold)} dB`, 1200);
|
||||
}
|
||||
sdrSquelchEl.value = String(nextPct);
|
||||
updateSdrSquelchPctLabel();
|
||||
saveSetting("sdrSquelchPct", nextPct);
|
||||
submitSdrSquelchPercent(nextPct);
|
||||
showHint(nextPct > 0 ? `Squelch ${nextPct}%` : "Squelch Off", 1200);
|
||||
} else {
|
||||
showHint("Squelch N/A", 1200);
|
||||
}
|
||||
@@ -8521,8 +8794,13 @@ const bandplanStripEl = document.getElementById("spectrum-bandplan-strip");
|
||||
const bandplanRegionSelect = document.getElementById("bandplan-region-select") as HTMLSelectElement | null;
|
||||
const bandplanLabelsCheck = document.getElementById("bandplan-labels-check") as HTMLInputElement | null;
|
||||
|
||||
(function loadBandplanJson() {
|
||||
fetch("/bandplan.json")
|
||||
// Fired at startup, and again once the session exists. The first attempt can
|
||||
// land before the user is authenticated, and it used to fail silently and
|
||||
// never retry, which is why the band plan sometimes only appeared after a
|
||||
// manual reload. Redraws on arrival: the strip is painted from the spectrum
|
||||
// draw, and a rig sitting between frames would otherwise stay blank.
|
||||
function loadBandplanJson(): Promise<void> {
|
||||
return fetch("/bandplan.json")
|
||||
.then(async (response) => {
|
||||
if (!response.ok) throw new Error(String(response.status));
|
||||
return await responseJsonUnknown(response);
|
||||
@@ -8532,9 +8810,13 @@ const bandplanLabelsCheck = document.getElementById("bandplan-labels-check") as
|
||||
bandplanData = data as BandplanData;
|
||||
bandplanSegmentsCache = null;
|
||||
bandplanCacheKey = "";
|
||||
if (lastSpectrumData) scheduleSpectrumDraw();
|
||||
})
|
||||
.catch(() => {});
|
||||
})();
|
||||
.catch((err) => {
|
||||
console.warn("Band plan unavailable", err);
|
||||
});
|
||||
}
|
||||
void loadBandplanJson();
|
||||
|
||||
if (bandplanRegionSelect) {
|
||||
bandplanRegionSelect.value = bandplanRegion;
|
||||
@@ -8606,27 +8888,36 @@ function bandplanVisibleSegments(region: string, loHz: number, hiHz: number): Vi
|
||||
return result;
|
||||
}
|
||||
|
||||
function _hideBandplanStrip() {
|
||||
// Empties the strip. `reserveSpace` keeps its height: the strip is in flow, so
|
||||
// collapsing it on a range with no allocations shifted the whole page down by
|
||||
// its height every time tuning crossed out of a band. Space stays reserved
|
||||
// whenever a band plan could be drawn at all, and is only given back when the
|
||||
// feature is off, has no data, or there is no spectrum to annotate.
|
||||
function _clearBandplanStrip(reserveSpace: boolean) {
|
||||
if (!bandplanStripEl) return;
|
||||
bandplanStripEl.classList.remove("bp-visible");
|
||||
bandplanStripEl.replaceChildren();
|
||||
bandplanCacheKey = "";
|
||||
if (bandplanCacheKey) {
|
||||
bandplanStripEl.replaceChildren();
|
||||
bandplanCacheKey = "";
|
||||
}
|
||||
bandplanStripEl.classList.toggle("bp-visible", reserveSpace);
|
||||
bandplanStripEl.classList.toggle("bp-empty", reserveSpace);
|
||||
}
|
||||
|
||||
function updateBandplanStrip(range: SpectrumRange | null) {
|
||||
if (!bandplanStripEl) return;
|
||||
if (!range || bandplanRegion === "off" || !bandplanData) {
|
||||
if (bandplanStripEl.classList.contains("bp-visible")) _hideBandplanStrip();
|
||||
_clearBandplanStrip(false);
|
||||
return;
|
||||
}
|
||||
|
||||
const segments = bandplanVisibleSegments(bandplanRegion, range.visLoHz, range.visHiHz);
|
||||
if (segments.length === 0) {
|
||||
if (bandplanStripEl.classList.contains("bp-visible")) _hideBandplanStrip();
|
||||
_clearBandplanStrip(true);
|
||||
return;
|
||||
}
|
||||
|
||||
bandplanStripEl.classList.add("bp-visible");
|
||||
bandplanStripEl.classList.remove("bp-empty");
|
||||
|
||||
const newKey = bandplanRegion + ":" + (bandplanShowLabels ? "L" : "N") + ":" +
|
||||
segments.map((s) => s.low_hz + "-" + s.high_hz).join(",");
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import type * as Leaflet from "leaflet";
|
||||
import { aprsSymbolSprite } from "./plugins/aprs-shared";
|
||||
|
||||
export {};
|
||||
|
||||
@@ -1979,48 +1980,43 @@ const mapWindow = window as unknown as MapWindow;
|
||||
if (aprsMap) aprsMap.invalidateSize();
|
||||
return;
|
||||
}
|
||||
// Everything below is the windowed path — the fullscreen branch returned.
|
||||
// The map tab is a whole page, so the stage fills the column down to the
|
||||
// footer. Capping it at a fraction of the viewport, or at a width-derived
|
||||
// aspect ratio, left a dead band under the map that grew with the window
|
||||
// (and on narrow screens made the map barely a third of the page).
|
||||
const mapRect = mapContainer.getBoundingClientRect();
|
||||
const width = mapContainer.clientWidth || mapRect.width;
|
||||
const footer = document.querySelector(".footer");
|
||||
let bottom = mapIsFullscreen() && stage
|
||||
? stage.getBoundingClientRect().bottom
|
||||
: window.innerHeight;
|
||||
if (!mapIsFullscreen() && footer) {
|
||||
let bottom = window.innerHeight;
|
||||
if (footer) {
|
||||
const fr = footer.getBoundingClientRect();
|
||||
if (fr.top > mapRect.top + 50) bottom = fr.top;
|
||||
// Clamped to the viewport: once the column is tall enough to push the
|
||||
// footer below the fold, growing into it would push it further still.
|
||||
if (fr.top > mapRect.top + 50) bottom = Math.min(fr.top, bottom);
|
||||
}
|
||||
const available = Math.max(0, Math.floor(bottom - mapRect.top - 8));
|
||||
const widthDriven = width > 0 ? Math.floor(width / 1.55) : available;
|
||||
const viewportCap = mapIsFullscreen()
|
||||
? Math.floor(window.innerHeight * 0.9)
|
||||
: Math.floor(window.innerHeight * 0.75);
|
||||
const minHeight = Math.min(260, available);
|
||||
const target = Math.max(minHeight, Math.min(available, viewportCap, widthDriven));
|
||||
const target = Math.max(0, Math.floor(bottom - mapRect.top - 8));
|
||||
mapContainer.style.height = `${target}px`;
|
||||
if (aprsMap) aprsMap.invalidateSize();
|
||||
}
|
||||
|
||||
function aprsSymbolIcon(symbolTable: string, symbolCode: string): Leaflet.DivIcon | null {
|
||||
if (!symbolTable || !symbolCode) return null;
|
||||
const table = symbolTable === "/" ? "primary" : "alternate";
|
||||
const sprite = aprsSymbolSprite(symbolTable, symbolCode);
|
||||
const html = sprite
|
||||
? `<div class="aprs-symbol aprs-symbol-marker ${sprite.className}" role="img"` +
|
||||
` style="background-position:${sprite.backgroundPosition}"` +
|
||||
` title="${escapeMapHtml(sprite.label)}" aria-label="${escapeMapHtml(sprite.label)}"></div>`
|
||||
: `<div class="aprs-symbol aprs-symbol-marker aprs-symbol-local" title="${symbolTable === "/" ? "primary" : "alternate"} APRS symbol ${escapeMapHtml(symbolCode)}">${escapeMapHtml(symbolCode)}</div>`;
|
||||
return L.divIcon({
|
||||
className: "",
|
||||
html: `<div class="aprs-symbol-local" title="${table} APRS symbol ${escapeMapHtml(symbolCode)}">${escapeMapHtml(symbolCode)}</div>`,
|
||||
html,
|
||||
iconSize: [24, 24],
|
||||
iconAnchor: [12, 12],
|
||||
popupAnchor: [0, -12]
|
||||
});
|
||||
}
|
||||
|
||||
mapWindow.navigateToAprsMap = function(lat, lon) {
|
||||
// Activate the map tab
|
||||
T._activeTab = "map";
|
||||
document.querySelectorAll(".tab-bar .tab").forEach((t) => { t.classList.remove("active"); });
|
||||
const mapTabBtn = document.querySelector(".tab-bar .tab[data-tab='map']");
|
||||
if (mapTabBtn) mapTabBtn.classList.add("active");
|
||||
document.querySelectorAll<HTMLElement>(".tab-panel").forEach((p) => (p.style.display = "none"));
|
||||
const mapPanel = mapEl("tab-map");
|
||||
if (mapPanel) mapPanel.style.display = "";
|
||||
function focusMapPosition(lat: number, lon: number) {
|
||||
initAprsMap();
|
||||
sizeAprsMapToViewport();
|
||||
if (aprsMap) {
|
||||
@@ -2032,20 +2028,12 @@ const mapWindow = window as unknown as MapWindow;
|
||||
});
|
||||
});
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
mapWindow.navigateToMapLocator = function(grid, preferredType = null) {
|
||||
function focusMapLocator(grid: string, preferredType: string | null = null) {
|
||||
const normalizedGrid = String(grid || "").trim().toUpperCase();
|
||||
if (!/^[A-R]{2}\d{2}(?:[A-X]{2})?$/.test(normalizedGrid)) return false;
|
||||
|
||||
T._activeTab = "map";
|
||||
document.querySelectorAll(".tab-bar .tab").forEach((t) => { t.classList.remove("active"); });
|
||||
const mapTabBtn = document.querySelector(".tab-bar .tab[data-tab='map']");
|
||||
if (mapTabBtn) mapTabBtn.classList.add("active");
|
||||
document.querySelectorAll<HTMLElement>(".tab-panel").forEach((p) => (p.style.display = "none"));
|
||||
const mapPanel = mapEl("tab-map");
|
||||
if (mapPanel) mapPanel.style.display = "";
|
||||
|
||||
initAprsMap();
|
||||
sizeAprsMapToViewport();
|
||||
if (!aprsMap) return false;
|
||||
@@ -2095,7 +2083,7 @@ const mapWindow = window as unknown as MapWindow;
|
||||
requestAnimationFrame(focusMarker);
|
||||
});
|
||||
return true;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -2806,7 +2794,7 @@ const mapWindow = window as unknown as MapWindow;
|
||||
selectedMapQsoKey = selectedMapQsoKey === entry.pathKey ? null : entry.pathKey ?? null;
|
||||
syncDecodeContactPathVisibility();
|
||||
if (selectedMapQsoKey && entry.sourceGrid) {
|
||||
mapWindow.navigateToMapLocator?.(entry.sourceGrid, entry.sourceType);
|
||||
focusMapLocator(entry.sourceGrid, entry.sourceType);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -2933,7 +2921,7 @@ const mapWindow = window as unknown as MapWindow;
|
||||
card.className = "map-qso-card";
|
||||
if (entry.grid) {
|
||||
card.addEventListener("click", () => {
|
||||
mapWindow.navigateToMapLocator?.(entry.grid ?? "", entry.sourceType);
|
||||
focusMapLocator(entry.grid ?? "", entry.sourceType);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -3059,7 +3047,7 @@ const mapWindow = window as unknown as MapWindow;
|
||||
card.className = "map-qso-card";
|
||||
if (entry.grid) {
|
||||
card.addEventListener("click", () => {
|
||||
mapWindow.navigateToMapLocator?.(entry.grid ?? "", entry.sourceType);
|
||||
focusMapLocator(entry.grid ?? "", entry.sourceType);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -3623,6 +3611,8 @@ const mapWindow = window as unknown as MapWindow;
|
||||
// Register module API for core to call
|
||||
modules.map = {
|
||||
initAprsMap,
|
||||
focusMapPosition,
|
||||
focusMapLocator,
|
||||
sizeAprsMapToViewport,
|
||||
syncAprsReceiverMarker,
|
||||
updateMapRigFilter,
|
||||
|
||||
@@ -108,8 +108,80 @@ function escapeAprsCharacter(character: string): string {
|
||||
return character;
|
||||
}
|
||||
|
||||
// The vendored sprite sheets (assets/web/vendor/aprs-symbols-24-*.png) are
|
||||
// 16x6 grids of 24px cells covering the printable codes 0x21..0x7E, so a
|
||||
// symbol's cell index is simply `code - 0x21`. The sheet URLs live in CSS so
|
||||
// the retina variants can be picked up by a media query; only the cell offsets
|
||||
// are computed here.
|
||||
const APRS_SPRITE_COLUMNS = 16;
|
||||
const APRS_SPRITE_CELL_PX = 24;
|
||||
const APRS_SPRITE_FIRST_CODE = 0x21;
|
||||
const APRS_SPRITE_LAST_CODE = 0x7e;
|
||||
|
||||
export interface AprsSymbolSprite {
|
||||
/** Sheet modifier class appended to `.aprs-symbol`. */
|
||||
className: string;
|
||||
/** `background-position` covering the overlay layer first, if any. */
|
||||
backgroundPosition: string;
|
||||
/** Human-readable description for the tooltip. */
|
||||
label: string;
|
||||
}
|
||||
|
||||
function aprsSpriteOffset(code: string): string | null {
|
||||
if (code.length !== 1) return null;
|
||||
const point = code.charCodeAt(0);
|
||||
if (point < APRS_SPRITE_FIRST_CODE || point > APRS_SPRITE_LAST_CODE) return null;
|
||||
const index = point - APRS_SPRITE_FIRST_CODE;
|
||||
const column = index % APRS_SPRITE_COLUMNS;
|
||||
const row = Math.floor(index / APRS_SPRITE_COLUMNS);
|
||||
return `${String(-column * APRS_SPRITE_CELL_PX)}px ${String(-row * APRS_SPRITE_CELL_PX)}px`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Resolve an APRS table/code pair to a sprite cell. A table identifier of `/`
|
||||
* selects the primary sheet and `\` the alternate one; any other character is
|
||||
* an overlay, which draws that character from the overlay sheet on top of the
|
||||
* alternate symbol. Returns null when the pair is outside the sprite sheets,
|
||||
* leaving callers to fall back to the raw character.
|
||||
*/
|
||||
export function aprsSymbolSprite(
|
||||
symbolTable: string | null | undefined,
|
||||
symbolCode: string | null | undefined,
|
||||
): AprsSymbolSprite | null {
|
||||
if (!symbolTable || !symbolCode) return null;
|
||||
const symbolOffset = aprsSpriteOffset(symbolCode);
|
||||
if (!symbolOffset) return null;
|
||||
if (symbolTable === "/") {
|
||||
return {
|
||||
className: "aprs-symbol-primary",
|
||||
backgroundPosition: symbolOffset,
|
||||
label: `Primary APRS symbol ${symbolTable}${symbolCode}`,
|
||||
};
|
||||
}
|
||||
if (symbolTable === "\\") {
|
||||
return {
|
||||
className: "aprs-symbol-alternate",
|
||||
backgroundPosition: symbolOffset,
|
||||
label: `Alternate APRS symbol ${symbolTable}${symbolCode}`,
|
||||
};
|
||||
}
|
||||
const overlayOffset = aprsSpriteOffset(symbolTable);
|
||||
if (!overlayOffset) return null;
|
||||
return {
|
||||
className: "aprs-symbol-overlaid",
|
||||
backgroundPosition: `${overlayOffset}, ${symbolOffset}`,
|
||||
label: `Alternate APRS symbol \\${symbolCode} with overlay ${symbolTable}`,
|
||||
};
|
||||
}
|
||||
|
||||
export function renderLocalAprsSymbol(packet: AprsPacket, escapeHtml: (value: string) => string): string {
|
||||
if (!packet.symbolTable || !packet.symbolCode) return "";
|
||||
const sprite = aprsSymbolSprite(packet.symbolTable, packet.symbolCode);
|
||||
if (sprite) {
|
||||
return `<span class="aprs-symbol ${sprite.className}" role="img"` +
|
||||
` style="background-position:${sprite.backgroundPosition}"` +
|
||||
` title="${escapeHtml(sprite.label)}" aria-label="${escapeHtml(sprite.label)}"></span>`;
|
||||
}
|
||||
const symbol = escapeHtml(packet.symbolCode);
|
||||
const table = packet.symbolTable === "/" ? "Primary" : "Alternate";
|
||||
return `<span class="aprs-symbol aprs-symbol-local" title="${table} APRS symbol ${symbol}">${symbol}</span>`;
|
||||
|
||||
@@ -456,6 +456,7 @@ function bmApply(bm: Bookmark): void {
|
||||
const modeEl = document.getElementById("mode") as HTMLSelectElement | null;
|
||||
if (modeEl) {
|
||||
modeEl.value = (bm.mode || "").toUpperCase();
|
||||
hostCore.syncModePicker();
|
||||
}
|
||||
if (bm.bandwidth_hz) {
|
||||
hostState.currentBandwidthHz = bm.bandwidth_hz;
|
||||
|
||||
@@ -59,6 +59,8 @@ export interface HostCore {
|
||||
setRigFrequency(frequencyHz: number): void;
|
||||
syncBandwidthInput(bandwidthHz: number): void;
|
||||
scheduleSpectrumDraw(): void;
|
||||
/** Repaints the mode buttons from #mode after writing to it. */
|
||||
syncModePicker(): void;
|
||||
onDecoderRegistryReady(callback: () => void): void;
|
||||
}
|
||||
|
||||
|
||||
@@ -403,7 +403,10 @@ function vchanSyncModeDisplay() {
|
||||
if (!modeEl) return;
|
||||
if (vchanIsOnVirtual()) {
|
||||
const ch = vchanActiveChannel();
|
||||
if (ch && ch.mode) modeEl.value = ch.mode.toUpperCase();
|
||||
if (ch && ch.mode) {
|
||||
modeEl.value = ch.mode.toUpperCase();
|
||||
hostCore.syncModePicker();
|
||||
}
|
||||
}
|
||||
// When on primary channel, app.js rig-state updates handle the picker.
|
||||
const modeUpper = (modeEl.value || "").toUpperCase();
|
||||
|
||||
@@ -317,7 +317,10 @@ function elementById<T extends HTMLElement>(id: string): T {
|
||||
const element = document.getElementById(id);
|
||||
if (element) body.appendChild(element);
|
||||
});
|
||||
tray.appendChild(details);
|
||||
// Ahead of the collapsibles the markup ships: the radio's own settings
|
||||
// come before audio and the scheduler, and appending would put the
|
||||
// section built here last whatever the markup says.
|
||||
tray.insertBefore(details, document.getElementById("audio-controls"));
|
||||
api.applyLayout(savedLayoutName(), { persist: false });
|
||||
}
|
||||
}
|
||||
@@ -397,31 +400,40 @@ function elementById<T extends HTMLElement>(id: string): T {
|
||||
});
|
||||
document.addEventListener("keydown", (event) => { if (event.key === "Escape") closeMenu(); });
|
||||
|
||||
// Measured against the bar, not the actions container: the actions are
|
||||
// sized by their content, so their own scrollWidth never exceeds their
|
||||
// clientWidth. A viewport-width threshold is not enough either — how much
|
||||
// fits depends on the rig name and the translated labels, so a bar that is
|
||||
// wide enough on one rig clips a control on another.
|
||||
// `bar.scrollWidth > bar.clientWidth` is true even when nothing is clipped,
|
||||
// so it cannot be the test. What actually matters is that the controls stay
|
||||
// inside the bar and the page tabs are not squeezed into a scroller: seeing
|
||||
// every tab beats keeping the style picker inline.
|
||||
// Compare natural widths against the space available. Rendered widths
|
||||
// cannot answer this: the nav has min-width 0 and scrolls, so it always
|
||||
// shrinks to the leftover space and always reports "scrolling", while the
|
||||
// bar reports overflow even when nothing is clipped. scrollWidth on a
|
||||
// scroll container is its unconstrained content width, which is what a fit
|
||||
// test needs.
|
||||
// What "fits" means, measured rather than predicted. Two things have to
|
||||
// hold: the controls stay inside the bar, and no tab reaches them. The
|
||||
// tabs are the test rather than the nav's own box because the nav may
|
||||
// shrink below its content — its box gets smaller while the tabs inside
|
||||
// keep their width and slide under the controls, so the container reports
|
||||
// nothing wrong while destinations become unclickable.
|
||||
//
|
||||
// This was an arithmetic estimate — identity + nav.scrollWidth +
|
||||
// actions.scrollWidth + a 48px allowance for the gaps — which under-counts
|
||||
// whatever the allowance does not cover. On a platform whose fonts run
|
||||
// wider than this machine's it declared a fit that overlapped by 9px, and
|
||||
// nothing degraded because nothing thought anything was wrong. Reading
|
||||
// the geometry costs a synchronous layout per step, at most five per pass,
|
||||
// and cannot disagree with what the operator sees.
|
||||
const barFits = () => {
|
||||
const bar = actions.closest<HTMLElement>(".tab-bar");
|
||||
if (!bar) return true;
|
||||
const identity = bar.querySelector<HTMLElement>(".header-main");
|
||||
const nav = bar.querySelector<HTMLElement>(".tab-bar-nav");
|
||||
const gutters = 48;
|
||||
const needed = (identity?.offsetWidth ?? 0) + (nav?.scrollWidth ?? 0) + actions.scrollWidth + gutters;
|
||||
return needed <= bar.clientWidth;
|
||||
const nav = bar?.querySelector<HTMLElement>(".tab-bar-nav");
|
||||
if (!bar || !nav) return true;
|
||||
const barRect = bar.getBoundingClientRect();
|
||||
const actionsRect = actions.getBoundingClientRect();
|
||||
if (actionsRect.right > barRect.right + 1) return false;
|
||||
const tabs = Array.from(nav.querySelectorAll<HTMLElement>(".tab"))
|
||||
.filter((tab) => tab.offsetParent !== null);
|
||||
if (!tabs.length) return true;
|
||||
const tabsRight = Math.max(...tabs.map((tab) => tab.getBoundingClientRect().right));
|
||||
return tabsRight <= actionsRect.left - 1;
|
||||
};
|
||||
const reflowOverflow = () => {
|
||||
const nav = document.querySelector<HTMLElement>(".tab-bar-nav");
|
||||
const bar = actions.closest<HTMLElement>(".tab-bar");
|
||||
// Measure from the roomiest state every time, so the decision is a
|
||||
// function of the current widths alone and cannot ratchet.
|
||||
nav?.classList.remove("nav-icons-only");
|
||||
bar?.classList.remove("bar-tight");
|
||||
overflowOrder.forEach((selector) => {
|
||||
const element = menu.querySelector<HTMLElement>(selector);
|
||||
if (element) actions.insertBefore(element, wrap);
|
||||
@@ -434,11 +446,32 @@ function elementById<T extends HTMLElement>(id: string): T {
|
||||
wrap.hidden = false;
|
||||
menu.appendChild(element);
|
||||
}
|
||||
// Last resort, once every movable control is already in the menu: drop
|
||||
// the tabs to their icons. Without it the nav — which may shrink below
|
||||
// its content — keeps its tabs at full width and runs them under the
|
||||
// controls, so the destinations nearest the controls become unclickable.
|
||||
// Icon widths are fixed, so this always buys back the labels' width.
|
||||
if (nav && !barFits()) nav.classList.add("nav-icons-only");
|
||||
// Still short with the tabs down to icons: hand the squeeze to the
|
||||
// identity block, which can ellipsise, rather than to the strip, which
|
||||
// can only clip destinations out of reach.
|
||||
if (bar && !barFits()) bar.classList.add("bar-tight");
|
||||
wrap.hidden = menu.children.length === 0;
|
||||
if (wrap.hidden) closeMenu();
|
||||
};
|
||||
reflowOverflow();
|
||||
window.addEventListener("resize", reflowOverflow);
|
||||
// A resize is not the only thing that changes what fits: the rig name
|
||||
// arrives from the server, the style picker fills in, a web font swaps in
|
||||
// wider metrics. Each changes the bar's content without touching the
|
||||
// window, and the strip stayed as it was through all of them.
|
||||
if (typeof ResizeObserver !== "undefined") {
|
||||
const bar = actions.closest<HTMLElement>(".tab-bar");
|
||||
const observer = new ResizeObserver(() => { reflowOverflow(); });
|
||||
if (bar) observer.observe(bar);
|
||||
observer.observe(actions);
|
||||
}
|
||||
document.fonts?.ready.then(() => { reflowOverflow(); }).catch(() => {});
|
||||
}
|
||||
|
||||
function installMobileMore() {
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import assert from "node:assert/strict";
|
||||
import test from "node:test";
|
||||
import vm from "node:vm";
|
||||
import { readFile } from "node:fs/promises";
|
||||
import { bundleEntry } from "./bundle-entry.mjs";
|
||||
|
||||
const sharedUrl = new URL("../src/plugins/aprs-shared.ts", import.meta.url);
|
||||
const stylePath = new URL("../../assets/web/style.css", import.meta.url);
|
||||
|
||||
async function loadShared() {
|
||||
const source = await bundleEntry(sharedUrl, "trxAprsShared");
|
||||
const context = vm.createContext({ Math, String, Number, Array, Date, Set, console });
|
||||
new vm.Script(source).runInContext(context);
|
||||
return context.trxAprsShared;
|
||||
}
|
||||
|
||||
// The sheets are 16x6 grids of 24px cells covering 0x21..0x7E, so cell index
|
||||
// is `code - 0x21`. Getting this wrong shifts every station to a neighbouring
|
||||
// icon, which is invisible in a screenshot but wrong on every packet.
|
||||
test("sprite cells are indexed from the first printable symbol code", async () => {
|
||||
const { aprsSymbolSprite } = await loadShared();
|
||||
|
||||
const first = aprsSymbolSprite("/", "!");
|
||||
assert.equal(first.className, "aprs-symbol-primary");
|
||||
assert.equal(first.backgroundPosition, "0px 0px");
|
||||
assert.equal(first.label, "Primary APRS symbol /!");
|
||||
// '>' is 0x3E -> index 29 -> column 13, row 1.
|
||||
assert.equal(aprsSymbolSprite("/", ">").backgroundPosition, "-312px -24px");
|
||||
// '~' is 0x7E -> index 93 -> the last cell of the last row.
|
||||
assert.equal(aprsSymbolSprite("/", "~").backgroundPosition, "-312px -120px");
|
||||
});
|
||||
|
||||
test("the table identifier selects the primary, alternate, or overlay sheet", async () => {
|
||||
const { aprsSymbolSprite } = await loadShared();
|
||||
|
||||
assert.equal(aprsSymbolSprite("/", "_").className, "aprs-symbol-primary");
|
||||
assert.equal(aprsSymbolSprite("\\", "_").className, "aprs-symbol-alternate");
|
||||
|
||||
// An alphanumeric table identifier is an overlay character drawn on top of
|
||||
// the alternate symbol: overlay cell first, then the symbol cell.
|
||||
const overlaid = aprsSymbolSprite("S", ">");
|
||||
assert.equal(overlaid.className, "aprs-symbol-overlaid");
|
||||
assert.equal(overlaid.backgroundPosition, "-48px -72px, -312px -24px");
|
||||
assert.equal(overlaid.label, "Alternate APRS symbol \\> with overlay S");
|
||||
});
|
||||
|
||||
test("codes outside the sprite sheets fall back to the raw character", async () => {
|
||||
const { aprsSymbolSprite, renderLocalAprsSymbol } = await loadShared();
|
||||
const escape = (value) => value;
|
||||
|
||||
assert.equal(aprsSymbolSprite("/", " "), null);
|
||||
assert.equal(aprsSymbolSprite("/", ""), null);
|
||||
assert.equal(aprsSymbolSprite("/", "ab"), null);
|
||||
assert.equal(aprsSymbolSprite(null, ">"), null);
|
||||
|
||||
assert.equal(renderLocalAprsSymbol({ symbolTable: "/", symbolCode: " " }, escape),
|
||||
'<span class="aprs-symbol aprs-symbol-local" title="Primary APRS symbol "> </span>');
|
||||
assert.equal(renderLocalAprsSymbol({}, escape), "");
|
||||
});
|
||||
|
||||
test("rendered symbols carry a sprite class and an inline cell offset", async () => {
|
||||
const { renderLocalAprsSymbol } = await loadShared();
|
||||
const html = renderLocalAprsSymbol({ symbolTable: "/", symbolCode: ">" }, (value) => value);
|
||||
|
||||
assert.match(html, /class="aprs-symbol aprs-symbol-primary"/);
|
||||
assert.match(html, /style="background-position:-312px -24px"/);
|
||||
assert.match(html, /aria-label="Primary APRS symbol \/>"/);
|
||||
assert.equal(html.includes("http"), false);
|
||||
});
|
||||
|
||||
// The cell offsets are computed in the bundles, so the sheet URLs and the grid
|
||||
// geometry have to stay in lockstep with them here.
|
||||
test("the stylesheet serves every sheet locally at the sprite geometry", async () => {
|
||||
const css = await readFile(stylePath, "utf8");
|
||||
|
||||
assert.match(css, /\.aprs-symbol\s*\{[^}]*background-size:\s*384px 144px/);
|
||||
for (const sheet of ["24-0", "24-1", "24-2", "24-0-2x", "24-1-2x", "24-2-2x"]) {
|
||||
assert.ok(css.includes(`url('/vendor/aprs-symbols-${sheet}.png')`), `missing sheet ${sheet}`);
|
||||
}
|
||||
assert.match(css, /\.aprs-symbol-overlaid\s*\{[^}]*aprs-symbols-24-2\.png'\), url\('\/vendor\/aprs-symbols-24-1\.png'\)/);
|
||||
});
|
||||
@@ -29,7 +29,7 @@ class ElementFixture {
|
||||
// Mirrors the `window.trx` host contract published by app.ts. The plugin is a
|
||||
// separate bundle, so every application service it uses arrives this way.
|
||||
function hostFixture(overrides = {}) {
|
||||
const calls = { postPath: [], setRigFrequency: [], armOptimisticFrequency: [], applyLocalTunedFrequency: [], syncBandwidthInput: [], scheduleSpectrumDraw: 0 };
|
||||
const calls = { postPath: [], setRigFrequency: [], armOptimisticFrequency: [], applyLocalTunedFrequency: [], syncBandwidthInput: [], scheduleSpectrumDraw: 0, syncModePicker: 0 };
|
||||
const state = {
|
||||
authEnabled: false,
|
||||
authRole: "control",
|
||||
@@ -50,6 +50,7 @@ function hostFixture(overrides = {}) {
|
||||
armOptimisticFrequency: (hz) => { calls.armOptimisticFrequency.push(hz); },
|
||||
syncBandwidthInput: (hz) => { calls.syncBandwidthInput.push(hz); },
|
||||
scheduleSpectrumDraw: () => { calls.scheduleSpectrumDraw += 1; },
|
||||
syncModePicker: () => { calls.syncModePicker += 1; },
|
||||
onDecoderRegistryReady: () => {},
|
||||
};
|
||||
return { window: { trx: { state, core, modules: {} }, trxUi: { confirm: async () => true } }, calls };
|
||||
|
||||
@@ -3,170 +3,18 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import assert from "node:assert/strict";
|
||||
import { readFile } from "node:fs/promises";
|
||||
import http from "node:http";
|
||||
import path from "node:path";
|
||||
import { fileURLToPath } from "node:url";
|
||||
import { chromium } from "playwright-core";
|
||||
import { startBrowser, startWebFixture } from "./web-fixture.mjs";
|
||||
|
||||
// page.evaluate callbacks run in the browser, not in this Node process.
|
||||
/* global document */
|
||||
/* global document, getComputedStyle, window, location */
|
||||
|
||||
const frontendDir = path.dirname(path.dirname(fileURLToPath(import.meta.url)));
|
||||
const webDir = path.resolve(frontendDir, "../assets/web");
|
||||
const generatedDir = path.join(webDir, "generated");
|
||||
const rigItems = ["rig-a", "rig-b"].map((remote) => ({
|
||||
remote,
|
||||
display_name: remote === "rig-a" ? "Primary fixture" : "Secondary fixture",
|
||||
manufacturer: "Smoke",
|
||||
model: "Fixture",
|
||||
supported_modes: ["FM"],
|
||||
tx: false,
|
||||
filter_controls: false,
|
||||
initialized: true,
|
||||
latitude: null,
|
||||
longitude: null,
|
||||
}));
|
||||
const rigsResponse = { rigs: rigItems, active_remote: "rig-a" };
|
||||
const selectedRigs = [];
|
||||
|
||||
const jsonRoutes = new Map([
|
||||
["/auth/session", { authenticated: true, role: "control", auth_disabled: true }],
|
||||
["/decoders", []],
|
||||
["/rigs", rigsResponse],
|
||||
["/status", {
|
||||
info: {
|
||||
manufacturer: "Smoke",
|
||||
model: "Fixture",
|
||||
revision: "1",
|
||||
access: { Tcp: { addr: "127.0.0.1:0" } },
|
||||
capabilities: {
|
||||
min_freq_step_hz: 1,
|
||||
supported_bands: [],
|
||||
supported_modes: ["FM"],
|
||||
num_vfos: 1,
|
||||
lock: false,
|
||||
lockable: false,
|
||||
attenuator: false,
|
||||
preamp: false,
|
||||
rit: false,
|
||||
rpt: false,
|
||||
split: false,
|
||||
tx: false,
|
||||
tx_limit: false,
|
||||
vfo_switch: false,
|
||||
filter_controls: false,
|
||||
signal_meter: false,
|
||||
},
|
||||
},
|
||||
status: { freq: { hz: 100_000_000 }, mode: "FM", tx_en: false, vfo: null, tx: null, rx: null, lock: null },
|
||||
band: null,
|
||||
enabled: true,
|
||||
initialized: true,
|
||||
cw_auto: false,
|
||||
cw_wpm: 20,
|
||||
cw_tone_hz: 700,
|
||||
aprs_decode_enabled: false,
|
||||
hf_aprs_decode_enabled: false,
|
||||
cw_decode_enabled: false,
|
||||
ft8_decode_enabled: false,
|
||||
ft4_decode_enabled: false,
|
||||
ft2_decode_enabled: false,
|
||||
wspr_decode_enabled: false,
|
||||
lrpt_decode_enabled: false,
|
||||
wefax_decode_enabled: false,
|
||||
recorder_enabled: false,
|
||||
clients: 1,
|
||||
rigctl_clients: 0,
|
||||
audio_clients: 0,
|
||||
active_remote: "rig-a",
|
||||
remotes: ["rig-a", "rig-b"],
|
||||
show_sdr_gain_control: false,
|
||||
initial_map_zoom: 10,
|
||||
spectrum_coverage_margin_hz: 50_000,
|
||||
spectrum_usable_span_ratio: 0.92,
|
||||
bandplan_enabled: false,
|
||||
bandplan_region: "iaru1",
|
||||
decode_history_retention_min: 1440,
|
||||
server_connected: true,
|
||||
}],
|
||||
["/bandplan.json", {}],
|
||||
["/api/recorder/status", []],
|
||||
["/api/recorder/files", []],
|
||||
]);
|
||||
|
||||
const contentTypes = new Map([
|
||||
[".css", "text/css; charset=utf-8"],
|
||||
[".html", "text/html; charset=utf-8"],
|
||||
[".js", "application/javascript; charset=utf-8"],
|
||||
[".json", "application/json; charset=utf-8"],
|
||||
[".png", "image/png"],
|
||||
[".woff2", "font/woff2"],
|
||||
]);
|
||||
|
||||
function assetPath(urlPath) {
|
||||
if (urlPath === "/") return path.join(webDir, "index.html");
|
||||
if (urlPath.startsWith("/vendor/")) return path.join(webDir, urlPath);
|
||||
const generated = path.join(generatedDir, path.basename(urlPath));
|
||||
if (urlPath.endsWith(".js")) return generated;
|
||||
return path.join(webDir, urlPath);
|
||||
}
|
||||
|
||||
const server = http.createServer(async (request, response) => {
|
||||
const url = new URL(request.url ?? "/", "http://127.0.0.1");
|
||||
if (url.pathname === "/select_rig" && request.method === "POST") {
|
||||
const remote = url.searchParams.get("remote");
|
||||
if (remote) {
|
||||
rigsResponse.active_remote = remote;
|
||||
jsonRoutes.get("/status").active_remote = remote;
|
||||
selectedRigs.push(remote);
|
||||
}
|
||||
response.writeHead(200).end();
|
||||
return;
|
||||
}
|
||||
if (jsonRoutes.has(url.pathname)) {
|
||||
response.writeHead(200, { "content-type": "application/json" });
|
||||
response.end(JSON.stringify(jsonRoutes.get(url.pathname)));
|
||||
return;
|
||||
}
|
||||
if (url.pathname === "/audio") {
|
||||
response.writeHead(404).end();
|
||||
return;
|
||||
}
|
||||
if (["/events", "/decode", "/spectrum", "/meter"].includes(url.pathname)) {
|
||||
response.writeHead(200, {
|
||||
"cache-control": "no-cache",
|
||||
connection: "keep-alive",
|
||||
"content-type": "text/event-stream",
|
||||
});
|
||||
response.write(": browser smoke stream\n\n");
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const file = assetPath(url.pathname);
|
||||
const bytes = await readFile(file);
|
||||
response.writeHead(200, {
|
||||
"content-type": contentTypes.get(path.extname(file)) ?? "application/octet-stream",
|
||||
});
|
||||
response.end(bytes);
|
||||
} catch {
|
||||
response.writeHead(404).end();
|
||||
}
|
||||
});
|
||||
|
||||
await new Promise((resolve) => server.listen(0, "127.0.0.1", resolve));
|
||||
const address = server.address();
|
||||
assert(address && typeof address === "object");
|
||||
|
||||
const executablePath = process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH
|
||||
?? "/usr/bin/chromium";
|
||||
const browser = await chromium.launch({ executablePath, headless: true, args: ["--no-sandbox"] });
|
||||
const page = await browser.newPage();
|
||||
const runtimeErrors = [];
|
||||
page.on("pageerror", (error) => runtimeErrors.push(error.stack ?? error.message));
|
||||
const fixture = await startWebFixture();
|
||||
const { selectedRigs } = fixture;
|
||||
const { browser, page, runtimeErrors } = await startBrowser(chromium);
|
||||
|
||||
try {
|
||||
await page.goto(`http://127.0.0.1:${address.port}/`, { waitUntil: "domcontentloaded" });
|
||||
await page.goto(`${fixture.origin}/`, { waitUntil: "domcontentloaded" });
|
||||
await page.waitForTimeout(500);
|
||||
assert.deepEqual(runtimeErrors, []);
|
||||
await page.locator("#content").waitFor({ state: "visible" });
|
||||
@@ -175,6 +23,130 @@ try {
|
||||
await page.locator("summary", { hasText: "Audio controls" }).click();
|
||||
assert.equal(await page.locator("#rx-audio-btn").count(), 1);
|
||||
|
||||
// Digital modes: the decoders are a list down the side, and the panel for the
|
||||
// selected one sits beside it. A horizontal strip put thirteen decoders in a
|
||||
// scroller and marked the open one with a single underline among them.
|
||||
await page.locator('.tab[data-tab="digital-modes"]').click();
|
||||
await page.locator("#tab-digital-modes").waitFor({ state: "visible" });
|
||||
await page.locator('.sub-tab[data-subtab="ft8"]').click();
|
||||
await page.waitForTimeout(250);
|
||||
const digital = await page.evaluate(() => {
|
||||
const bar = document.querySelector("#tab-digital-modes > .sub-tab-bar").getBoundingClientRect();
|
||||
const panel = document.getElementById("subtab-ft8").getBoundingClientRect();
|
||||
const shown = [...document.querySelectorAll("#tab-digital-modes > .sub-tab-panel")]
|
||||
.filter((element) => getComputedStyle(element).display !== "none")
|
||||
.map((element) => element.id);
|
||||
return {
|
||||
sidebarIsColumn: bar.height > bar.width,
|
||||
panelBesideSidebar: Math.round(panel.left) >= Math.round(bar.right),
|
||||
panelsShown: shown,
|
||||
decoders: document.querySelectorAll("#tab-digital-modes > .sub-tab-bar .sub-tab").length,
|
||||
};
|
||||
});
|
||||
assert.ok(digital.sidebarIsColumn, "the decoder list is not a sidebar");
|
||||
assert.ok(digital.panelBesideSidebar, "the decoder panel does not sit beside the sidebar");
|
||||
assert.deepEqual(digital.panelsShown, ["subtab-ft8"], `panels shown: ${JSON.stringify(digital.panelsShown)}`);
|
||||
assert.ok(digital.decoders >= 10, `only ${digital.decoders} decoders in the sidebar`);
|
||||
await page.locator('.tab[data-tab="main"]').click();
|
||||
await page.waitForTimeout(200);
|
||||
|
||||
// Map links from decode rows, before anything has opened the Map tab. The
|
||||
// lazy map module used to install these globals itself, so an AIS pin threw
|
||||
// "not a function" and an APRS link silently did nothing until the tab had
|
||||
// been visited once.
|
||||
const mapLinkReady = await page.evaluate(() => ({
|
||||
position: typeof window.navigateToAprsMap,
|
||||
locator: typeof window.navigateToMapLocator,
|
||||
mapModuleLoaded: !!window.trx.modules.map,
|
||||
}));
|
||||
assert.equal(mapLinkReady.position, "function", "navigateToAprsMap is missing before the map loads");
|
||||
assert.equal(mapLinkReady.locator, "function", "navigateToMapLocator is missing before the map loads");
|
||||
assert.equal(mapLinkReady.mapModuleLoaded, false, "the map module was already loaded, so this proves nothing");
|
||||
|
||||
await page.evaluate(() => { window.navigateToAprsMap(52.2, 21.0); });
|
||||
await page.locator("#aprs-map .leaflet-pane").first().waitFor({ state: "attached" });
|
||||
await page.waitForTimeout(500);
|
||||
const followed = await page.evaluate(() => ({
|
||||
path: location.pathname,
|
||||
active: [...document.querySelectorAll(".tab-bar .tab.active")].map((tab) => tab.dataset.tab || tab.id),
|
||||
mapHeight: Math.round(document.getElementById("aprs-map").getBoundingClientRect().height),
|
||||
}));
|
||||
assert.equal(followed.path, "/map", `the map link left the page on ${followed.path}`);
|
||||
assert.ok(followed.active.includes("map"), `the strip marks ${JSON.stringify(followed.active)}`);
|
||||
assert.ok(followed.mapHeight > 100, `the map came up ${followed.mapHeight}px tall`);
|
||||
await page.locator('.tab[data-tab="main"]').click();
|
||||
await page.waitForTimeout(200);
|
||||
|
||||
// Section order in the tray. "Advanced radio controls" is built at runtime,
|
||||
// so it lands wherever ui-core puts it rather than where the markup says —
|
||||
// appending, as it once did, always left it last.
|
||||
const sections = await page.evaluate(() =>
|
||||
[...document.querySelectorAll(".controls-tray > details")].map((section) =>
|
||||
section.querySelector("summary").textContent.trim()));
|
||||
assert.deepEqual(sections, ["Advanced radio controls", "Audio controls", "Scheduler controls"],
|
||||
`tray sections are ${JSON.stringify(sections)}`);
|
||||
|
||||
// Mode is a button group over a hidden <select>, which stays the value a
|
||||
// dozen call sites and several plugins read. The click has to reach it, and
|
||||
// the select must not take part in layout while it does.
|
||||
const modeBefore = await page.evaluate(() => ({
|
||||
buttons: document.querySelectorAll("#mode-picker button").length,
|
||||
value: document.getElementById("mode").value,
|
||||
active: document.querySelector("#mode-picker button.active")?.dataset.mode,
|
||||
}));
|
||||
assert.ok(modeBefore.buttons > 1, `mode picker rendered ${modeBefore.buttons} buttons`);
|
||||
assert.equal(modeBefore.active, modeBefore.value, "mode picker disagrees with the select");
|
||||
const target = await page.evaluate(() => {
|
||||
const other = [...document.querySelectorAll("#mode-picker button")]
|
||||
.find((btn) => btn.dataset.mode !== document.getElementById("mode").value);
|
||||
return other?.dataset.mode;
|
||||
});
|
||||
await page.locator(`#mode-picker button[data-mode="${target}"]`).click();
|
||||
await page.waitForTimeout(200);
|
||||
const modeAfter = await page.evaluate(() => ({
|
||||
value: document.getElementById("mode").value,
|
||||
active: document.querySelector("#mode-picker button.active")?.dataset.mode,
|
||||
selectWidth: Math.round(document.getElementById("mode").getBoundingClientRect().width),
|
||||
}));
|
||||
assert.equal(modeAfter.value, target, `clicking ${target} left the select at ${modeAfter.value}`);
|
||||
assert.equal(modeAfter.active, target, "the clicked mode is not the marked one");
|
||||
assert.ok(modeAfter.selectWidth <= 2, `the hidden select still occupies ${modeAfter.selectWidth}px`);
|
||||
|
||||
// Mode-specific controls live on their own row, which has to leave with them:
|
||||
// an empty one would still take a track and a gap in the tray and draw its
|
||||
// divider under the controls every rig has.
|
||||
const modeRowState = async () => page.evaluate(() => {
|
||||
const row = document.getElementById("mode-controls-row");
|
||||
return { display: getComputedStyle(row).display, height: Math.round(row.getBoundingClientRect().height) };
|
||||
});
|
||||
await page.locator('#mode-picker button[data-mode="WFM"]').click();
|
||||
await page.waitForTimeout(250);
|
||||
const withWfm = await modeRowState();
|
||||
assert.notEqual(withWfm.display, "none", "WFM controls did not bring their row up");
|
||||
assert.ok(withWfm.height > 0, `WFM row has no height (${withWfm.height}px)`);
|
||||
await page.locator('#mode-picker button[data-mode="FM"]').click();
|
||||
await page.waitForTimeout(250);
|
||||
const withoutWfm = await modeRowState();
|
||||
assert.equal(withoutWfm.display, "none", "the mode row stayed behind with nothing in it");
|
||||
|
||||
// Scheduler controls read left to right: step, hand back, then the entry on
|
||||
// air. The separator is drawn by the current-entry block, so it can only sit
|
||||
// in the right place if that block is last.
|
||||
const schedulerRow = await page.evaluate(() => [...document.querySelectorAll(".scheduler-action-row > *")]
|
||||
.map((el) => el.id || [...el.children].map((c) => c.id).join("+")));
|
||||
assert.deepEqual(schedulerRow,
|
||||
["scheduler-prev-btn+scheduler-next-btn", "scheduler-release-btn", "scheduler-cycle-status"],
|
||||
`scheduler control order is ${JSON.stringify(schedulerRow)}`);
|
||||
|
||||
// The footer status pill colours its dot from data-state, so a hint written
|
||||
// straight to textContent would leave the dot stuck on the previous state.
|
||||
const hint = await page.evaluate(() => {
|
||||
const element = document.getElementById("power-hint");
|
||||
return { state: element.dataset.state, text: element.textContent.trim() };
|
||||
});
|
||||
assert.ok(["ok", "busy", "error"].includes(hint.state), `status pill state is ${hint.state}`);
|
||||
assert.equal(hint.state, "ok", `fixture reports "${hint.text}" but the pill is ${hint.state}`);
|
||||
|
||||
const rigPicker = page.locator("#header-rig-switch-select");
|
||||
await rigPicker.locator("option").nth(1).waitFor({ state: "attached" });
|
||||
await rigPicker.selectOption("rig-b");
|
||||
@@ -184,6 +156,44 @@ try {
|
||||
await page.locator('.tab[data-tab="map"]').click();
|
||||
await page.locator("#aprs-map .leaflet-pane").first().waitFor({ state: "attached" });
|
||||
assert.equal(new URL(page.url()).pathname, "/map");
|
||||
|
||||
// The selected destination is marked by a box on all four sides, so a rule
|
||||
// that drops one edge (the mobile nav used to lose its bottom border) is a
|
||||
// regression even though the tab still reads as "active".
|
||||
const activeTab = await page.evaluate(() => {
|
||||
const style = getComputedStyle(document.querySelector(".tab-bar-nav .tab.active"));
|
||||
return ["Top", "Right", "Bottom", "Left"].map((side) => ({
|
||||
width: style.getPropertyValue(`border-${side.toLowerCase()}-width`),
|
||||
color: style.getPropertyValue(`border-${side.toLowerCase()}-color`),
|
||||
}));
|
||||
});
|
||||
for (const edge of activeTab) {
|
||||
assert.notEqual(edge.width, "0px", `active tab border: ${JSON.stringify(activeTab)}`);
|
||||
assert.ok(!/rgba\(0, 0, 0, 0\)|transparent/.test(edge.color), `active tab border: ${JSON.stringify(activeTab)}`);
|
||||
}
|
||||
|
||||
// The map is full-bleed: it breaks out of the centred .card column and
|
||||
// reaches both viewport edges, without pushing the page sideways.
|
||||
const stage = await page.evaluate(() => {
|
||||
const rect = document.getElementById("map-stage").getBoundingClientRect();
|
||||
return {
|
||||
left: Math.round(rect.left),
|
||||
right: Math.round(rect.right),
|
||||
viewport: document.documentElement.clientWidth,
|
||||
sideways: document.documentElement.scrollWidth > document.documentElement.clientWidth + 1,
|
||||
gapToFooter: Math.round(document.querySelector(".footer").getBoundingClientRect().top - rect.bottom),
|
||||
pageScrolls: document.documentElement.scrollHeight > document.documentElement.clientHeight + 1,
|
||||
};
|
||||
});
|
||||
assert.equal(stage.left, 0, `map stage starts at ${stage.left}px, not the viewport edge`);
|
||||
assert.equal(stage.right, stage.viewport, `map stage ends at ${stage.right}px, not ${stage.viewport}px`);
|
||||
assert.equal(stage.sideways, false, "full-bleed map makes the page scroll sideways");
|
||||
// ...and fills the column down to the footer. Capping the height at a
|
||||
// fraction of the viewport left a dead band that grew with the window.
|
||||
assert.ok(stage.gapToFooter <= 16,
|
||||
`${stage.gapToFooter}px of dead space between the map and the footer`);
|
||||
assert.equal(stage.pageScrolls, false, "the map grew past the viewport");
|
||||
|
||||
await page.locator('.tab[data-tab="main"]').click();
|
||||
assert.equal(new URL(page.url()).pathname, "/");
|
||||
|
||||
@@ -199,6 +209,24 @@ try {
|
||||
assert.equal(new URL(page.url()).pathname, "/");
|
||||
assert.deepEqual(runtimeErrors, []);
|
||||
|
||||
// Refreshing or deep-linking must mark the destination, not Tools. The first
|
||||
// route navigation runs while the card is still behind the loading state, so
|
||||
// a test that asked whether the tab was displayed saw "none" for every tab
|
||||
// and lit Tools up on every refresh of every page.
|
||||
for (const [route, tab, toolsLit] of [["/map", "map", false], ["/about", "about", true]]) {
|
||||
await page.goto(`${fixture.origin}${route}`, { waitUntil: "domcontentloaded" });
|
||||
await page.locator(`#tab-${tab}`).waitFor({ state: "visible" });
|
||||
const marked = await page.evaluate(() => ({
|
||||
actives: [...document.querySelectorAll(".tab-bar .tab.active")].map((t) => t.dataset.tab || t.id),
|
||||
tools: document.getElementById("mobile-more-btn").classList.contains("active"),
|
||||
}));
|
||||
assert.ok(marked.actives.includes(tab), `${route} marks ${JSON.stringify(marked.actives)}`);
|
||||
assert.equal(marked.tools, toolsLit, `${route}: Tools active is ${marked.tools}`);
|
||||
}
|
||||
await page.goto(`${fixture.origin}/`, { waitUntil: "domcontentloaded" });
|
||||
await page.locator("#tab-main").waitFor({ state: "visible" });
|
||||
assert.deepEqual(runtimeErrors, []);
|
||||
|
||||
// --- Layout regressions -------------------------------------------------
|
||||
// Every fault below shipped at some point while the rest of this file
|
||||
// passed, because nothing here looked at geometry: a header whose height
|
||||
@@ -247,7 +275,71 @@ try {
|
||||
assert.ok(menu.height > 40 && menu.width > 80, `menu rendered ${menu.width}x${menu.height}`);
|
||||
assert.ok(menu.onTop, "menu is painted underneath the page");
|
||||
|
||||
// Wider text than this machine renders. This suite passed on macOS twice
|
||||
// while CI, whose system font is wider, put the tab strip into the controls —
|
||||
// the second time by 9px at 1440px with no scaling at all, because the fit
|
||||
// test was an arithmetic estimate whose fixed allowance for the gaps did not
|
||||
// cover them at those metrics. A single scale factor cannot stand in for
|
||||
// another platform's fonts, so sweep: somewhere in this range is whatever CI
|
||||
// renders, and the strip has to hold at every step of it.
|
||||
const applyTextScale = (scale) => page.addStyleTag({ content: `
|
||||
.tab-bar .title { font-size: ${1.05 * scale}rem !important; }
|
||||
.tab-bar .subtitle { font-size: ${0.78 * scale}rem !important; }
|
||||
.tab-bar .tab { font-size: ${0.95 * scale}rem !important; }
|
||||
.tab-bar select, .tab-bar button { font-size: ${0.95 * scale}rem !important; }
|
||||
` });
|
||||
const measureBar = () => page.evaluate(() => {
|
||||
const nav = document.querySelector(".tab-bar-nav");
|
||||
const actions = document.querySelector(".top-bar-actions");
|
||||
const tabs = [...nav.querySelectorAll(".tab")].filter((tab) => tab.offsetParent !== null);
|
||||
return {
|
||||
overlap: Math.round(Math.max(...tabs.map((tab) => tab.getBoundingClientRect().right))
|
||||
- actions.getBoundingClientRect().left),
|
||||
iconsOnly: nav.classList.contains("nav-icons-only"),
|
||||
};
|
||||
});
|
||||
|
||||
for (const scale of [1.0, 1.15, 1.3, 1.5, 1.75, 2.0]) {
|
||||
await applyTextScale(scale);
|
||||
// 1100px is the narrowest bar in the app: the bookmark gutters take 9.5rem
|
||||
// a side above that width, leaving less room than 900px has.
|
||||
for (const width of [1440, 1280, 1100, 900]) {
|
||||
await page.setViewportSize({ width, height: 900 });
|
||||
await page.waitForTimeout(120);
|
||||
const crowded = await measureBar();
|
||||
assert.ok(crowded.overlap <= 0,
|
||||
`at ${scale}x text the tab strip overlaps the controls by ${crowded.overlap}px at ${width}px`);
|
||||
}
|
||||
}
|
||||
|
||||
// A station name long enough that the bar cannot hold it, which is the rung
|
||||
// below icons: the identity has to give, not the strip.
|
||||
await page.evaluate(() => {
|
||||
document.getElementById("rig-subtitle").textContent =
|
||||
"Rig: Shack SDR — RTL-SDR v4 on the attic dipole, north-west";
|
||||
});
|
||||
await applyTextScale(1.6);
|
||||
for (const width of [1440, 1100]) {
|
||||
await page.setViewportSize({ width, height: 900 });
|
||||
await page.waitForTimeout(200);
|
||||
const crowded = await measureBar();
|
||||
assert.ok(crowded.overlap <= 0,
|
||||
`with a long station name the tab strip overlaps the controls by ${crowded.overlap}px at ${width}px`);
|
||||
}
|
||||
|
||||
// ...and when the text changes under a bar that is not resized. The rig name
|
||||
// arrives from the server, a web font swaps in: neither is a window resize,
|
||||
// and the strip used to sit there as it was.
|
||||
await page.setViewportSize({ width: 1440, height: 900 });
|
||||
await page.waitForTimeout(200);
|
||||
await applyTextScale(2.4);
|
||||
await page.waitForTimeout(400);
|
||||
const unresized = await measureBar();
|
||||
assert.ok(unresized.overlap <= 0,
|
||||
`text grew without a resize and the strip overlaps by ${unresized.overlap}px`);
|
||||
assert.equal(unresized.iconsOnly, true, "the strip kept its labels with no room for them");
|
||||
|
||||
} finally {
|
||||
await browser.close();
|
||||
await new Promise((resolve, reject) => server.close((error) => error ? reject(error) : resolve()));
|
||||
await fixture.close();
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
import { build } from "esbuild";
|
||||
|
||||
export async function bundleEntry(entryUrl) {
|
||||
export async function bundleEntry(entryUrl, globalName) {
|
||||
const result = await build({
|
||||
entryPoints: [entryUrl.pathname],
|
||||
bundle: true,
|
||||
@@ -12,6 +12,7 @@ export async function bundleEntry(entryUrl) {
|
||||
platform: "browser",
|
||||
target: "es2022",
|
||||
write: false,
|
||||
...(globalName ? { globalName } : {}),
|
||||
});
|
||||
const output = result.outputFiles[0];
|
||||
if (!output) throw new Error(`No bundle output for ${entryUrl.pathname}`);
|
||||
|
||||
@@ -57,6 +57,7 @@ export function createHost({ state = {}, core = {}, modules = {} } = {}) {
|
||||
setRigFrequency: record("setRigFrequency"),
|
||||
syncBandwidthInput: record("syncBandwidthInput"),
|
||||
scheduleSpectrumDraw: record("scheduleSpectrumDraw"),
|
||||
syncModePicker: record("syncModePicker"),
|
||||
onDecoderRegistryReady: record("onDecoderRegistryReady"),
|
||||
...core,
|
||||
},
|
||||
|
||||
@@ -0,0 +1,224 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
// Geometry of the spectrum area while tuning. Everything above the spectrum is
|
||||
// driven by what happens to be in the visible range — band plan allocations,
|
||||
// bookmarks — and the strips that show them used to appear and disappear with
|
||||
// it, so tuning across a band edge moved the whole page under the operator's
|
||||
// cursor. Nothing else in the suite serves a rig with a spectrum.
|
||||
|
||||
import assert from "node:assert/strict";
|
||||
import { chromium } from "playwright-core";
|
||||
import { startBrowser, startWebFixture } from "./web-fixture.mjs";
|
||||
|
||||
/* global document, getComputedStyle */
|
||||
|
||||
const BOOKMARKS = [
|
||||
{ id: "b1", name: "40m FT8", freq_hz: 7074000, mode: "DIG", category: "Digital", comment: "", locator: "" },
|
||||
{ id: "b2", name: "40m CW", freq_hz: 7030000, mode: "CW", category: "", comment: "", locator: "" },
|
||||
];
|
||||
const BANDPLAN = {
|
||||
iaru1: {
|
||||
bands: [{
|
||||
name: "40m",
|
||||
low_hz: 7000000,
|
||||
high_hz: 7200000,
|
||||
segments: [
|
||||
{ low_hz: 7000000, high_hz: 7040000, mode: "CW", label: "CW" },
|
||||
{ low_hz: 7040000, high_hz: 7200000, mode: "All", label: "All modes" },
|
||||
],
|
||||
}],
|
||||
},
|
||||
};
|
||||
// 40m has both bookmarks and allocations; 20m has neither.
|
||||
const BAND_WITH_CONTENT = 7074000;
|
||||
const BAND_WITHOUT_CONTENT = 14074000;
|
||||
|
||||
// The meter sits well away from the spectrum's noise floor, so a squelch that
|
||||
// took its level from the plot would land somewhere else entirely.
|
||||
const METER_DB = -70;
|
||||
|
||||
const fixture = await startWebFixture({
|
||||
spectrum: true,
|
||||
bookmarks: BOOKMARKS,
|
||||
bandplan: BANDPLAN,
|
||||
bandplanEnabled: true,
|
||||
meterDb: METER_DB,
|
||||
});
|
||||
const { browser, page, runtimeErrors } = await startBrowser(chromium);
|
||||
|
||||
function readGeometry() {
|
||||
const top = (selector) => {
|
||||
const el = document.querySelector(selector);
|
||||
return el ? Math.round(el.getBoundingClientRect().top) : null;
|
||||
};
|
||||
const axis = document.getElementById("spectrum-bookmark-axis");
|
||||
const strip = document.getElementById("spectrum-bandplan-strip");
|
||||
return {
|
||||
chips: axis.querySelectorAll(".spectrum-bookmark-chip").length,
|
||||
axisEmpty: axis.classList.contains("bm-axis-empty"),
|
||||
stripReserved: strip.classList.contains("bp-visible"),
|
||||
stripEmpty: strip.classList.contains("bp-empty"),
|
||||
overviewTop: top(".overview-strip"),
|
||||
spectrumTop: top("#spectrum-panel"),
|
||||
controlsTop: top(".controls-row"),
|
||||
footerTop: top(".footer"),
|
||||
docHeight: document.documentElement.scrollHeight,
|
||||
};
|
||||
}
|
||||
|
||||
const layoutOf = (geometry) => ({
|
||||
overviewTop: geometry.overviewTop,
|
||||
spectrumTop: geometry.spectrumTop,
|
||||
controlsTop: geometry.controlsTop,
|
||||
footerTop: geometry.footerTop,
|
||||
docHeight: geometry.docHeight,
|
||||
});
|
||||
|
||||
async function tuneTo(hz) {
|
||||
fixture.setCenterHz(hz);
|
||||
await page.waitForTimeout(900);
|
||||
return page.evaluate(readGeometry);
|
||||
}
|
||||
|
||||
try {
|
||||
await page.setViewportSize({ width: 1600, height: 950 });
|
||||
await page.goto(fixture.origin, { waitUntil: "domcontentloaded" });
|
||||
await page.locator("#content").waitFor({ state: "visible" });
|
||||
await page.locator("#spectrum-panel").waitFor({ state: "visible" });
|
||||
await page.waitForTimeout(1500);
|
||||
|
||||
const populated = await tuneTo(BAND_WITH_CONTENT);
|
||||
assert.equal(populated.chips, BOOKMARKS.length, `expected both bookmarks, saw ${populated.chips}`);
|
||||
assert.equal(populated.axisEmpty, false, "bookmark rail claims to be empty with chips in it");
|
||||
assert.equal(populated.stripReserved, true, "band plan strip is missing on a band with allocations");
|
||||
assert.equal(populated.stripEmpty, false, "band plan strip claims to be empty with segments in it");
|
||||
|
||||
const bare = await tuneTo(BAND_WITHOUT_CONTENT);
|
||||
assert.equal(bare.chips, 0, `expected no bookmarks on ${BAND_WITHOUT_CONTENT}Hz, saw ${bare.chips}`);
|
||||
assert.equal(bare.axisEmpty, true, "bookmark rail should show its placeholder");
|
||||
assert.equal(bare.stripReserved, true, "band plan strip gave its height back");
|
||||
assert.equal(bare.stripEmpty, true, "band plan strip should be marked empty");
|
||||
|
||||
// The point of both placeholders: tuning must not move anything.
|
||||
assert.deepEqual(layoutOf(bare), layoutOf(populated),
|
||||
`tuning off the band moved the page: ${JSON.stringify(populated)} -> ${JSON.stringify(bare)}`);
|
||||
|
||||
const back = await tuneTo(BAND_WITH_CONTENT);
|
||||
assert.equal(back.chips, BOOKMARKS.length, "bookmarks did not come back");
|
||||
assert.deepEqual(layoutOf(back), layoutOf(populated), "tuning back moved the page");
|
||||
|
||||
// The rail covers the top of the overview, so only the chips may take
|
||||
// pointer events — the rest has to fall through to the plot behind it.
|
||||
const hits = await page.evaluate(() => {
|
||||
const chip = document.querySelector("#spectrum-bookmark-axis .spectrum-bookmark-chip");
|
||||
const chipRect = chip.getBoundingClientRect();
|
||||
const axisRect = document.getElementById("spectrum-bookmark-axis").getBoundingClientRect();
|
||||
const onChip = document.elementFromPoint(chipRect.left + chipRect.width / 2, chipRect.top + chipRect.height / 2);
|
||||
const besideChip = document.elementFromPoint(axisRect.right - 30, axisRect.top + 10);
|
||||
return {
|
||||
chip: onChip?.closest(".spectrum-bookmark-chip") ? "chip" : (onChip?.id || onChip?.tagName),
|
||||
besideChip: besideChip?.id || besideChip?.tagName,
|
||||
};
|
||||
});
|
||||
assert.equal(hits.chip, "chip", `chip is not clickable, hit ${hits.chip}`);
|
||||
assert.equal(hits.besideChip, "overview-canvas", `rail swallows events, hit ${hits.besideChip}`);
|
||||
|
||||
// Squelch: the threshold is in the dB the spectrum axis is labelled in, so the
|
||||
// line is the control. It used to be a percentage on a slider in the audio
|
||||
// row, with nothing on screen to relate the number to.
|
||||
await page.locator("summary", { hasText: "Audio controls" }).click();
|
||||
await page.locator("#sdr-squelch-toggle").click();
|
||||
// Auto parks it just above the noise the meter reports — not above the
|
||||
// spectrum's noise floor, which sits anywhere from 1 dB below to 22 dB above
|
||||
// the meter depending on span, bandwidth and decimation.
|
||||
await page.locator("#sdr-squelch-auto").click();
|
||||
await page.waitForTimeout(400);
|
||||
const auto = await page.evaluate(() => Number(document.getElementById("sdr-squelch-db").value));
|
||||
assert.ok(Math.abs(auto - (METER_DB + 5)) <= 1,
|
||||
`auto put the threshold at ${auto} dB with the meter at ${METER_DB} dB`);
|
||||
const squelchOn = await page.evaluate(() => {
|
||||
const line = document.getElementById("spectrum-squelch-line");
|
||||
return {
|
||||
shown: getComputedStyle(line).display !== "none",
|
||||
db: Number(document.getElementById("sdr-squelch-db").value),
|
||||
label: Number(document.getElementById("spectrum-squelch-label").textContent),
|
||||
toggle: document.getElementById("sdr-squelch-toggle").getAttribute("aria-pressed"),
|
||||
top: Math.round(line.getBoundingClientRect().top),
|
||||
};
|
||||
});
|
||||
assert.equal(squelchOn.shown, true, "the threshold line did not appear with the squelch on");
|
||||
assert.equal(squelchOn.toggle, "true", "the SQL switch did not follow the squelch state");
|
||||
assert.equal(squelchOn.label, squelchOn.db, "the line and the readout disagree on the threshold");
|
||||
|
||||
// Dragging the line down lowers the threshold and tells the server.
|
||||
const submitted = [];
|
||||
page.on("request", (request) => {
|
||||
if (request.url().includes("/set_sdr_squelch")) {
|
||||
submitted.push(Number(new URL(request.url()).searchParams.get("threshold_db")));
|
||||
}
|
||||
});
|
||||
const grip = await page.locator("#spectrum-squelch-grip").boundingBox();
|
||||
await page.mouse.move(grip.x + grip.width / 2, grip.y + grip.height / 2);
|
||||
await page.mouse.down();
|
||||
await page.mouse.move(grip.x + grip.width / 2, grip.y + grip.height / 2 + 60, { steps: 8 });
|
||||
await page.mouse.up();
|
||||
await page.waitForTimeout(400);
|
||||
const dragged = await page.evaluate(() => ({
|
||||
db: Number(document.getElementById("sdr-squelch-db").value),
|
||||
label: Number(document.getElementById("spectrum-squelch-label").textContent),
|
||||
top: Math.round(document.getElementById("spectrum-squelch-line").getBoundingClientRect().top),
|
||||
}));
|
||||
assert.ok(dragged.db < squelchOn.db,
|
||||
`dragging down left the threshold at ${dragged.db} dB (was ${squelchOn.db})`);
|
||||
assert.equal(dragged.label, dragged.db, "the line label did not follow the drag");
|
||||
assert.ok(dragged.top > squelchOn.top, "the line did not move with the drag");
|
||||
assert.ok(submitted.includes(dragged.db),
|
||||
`the server was never told about ${dragged.db} dB (saw ${JSON.stringify(submitted)})`);
|
||||
|
||||
// Turning it off leaves the threshold alone — the old control conflated the
|
||||
// two, so dropping to zero to listen threw the setting away.
|
||||
await page.locator("#sdr-squelch-toggle").click();
|
||||
await page.waitForTimeout(300);
|
||||
const squelchOff = await page.evaluate(() => ({
|
||||
db: Number(document.getElementById("sdr-squelch-db").value),
|
||||
shown: getComputedStyle(document.getElementById("spectrum-squelch-line")).display !== "none",
|
||||
dot: document.getElementById("sdr-squelch-state").dataset.state,
|
||||
}));
|
||||
assert.equal(squelchOff.db, dragged.db, "turning the squelch off discarded the threshold");
|
||||
assert.equal(squelchOff.shown, false, "the line stayed up with the squelch off");
|
||||
assert.equal(squelchOff.dot, "off", "the indicator did not follow the squelch off");
|
||||
|
||||
assert.deepEqual(runtimeErrors, []);
|
||||
} finally {
|
||||
await browser.close();
|
||||
await fixture.close();
|
||||
}
|
||||
|
||||
// The band plan is fetched once at startup, which can land before the session
|
||||
// exists. It used to fail silently and never retry, so the allocations only
|
||||
// turned up if the operator reloaded the page by hand.
|
||||
const retryFixture = await startWebFixture({
|
||||
spectrum: true,
|
||||
bandplan: BANDPLAN,
|
||||
bandplanEnabled: true,
|
||||
bandplanUnauthorizedFirst: true,
|
||||
});
|
||||
const retry = await startBrowser(chromium);
|
||||
try {
|
||||
await retry.page.setViewportSize({ width: 1600, height: 950 });
|
||||
await retry.page.goto(retryFixture.origin, { waitUntil: "domcontentloaded" });
|
||||
await retry.page.locator("#spectrum-panel").waitFor({ state: "visible" });
|
||||
await retry.page.waitForTimeout(2000);
|
||||
const strip = await retry.page.evaluate(() => {
|
||||
const element = document.getElementById("spectrum-bandplan-strip");
|
||||
return { segments: element.children.length, empty: element.classList.contains("bp-empty") };
|
||||
});
|
||||
assert.ok(strip.segments > 0,
|
||||
"the band plan never arrived after its first request was refused");
|
||||
assert.equal(strip.empty, false, "the strip is still showing its placeholder");
|
||||
} finally {
|
||||
await retry.browser.close();
|
||||
await retryFixture.close();
|
||||
}
|
||||
@@ -0,0 +1,277 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
// The static server the browser tests load the real web assets from. It was
|
||||
// inline in browser-smoke.mjs until a second browser test needed a rig with a
|
||||
// spectrum: the interesting layout lives in the spectrum area, and none of it
|
||||
// could be exercised while the only fixture served a CAT-only rig.
|
||||
|
||||
import { readFile } from "node:fs/promises";
|
||||
import http from "node:http";
|
||||
import path from "node:path";
|
||||
import { fileURLToPath } from "node:url";
|
||||
|
||||
const frontendDir = path.dirname(path.dirname(fileURLToPath(import.meta.url)));
|
||||
const webDir = path.resolve(frontendDir, "../assets/web");
|
||||
const generatedDir = path.join(webDir, "generated");
|
||||
|
||||
// A realistic decoder registry. Serving an empty one hid most of the
|
||||
// application from this test: the decoder sub-tabs, their panels, the decode
|
||||
// toggles and the bookmark decoder checkboxes are all built from it, so with
|
||||
// no decoders only three of thirteen sub-tabs existed and none of the decoder
|
||||
// UI was ever constructed.
|
||||
const DECODER_REGISTRY = [
|
||||
{ id: "ft8", label: "FT8", activation: "toggle", active_modes: ["USB"] },
|
||||
{ id: "ft4", label: "FT4", activation: "toggle", active_modes: ["USB"] },
|
||||
{ id: "ft2", label: "FT2", activation: "toggle", active_modes: ["USB"] },
|
||||
{ id: "wspr", label: "WSPR", activation: "toggle", active_modes: ["USB"] },
|
||||
{ id: "cw", label: "CW", activation: "toggle", active_modes: ["CW", "CWR"] },
|
||||
{ id: "sat", label: "SAT", activation: "toggle", active_modes: ["FM"] },
|
||||
{ id: "wefax", label: "WEFAX", activation: "toggle", active_modes: ["USB"] },
|
||||
{ id: "ais", label: "AIS", activation: "toggle", active_modes: ["FM"] },
|
||||
{ id: "aprs", label: "APRS", activation: "toggle", active_modes: ["FM"] },
|
||||
{ id: "hf-aprs", label: "HF APRS", activation: "toggle", active_modes: ["USB"] },
|
||||
{ id: "vdes", label: "VDES", activation: "toggle", active_modes: ["FM"] },
|
||||
].map((decoder) => ({ ...decoder, background_decode: false, bookmark_selectable: true }));
|
||||
|
||||
const CONTENT_TYPES = new Map([
|
||||
[".css", "text/css; charset=utf-8"],
|
||||
[".html", "text/html; charset=utf-8"],
|
||||
[".js", "application/javascript; charset=utf-8"],
|
||||
[".json", "application/json; charset=utf-8"],
|
||||
[".png", "image/png"],
|
||||
[".woff2", "font/woff2"],
|
||||
]);
|
||||
|
||||
function assetPath(urlPath) {
|
||||
// Every tab route has its own index handler on the server (see api/assets.rs),
|
||||
// so a deep link or a refresh serves the SPA shell, not a 404.
|
||||
if (!path.extname(urlPath)) return path.join(webDir, "index.html");
|
||||
if (urlPath.startsWith("/vendor/")) return path.join(webDir, urlPath);
|
||||
const generated = path.join(generatedDir, path.basename(urlPath));
|
||||
if (urlPath.endsWith(".js")) return generated;
|
||||
return path.join(webDir, urlPath);
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts the fixture server.
|
||||
*
|
||||
* `spectrum` turns the rig into an SDR: `filter_controls` is what gates the
|
||||
* spectrum panel, and frames are pushed on the /spectrum stream from a centre
|
||||
* frequency the test moves with `setCenterHz` to simulate tuning across bands.
|
||||
*/
|
||||
export async function startWebFixture({
|
||||
spectrum = false,
|
||||
tx = false,
|
||||
meterDb = -70,
|
||||
bookmarks = [],
|
||||
bandplan = {},
|
||||
bandplanEnabled = false,
|
||||
bandplanUnauthorizedFirst = false,
|
||||
} = {}) {
|
||||
const rigItems = ["rig-a", "rig-b"].map((remote) => ({
|
||||
remote,
|
||||
display_name: remote === "rig-a" ? "Primary fixture" : "Secondary fixture",
|
||||
manufacturer: "Smoke",
|
||||
model: "Fixture",
|
||||
supported_modes: ["FM"],
|
||||
tx,
|
||||
filter_controls: spectrum,
|
||||
initialized: true,
|
||||
latitude: null,
|
||||
longitude: null,
|
||||
}));
|
||||
const rigsResponse = { rigs: rigItems, active_remote: "rig-a" };
|
||||
const selectedRigs = [];
|
||||
const state = { centerHz: 7074000 };
|
||||
let bandplanServed = false;
|
||||
|
||||
const status = {
|
||||
info: {
|
||||
manufacturer: "Smoke",
|
||||
model: "Fixture",
|
||||
revision: "1",
|
||||
access: { Tcp: { addr: "127.0.0.1:0" } },
|
||||
capabilities: {
|
||||
min_freq_step_hz: 1,
|
||||
supported_bands: [],
|
||||
supported_modes: ["LSB", "USB", "CW", "CWR", "AM", "SAM", "WFM", "FM", "AIS", "VDES", "DIG", "PKT"],
|
||||
num_vfos: 1,
|
||||
lock: false,
|
||||
lockable: tx,
|
||||
attenuator: false,
|
||||
preamp: false,
|
||||
rit: false,
|
||||
rpt: false,
|
||||
split: false,
|
||||
tx,
|
||||
tx_limit: tx,
|
||||
vfo_switch: false,
|
||||
filter_controls: spectrum,
|
||||
signal_meter: spectrum,
|
||||
},
|
||||
},
|
||||
status: { freq: { hz: 100_000_000 }, mode: "FM", tx_en: false, vfo: null, tx: null, rx: { sig: meterDb }, lock: null },
|
||||
// Reported only by SDR backends, and what makes the client show the
|
||||
// squelch control at all.
|
||||
filter: spectrum
|
||||
? {
|
||||
bandwidth_hz: 12_000,
|
||||
sdr_squelch_enabled: false,
|
||||
sdr_squelch_threshold_db: -95,
|
||||
sdr_agc_enabled: false,
|
||||
}
|
||||
: null,
|
||||
band: null,
|
||||
enabled: true,
|
||||
initialized: true,
|
||||
cw_auto: false,
|
||||
cw_wpm: 20,
|
||||
cw_tone_hz: 700,
|
||||
aprs_decode_enabled: false,
|
||||
hf_aprs_decode_enabled: false,
|
||||
cw_decode_enabled: false,
|
||||
ft8_decode_enabled: false,
|
||||
ft4_decode_enabled: false,
|
||||
ft2_decode_enabled: false,
|
||||
wspr_decode_enabled: false,
|
||||
lrpt_decode_enabled: false,
|
||||
wefax_decode_enabled: false,
|
||||
recorder_enabled: false,
|
||||
clients: 1,
|
||||
rigctl_clients: 0,
|
||||
audio_clients: 0,
|
||||
active_remote: "rig-a",
|
||||
remotes: ["rig-a", "rig-b"],
|
||||
show_sdr_gain_control: false,
|
||||
initial_map_zoom: 10,
|
||||
spectrum_coverage_margin_hz: 50_000,
|
||||
spectrum_usable_span_ratio: 0.92,
|
||||
bandplan_enabled: bandplanEnabled,
|
||||
bandplan_region: "iaru1",
|
||||
decode_history_retention_min: 1440,
|
||||
server_connected: true,
|
||||
};
|
||||
|
||||
const jsonRoutes = new Map([
|
||||
["/auth/session", { authenticated: true, role: "control", auth_disabled: true }],
|
||||
["/decoders", DECODER_REGISTRY],
|
||||
["/rigs", rigsResponse],
|
||||
["/status", status],
|
||||
["/bookmarks", bookmarks],
|
||||
["/bandplan.json", bandplan],
|
||||
["/api/recorder/status", []],
|
||||
["/api/recorder/files", []],
|
||||
]);
|
||||
|
||||
// Flat i8 bins: the shape does not matter, only that frames arrive so the
|
||||
// page has a spectrum range to place bookmarks and allocations against.
|
||||
const spectrumBins = Buffer.alloc(512, 200);
|
||||
const spectrumB64 = spectrumBins.toString("base64");
|
||||
|
||||
const server = http.createServer(async (request, response) => {
|
||||
const url = new URL(request.url ?? "/", "http://127.0.0.1");
|
||||
if (url.pathname === "/select_rig" && request.method === "POST") {
|
||||
const remote = url.searchParams.get("remote");
|
||||
if (remote) {
|
||||
rigsResponse.active_remote = remote;
|
||||
status.active_remote = remote;
|
||||
selectedRigs.push(remote);
|
||||
}
|
||||
response.writeHead(200).end();
|
||||
return;
|
||||
}
|
||||
// Rejects the first band plan request the way the server did before it was
|
||||
// classified as a public asset: the page asks for it at startup, which can
|
||||
// land before the session exists.
|
||||
if (bandplanUnauthorizedFirst && url.pathname === "/bandplan.json" && !bandplanServed) {
|
||||
bandplanServed = true;
|
||||
response.writeHead(401).end();
|
||||
return;
|
||||
}
|
||||
if (jsonRoutes.has(url.pathname)) {
|
||||
response.writeHead(200, { "content-type": "application/json" });
|
||||
response.end(JSON.stringify(jsonRoutes.get(url.pathname)));
|
||||
return;
|
||||
}
|
||||
// 200 means "audio is configured": the client hides the whole audio row —
|
||||
// and the squelch control with it — when this 404s.
|
||||
if (url.pathname === "/audio") {
|
||||
response.writeHead(200, { "content-type": "application/json" });
|
||||
response.end(JSON.stringify({ sample_rate: 48_000, channels: 1 }));
|
||||
return;
|
||||
}
|
||||
if (spectrum && url.pathname === "/spectrum") {
|
||||
response.writeHead(200, {
|
||||
"cache-control": "no-cache",
|
||||
connection: "keep-alive",
|
||||
"content-type": "text/event-stream",
|
||||
});
|
||||
const timer = setInterval(() => {
|
||||
response.write(`event: b\ndata: ${state.centerHz},192000,${spectrumB64}\n\n`);
|
||||
}, 100);
|
||||
request.on("close", () => clearInterval(timer));
|
||||
return;
|
||||
}
|
||||
// The meter streams like the server's does: the squelch reads its noise
|
||||
// level from here, so a static snapshot would leave it nothing to measure.
|
||||
if (url.pathname === "/meter") {
|
||||
response.writeHead(200, {
|
||||
"cache-control": "no-cache",
|
||||
connection: "keep-alive",
|
||||
"content-type": "text/event-stream",
|
||||
});
|
||||
const timer = setInterval(() => {
|
||||
response.write(`data: ${JSON.stringify({ sig: meterDb })}\n\n`);
|
||||
}, 120);
|
||||
request.on("close", () => clearInterval(timer));
|
||||
return;
|
||||
}
|
||||
if (["/events", "/decode", "/spectrum", "/meter"].includes(url.pathname)) {
|
||||
response.writeHead(200, {
|
||||
"cache-control": "no-cache",
|
||||
connection: "keep-alive",
|
||||
"content-type": "text/event-stream",
|
||||
});
|
||||
response.write(": browser smoke stream\n\n");
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const file = assetPath(url.pathname);
|
||||
const bytes = await readFile(file);
|
||||
response.writeHead(200, {
|
||||
"content-type": CONTENT_TYPES.get(path.extname(file)) ?? "application/octet-stream",
|
||||
});
|
||||
response.end(bytes);
|
||||
} catch {
|
||||
response.writeHead(404).end();
|
||||
}
|
||||
});
|
||||
|
||||
await new Promise((resolve) => server.listen(0, "127.0.0.1", resolve));
|
||||
const address = server.address();
|
||||
if (!address || typeof address !== "object") throw new Error("fixture server has no port");
|
||||
|
||||
return {
|
||||
origin: `http://127.0.0.1:${address.port}`,
|
||||
selectedRigs,
|
||||
rigsResponse,
|
||||
/** Moves the spectrum centre, i.e. tunes the fixture rig to another band. */
|
||||
setCenterHz(hz) { state.centerHz = hz; },
|
||||
close() {
|
||||
return new Promise((resolve, reject) => server.close((error) => error ? reject(error) : resolve()));
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
/** Launches headless Chromium and records any uncaught page error. */
|
||||
export async function startBrowser(chromium) {
|
||||
const executablePath = process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH
|
||||
?? "/usr/bin/chromium";
|
||||
const browser = await chromium.launch({ executablePath, headless: true, args: ["--no-sandbox"] });
|
||||
const page = await browser.newPage();
|
||||
const runtimeErrors = [];
|
||||
page.on("pageerror", (error) => runtimeErrors.push(error.stack ?? error.message));
|
||||
return { browser, page, runtimeErrors };
|
||||
}
|
||||
@@ -279,6 +279,47 @@ pub(crate) async fn leaflet_layers_2x() -> impl Responder {
|
||||
.body(status::LEAFLET_LAYERS_2X)
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Vendored APRS symbol sprites
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
fn embedded_png(bytes: &'static [u8]) -> HttpResponse {
|
||||
HttpResponse::Ok()
|
||||
.insert_header((header::CONTENT_TYPE, "image/png"))
|
||||
.insert_header((header::CACHE_CONTROL, "public, max-age=604800, immutable"))
|
||||
.body(bytes)
|
||||
}
|
||||
|
||||
#[get("/vendor/aprs-symbols-24-0.png")]
|
||||
pub(crate) async fn aprs_symbols_primary() -> impl Responder {
|
||||
embedded_png(status::APRS_SYMBOLS_PRIMARY)
|
||||
}
|
||||
|
||||
#[get("/vendor/aprs-symbols-24-0-2x.png")]
|
||||
pub(crate) async fn aprs_symbols_primary_2x() -> impl Responder {
|
||||
embedded_png(status::APRS_SYMBOLS_PRIMARY_2X)
|
||||
}
|
||||
|
||||
#[get("/vendor/aprs-symbols-24-1.png")]
|
||||
pub(crate) async fn aprs_symbols_alternate() -> impl Responder {
|
||||
embedded_png(status::APRS_SYMBOLS_ALTERNATE)
|
||||
}
|
||||
|
||||
#[get("/vendor/aprs-symbols-24-1-2x.png")]
|
||||
pub(crate) async fn aprs_symbols_alternate_2x() -> impl Responder {
|
||||
embedded_png(status::APRS_SYMBOLS_ALTERNATE_2X)
|
||||
}
|
||||
|
||||
#[get("/vendor/aprs-symbols-24-2.png")]
|
||||
pub(crate) async fn aprs_symbols_overlay() -> impl Responder {
|
||||
embedded_png(status::APRS_SYMBOLS_OVERLAY)
|
||||
}
|
||||
|
||||
#[get("/vendor/aprs-symbols-24-2-2x.png")]
|
||||
pub(crate) async fn aprs_symbols_overlay_2x() -> impl Responder {
|
||||
embedded_png(status::APRS_SYMBOLS_OVERLAY_2X)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
@@ -307,4 +348,41 @@ mod tests {
|
||||
);
|
||||
assert_eq!(generated_content_type("secret.txt"), None);
|
||||
}
|
||||
|
||||
/// Reads the width and height out of a PNG IHDR chunk.
|
||||
fn png_dimensions(bytes: &[u8]) -> (u32, u32) {
|
||||
assert_eq!(&bytes[..8], b"\x89PNG\r\n\x1a\n", "not a PNG");
|
||||
assert_eq!(&bytes[12..16], b"IHDR", "first chunk is not IHDR");
|
||||
let width = u32::from_be_bytes(bytes[16..20].try_into().expect("IHDR width"));
|
||||
let height = u32::from_be_bytes(bytes[20..24].try_into().expect("IHDR height"));
|
||||
(width, height)
|
||||
}
|
||||
|
||||
/// The browser computes sprite cell offsets from a 16x6 grid of 24px cells,
|
||||
/// so a sheet at any other size would silently shift every APRS symbol.
|
||||
#[test]
|
||||
fn aprs_symbol_sheets_match_the_sprite_grid_the_frontend_assumes() {
|
||||
for (name, bytes) in [
|
||||
("aprs-symbols-24-0", status::APRS_SYMBOLS_PRIMARY),
|
||||
("aprs-symbols-24-1", status::APRS_SYMBOLS_ALTERNATE),
|
||||
("aprs-symbols-24-2", status::APRS_SYMBOLS_OVERLAY),
|
||||
] {
|
||||
assert_eq!(
|
||||
png_dimensions(bytes),
|
||||
(384, 144),
|
||||
"{name} is not a 16x6 grid"
|
||||
);
|
||||
}
|
||||
for (name, bytes) in [
|
||||
("aprs-symbols-24-0-2x", status::APRS_SYMBOLS_PRIMARY_2X),
|
||||
("aprs-symbols-24-1-2x", status::APRS_SYMBOLS_ALTERNATE_2X),
|
||||
("aprs-symbols-24-2-2x", status::APRS_SYMBOLS_OVERLAY_2X),
|
||||
] {
|
||||
assert_eq!(
|
||||
png_dimensions(bytes),
|
||||
(768, 288),
|
||||
"{name} is not a 2x sheet"
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -658,6 +658,13 @@ pub fn configure(cfg: &mut web::ServiceConfig) {
|
||||
.service(assets::leaflet_marker_shadow)
|
||||
.service(assets::leaflet_layers)
|
||||
.service(assets::leaflet_layers_2x)
|
||||
// Vendored APRS symbol sprites
|
||||
.service(assets::aprs_symbols_primary)
|
||||
.service(assets::aprs_symbols_primary_2x)
|
||||
.service(assets::aprs_symbols_alternate)
|
||||
.service(assets::aprs_symbols_alternate_2x)
|
||||
.service(assets::aprs_symbols_overlay)
|
||||
.service(assets::aprs_symbols_overlay_2x)
|
||||
.service(assets::generated_asset)
|
||||
// Virtual channels
|
||||
.service(vchan::list_channels)
|
||||
|
||||
@@ -504,7 +504,14 @@ impl RouteAccess {
|
||||
return Self::Public;
|
||||
}
|
||||
|
||||
// Static assets
|
||||
// Static assets. The band plan is one of them: it is compiled into the
|
||||
// binary and identical for every user, but ".json" is not an asset
|
||||
// suffix, so it used to fall through to Control — leaving read-only
|
||||
// users without a band plan, and everyone else without one whenever the
|
||||
// page requested it before the session was established.
|
||||
if path == "/bandplan.json" {
|
||||
return Self::Public;
|
||||
}
|
||||
if path.starts_with("/style.css")
|
||||
|| path.starts_with("/app.js")
|
||||
|| path.ends_with(".js")
|
||||
@@ -696,6 +703,12 @@ mod tests {
|
||||
assert_eq!(RouteAccess::from_path("/auth/logout"), RouteAccess::Public);
|
||||
assert_eq!(RouteAccess::from_path("/style.css"), RouteAccess::Public);
|
||||
assert_eq!(RouteAccess::from_path("/app.js"), RouteAccess::Public);
|
||||
// Static reference data, served to every role: ".json" is not in the
|
||||
// asset suffix list, so this one has to be named.
|
||||
assert_eq!(
|
||||
RouteAccess::from_path("/bandplan.json"),
|
||||
RouteAccess::Public
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
@@ -37,6 +37,23 @@ pub const LEAFLET_MARKER_SHADOW: &[u8] = include_bytes!("../assets/web/vendor/ma
|
||||
pub const LEAFLET_LAYERS: &[u8] = include_bytes!("../assets/web/vendor/layers.png");
|
||||
pub const LEAFLET_LAYERS_2X: &[u8] = include_bytes!("../assets/web/vendor/layers-2x.png");
|
||||
|
||||
// Vendored APRS symbol sprites (https://github.com/hessu/aprs-symbols).
|
||||
// Each sheet is a 16x6 grid of 24px cells indexed by `symbol code - 0x21`:
|
||||
// table 0 is the primary ('/') set, table 1 the alternate ('\') set, and
|
||||
// table 2 the overlay characters drawn on top of an alternate symbol.
|
||||
pub const APRS_SYMBOLS_PRIMARY: &[u8] =
|
||||
include_bytes!("../assets/web/vendor/aprs-symbols-24-0.png");
|
||||
pub const APRS_SYMBOLS_PRIMARY_2X: &[u8] =
|
||||
include_bytes!("../assets/web/vendor/aprs-symbols-24-0-2x.png");
|
||||
pub const APRS_SYMBOLS_ALTERNATE: &[u8] =
|
||||
include_bytes!("../assets/web/vendor/aprs-symbols-24-1.png");
|
||||
pub const APRS_SYMBOLS_ALTERNATE_2X: &[u8] =
|
||||
include_bytes!("../assets/web/vendor/aprs-symbols-24-1-2x.png");
|
||||
pub const APRS_SYMBOLS_OVERLAY: &[u8] =
|
||||
include_bytes!("../assets/web/vendor/aprs-symbols-24-2.png");
|
||||
pub const APRS_SYMBOLS_OVERLAY_2X: &[u8] =
|
||||
include_bytes!("../assets/web/vendor/aprs-symbols-24-2-2x.png");
|
||||
|
||||
/// Build version tag used for cache-busting asset URLs and ETag headers.
|
||||
/// Computed once from `PKG_VERSION` + `CLIENT_BUILD_DATE`.
|
||||
pub fn build_version_tag() -> &'static str {
|
||||
|
||||
@@ -837,12 +837,6 @@ impl ChannelDsp {
|
||||
}
|
||||
}
|
||||
|
||||
let signal_power = decimated
|
||||
.iter()
|
||||
.map(|s| s.re * s.re + s.im * s.im)
|
||||
.sum::<f32>()
|
||||
/ decimated.len() as f32;
|
||||
let signal_db = 10.0 * signal_power.max(1e-12).log10();
|
||||
const WFM_OUTPUT_GAIN: f32 = 0.50;
|
||||
let mut audio = if let Some(decoder) = self.wfm_decoder.as_mut() {
|
||||
let mut out = decoder.process_iq(decimated);
|
||||
@@ -884,7 +878,14 @@ impl ChannelDsp {
|
||||
raw
|
||||
}
|
||||
};
|
||||
if !self.squelch.update(&self.mode, signal_db) {
|
||||
// Against the meter reading, not the block level after the IQ AGC.
|
||||
// The threshold arrives in the scale the operator sets it from — the
|
||||
// S-meter and the spectrum — while the level measured here had been
|
||||
// through the AGC, whose whole job is to hold it at a setpoint. For
|
||||
// every mode that has one (FM, PKT, AIS, AM, SAM) the squelch was
|
||||
// therefore comparing against a near-constant, and for the rest it was
|
||||
// still off by the decimation correction the meter applies.
|
||||
if !self.squelch.update(&self.mode, self.last_signal_db) {
|
||||
audio.fill(0.0);
|
||||
}
|
||||
|
||||
@@ -933,6 +934,93 @@ mod tests {
|
||||
dsp.process_block(&block);
|
||||
}
|
||||
|
||||
/// Feeds one signal twice, with the squelch threshold set from the channel's
|
||||
/// own meter reading: 6 dB above it must gate the audio, 6 dB below it must
|
||||
/// pass. FM runs an IQ AGC, so a squelch measured after that stage compares
|
||||
/// against a level pinned near the AGC setpoint — some 20 dB adrift of the
|
||||
/// scale the operator reads the threshold off, and open on plain noise.
|
||||
#[test]
|
||||
fn squelch_follows_the_meter_the_threshold_is_set_from() {
|
||||
const AMPLITUDE: f32 = 0.0025;
|
||||
|
||||
let (pcm_tx, mut pcm_rx) = broadcast::channel::<Vec<f32>>(4096);
|
||||
let (iq_tx, _iq_rx) = broadcast::channel::<Vec<Complex<f32>>>(8);
|
||||
let mut dsp = ChannelDsp::new(
|
||||
0.0,
|
||||
&RigMode::FM,
|
||||
48_000,
|
||||
8_000,
|
||||
1,
|
||||
20,
|
||||
12_000,
|
||||
75,
|
||||
true,
|
||||
false,
|
||||
VirtualSquelchConfig::default(),
|
||||
NoiseBlankerConfig::default(),
|
||||
pcm_tx,
|
||||
iq_tx,
|
||||
);
|
||||
|
||||
// A 1 kHz tone on the carrier, so an open gate is audibly non-zero and
|
||||
// a closed one is unambiguously silent.
|
||||
let mut phase = 0.0_f32;
|
||||
let mut mod_phase = 0.0_f32;
|
||||
let mut feed = |dsp: &mut ChannelDsp, blocks: usize| {
|
||||
for _ in 0..blocks {
|
||||
let mut block = Vec::with_capacity(4096);
|
||||
for _ in 0..4096 {
|
||||
mod_phase += std::f32::consts::TAU * 1_000.0 / 48_000.0;
|
||||
phase += std::f32::consts::TAU * (3_000.0 * mod_phase.sin()) / 48_000.0;
|
||||
block.push(Complex::new(
|
||||
AMPLITUDE * phase.cos(),
|
||||
AMPLITUDE * phase.sin(),
|
||||
));
|
||||
}
|
||||
dsp.process_block(&block);
|
||||
}
|
||||
};
|
||||
let drain = |rx: &mut broadcast::Receiver<Vec<f32>>| {
|
||||
let mut audio = Vec::new();
|
||||
while let Ok(frame) = rx.try_recv() {
|
||||
audio.extend_from_slice(&frame);
|
||||
}
|
||||
audio
|
||||
};
|
||||
let peak = |audio: &[f32]| audio.iter().fold(0.0_f32, |acc, s| acc.max(s.abs()));
|
||||
|
||||
// Settle the meter on this signal, then read what the operator would.
|
||||
feed(&mut dsp, 24);
|
||||
let meter_db = dsp.signal_db();
|
||||
assert!(
|
||||
meter_db > -120.0,
|
||||
"the meter never moved off its floor ({meter_db} dB)"
|
||||
);
|
||||
|
||||
dsp.set_squelch(true, meter_db + 6.0);
|
||||
let _ = drain(&mut pcm_rx);
|
||||
feed(&mut dsp, 24);
|
||||
let gated = drain(&mut pcm_rx);
|
||||
assert!(!gated.is_empty(), "no audio frames were produced at all");
|
||||
// From the second half on: the first frame out still carries the audio
|
||||
// that was already buffered when the threshold changed.
|
||||
assert_eq!(
|
||||
peak(&gated[gated.len() / 2..]),
|
||||
0.0,
|
||||
"squelch set 6 dB above the meter ({meter_db} dB) still passed audio"
|
||||
);
|
||||
|
||||
dsp.set_squelch(true, meter_db - 6.0);
|
||||
let _ = drain(&mut pcm_rx);
|
||||
feed(&mut dsp, 24);
|
||||
let passed = drain(&mut pcm_rx);
|
||||
assert!(!passed.is_empty(), "no audio frames were produced at all");
|
||||
assert!(
|
||||
peak(&passed[passed.len() / 2..]) > 0.0,
|
||||
"squelch set 6 dB below the meter ({meter_db} dB) gated the audio"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn channel_dsp_set_mode() {
|
||||
let (pcm_tx, _) = broadcast::channel::<Vec<f32>>(8);
|
||||
|
||||
Reference in New Issue
Block a user