Compare commits
4 Commits
f9cf95705a
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
d0bd38d7df
|
|||
| bf9617e24d | |||
| 3c235fce5e | |||
| ba48de2d30 |
@@ -1,3 +1,7 @@
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
# Enable CPU optimizations for better performance
|
||||
# Set target-cpu to native to use all available CPU features on the build machine
|
||||
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
name: Sync docs to Wiki
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
paths:
|
||||
- 'docs/**'
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
jobs:
|
||||
wiki:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Checkout wiki
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
repository: ${{ github.repository }}.wiki
|
||||
path: wiki
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Sync docs to wiki
|
||||
run: |
|
||||
rsync -av --delete --exclude='.git' docs/ wiki/
|
||||
cd wiki
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "github-actions[bot]@users.noreply.github.com"
|
||||
git add -A
|
||||
if git diff --cached --quiet; then
|
||||
echo "No wiki changes to commit."
|
||||
else
|
||||
git commit -m "Sync docs from ${GITHUB_SHA::8}"
|
||||
git push
|
||||
fi
|
||||
Generated
+2
@@ -3178,6 +3178,7 @@ version = "0.1.0"
|
||||
dependencies = [
|
||||
"actix-web",
|
||||
"actix-ws",
|
||||
"base64",
|
||||
"brotli 7.0.0",
|
||||
"bytes",
|
||||
"dirs",
|
||||
@@ -3261,6 +3262,7 @@ dependencies = [
|
||||
name = "trx-server"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"base64",
|
||||
"bytes",
|
||||
"chrono",
|
||||
"clap",
|
||||
|
||||
+1
-1
@@ -1,3 +1,3 @@
|
||||
SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
|
||||
SPDX-License-Identifier: BSD-2-Clause
|
||||
SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-2-Clause
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
[workspace]
|
||||
members = [
|
||||
|
||||
-143
@@ -1,143 +0,0 @@
|
||||
# Fix Plan
|
||||
|
||||
Current state analysis of trx-rs as of 2026-04-08.
|
||||
|
||||
## Overall Assessment
|
||||
|
||||
The codebase is in good shape. Clippy is clean, no `unsafe` code, no TODO/FIXME markers,
|
||||
robust error handling throughout. One broken test and several untested crates are the
|
||||
main weak spots.
|
||||
|
||||
---
|
||||
|
||||
## P0 — Broken Test
|
||||
|
||||
### 1. `test_toggle_ft8_decode` returns 500 instead of 200
|
||||
|
||||
**Location:** `src/trx-client/trx-frontend/trx-frontend-http/src/api/mod.rs:1016`
|
||||
|
||||
**Root cause:** The handler `toggle_ft8_decode` (decoder.rs:353) requires
|
||||
`context: web::Data<Arc<FrontendRuntimeContext>>` for multi-rig state resolution.
|
||||
The test registers `state_rx` and `rig_tx` but not `context`, so actix-web returns 500
|
||||
(missing app data). A `make_context()` helper already exists at line 757 but is unused
|
||||
by this test.
|
||||
|
||||
**Fix:** Add `.app_data(web::Data::new(make_context()))` to the test's `App` builder
|
||||
(line 1036-1041). ~1 line change.
|
||||
|
||||
**Impact:** This is the only failing test in the entire suite (50 pass, 1 fail).
|
||||
|
||||
---
|
||||
|
||||
## P1 — Test Coverage Gaps
|
||||
|
||||
### 2. trx-aprs decoder — 0 tests (596 LOC)
|
||||
|
||||
**Location:** `src/decoders/trx-aprs/src/lib.rs`
|
||||
|
||||
Bell 202 AFSK demodulator + AX.25 HDLC frame parser + CRC-16 validation.
|
||||
No `#[cfg(test)]` module at all.
|
||||
|
||||
**Suggested tests:**
|
||||
- CRC-16 computation on known frames
|
||||
- HDLC flag detection and bit-unstuffing
|
||||
- Full frame decode from synthetic AFSK audio (1200 baud sine pairs)
|
||||
- Rejection of corrupted frames (bad CRC, truncated)
|
||||
|
||||
### 3. trx-decode-log — 0 tests (226 LOC)
|
||||
|
||||
**Location:** `src/decoders/trx-decode-log/src/lib.rs`
|
||||
|
||||
JSON Lines file writer with date-based rotation. Pure I/O wrapper.
|
||||
|
||||
**Suggested tests:**
|
||||
- Write + read-back round-trip in a tempdir
|
||||
- Date rotation triggers new file creation
|
||||
- Flush error logging (mock writer)
|
||||
|
||||
### 4. trx-reporting — partial tests (1,065 LOC across 2 files)
|
||||
|
||||
**Location:** `src/trx-reporting/src/pskreporter.rs` (582 LOC),
|
||||
`src/trx-reporting/src/aprsfi.rs` (483 LOC)
|
||||
|
||||
Both files have `#[cfg(test)]` modules but coverage is limited to serialization.
|
||||
Network behavior (reconnect, rate-limit, batching) is untested.
|
||||
|
||||
**Suggested tests:**
|
||||
- PSKReporter UDP datagram encoding round-trip
|
||||
- APRS-IS login line formatting
|
||||
- Spot batching and dedup logic (unit-testable without network)
|
||||
|
||||
---
|
||||
|
||||
## P2 — Code Quality
|
||||
|
||||
### 5. `audio.rs` is 4,000 LOC
|
||||
|
||||
**Location:** `src/trx-server/src/audio.rs`
|
||||
|
||||
Houses all decoder task launchers (FT8, FT4, FT2, APRS, AIS, VDES, CW, WSPR, LRPT,
|
||||
WEFAX). Each launcher follows the same pattern. The file is coherent but large.
|
||||
|
||||
**Suggested improvement:** Extract decoder launchers into a `decoders/` submodule
|
||||
within trx-server, one file per decoder family (e.g., `ftx.rs`, `aprs.rs`, `wefax.rs`).
|
||||
Keep the audio pipeline and capture logic in `audio.rs`.
|
||||
|
||||
### 6. `scheduler.rs` is 1,585 LOC
|
||||
|
||||
**Location:** `src/trx-client/trx-frontend/trx-frontend-http/src/scheduler.rs`
|
||||
|
||||
Mixes grayline computation, timespan matching, satellite pass prediction, and the
|
||||
scheduler state machine. Well-tested but dense.
|
||||
|
||||
**Suggested improvement:** Extract grayline and satellite pass logic into separate
|
||||
modules (these are pure functions with no HTTP dependencies).
|
||||
|
||||
---
|
||||
|
||||
## P3 — Minor
|
||||
|
||||
### 7. `#[allow(dead_code)]` in soapysdr backend (4 annotations)
|
||||
|
||||
**Locations:**
|
||||
- `vchan_impl.rs:66,87` — `fixed_slot_count`, `process_pair`
|
||||
- `real_iq_source.rs:20` — `device`
|
||||
- `demod.rs:113` — lifetime anchor
|
||||
|
||||
All documented as intentional (lifetime anchors / reserved capacity). No action needed
|
||||
unless the fields can be converted to `PhantomData` or `_`-prefixed without breaking
|
||||
semantics.
|
||||
|
||||
### 8. FrontendRuntimeContext test helper duplication risk
|
||||
|
||||
**Location:** `src/trx-client/trx-frontend/trx-frontend-http/src/api/mod.rs:757`
|
||||
|
||||
`make_context()` and `spawn_rig_responder()` are good helpers but only used by some
|
||||
tests. As new endpoint tests are added, ensure they consistently use these helpers to
|
||||
avoid repeating the `test_toggle_ft8_decode` bug.
|
||||
|
||||
---
|
||||
|
||||
## Implementation Order
|
||||
|
||||
```mermaid
|
||||
gantt
|
||||
title Fix Plan
|
||||
dateFormat X
|
||||
axisFormat %s
|
||||
|
||||
section P0
|
||||
Fix test_toggle_ft8_decode :p0, 0, 1
|
||||
|
||||
section P1
|
||||
Add trx-aprs tests :p1a, 1, 3
|
||||
Add trx-decode-log tests :p1b, 1, 2
|
||||
Expand trx-reporting tests :p1c, 1, 3
|
||||
|
||||
section P2
|
||||
Split audio.rs decoder launchers :p2a, 3, 5
|
||||
Extract scheduler pure functions :p2b, 3, 5
|
||||
```
|
||||
|
||||
P0 is a one-line fix. P1 items are independent and can be parallelized. P2 items are
|
||||
refactors that should wait until P1 tests provide regression safety.
|
||||
@@ -0,0 +1,338 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||
<https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
License is intended to guarantee your freedom to share and change free
|
||||
software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
the GNU Lesser General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
this service if you wish), that you receive source code or can get it
|
||||
if you want it, that you can change the software or use pieces of it
|
||||
in new free programs; and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
anyone to deny you these rights or to ask you to surrender the rights.
|
||||
These restrictions translate to certain responsibilities for you if you
|
||||
distribute copies of the software, or if you modify it.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must give the recipients all the rights that
|
||||
you have. You must make sure that they, too, receive or can get the
|
||||
source code. And you must show them these terms so they know their
|
||||
rights.
|
||||
|
||||
We protect your rights with two steps: (1) copyright the software, and
|
||||
(2) offer you this license which gives you legal permission to copy,
|
||||
distribute and/or modify the software.
|
||||
|
||||
Also, for each author's protection and ours, we want to make certain
|
||||
that everyone understands that there is no warranty for this free
|
||||
software. If the software is modified by someone else and passed on, we
|
||||
want its recipients to know that what they have is not the original, so
|
||||
that any problems introduced by others will not reflect on the original
|
||||
authors' reputations.
|
||||
|
||||
Finally, any free program is threatened constantly by software
|
||||
patents. We wish to avoid the danger that redistributors of a free
|
||||
program will individually obtain patent licenses, in effect making the
|
||||
program proprietary. To prevent this, we have made it clear that any
|
||||
patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License applies to any program or other work which contains
|
||||
a notice placed by the copyright holder saying it may be distributed
|
||||
under the terms of this General Public License. The "Program", below,
|
||||
refers to any such program or work, and a "work based on the Program"
|
||||
means either the Program or any derivative work under copyright law:
|
||||
that is to say, a work containing the Program or a portion of it,
|
||||
either verbatim or with modifications and/or translated into another
|
||||
language. (Hereinafter, translation is included without limitation in
|
||||
the term "modification".) Each licensee is addressed as "you".
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running the Program is not restricted, and the output from the Program
|
||||
is covered only if its contents constitute a work based on the
|
||||
Program (independent of having been made by running the Program).
|
||||
Whether that is true depends on what the Program does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Program's
|
||||
source code as you receive it, in any medium, provided that you
|
||||
conspicuously and appropriately publish on each copy an appropriate
|
||||
copyright notice and disclaimer of warranty; keep intact all the
|
||||
notices that refer to this License and to the absence of any warranty;
|
||||
and give any other recipients of the Program a copy of this License
|
||||
along with the Program.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy, and
|
||||
you may at your option offer warranty protection in exchange for a fee.
|
||||
|
||||
2. You may modify your copy or copies of the Program or any portion
|
||||
of it, thus forming a work based on the Program, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) You must cause the modified files to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
b) You must cause any work that you distribute or publish, that in
|
||||
whole or in part contains or is derived from the Program or any
|
||||
part thereof, to be licensed as a whole at no charge to all third
|
||||
parties under the terms of this License.
|
||||
|
||||
c) If the modified program normally reads commands interactively
|
||||
when run, you must cause it, when started running for such
|
||||
interactive use in the most ordinary way, to print or display an
|
||||
announcement including an appropriate copyright notice and a
|
||||
notice that there is no warranty (or else, saying that you provide
|
||||
a warranty) and that users may redistribute the program under
|
||||
these conditions, and telling the user how to view a copy of this
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Program, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Program.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Program
|
||||
with the Program (or with a work based on the Program) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may copy and distribute the Program (or a work based on it,
|
||||
under Section 2) in object code or executable form under the terms of
|
||||
Sections 1 and 2 above provided that you also do one of the following:
|
||||
|
||||
a) Accompany it with the complete corresponding machine-readable
|
||||
source code, which must be distributed under the terms of Sections
|
||||
1 and 2 above on a medium customarily used for software interchange; or,
|
||||
|
||||
b) Accompany it with a written offer, valid for at least three
|
||||
years, to give any third party, for a charge no more than your
|
||||
cost of physically performing source distribution, a complete
|
||||
machine-readable copy of the corresponding source code, to be
|
||||
distributed under the terms of Sections 1 and 2 above on a medium
|
||||
customarily used for software interchange; or,
|
||||
|
||||
c) Accompany it with the information you received as to the offer
|
||||
to distribute corresponding source code. (This alternative is
|
||||
allowed only for noncommercial distribution and only if you
|
||||
received the program in object code or executable form with such
|
||||
an offer, in accord with Subsection b above.)
|
||||
|
||||
The source code for a work means the preferred form of the work for
|
||||
making modifications to it. For an executable work, complete source
|
||||
code means all the source code for all modules it contains, plus any
|
||||
associated interface definition files, plus the scripts used to
|
||||
control compilation and installation of the executable. However, as a
|
||||
special exception, the source code distributed need not include
|
||||
anything that is normally distributed (in either source or binary
|
||||
form) with the major components (compiler, kernel, and so on) of the
|
||||
operating system on which the executable runs, unless that component
|
||||
itself accompanies the executable.
|
||||
|
||||
If distribution of executable or object code is made by offering
|
||||
access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
void, and will automatically terminate your rights under this License.
|
||||
However, parties who have received copies, or rights, from you under
|
||||
this License will not have their licenses terminated so long as such
|
||||
parties remain in full compliance.
|
||||
|
||||
5. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Program or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Program (or any work based on the
|
||||
Program), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Program or works based on it.
|
||||
|
||||
6. Each time you redistribute the Program (or any work based on the
|
||||
Program), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute or modify the Program subject to
|
||||
these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties to
|
||||
this License.
|
||||
|
||||
7. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Program at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Program by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Program.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under
|
||||
any particular circumstance, the balance of the section is intended to
|
||||
apply and the section as a whole is intended to apply in other
|
||||
circumstances.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system, which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
may add an explicit geographical distribution limitation excluding
|
||||
those countries, so that distribution is permitted only in or among
|
||||
countries not thus excluded. In such case, this License incorporates
|
||||
the limitation as if written in the body of this License.
|
||||
|
||||
9. The Free Software Foundation may publish revised and/or new versions
|
||||
of the General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the Program
|
||||
specifies a version number of this License which applies to it and "any
|
||||
later version", you have the option of following the terms and conditions
|
||||
either of that version or of any later version published by the Free
|
||||
Software Foundation. If the Program does not specify a version number of
|
||||
this License, you may choose any version ever published by the Free Software
|
||||
Foundation.
|
||||
|
||||
10. If you wish to incorporate parts of the Program into other free
|
||||
programs whose distribution conditions are different, write to the author
|
||||
to ask for permission. For software which is copyrighted by the Free
|
||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||
make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||
REPAIR OR CORRECTION.
|
||||
|
||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program is interactive, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
|
||||
Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, the commands you use may
|
||||
be called something other than `show w' and `show c'; they could even be
|
||||
mouse-clicks or menu items--whatever suits your program.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
<signature of Moe Ghoul>, 1 April 1989
|
||||
Moe Ghoul, President of Vice
|
||||
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License.
|
||||
@@ -0,0 +1,43 @@
|
||||
SIL OPEN FONT LICENSE
|
||||
|
||||
Version 1.1 - 26 February 2007
|
||||
|
||||
PREAMBLE
|
||||
|
||||
The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.
|
||||
|
||||
DEFINITIONS
|
||||
|
||||
"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the copyright statement(s).
|
||||
|
||||
"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s).
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting, or substituting — in part or in whole — any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.
|
||||
|
||||
PERMISSION & CONDITIONS
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:
|
||||
|
||||
1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.
|
||||
|
||||
2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
|
||||
|
||||
3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.
|
||||
|
||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.
|
||||
|
||||
5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.
|
||||
|
||||
TERMINATION
|
||||
|
||||
This license becomes null and void if any of the above conditions are not met.
|
||||
|
||||
DISCLAIMER
|
||||
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
A modular amateur radio control stack written in Rust.
|
||||
|
||||
[](LICENSES)
|
||||
[](LICENSES)
|
||||
|
||||
</div>
|
||||
|
||||
@@ -64,9 +64,15 @@ brew install soapysdr
|
||||
```
|
||||
</details>
|
||||
|
||||
See [Build Requirements](https://github.com/sgrams/trx-rs/wiki/User-Manual#build-requirements)
|
||||
See [Build Requirements](https://git.haxx.space/sjg/trx-rs/wiki/User-Manual#build-requirements)
|
||||
in the wiki for details on each library.
|
||||
|
||||
> **Note:** `cmake` is required even when a system Opus library is installed.
|
||||
> The `audiopus_sys` crate probes for Opus via `pkg-config`; if it is not found
|
||||
> (or `pkg-config` is unavailable), it falls back to compiling a vendored copy
|
||||
> of Opus with CMake. A missing `cmake` therefore fails the build with
|
||||
> `is cmake not installed?` rather than a missing-Opus error.
|
||||
|
||||
### 2. Build
|
||||
|
||||
```bash
|
||||
@@ -127,12 +133,15 @@ a unified set of frontends.
|
||||
|
||||
| Resource | Description |
|
||||
|----------|-------------|
|
||||
| [User Manual](https://github.com/sgrams/trx-rs/wiki/User-Manual) | Configuration, features, and usage |
|
||||
| [Architecture](https://github.com/sgrams/trx-rs/wiki/Architecture) | System design, crate layout, data flow, and internals |
|
||||
| [Optimization Guidelines](https://github.com/sgrams/trx-rs/wiki/Optimization-Guidelines) | Performance guidelines for the real-time DSP pipeline |
|
||||
| [Planned Features](https://github.com/sgrams/trx-rs/wiki/Planned-Features) | Roadmap and design notes |
|
||||
| [User Manual](https://git.haxx.space/sjg/trx-rs/wiki/User-Manual) | Configuration, features, and usage |
|
||||
| [Architecture](https://git.haxx.space/sjg/trx-rs/wiki/Architecture) | System design, crate layout, data flow, and internals |
|
||||
| [Optimization Guidelines](https://git.haxx.space/sjg/trx-rs/wiki/Optimization-Guidelines) | Performance guidelines for the real-time DSP pipeline |
|
||||
| [Planned Features](https://git.haxx.space/sjg/trx-rs/wiki/Planned-Features) | Roadmap and design notes |
|
||||
| [Contributing](CONTRIBUTING.md) | Commit conventions, workflow, and code style |
|
||||
|
||||
## License
|
||||
|
||||
BSD-2-Clause. See [`LICENSES`](LICENSES) for bundled third-party license files.
|
||||
GPL-2.0-or-later. See [`LICENSES`](LICENSES) for the full license text and
|
||||
bundled third-party license files. Bundled third-party components (Leaflet and
|
||||
the Leaflet AIS tracksymbol plugin under `assets/web/vendor/`) retain their
|
||||
original BSD-2-Clause license.
|
||||
|
||||
+43
@@ -0,0 +1,43 @@
|
||||
version = 1
|
||||
|
||||
# Project-owned files without an in-file SPDX header (docs, config,
|
||||
# repo metadata, logos, and bespoke web assets).
|
||||
[[annotations]]
|
||||
path = [
|
||||
".gitattributes",
|
||||
".gitignore",
|
||||
"CLAUDE.md",
|
||||
"CONTRIBUTING.md",
|
||||
"README.md",
|
||||
"trx-rs.toml.example",
|
||||
"docs/**",
|
||||
"src/decoders/trx-ftx/README.md",
|
||||
"src/decoders/trx-wxsat/README.md",
|
||||
"assets/trx-logo.png",
|
||||
"src/trx-client/trx-frontend/trx-frontend-http/assets/trx-favicon.png",
|
||||
"src/trx-client/trx-frontend/trx-frontend-http/assets/trx-logo.png",
|
||||
"src/trx-client/trx-frontend/trx-frontend-http/assets/web/bandplan.json",
|
||||
"src/trx-client/trx-frontend/trx-frontend-http/assets/web/leaflet-ais-tracksymbol.js",
|
||||
]
|
||||
SPDX-FileCopyrightText = "2026 Stan Grams <sjg@haxx.space>"
|
||||
SPDX-License-Identifier = "GPL-2.0-or-later"
|
||||
|
||||
# Vendored Leaflet 1.9.4 (https://leafletjs.com), distributed under BSD-2-Clause.
|
||||
[[annotations]]
|
||||
path = [
|
||||
"src/trx-client/trx-frontend/trx-frontend-http/assets/web/vendor/leaflet.js",
|
||||
"src/trx-client/trx-frontend/trx-frontend-http/assets/web/vendor/leaflet.css",
|
||||
"src/trx-client/trx-frontend/trx-frontend-http/assets/web/vendor/layers.png",
|
||||
"src/trx-client/trx-frontend/trx-frontend-http/assets/web/vendor/layers-2x.png",
|
||||
"src/trx-client/trx-frontend/trx-frontend-http/assets/web/vendor/marker-icon.png",
|
||||
"src/trx-client/trx-frontend/trx-frontend-http/assets/web/vendor/marker-icon-2x.png",
|
||||
"src/trx-client/trx-frontend/trx-frontend-http/assets/web/vendor/marker-shadow.png",
|
||||
]
|
||||
SPDX-FileCopyrightText = "2010-2023 Vladimir Agafonkin, 2010-2011 CloudMade"
|
||||
SPDX-License-Identifier = "BSD-2-Clause"
|
||||
|
||||
# Vendored DSEG14 font (https://github.com/keshikan/DSEG), SIL OFL 1.1.
|
||||
[[annotations]]
|
||||
path = ["src/trx-client/trx-frontend/trx-frontend-http/assets/web/vendor/dseg14-classic-latin-400-normal.woff2"]
|
||||
SPDX-FileCopyrightText = "2020 The DSEG Authors (https://github.com/keshikan/DSEG)"
|
||||
SPDX-License-Identifier = "OFL-1.1"
|
||||
@@ -1,9 +1,13 @@
|
||||
# RDS Parameter Tuning — Work in Progress
|
||||
# RDS Parameter Tuning Notes
|
||||
|
||||
*Decoder tuning rationale for `trx-rds`. Recorded 2026-03-27; reflects the
|
||||
shipped parameter set. Kept as a reference for why these constants were chosen —
|
||||
not an open work item.*
|
||||
|
||||
## Goal
|
||||
Maximum sensitivity (weak-signal decode) with zero false positive PI decodes.
|
||||
|
||||
## Changes Made
|
||||
## Changes Applied
|
||||
|
||||
### `src/decoders/trx-rds/src/lib.rs`
|
||||
|
||||
Executable → Regular
+4
@@ -1,4 +1,8 @@
|
||||
#!/usr/bin/env bash
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
# Run trx-server with the dummy backend for development and testing.
|
||||
set -euo pipefail
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-2-Clause
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
[package]
|
||||
name = "trx-ais"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Basic AIS GMSK/HDLC decoder.
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-2-Clause
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
[package]
|
||||
name = "trx-aprs"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Bell 202 AFSK demodulator + AX.25/APRS decoder.
|
||||
//!
|
||||
@@ -686,16 +686,16 @@ mod tests {
|
||||
frame.push(ch << 1);
|
||||
}
|
||||
frame.push(0 << 1); // SSID=0, last=false
|
||||
// Source address (7 bytes)
|
||||
// Source address (7 bytes)
|
||||
let src_bytes = format!("{:<6}", src);
|
||||
for &ch in src_bytes.as_bytes().iter().take(6) {
|
||||
frame.push(ch << 1);
|
||||
}
|
||||
frame.push((0 << 1) | 1); // SSID=0, last=true
|
||||
// Control + PID
|
||||
// Control + PID
|
||||
frame.push(0x03); // UI frame
|
||||
frame.push(0xF0); // No layer-3 protocol
|
||||
// Info field
|
||||
// Info field
|
||||
frame.extend_from_slice(info);
|
||||
frame
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-2-Clause
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
[package]
|
||||
name = "trx-cw"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Goertzel-based CW (Morse code) decoder.
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-2-Clause
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
[package]
|
||||
name = "trx-decode-log"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Server-side decoder file logging (APRS / CW / FT8 / WSPR).
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-2-Clause
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
[package]
|
||||
name = "trx-ftx"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Open-addressing hash table for callsign lookup during FTx decoding.
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
use super::protocol::{FTX_LDPC_K_BYTES, FTX_LDPC_M, FTX_LDPC_N};
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
use super::protocol::{FT8_CRC_POLYNOMIAL, FT8_CRC_WIDTH};
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Candidate search, shared decode helpers, and dispatcher functions for FTx decoding.
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Shared LDPC encoding functions used by all FTx protocols.
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Pure Rust LDPC decoder for FTx protocols.
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! FTx message pack/unpack logic.
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Common types, constants, and shared functions used across all FTx protocols.
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Windowed FFT waterfall/spectrogram engine for FTx decoding.
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! OSD-1/OSD-2 CRC-guided bit-flip decoder for the (174,91) LDPC code.
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
/// FTx protocol variants.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Character table lookup and string utility functions for FTx message
|
||||
//! encoding/decoding.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Top-level FTx decoder matching the `trx-ft8` public API.
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Per-symbol FFT and multi-scale bit metrics extraction.
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! FT2-specific waterfall sync scoring and likelihood extraction.
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Frequency-domain downsampling via IFFT.
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! FT2 pipeline orchestration.
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! 2D sync scoring with complex Costas reference waveforms.
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! FT4-specific sync scoring, likelihood extraction, and tone encoding.
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! FT8-specific sync scoring, likelihood extraction, and tone encoding.
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
pub mod common;
|
||||
mod decoder;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-2-Clause
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
[package]
|
||||
name = "trx-rds"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
use std::f32::consts::{PI, SQRT_2, TAU};
|
||||
use std::sync::Arc;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-2-Clause
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
[package]
|
||||
name = "trx-vdes"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! CRC-16 for VDES link-layer frames.
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! VDES 100 kHz decoder for VDE-TER (ITU-R M.2092-1).
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! VDES link-layer frame parsing per ITU-R M.2092-1.
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Turbo FEC decoder for VDES TER-MCS-1 (100 kHz channel).
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-2-Clause
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
[package]
|
||||
name = "trx-wefax"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! WEFAX decoder configuration.
|
||||
|
||||
@@ -19,9 +19,6 @@ pub struct WefaxConfig {
|
||||
pub output_dir: Option<String>,
|
||||
/// Whether to emit line-by-line progress events.
|
||||
pub emit_progress: bool,
|
||||
/// Whether to continuously track and correct sample-clock drift
|
||||
/// (line-to-line cross-correlation) to remove image slant.
|
||||
pub slant_correction: bool,
|
||||
}
|
||||
|
||||
impl Default for WefaxConfig {
|
||||
@@ -33,7 +30,6 @@ impl Default for WefaxConfig {
|
||||
deviation_hz: 400.0,
|
||||
output_dir: None,
|
||||
emit_progress: true,
|
||||
slant_correction: true,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Top-level WEFAX decoder state machine.
|
||||
//!
|
||||
@@ -43,26 +43,11 @@ const LINE_CORR_NOISE_THRESHOLD: f32 = 0.2;
|
||||
/// fldigi's line-to-line correlation check for automatic stop.
|
||||
const LINE_CORR_NOISE_LINES: u32 = 30;
|
||||
|
||||
/// Pearson correlation above which adjacent lines are considered good
|
||||
/// evidence of real image content. Used to verify unverified auto-starts.
|
||||
const LINE_CORR_IMAGE_THRESHOLD: f32 = 0.5;
|
||||
|
||||
/// Number of consecutive well-correlated lines that verify an unverified
|
||||
/// reception (i.e. an auto-start from variance detection). Low enough to
|
||||
/// engage quickly on real imagery.
|
||||
const VERIFY_HIGH_CORR_STREAK: u32 = 5;
|
||||
|
||||
/// Maximum number of scan lines the verifier waits for before giving up on
|
||||
/// an unverified reception. Roughly 20 s at 120 LPM. If no high-correlation
|
||||
/// streak appears by then, the buffered content is dropped and we return
|
||||
/// to Idle without saving anything.
|
||||
const VERIFY_TIMEOUT_LINES: u32 = 40;
|
||||
|
||||
/// Maximum number of scan-line-equivalent sample windows to wait for phasing
|
||||
/// lock before falling through to Receiving (unverified). Typical WEFAX
|
||||
/// phasing lasts ~30 s; if the phasing detector hasn't converged by then
|
||||
/// we give up on alignment and let the correlation verifier decide whether
|
||||
/// the content that follows is a real image. At 120 LPM this is ~30 s.
|
||||
/// lock before falling through to Receiving. Typical WEFAX phasing lasts
|
||||
/// ~30 s; if the phasing detector hasn't converged by then we give up on
|
||||
/// alignment and let the carrier-loss watchdog decide whether the content
|
||||
/// that follows is real imagery. At 120 LPM this is ~30 s.
|
||||
const PHASING_TIMEOUT_LINES: u32 = 60;
|
||||
|
||||
/// WEFAX decoder output event.
|
||||
@@ -117,18 +102,10 @@ pub struct WefaxDecoder {
|
||||
/// `LINE_CORR_NOISE_LINES` the decoder auto-finalizes the in-progress
|
||||
/// image (carrier dropped / tx ended without an APT stop tone).
|
||||
low_corr_lines: u32,
|
||||
/// `true` once the current reception has been confirmed to contain real
|
||||
/// image content. Set immediately for phasing-driven entries (the APT
|
||||
/// start tone + phasing pulses already proved the signal); set later
|
||||
/// by the correlation verifier for variance-driven auto-starts.
|
||||
verified: bool,
|
||||
/// Rolling count of consecutive well-correlated lines, used to confirm
|
||||
/// an unverified reception.
|
||||
high_corr_streak: u32,
|
||||
/// Number of luminance samples processed while in `State::Phasing`.
|
||||
/// When this exceeds the equivalent of `PHASING_TIMEOUT_LINES` lines,
|
||||
/// the decoder falls through to Receiving (unverified) so a noisy or
|
||||
/// partial phasing signal doesn't wedge the state machine.
|
||||
/// the decoder falls through to Receiving so a noisy or partial
|
||||
/// phasing signal doesn't wedge the state machine.
|
||||
phasing_samples: u64,
|
||||
/// Current rig dial frequency in Hz (for image filenames).
|
||||
freq_hz: u64,
|
||||
@@ -157,8 +134,6 @@ impl WefaxDecoder {
|
||||
signal_detect_count: 0,
|
||||
signal_detect_buf: Vec::with_capacity(INTERNAL_RATE as usize / 2),
|
||||
low_corr_lines: 0,
|
||||
verified: false,
|
||||
high_corr_streak: 0,
|
||||
phasing_samples: 0,
|
||||
freq_hz: 0,
|
||||
mode: String::new(),
|
||||
@@ -267,7 +242,7 @@ impl WefaxDecoder {
|
||||
.as_millis() as i64,
|
||||
);
|
||||
self.signal_detect_buf.clear();
|
||||
events.push(self.transition_to_receiving(ioc, lpm, 0, false));
|
||||
events.push(self.transition_to_receiving(ioc, lpm, 0));
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -297,12 +272,12 @@ impl WefaxDecoder {
|
||||
|
||||
if let Some(ref mut phasing) = self.phasing {
|
||||
if let Some(offset) = phasing.process(&luminance) {
|
||||
events.push(self.transition_to_receiving(ioc, lpm, offset, true));
|
||||
events.push(self.transition_to_receiving(ioc, lpm, offset));
|
||||
} else {
|
||||
// Phasing timeout: if alignment doesn't converge in
|
||||
// ~PHASING_TIMEOUT_LINES lines, fall through to
|
||||
// Receiving (unverified) and let the correlation
|
||||
// verifier decide.
|
||||
// Receiving and let the carrier-loss watchdog decide
|
||||
// whether the content that follows is real imagery.
|
||||
self.phasing_samples += luminance.len() as u64;
|
||||
let spl = WefaxConfig::samples_per_line(lpm, INTERNAL_RATE) as u64;
|
||||
if self.phasing_samples >= spl * PHASING_TIMEOUT_LINES as u64 {
|
||||
@@ -310,7 +285,7 @@ impl WefaxDecoder {
|
||||
ioc,
|
||||
lpm, "WEFAX: phasing timeout — falling through to receiving"
|
||||
);
|
||||
events.push(self.transition_to_receiving(ioc, lpm, 0, false));
|
||||
events.push(self.transition_to_receiving(ioc, lpm, 0));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -327,66 +302,36 @@ impl WefaxDecoder {
|
||||
|
||||
// Feed luminance to line slicer.
|
||||
let mut carrier_lost = false;
|
||||
let mut verify_failed = false;
|
||||
if let Some(ref mut slicer) = self.slicer {
|
||||
let new_lines = slicer.process(&luminance);
|
||||
for line in new_lines {
|
||||
if let Some(ref mut image) = self.image {
|
||||
// Line-to-line Pearson correlation classifies the
|
||||
// new line as image-like, noise-like, or flat.
|
||||
// fldigi-style: real imagery has highly correlated
|
||||
// adjacent lines; pure noise does not.
|
||||
// Carrier-loss watchdog: real imagery has highly
|
||||
// correlated adjacent lines; pure noise does not.
|
||||
// After LINE_CORR_NOISE_LINES consecutive low-
|
||||
// correlation lines we finalize (fldigi-style
|
||||
// automatic stop).
|
||||
if let Some(r) = image.correlation_with_last(&line) {
|
||||
if r >= LINE_CORR_IMAGE_THRESHOLD {
|
||||
self.high_corr_streak += 1;
|
||||
self.low_corr_lines = 0;
|
||||
if !self.verified
|
||||
&& self.high_corr_streak >= VERIFY_HIGH_CORR_STREAK
|
||||
{
|
||||
self.verified = true;
|
||||
debug!(
|
||||
lines = image.line_count(),
|
||||
"WEFAX: reception verified from line correlation"
|
||||
);
|
||||
}
|
||||
} else if r < LINE_CORR_NOISE_THRESHOLD {
|
||||
if r < LINE_CORR_NOISE_THRESHOLD {
|
||||
self.low_corr_lines += 1;
|
||||
self.high_corr_streak = 0;
|
||||
trace!(
|
||||
r = format!("{:.3}", r),
|
||||
count = self.low_corr_lines,
|
||||
"WEFAX low line-correlation"
|
||||
);
|
||||
} else {
|
||||
// Middle zone — reset high streak, hold
|
||||
// low-corr counter.
|
||||
self.high_corr_streak = 0;
|
||||
self.low_corr_lines = 0;
|
||||
}
|
||||
}
|
||||
// Flat lines (correlation == None) don't advance
|
||||
// either counter — solid bands in real imagery
|
||||
// shouldn't be scored as noise OR as evidence.
|
||||
// the counter but also don't reset it — an image
|
||||
// with a solid band surrounded by noise still
|
||||
// trips the watchdog once the noise resumes.
|
||||
|
||||
image.push_line(line);
|
||||
let count = image.line_count();
|
||||
|
||||
// Unverified timeout: if we got here from a
|
||||
// variance auto-start and line correlation never
|
||||
// took hold, the "signal" wasn't real WEFAX.
|
||||
// Abandon without saving.
|
||||
if !self.verified && count >= VERIFY_TIMEOUT_LINES {
|
||||
debug!(
|
||||
lines = count,
|
||||
"WEFAX: failed to verify image content — abandoning"
|
||||
);
|
||||
verify_failed = true;
|
||||
break;
|
||||
}
|
||||
|
||||
// Carrier-loss watchdog — only active once the
|
||||
// reception has been verified (otherwise it
|
||||
// double-counts with the verify timeout).
|
||||
if self.verified && self.low_corr_lines >= LINE_CORR_NOISE_LINES {
|
||||
if self.low_corr_lines >= LINE_CORR_NOISE_LINES {
|
||||
debug!(
|
||||
lines = count,
|
||||
"WEFAX: line correlation lost — auto-finalizing image"
|
||||
@@ -418,15 +363,6 @@ impl WefaxDecoder {
|
||||
}
|
||||
}
|
||||
|
||||
if verify_failed {
|
||||
// Drop buffered content without saving — this was a
|
||||
// false auto-start (tone, noise burst, etc.).
|
||||
self.image = None;
|
||||
self.reception_start_ms = None;
|
||||
self.transition_to_idle();
|
||||
return events;
|
||||
}
|
||||
|
||||
if carrier_lost {
|
||||
events.extend(self.finalize_image(ioc, lpm));
|
||||
self.transition_to_idle();
|
||||
@@ -465,8 +401,6 @@ impl WefaxDecoder {
|
||||
self.signal_detect_count = 0;
|
||||
self.signal_detect_buf.clear();
|
||||
self.low_corr_lines = 0;
|
||||
self.verified = false;
|
||||
self.high_corr_streak = 0;
|
||||
self.phasing_samples = 0;
|
||||
events
|
||||
}
|
||||
@@ -522,30 +456,13 @@ impl WefaxDecoder {
|
||||
self.state_event("Phasing", ioc, lpm)
|
||||
}
|
||||
|
||||
fn transition_to_receiving(
|
||||
&mut self,
|
||||
ioc: u16,
|
||||
lpm: u16,
|
||||
phase_offset: usize,
|
||||
verified: bool,
|
||||
) -> WefaxEvent {
|
||||
debug!(
|
||||
ioc,
|
||||
lpm, phase_offset, verified, "WEFAX: entering receiving"
|
||||
);
|
||||
fn transition_to_receiving(&mut self, ioc: u16, lpm: u16, phase_offset: usize) -> WefaxEvent {
|
||||
debug!(ioc, lpm, phase_offset, "WEFAX: entering receiving");
|
||||
let ppl = WefaxConfig::pixels_per_line(ioc) as usize;
|
||||
self.slicer = Some(LineSlicer::with_slant(
|
||||
lpm,
|
||||
ioc,
|
||||
INTERNAL_RATE,
|
||||
phase_offset,
|
||||
self.config.slant_correction,
|
||||
));
|
||||
self.slicer = Some(LineSlicer::new(lpm, ioc, INTERNAL_RATE, phase_offset));
|
||||
self.image = Some(ImageAssembler::new(ppl));
|
||||
self.tone_detector.reset();
|
||||
self.low_corr_lines = 0;
|
||||
self.verified = verified;
|
||||
self.high_corr_streak = 0;
|
||||
self.state = State::Receiving { ioc, lpm };
|
||||
self.state_event("Receiving", ioc, lpm)
|
||||
}
|
||||
@@ -559,8 +476,6 @@ impl WefaxDecoder {
|
||||
self.signal_detect_count = 0;
|
||||
self.signal_detect_buf.clear();
|
||||
self.low_corr_lines = 0;
|
||||
self.verified = false;
|
||||
self.high_corr_streak = 0;
|
||||
self.phasing_samples = 0;
|
||||
}
|
||||
|
||||
@@ -574,12 +489,23 @@ impl WefaxDecoder {
|
||||
|
||||
let ppl = WefaxConfig::pixels_per_line(ioc);
|
||||
let mut path_str = None;
|
||||
let mut png_data = None;
|
||||
|
||||
// Save PNG if output directory is configured.
|
||||
if let Some(ref dir) = self.config.output_dir {
|
||||
let output_path = PathBuf::from(dir);
|
||||
match image.save_png(&output_path, self.freq_hz, &self.mode) {
|
||||
Ok(p) => {
|
||||
// Read back the PNG bytes for remote client transfer.
|
||||
match std::fs::read(&p) {
|
||||
Ok(bytes) => {
|
||||
png_data =
|
||||
Some(base64::engine::general_purpose::STANDARD.encode(&bytes));
|
||||
}
|
||||
Err(e) => {
|
||||
eprintln!("WEFAX: failed to read PNG for transfer: {}", e);
|
||||
}
|
||||
}
|
||||
path_str = Some(p.to_string_lossy().into_owned());
|
||||
}
|
||||
Err(e) => {
|
||||
@@ -597,6 +523,7 @@ impl WefaxDecoder {
|
||||
ioc,
|
||||
pixels_per_line: ppl,
|
||||
path: path_str,
|
||||
png_data,
|
||||
complete: true,
|
||||
}));
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! FM discriminator for WEFAX demodulation.
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Image buffer and PNG encoding for WEFAX decoded images.
|
||||
|
||||
@@ -144,9 +144,15 @@ impl ImageAssembler {
|
||||
}
|
||||
debug_assert_eq!(img_data.len(), expected_bytes);
|
||||
|
||||
writer
|
||||
.write_image_data(&img_data)
|
||||
.map_err(|e| format!("write PNG data ({} bytes, {}x{}): {}", img_data.len(), width, height, e))?;
|
||||
writer.write_image_data(&img_data).map_err(|e| {
|
||||
format!(
|
||||
"write PNG data ({} bytes, {}x{}): {}",
|
||||
img_data.len(),
|
||||
width,
|
||||
height,
|
||||
e
|
||||
)
|
||||
})?;
|
||||
|
||||
// Explicitly finish the writer (writes IEND). Relying on Drop
|
||||
// alone swallows any I/O error and can yield a truncated file.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! WEFAX (Weather Facsimile) decoder.
|
||||
//!
|
||||
|
||||
@@ -1,27 +1,15 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Line slicer: pixel clock recovery and line buffer assembly.
|
||||
//!
|
||||
//! Once the phasing detector has established a line-start phase offset,
|
||||
//! the line slicer accumulates demodulated luminance samples and extracts
|
||||
//! complete image lines at the configured LPM rate.
|
||||
//!
|
||||
//! When `slant_correction` is enabled, the slicer tracks line-to-line
|
||||
//! drift via cross-correlation with the previous line and nudges the
|
||||
//! extraction cursor by ±`MAX_DRIFT_SAMPLES` per line. This compensates
|
||||
//! for the small mismatch between the transmitter's and receiver's
|
||||
//! sample clocks that would otherwise skew the assembled image.
|
||||
|
||||
use crate::config::WefaxConfig;
|
||||
|
||||
/// Maximum per-line drift (in samples at the internal rate) searched for
|
||||
/// when slant correction is enabled. At 120 LPM / 11025 Hz there are
|
||||
/// ~5512 samples per line, so ±6 samples is ~0.1% drift per line — more
|
||||
/// than enough for any real-world sample-clock mismatch.
|
||||
const MAX_DRIFT_SAMPLES: usize = 6;
|
||||
|
||||
/// Line slicer for WEFAX image assembly.
|
||||
pub struct LineSlicer {
|
||||
/// Samples per line at the internal sample rate.
|
||||
@@ -30,34 +18,14 @@ pub struct LineSlicer {
|
||||
pixels_per_line: usize,
|
||||
/// Phase offset in samples from the phasing detector.
|
||||
phase_offset: usize,
|
||||
/// Accumulated luminance samples. While `slant_correction` is on,
|
||||
/// the buffer anchor is the *start of the previous line* (so the
|
||||
/// first `samples_per_line` samples are the reference for drift
|
||||
/// tracking). Without slant correction the anchor is simply the
|
||||
/// start of the next line to extract.
|
||||
/// Accumulated luminance samples.
|
||||
buffer: Vec<f32>,
|
||||
/// Whether we have aligned to the phase offset yet.
|
||||
aligned: bool,
|
||||
/// Whether a reference (previous) line is held at the buffer anchor.
|
||||
has_reference: bool,
|
||||
/// Enable line-to-line drift tracking.
|
||||
slant_correction: bool,
|
||||
/// Cumulative drift applied so far (samples). Diagnostic.
|
||||
pub(crate) total_drift: i64,
|
||||
}
|
||||
|
||||
impl LineSlicer {
|
||||
pub fn new(lpm: u16, ioc: u16, sample_rate: u32, phase_offset: usize) -> Self {
|
||||
Self::with_slant(lpm, ioc, sample_rate, phase_offset, true)
|
||||
}
|
||||
|
||||
pub fn with_slant(
|
||||
lpm: u16,
|
||||
ioc: u16,
|
||||
sample_rate: u32,
|
||||
phase_offset: usize,
|
||||
slant_correction: bool,
|
||||
) -> Self {
|
||||
let samples_per_line = WefaxConfig::samples_per_line(lpm, sample_rate);
|
||||
let pixels_per_line = WefaxConfig::pixels_per_line(ioc) as usize;
|
||||
|
||||
@@ -65,11 +33,8 @@ impl LineSlicer {
|
||||
samples_per_line,
|
||||
pixels_per_line,
|
||||
phase_offset,
|
||||
buffer: Vec::with_capacity(samples_per_line * 3),
|
||||
buffer: Vec::with_capacity(samples_per_line * 2),
|
||||
aligned: false,
|
||||
has_reference: false,
|
||||
slant_correction,
|
||||
total_drift: 0,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -90,57 +55,16 @@ impl LineSlicer {
|
||||
self.aligned = true;
|
||||
}
|
||||
|
||||
let spl = self.samples_per_line;
|
||||
|
||||
if !self.slant_correction {
|
||||
// Simple fixed-period extraction.
|
||||
let mut offset = 0;
|
||||
while offset + spl <= self.buffer.len() {
|
||||
let line_samples = &self.buffer[offset..offset + spl];
|
||||
let pixels = self.resample_line(line_samples);
|
||||
lines.push(pixels);
|
||||
offset += spl;
|
||||
}
|
||||
if offset > 0 {
|
||||
self.buffer.drain(..offset);
|
||||
}
|
||||
return lines;
|
||||
}
|
||||
|
||||
// Slant-corrected extraction.
|
||||
let max_shift = MAX_DRIFT_SAMPLES;
|
||||
|
||||
// Bootstrap: the very first line has no previous reference.
|
||||
// Extract it naively and keep it in the buffer as the reference.
|
||||
if !self.has_reference {
|
||||
if self.buffer.len() < spl {
|
||||
return lines;
|
||||
}
|
||||
let first = self.buffer[0..spl].to_vec();
|
||||
let pixels = self.resample_line(&first);
|
||||
// Extract complete lines (single drain at the end to avoid O(n²)).
|
||||
let mut offset = 0;
|
||||
while offset + self.samples_per_line <= self.buffer.len() {
|
||||
let line_samples = &self.buffer[offset..offset + self.samples_per_line];
|
||||
let pixels = self.resample_line(line_samples);
|
||||
lines.push(pixels);
|
||||
self.has_reference = true;
|
||||
// Do NOT drain: the first `spl` samples remain as the
|
||||
// reference for the next line's drift search.
|
||||
offset += self.samples_per_line;
|
||||
}
|
||||
|
||||
// Subsequent lines: for each iteration, buffer[0..spl] is the
|
||||
// reference line, and we search for the best starting position
|
||||
// of the NEXT line in the range [spl - max_shift, spl + max_shift].
|
||||
while self.buffer.len() >= 2 * spl + max_shift {
|
||||
let prev = &self.buffer[0..spl];
|
||||
let (best_d, _best_r) =
|
||||
search_best_shift(prev, &self.buffer, spl, max_shift);
|
||||
|
||||
let start = (spl as i32 + best_d) as usize;
|
||||
let next_line = self.buffer[start..start + spl].to_vec();
|
||||
let pixels = self.resample_line(&next_line);
|
||||
lines.push(pixels);
|
||||
|
||||
// Advance the anchor to the start of the line we just
|
||||
// emitted — it becomes the reference for the next iteration.
|
||||
self.buffer.drain(..start);
|
||||
self.total_drift += best_d as i64;
|
||||
if offset > 0 {
|
||||
self.buffer.drain(..offset);
|
||||
}
|
||||
|
||||
lines
|
||||
@@ -150,16 +74,9 @@ impl LineSlicer {
|
||||
self.pixels_per_line
|
||||
}
|
||||
|
||||
/// Samples per line at the internal rate (for diagnostics).
|
||||
pub fn samples_per_line(&self) -> usize {
|
||||
self.samples_per_line
|
||||
}
|
||||
|
||||
pub fn reset(&mut self) {
|
||||
self.buffer.clear();
|
||||
self.aligned = false;
|
||||
self.has_reference = false;
|
||||
self.total_drift = 0;
|
||||
}
|
||||
|
||||
/// Resample a line's worth of luminance samples to the target pixel count
|
||||
@@ -190,82 +107,6 @@ impl LineSlicer {
|
||||
}
|
||||
}
|
||||
|
||||
/// Search for the drift `d ∈ [-max_shift, +max_shift]` that maximises
|
||||
/// the Pearson correlation between `reference` and
|
||||
/// `buffer[spl+d .. spl+d+spl]`.
|
||||
///
|
||||
/// Returns `(best_d, best_r)`. A correlation-peak deadband prefers
|
||||
/// `d = 0` when the peak is only marginally better than at zero, which
|
||||
/// keeps tracking stable on quiet lines.
|
||||
fn search_best_shift(
|
||||
reference: &[f32],
|
||||
buffer: &[f32],
|
||||
spl: usize,
|
||||
max_shift: usize,
|
||||
) -> (i32, f32) {
|
||||
debug_assert!(buffer.len() >= 2 * spl + max_shift);
|
||||
debug_assert_eq!(reference.len(), spl);
|
||||
|
||||
// Pre-compute reference mean + variance.
|
||||
let n = spl as f32;
|
||||
let mean_r = reference.iter().sum::<f32>() / n;
|
||||
let mut var_r = 0.0f32;
|
||||
for &v in reference {
|
||||
let d = v - mean_r;
|
||||
var_r += d * d;
|
||||
}
|
||||
|
||||
// Guard against a flat reference line — drift tracking is useless.
|
||||
const MIN_VAR: f32 = 32.0;
|
||||
if var_r < MIN_VAR {
|
||||
return (0, 0.0);
|
||||
}
|
||||
|
||||
let ms = max_shift as i32;
|
||||
let mut best_d = 0i32;
|
||||
let mut best_r = f32::NEG_INFINITY;
|
||||
let mut r_at_zero = 0.0f32;
|
||||
|
||||
for d in -ms..=ms {
|
||||
let start = (spl as i32 + d) as usize;
|
||||
let candidate = &buffer[start..start + spl];
|
||||
|
||||
let mean_c = candidate.iter().sum::<f32>() / n;
|
||||
let mut var_c = 0.0f32;
|
||||
let mut cov = 0.0f32;
|
||||
for (i, &v) in candidate.iter().enumerate() {
|
||||
let dr = reference[i] - mean_r;
|
||||
let dc = v - mean_c;
|
||||
cov += dr * dc;
|
||||
var_c += dc * dc;
|
||||
}
|
||||
|
||||
let r = if var_c < MIN_VAR {
|
||||
// Skip flat candidate slices.
|
||||
f32::NEG_INFINITY
|
||||
} else {
|
||||
cov / (var_r.sqrt() * var_c.sqrt())
|
||||
};
|
||||
|
||||
if d == 0 {
|
||||
r_at_zero = r;
|
||||
}
|
||||
if r > best_r {
|
||||
best_r = r;
|
||||
best_d = d;
|
||||
}
|
||||
}
|
||||
|
||||
// Deadband: if the peak is only marginally better than `d = 0`,
|
||||
// stick with zero. This avoids per-line jitter when drift is small.
|
||||
const DEADBAND: f32 = 0.01;
|
||||
if r_at_zero.is_finite() && best_r - r_at_zero < DEADBAND {
|
||||
return (0, r_at_zero);
|
||||
}
|
||||
|
||||
(best_d, best_r)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
@@ -278,8 +119,7 @@ mod tests {
|
||||
let spl = WefaxConfig::samples_per_line(lpm, sr);
|
||||
let ppl = WefaxConfig::pixels_per_line(ioc) as usize;
|
||||
|
||||
// Slant correction off for deterministic line count.
|
||||
let mut slicer = LineSlicer::with_slant(lpm, ioc, sr, 0, false);
|
||||
let mut slicer = LineSlicer::new(lpm, ioc, sr, 0);
|
||||
// Feed exactly 3 lines worth of white.
|
||||
let samples = vec![1.0f32; spl * 3];
|
||||
let lines = slicer.process(&samples);
|
||||
@@ -296,7 +136,7 @@ mod tests {
|
||||
let sr = 11025;
|
||||
let spl = WefaxConfig::samples_per_line(lpm, sr);
|
||||
|
||||
let mut slicer = LineSlicer::with_slant(lpm, ioc, sr, 0, false);
|
||||
let mut slicer = LineSlicer::new(lpm, ioc, sr, 0);
|
||||
// Feed a linear ramp from 0.0 to 1.0.
|
||||
let samples: Vec<f32> = (0..spl).map(|i| i as f32 / spl as f32).collect();
|
||||
let lines = slicer.process(&samples);
|
||||
@@ -305,92 +145,4 @@ mod tests {
|
||||
assert!(lines[0][0] < 5);
|
||||
assert!(lines[0].last().copied().unwrap_or(0) > 250);
|
||||
}
|
||||
|
||||
/// Synthesise a noisy-ish gradient line that repeats with a small
|
||||
/// per-line offset, simulating a sample-clock mismatch. The slant
|
||||
/// tracker should follow the drift.
|
||||
#[test]
|
||||
fn slant_tracker_follows_drift() {
|
||||
let lpm = 120;
|
||||
let ioc = 576;
|
||||
let sr = 11025;
|
||||
let spl = WefaxConfig::samples_per_line(lpm, sr);
|
||||
|
||||
// Build a signal where each real line is `spl + 3` samples long
|
||||
// (i.e. transmitter clock is slower than expected → positive drift
|
||||
// of +3 samples per line). The content needs high-frequency
|
||||
// structure for a few-sample shift to be detectable against the
|
||||
// deadband.
|
||||
let true_line_len = spl + 3;
|
||||
let mut signal: Vec<f32> = Vec::new();
|
||||
let base: Vec<f32> = (0..true_line_len)
|
||||
.map(|i| {
|
||||
// Pseudo-random-but-repeatable content with a narrow
|
||||
// bright stripe — sharp features make sub-line shifts
|
||||
// easy to localise.
|
||||
let x = ((i as u32).wrapping_mul(2654435761)) >> 16;
|
||||
let noise = (x & 0xff) as f32 / 255.0;
|
||||
let stripe = if i == true_line_len / 3 { 1.0 } else { 0.0 };
|
||||
0.3 + 0.4 * noise + stripe
|
||||
})
|
||||
.collect();
|
||||
// 20 lines, each identical.
|
||||
for _ in 0..20 {
|
||||
signal.extend_from_slice(&base);
|
||||
}
|
||||
|
||||
let mut slicer = LineSlicer::with_slant(lpm, ioc, sr, 0, true);
|
||||
let lines = slicer.process(&signal);
|
||||
|
||||
// Expect ~ (20*true_line_len - spl) / (spl+drift) lines with
|
||||
// drift absorbing the extra 2 samples per line.
|
||||
assert!(
|
||||
lines.len() >= 15,
|
||||
"slant-corrected slicer produced only {} lines",
|
||||
lines.len()
|
||||
);
|
||||
// Should have tracked positive drift.
|
||||
assert!(
|
||||
slicer.total_drift > 0,
|
||||
"expected positive drift, got {}",
|
||||
slicer.total_drift
|
||||
);
|
||||
// Roughly +3 per line (after the first bootstrap line); allow wide tolerance.
|
||||
let per_line = slicer.total_drift as f32 / (lines.len() - 1) as f32;
|
||||
assert!(
|
||||
per_line > 1.5 && per_line < 4.0,
|
||||
"per-line drift {:.2} out of range (total {}, lines {})",
|
||||
per_line,
|
||||
slicer.total_drift,
|
||||
lines.len()
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn slant_tracker_deadband_on_no_drift() {
|
||||
let lpm = 120;
|
||||
let ioc = 576;
|
||||
let sr = 11025;
|
||||
let spl = WefaxConfig::samples_per_line(lpm, sr);
|
||||
|
||||
// Perfectly aligned lines → drift should stay at zero.
|
||||
let line: Vec<f32> = (0..spl)
|
||||
.map(|i| {
|
||||
let t = i as f32 / spl as f32;
|
||||
0.5 + 0.4 * (t * 9.0 * std::f32::consts::PI).sin()
|
||||
})
|
||||
.collect();
|
||||
let mut signal = Vec::new();
|
||||
for _ in 0..10 {
|
||||
signal.extend_from_slice(&line);
|
||||
}
|
||||
|
||||
let mut slicer = LineSlicer::with_slant(lpm, ioc, sr, 0, true);
|
||||
let _ = slicer.process(&signal);
|
||||
// Deadband should keep drift at 0.
|
||||
assert_eq!(
|
||||
slicer.total_drift, 0,
|
||||
"no drift expected for identical lines"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Phasing signal detector and line-start alignment for WEFAX.
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Polyphase rational resampler: 48000 Hz → 11025 Hz.
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! APT tone detector for WEFAX start/stop signals.
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-2-Clause
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
[package]
|
||||
name = "trx-wspr"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
use crate::protocol;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
mod decoder;
|
||||
mod protocol;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
/// Decoded WSPR message payload.
|
||||
#[derive(Debug, Clone)]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-2-Clause
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
[package]
|
||||
name = "trx-wxsat"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Shared PNG image encoding for weather satellite decoders.
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Weather satellite image decoders.
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! CCSDS CADU (Channel Access Data Unit) frame synchronisation and extraction.
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! QPSK demodulator for Meteor-M LRPT.
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! MCU (Minimum Coded Unit) assembly and multi-channel image composition.
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Meteor-M LRPT (Low Rate Picture Transmission) satellite image decoder.
|
||||
//!
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-2-Clause
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
[package]
|
||||
name = "trx-app"
|
||||
version.workspace = true
|
||||
edition = "2021"
|
||||
license = "BSD-2-Clause"
|
||||
license = "GPL-2.0-or-later"
|
||||
|
||||
[dependencies]
|
||||
serde = { workspace = true }
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
use serde::de::DeserializeOwned;
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
pub mod config;
|
||||
pub mod logging;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
use tracing::Level;
|
||||
use tracing_subscriber::FmtSubscriber;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Shared configuration validation helpers used by both `trx-server` and
|
||||
//! `trx-client`.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
/// Normalize a name to lowercase alphanumeric.
|
||||
pub fn normalize_name(name: &str) -> String {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-2-Clause
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
[package]
|
||||
name = "trx-client"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Local audio bridge for trx-client.
|
||||
//!
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Audio TCP client that connects to the server's audio port and relays
|
||||
//! RX/TX Opus frames via broadcast/mpsc channels.
|
||||
|
||||
use std::collections::{HashMap, HashSet};
|
||||
use std::sync::{Arc, Mutex, RwLock};
|
||||
use std::time::Duration;
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
use bytes::Bytes;
|
||||
use flate2::read::GzDecoder;
|
||||
@@ -36,6 +36,13 @@ use trx_core::audio::{
|
||||
use trx_core::decode::DecodedMessage;
|
||||
use trx_frontend::VChanAudioCmd;
|
||||
|
||||
/// Minimum uptime before a connection is "stable" enough to reset the
|
||||
/// reconnect backoff. Connections that die before this threshold leave the
|
||||
/// exponential backoff climbing — protects the server from a tight reconnect
|
||||
/// storm when the peer is broken in some way that only manifests after the
|
||||
/// TCP handshake.
|
||||
const STABLE_CONNECTION_THRESHOLD: Duration = Duration::from_secs(30);
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
struct ActiveVChanSub {
|
||||
freq_hz: u64,
|
||||
@@ -289,7 +296,7 @@ async fn run_single_rig_audio_client(
|
||||
info!("Audio client [{}]: connecting to {}", rig_id, server_addr);
|
||||
match TcpStream::connect(&server_addr).await {
|
||||
Ok(stream) => {
|
||||
reconnect_delay = Duration::from_secs(1);
|
||||
let connected_at = Instant::now();
|
||||
if let Err(e) = handle_single_rig_connection(
|
||||
stream,
|
||||
&rig_id,
|
||||
@@ -311,6 +318,13 @@ async fn run_single_rig_audio_client(
|
||||
{
|
||||
warn!("Audio connection [{}] dropped: {}", rig_id, e);
|
||||
}
|
||||
// Only reset the backoff after a connection survived long
|
||||
// enough to be considered stable. TCP `connect()` succeeding
|
||||
// is not enough — a peer that fails immediately after
|
||||
// accepting must not be hammered every second.
|
||||
if connected_at.elapsed() >= STABLE_CONNECTION_THRESHOLD {
|
||||
reconnect_delay = Duration::from_secs(1);
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
warn!("Audio connect [{}] failed: {}", rig_id, e);
|
||||
@@ -586,7 +600,10 @@ async fn handle_single_rig_connection(
|
||||
rig_id_for_rx, msg_type
|
||||
);
|
||||
}
|
||||
Err(_) => break,
|
||||
Err(e) => {
|
||||
warn!("Audio client [{}]: read error: {}", rig_id_for_rx, e);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
//! Configuration file support for trx-client.
|
||||
//!
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
mod audio_bridge;
|
||||
mod audio_client;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
use std::collections::HashMap;
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
@@ -95,8 +95,7 @@ pub async fn run_remote_client(
|
||||
// soon as short names are discovered. Runs independently so the meter
|
||||
// bar in the UI updates at the full server-side 30 Hz without being
|
||||
// gated on state polls or user commands.
|
||||
let meter_supervisor =
|
||||
tokio::spawn(run_meter_supervisor(config.clone(), shutdown_rx.clone()));
|
||||
let meter_supervisor = tokio::spawn(run_meter_supervisor(config.clone(), shutdown_rx.clone()));
|
||||
|
||||
let mut reconnect_delay = Duration::from_secs(1);
|
||||
|
||||
@@ -228,10 +227,7 @@ async fn run_spectrum_connection(
|
||||
/// one dedicated TCP connection per rig that streams `MeterUpdate` JSON lines
|
||||
/// (see `trx_protocol::MeterUpdate`). Each per-rig task owns its own watch
|
||||
/// sender in `config.rig_meters` and reconnects on failure.
|
||||
async fn run_meter_supervisor(
|
||||
config: RemoteClientConfig,
|
||||
mut shutdown_rx: watch::Receiver<bool>,
|
||||
) {
|
||||
async fn run_meter_supervisor(config: RemoteClientConfig, mut shutdown_rx: watch::Receiver<bool>) {
|
||||
let mut tasks: HashMap<String, tokio::task::JoinHandle<()>> = HashMap::new();
|
||||
let mut poll = time::interval(Duration::from_millis(500));
|
||||
|
||||
@@ -345,7 +341,11 @@ async fn stream_meter(
|
||||
let (reader, mut writer) = stream.into_split();
|
||||
let mut reader = BufReader::new(reader);
|
||||
|
||||
let envelope = build_envelope(config, ClientCommand::SubscribeMeter, Some(short_name.to_string()));
|
||||
let envelope = build_envelope(
|
||||
config,
|
||||
ClientCommand::SubscribeMeter,
|
||||
Some(short_name.to_string()),
|
||||
);
|
||||
let mut payload = serde_json::to_string(&envelope)
|
||||
.map_err(|e| RigError::communication(format!("JSON serialize failed: {e}")))?;
|
||||
payload.push('\n');
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-2-Clause
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
[package]
|
||||
name = "trx-frontend"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
use std::collections::{HashMap, HashSet, VecDeque};
|
||||
use std::net::SocketAddr;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-2-Clause
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
[package]
|
||||
name = "trx-frontend-http-json"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
pub mod server;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
use std::net::SocketAddr;
|
||||
use std::sync::Arc;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-2-Clause
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
[package]
|
||||
name = "trx-frontend-http"
|
||||
@@ -16,6 +16,7 @@ tokio = { workspace = true, features = ["full"] }
|
||||
serde = { workspace = true, features = ["derive"] }
|
||||
serde_json = { workspace = true }
|
||||
tracing = { workspace = true }
|
||||
base64 = "0.22"
|
||||
actix-web = "4.4"
|
||||
actix-ws = "0.3"
|
||||
tokio-stream = { version = "0.1", features = ["sync"] }
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
// --- Decoder registry (fetched from /decoders on load) ---
|
||||
/** @type {Array<{id:string,label:string,activation:string,active_modes:string[],background_decode:boolean,bookmark_selectable:boolean}>} */
|
||||
let decoderRegistry = [];
|
||||
@@ -4485,7 +4489,16 @@ function _initMapWhenReady() {
|
||||
if (loadingEl) loadingEl.classList.add("is-hidden");
|
||||
window.trx.map.initAprsMap();
|
||||
window.trx.map.sizeAprsMapToViewport();
|
||||
if (window.trx.map.aprsMap) setTimeout(() => window.trx.map.aprsMap.invalidateSize(), 50);
|
||||
// The map panel was just made visible (display:none → ""); the browser
|
||||
// may not have laid it out yet, so getBoundingClientRect() can return
|
||||
// stale/zero dimensions. Double-rAF ensures a full layout pass has
|
||||
// completed before we re-measure and tell Leaflet about its real size.
|
||||
requestAnimationFrame(() => {
|
||||
requestAnimationFrame(() => {
|
||||
window.trx.map.sizeAprsMapToViewport();
|
||||
if (window.trx.map.aprsMap) window.trx.map.aprsMap.invalidateSize();
|
||||
});
|
||||
});
|
||||
return;
|
||||
}
|
||||
// Not ready yet — show overlay and poll until both are available.
|
||||
@@ -7006,9 +7019,18 @@ function stopSpectrumStreaming() {
|
||||
|
||||
// ── /meter (fast signal-strength) streaming ─────────────────────────────────
|
||||
// Dedicated SSE channel pushed at ~30 Hz by trx-server; bypasses /events so
|
||||
// meter frames are never gated by full-RigState diffing. Synchronous DOM
|
||||
// write per frame — no rAF coalescing, per user requirement that it "feel
|
||||
// instant" on the frontend.
|
||||
// meter frames are never gated by full-RigState diffing.
|
||||
//
|
||||
// Client-side asymmetric EMA smoothing (GQRX-style ballistics):
|
||||
// attack τ ≈ 400 ms — rises in ~12 frames at 30 Hz
|
||||
// decay τ ≈ 1.0 s — falls in ~30 frames, readable
|
||||
// DOM updates are coalesced via requestAnimationFrame so the bar
|
||||
// animates at display refresh rate, not SSE rate.
|
||||
const METER_ATTACK_ALPHA = 0.08; // per-frame at ~30 Hz ≈ 400 ms τ
|
||||
const METER_DECAY_ALPHA = 0.03; // per-frame at ~30 Hz ≈ 1.0 s τ
|
||||
let meterSmoothedDbm = null;
|
||||
let meterRafPending = false;
|
||||
|
||||
function scheduleMeterReconnect() {
|
||||
if (meterReconnectTimer !== null) return;
|
||||
meterReconnectTimer = setTimeout(() => {
|
||||
@@ -7019,6 +7041,24 @@ function scheduleMeterReconnect() {
|
||||
|
||||
function applyMeterSample(dbm) {
|
||||
if (typeof dbm !== "number" || !Number.isFinite(dbm)) return;
|
||||
// Asymmetric EMA: fast attack, slow decay.
|
||||
if (meterSmoothedDbm === null) {
|
||||
meterSmoothedDbm = dbm;
|
||||
} else {
|
||||
const alpha = dbm > meterSmoothedDbm ? METER_ATTACK_ALPHA : METER_DECAY_ALPHA;
|
||||
meterSmoothedDbm += alpha * (dbm - meterSmoothedDbm);
|
||||
}
|
||||
// Coalesce DOM writes to display refresh rate.
|
||||
if (!meterRafPending) {
|
||||
meterRafPending = true;
|
||||
requestAnimationFrame(flushMeterDom);
|
||||
}
|
||||
}
|
||||
|
||||
function flushMeterDom() {
|
||||
meterRafPending = false;
|
||||
const dbm = meterSmoothedDbm;
|
||||
if (dbm === null) return;
|
||||
prevRenderData.sigDbm = dbm;
|
||||
const sUnits = dbmToSUnits(dbm);
|
||||
sigLastSUnits = sUnits;
|
||||
@@ -7059,6 +7099,7 @@ function stopMeterStreaming() {
|
||||
clearTimeout(meterReconnectTimer);
|
||||
meterReconnectTimer = null;
|
||||
}
|
||||
meterSmoothedDbm = null; // reset so next rig starts fresh
|
||||
}
|
||||
|
||||
// ── Rendering ────────────────────────────────────────────────────────────────
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
const textDecoder = typeof TextDecoder === "function" ? new TextDecoder() : null;
|
||||
const HISTORY_GROUP_KEYS = ["ais", "vdes", "aprs", "hf_aprs", "cw", "ft8", "ft4", "ft2", "wspr", "wefax"];
|
||||
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
<!DOCTYPE html>
|
||||
<!--
|
||||
SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0-or-later
|
||||
-->
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
@@ -1576,7 +1581,7 @@
|
||||
</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://github.com/sgrams/trx-rs" target="_blank" rel="noopener" aria-label="Open trx-rs on GitHub"><svg class="gh-link-icon" viewBox="0 0 16 16" aria-hidden="true"><path d="M8 0.2a8 8 0 0 0-2.53 15.59c0.4 0.07 0.55-0.17 0.55-0.39l-0.01-1.37c-2.23 0.49-2.7-0.95-2.7-0.95-0.36-0.91-0.89-1.15-0.89-1.15-0.73-0.49 0.06-0.48 0.06-0.48 0.8 0.06 1.22 0.82 1.22 0.82 0.72 1.22 1.88 0.87 2.34 0.67 0.07-0.51 0.28-0.86 0.5-1.06-1.78-0.2-3.64-0.89-3.64-3.95 0-0.87 0.31-1.58 0.81-2.14-0.08-0.2-0.35-1.02 0.08-2.12 0 0 0.67-0.21 2.2 0.82a7.56 7.56 0 0 1 4.01 0c1.53-1.03 2.2-0.82 2.2-0.82 0.43 1.1 0.16 1.92 0.08 2.12 0.51 0.56 0.81 1.27 0.81 2.14 0 3.07-1.87 3.75-3.66 3.95 0.29 0.25 0.54 0.73 0.54 1.48l-0.01 2.2c0 0.22 0.14 0.47 0.55 0.39A8 8 0 0 0 8 0.2Z"></path></svg><span>trx-rs on GitHub</span></a></span> — <span id="copyright-year"></span>
|
||||
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>
|
||||
<div class="hint" id="power-hint" aria-live="polite">Connecting…</div>
|
||||
</div>
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
// Map, statistics, and geolocation module (lazy-loaded on map tab activation).
|
||||
// Communicates with app.js core via window.trx namespace.
|
||||
(function () {
|
||||
@@ -1543,6 +1547,7 @@
|
||||
pruneMapHistory();
|
||||
}
|
||||
|
||||
let stageResizeObserver = null;
|
||||
function initAprsMap() {
|
||||
if (typeof L === "undefined") return;
|
||||
const mapEl = document.getElementById("aprs-map");
|
||||
@@ -1555,6 +1560,19 @@
|
||||
const zoom = hasLocation ? T.initialMapZoom : 2;
|
||||
|
||||
aprsMap = L.map("aprs-map").setView(center, zoom);
|
||||
|
||||
// Observe the parent stage for size changes. Display:none → "" on the
|
||||
// map tab, late-arriving content above the map, or any other layout
|
||||
// shift would otherwise leave Leaflet's internal pane sized against
|
||||
// stale dimensions until the user clicked the map. Observing the
|
||||
// *parent* (not #aprs-map itself, which we resize) avoids feedback
|
||||
// loops from sizeAprsMapToViewport's own height assignments.
|
||||
const stage = mapStageEl();
|
||||
if (stage && typeof ResizeObserver !== "undefined") {
|
||||
if (stageResizeObserver) stageResizeObserver.disconnect();
|
||||
stageResizeObserver = new ResizeObserver(() => sizeAprsMapToViewport());
|
||||
stageResizeObserver.observe(stage);
|
||||
}
|
||||
updateMapBaseLayerForTheme(T.currentTheme());
|
||||
syncAprsReceiverMarker();
|
||||
|
||||
@@ -1848,10 +1866,13 @@
|
||||
initAprsMap();
|
||||
sizeAprsMapToViewport();
|
||||
if (aprsMap) {
|
||||
setTimeout(() => {
|
||||
aprsMap.invalidateSize();
|
||||
aprsMap.setView([lat, lon], 13);
|
||||
}, 50);
|
||||
requestAnimationFrame(() => {
|
||||
requestAnimationFrame(() => {
|
||||
sizeAprsMapToViewport();
|
||||
aprsMap.invalidateSize();
|
||||
aprsMap.setView([lat, lon], 13);
|
||||
});
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1896,6 +1917,7 @@
|
||||
const center = locatorMarkerCenter(marker);
|
||||
const focusMarker = () => {
|
||||
if (!aprsMap || !marker) return;
|
||||
sizeAprsMapToViewport();
|
||||
aprsMap.invalidateSize();
|
||||
if (center) {
|
||||
const targetZoom = Math.max(aprsMap.getZoom() || 0, 7);
|
||||
@@ -1910,7 +1932,9 @@
|
||||
if (typeof marker.openPopup === "function") marker.openPopup();
|
||||
};
|
||||
focusMarker();
|
||||
setTimeout(focusMarker, 60);
|
||||
requestAnimationFrame(() => {
|
||||
requestAnimationFrame(focusMarker);
|
||||
});
|
||||
return true;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
// --- AIS Decoder Plugin (server-side decode) ---
|
||||
const aisStatus = document.getElementById("ais-status");
|
||||
const aisMessagesEl = document.getElementById("ais-messages");
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
// --- APRS Decoder Plugin (server-side decode) ---
|
||||
const aprsStatus = document.getElementById("aprs-status");
|
||||
const aprsPacketsEl = document.getElementById("aprs-packets");
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
(function () {
|
||||
"use strict";
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
// --- Bookmarks Tab ---
|
||||
|
||||
/** Current bookmark scope: "general" or a rig remote name. */
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
// --- CW (Morse) Decoder Plugin (server-side decode) ---
|
||||
const cwStatusEl = document.getElementById("cw-status");
|
||||
const cwOutputEl = document.getElementById("cw-output");
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// --- FT2 Decoder Plugin (server-side decode) ---
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
function ft8RenderMessageFt2(message) {
|
||||
if (typeof renderFt8Message === "function") return renderFt8Message(message);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// --- FT4 Decoder Plugin (server-side decode) ---
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
function ft8RenderMessage(message) {
|
||||
if (typeof renderFt8Message === "function") return renderFt8Message(message);
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
// --- FT8 Decoder Plugin (server-side decode) ---
|
||||
const ft8Status = document.getElementById("ft8-status");
|
||||
const ft8PeriodEl = document.getElementById("ft8-period");
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user