Compare commits
6 Commits
develop
...
original_w
Author | SHA1 | Date | |
---|---|---|---|
|
4fb99c05e0 | ||
|
d84e672e6e | ||
|
a687d7f163 | ||
|
9f1c9a0a09 | ||
|
f531f3c464 | ||
|
d3161b6fc1 |
@ -1,7 +0,0 @@
|
|||||||
.git
|
|
||||||
.gitignore
|
|
||||||
.idea
|
|
||||||
**/*.pyc
|
|
||||||
**/*.swp
|
|
||||||
black-env
|
|
||||||
debian
|
|
29
.github/ISSUE_TEMPLATE/bug_report.md
vendored
29
.github/ISSUE_TEMPLATE/bug_report.md
vendored
@ -1,29 +0,0 @@
|
|||||||
---
|
|
||||||
name: Bug report
|
|
||||||
about: Create a report to help us improve
|
|
||||||
title: ''
|
|
||||||
labels: ''
|
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Describe the bug**
|
|
||||||
A clear and concise description of what the bug is.
|
|
||||||
|
|
||||||
**To Reproduce**
|
|
||||||
Steps to reproduce the behavior.
|
|
||||||
|
|
||||||
**Expected behavior**
|
|
||||||
A clear and concise description of what you expected to happen.
|
|
||||||
|
|
||||||
**Installation method**
|
|
||||||
How did you install OpenWebRX? (Raspberry Pi SD card image, Debian / Ubuntu packages, Docker image, manually?)
|
|
||||||
|
|
||||||
**Versions**
|
|
||||||
What version of OpenWebRX are you running? (Check on startup, or see `owrx/version.py`. If a `-dev` version is used, ideally state the commit the issue is appearing on)
|
|
||||||
|
|
||||||
**Log messages**
|
|
||||||
Are there any relevant messages relating to the bug in the output / log of OpenWebRX? (On most installations, the log should be available using the command `sudo journalctl -u openwebrx`)
|
|
||||||
|
|
||||||
**Additional context**
|
|
||||||
Add any other context about the problem here.
|
|
5
.github/ISSUE_TEMPLATE/config.yml
vendored
5
.github/ISSUE_TEMPLATE/config.yml
vendored
@ -1,5 +0,0 @@
|
|||||||
blank_issues_enabled: false
|
|
||||||
contact_links:
|
|
||||||
- name: General support request or other project-relasted question
|
|
||||||
url: https://groups.io/g/openwebrx
|
|
||||||
about: Request help on the community mailing list
|
|
20
.github/ISSUE_TEMPLATE/feature_request.md
vendored
20
.github/ISSUE_TEMPLATE/feature_request.md
vendored
@ -1,20 +0,0 @@
|
|||||||
---
|
|
||||||
name: Feature request
|
|
||||||
about: Suggest an idea for this project
|
|
||||||
title: ''
|
|
||||||
labels: feature
|
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
Before posting a new feature request, please check if a similar idea has already been listed
|
|
||||||
* on the issue tracker
|
|
||||||
* on the [OpenWebRX github project](https://github.com/users/jketterl/projects/1).
|
|
||||||
|
|
||||||
In the latter case, please only proceed if you have additional information about the feature, and please let us know that there's already a card there.
|
|
||||||
|
|
||||||
**Feature description**
|
|
||||||
Please describe in plain words what functionality you'd like to see in OpenWebRX, and why you think it's useful.
|
|
||||||
|
|
||||||
**Target audience**
|
|
||||||
Please let us know if you think that this feature is of particular interest for a particular group of users (e.g. hams, SWLs, DXers, ...)
|
|
6
.gitignore
vendored
6
.gitignore
vendored
@ -1,5 +1,3 @@
|
|||||||
**/*.pyc
|
*.pyc
|
||||||
**/*.swp
|
*.swp
|
||||||
tags
|
tags
|
||||||
.idea
|
|
||||||
packages
|
|
||||||
|
219
CHANGELOG.md
219
CHANGELOG.md
@ -1,219 +0,0 @@
|
|||||||
**unreleased**
|
|
||||||
- SDR device log messages are now available in the web configuration to simplify troubleshooting
|
|
||||||
- Added support for the MSK144 digimode
|
|
||||||
|
|
||||||
**1.2.1**
|
|
||||||
- FifiSDR support fixed (pipeline formats now line up correctly)
|
|
||||||
- Added "Device" input for FifiSDR devices for sound card selection
|
|
||||||
|
|
||||||
**1.2.0**
|
|
||||||
- Major rewrite of all demodulation components to make use of the new csdr/pycsdr and digiham/pydigiham demodulator
|
|
||||||
modules
|
|
||||||
- Preliminary display of M17 callsign information
|
|
||||||
- New devices supported:
|
|
||||||
- Blade RF
|
|
||||||
|
|
||||||
**1.1.0**
|
|
||||||
- Reworked most graphical elements as SVGs for faster loadtimes and crispier display on hi-dpi displays
|
|
||||||
- Updated pipelines to match changes in digiham
|
|
||||||
- Changed D-Star and NXDN integrations to use new decoders from digiham
|
|
||||||
- Added D-Star and NXDN metadata display
|
|
||||||
|
|
||||||
**1.0.0**
|
|
||||||
- Introduced `squelch_auto_margin` config option that allows configuring the auto squelch level
|
|
||||||
- Removed `port` configuration option; `rtltcp_compat` takes the port number with the new connectors
|
|
||||||
- Added support for new WSJT-X modes FST4, FST4W (only available with WSJT-X 2.3) and Q65 (only avilable with
|
|
||||||
WSJT-X 2.4)
|
|
||||||
- Added support for demodulating M17 digital voice signals using m17-cxx-demod
|
|
||||||
- New reporting infrastructure, allowing WSPR and FST4W spots to be sent to wsprnet.org
|
|
||||||
- Add some basic filtering capabilities to the map
|
|
||||||
- New arguments to the `openwebrx` command-line to facilitate the administration of users (try `openwebrx admin`)
|
|
||||||
- Default bandwidth changes:
|
|
||||||
- "WFM" changed to 150kHz
|
|
||||||
- "Packet" (APRS) changed to 12.5kHz
|
|
||||||
- Configuration rework:
|
|
||||||
- New: fully web-based configuration interface
|
|
||||||
- System configuration parameters have been moved to a new, separate `openwebrx.conf` file
|
|
||||||
- Remaining parameters are now editable in the web configuration
|
|
||||||
- Existing `config_webrx.py` files will still be read, but changes made in the web configuration will be written to
|
|
||||||
a new storage system
|
|
||||||
- Added upload of avatar and panorama image via web configuration
|
|
||||||
- New devices supported:
|
|
||||||
- HPSDR devices (Hermes Lite 2) thanks to @jancona
|
|
||||||
- BBRF103 / RX666 / RX888 devices supported by libsddc
|
|
||||||
- R&S devices using the EB200 or Ammos protocols
|
|
||||||
|
|
||||||
**0.20.3**
|
|
||||||
- Fix a compatibility issue with python versions <= 3.6
|
|
||||||
|
|
||||||
**0.20.2**
|
|
||||||
- Fix a security problem that allowed arbitrary commands to be executed on the receiver
|
|
||||||
([See github issue #215](https://github.com/jketterl/openwebrx/issues/215))
|
|
||||||
|
|
||||||
**0.20.1**
|
|
||||||
- Remove broken OSM map fallback
|
|
||||||
|
|
||||||
**0.20.0**
|
|
||||||
- Added the ability to sign multiple keys in a single request, thus enabling multiple users to claim a single receiver
|
|
||||||
on receiverbook.de
|
|
||||||
- Fixed file descriptor leaks to prevent "too many open files" errors
|
|
||||||
- Add new demodulator chain for FreeDV
|
|
||||||
- Added new HD audio streaming mode along with a new WFM demodulator
|
|
||||||
- Reworked AGC code for better results in AM, SSB and digital modes
|
|
||||||
- Added support for demodulation of "Digital Radio Mondiale" (DRM) broadcast using the "dream" decoder.
|
|
||||||
- New default waterfall color scheme
|
|
||||||
- Prototype of a continuous automatic waterfall calibration mode
|
|
||||||
- New devices supported:
|
|
||||||
- FunCube Dongle Pro+ (`"type": "fcdpp"`)
|
|
||||||
- Support for connections to rtl_tcp (`"type": "rtl_tcp"`)
|
|
||||||
|
|
||||||
**0.19.1**
|
|
||||||
- Added ability to authenticate receivers with listing sites using "receiver id" tokens
|
|
||||||
|
|
||||||
**0.19.0**
|
|
||||||
- Fix direwolf connection setup by implementing a retry loop
|
|
||||||
- Pass direct sampling mode changes for rtl_sdr_soapy to owrx_connector
|
|
||||||
- OSM maps instead of Google when google_maps_api_key is not set (thanks @jquagga)
|
|
||||||
- Improved logic to pass parameters to soapy devices.
|
|
||||||
- `rtl_sdr_soapy`: added support for `bias_tee`
|
|
||||||
- `sdrplay`: added support for `bias_tee`, `rf_notch` and `dab_notch`
|
|
||||||
- `airspy`: added support for `bitpack`
|
|
||||||
- Added support for Perseus-SDR devices, (thanks @amontefusco)
|
|
||||||
- Property System has been rewritten so that defaults on sdr behave as expected
|
|
||||||
- Waterfall range auto-adjustment now only takes the center 80% of the spectrum into account, which should work better
|
|
||||||
with SDRs that oversample or have rather flat filter curves towards the spectrum edges
|
|
||||||
- Bugfix for negative network usage
|
|
||||||
- FiFi SDR: prevent arecord from shutting down after 2GB of data has been sent
|
|
||||||
- Added support for bias tee control on rtl_sdr devices
|
|
||||||
- All connector driven SDRs now support `"rf_gain": "auto"` to enable AGC
|
|
||||||
- `rtl_sdr` type now also supports the `direct_sampling` option
|
|
||||||
- Added decoding implementation for for digimode "JS8Call"
|
|
||||||
(requires an installation of [js8call](http://js8call.com/) and
|
|
||||||
[the js8py library](https://github.com/jketterl/js8py))
|
|
||||||
- Reorganization of the frontend demodulator code
|
|
||||||
- Improve receiver load time by concatenating javascript assets
|
|
||||||
- Docker images migrated to Debian slim images; This was necessary to allow the use of function multiversioning in
|
|
||||||
csdr and owrx_connector to allow the images to run on a wider range of CPUs
|
|
||||||
- Docker containers have been updated to include the SDRplay driver version 3
|
|
||||||
- HackRF support is now based on SoapyHackRF
|
|
||||||
- Removed sdr.hu server listing support since the site has been shut down
|
|
||||||
- Added support for Radioberry 2 Rasbperry Pi SDR Cape
|
|
||||||
|
|
||||||
**0.18.0**
|
|
||||||
- Support for SoapyRemote
|
|
||||||
|
|
||||||
**2020-02-08**
|
|
||||||
- Compression, resampling and filtering in the frontend have been rewritten in javascript, sdr.js has been removed
|
|
||||||
- Decoding of Pocsag modulation is now possible
|
|
||||||
- Removed the 3D waterfall since it had no real application and required ~1MB of javascript code to be downloaded
|
|
||||||
- Improved the frontend handling of the "too many users" scenario
|
|
||||||
- PSK63 digimode is now available (same decoding pipeline as PSK31, but with adopted parameters)
|
|
||||||
- The frequency can now be manipulated with the mousewheel, which should allow the user to tune more precise. The tuning
|
|
||||||
step size is determined by the digit the mouse cursor is hovering over.
|
|
||||||
- Clicking on the frequency now opens an input for direct frequency selection
|
|
||||||
- URL hashes have been fixed and improved: They are now updated automatically, so a shared URL will include frequency
|
|
||||||
and demodulator, which allows for improved sharing and linking.
|
|
||||||
- New daylight scheduler for background decoding, allows profiles to be selected by local sunrise / sunset times
|
|
||||||
- New devices supported:
|
|
||||||
- LimeSDR (`"type": "lime_sdr"`)
|
|
||||||
- PlutoSDR (`"type": "pluto_sdr"`)
|
|
||||||
- RTL_SDR via Soapy (`"type": "rtl_sdr_soapy"`) on special request to allow use of the direct sampling mode
|
|
||||||
|
|
||||||
**2020-01-04**
|
|
||||||
- The [owrx_connector](https://github.com/jketterl/owrx_connector) is now the default way of communicating with sdr
|
|
||||||
devices. The old sdr types have been replaced, all `_connector` suffixes on the type must be removed!
|
|
||||||
- The sources have been refactored, making it a lot easier to add support for other devices
|
|
||||||
- SDR device failure handling has been improved, including user feedback
|
|
||||||
- New devices supported:
|
|
||||||
- FiFiSDR (`"type": "fifi_sdr"`)
|
|
||||||
|
|
||||||
**2019-12-15**
|
|
||||||
- wsjt-x updated to 2.1.2
|
|
||||||
- The rtl_tcp compatibility mode of the owrx_connector is now configurable using the `rtltcp_compat` flag
|
|
||||||
|
|
||||||
**2019-12-10**
|
|
||||||
- added support for airspyhf devices (Airspy HF+ / Discovery)
|
|
||||||
|
|
||||||
**2019-12-05**
|
|
||||||
- explicit device filter for soapy devices for multi-device setups
|
|
||||||
|
|
||||||
**2019-12-03**
|
|
||||||
- compatibility fixes for safari browsers (ios and mac)
|
|
||||||
|
|
||||||
**2019-11-24**
|
|
||||||
- There is now a new way to interface with SDR hardware, .
|
|
||||||
They talk directly to the hardware (no rtl_sdr / rx_sdr necessary) and offer I/Q data on a socket, just like nmux
|
|
||||||
did before. They additionally offer a control socket that allows openwebrx to control the SDR parameters directly,
|
|
||||||
without the need for repeated restarts. This allows for quicker profile changes, and also reduces the risk of your
|
|
||||||
SDR hardware from failing during the switchover. See `config_webrx.py` for further information and instructions.
|
|
||||||
- Offset tuning using the `lfo_offset` has been reworked in a way that `center_freq` has to be set to the frequency you
|
|
||||||
actually want to listen to. If you're using an `lfo_offset` already, you will probably need to change its sign.
|
|
||||||
- `initial_squelch_level` can now be set on each profile.
|
|
||||||
- As usual, plenty of fixes and improvements.
|
|
||||||
|
|
||||||
**2019-10-27**
|
|
||||||
- Part of the frontend code has been reworked
|
|
||||||
- Audio buffer minimums have been completely stripped. As a result, you should get better latency. Unfortunately,
|
|
||||||
this also means there will be some skipping when audio starts.
|
|
||||||
- Now also supports AudioWorklets (for those browser that have it). The Raspberry Pi image has been updated to include
|
|
||||||
https due to the SecureContext requirement.
|
|
||||||
- Mousewheel controls for the receiver sliders
|
|
||||||
- Error handling for failed SDR devices
|
|
||||||
|
|
||||||
**2019-09-29**
|
|
||||||
- One of the most-requested features is finally coming to OpenWebRX: Bookmarks (sometimes also referred to as labels).
|
|
||||||
There's two kinds of bookmarks available:
|
|
||||||
- Serverside bookmarks that are set up by the receiver administrator. Check the file `bookmarks.json` for examples!
|
|
||||||
- Clientside bookmarks which every user can store for themselves. They are stored in the browser's localStorage.
|
|
||||||
- Some more bugs in the websocket handling have been fixed.
|
|
||||||
|
|
||||||
**2019-09-25**
|
|
||||||
- Automatic reporting of spots to [pskreporter](https://pskreporter.info/) is now possible. Please have a look at the
|
|
||||||
configuration on how to set it up.
|
|
||||||
- Websocket communication has been overhauled in large parts. It should now be more reliable, and failing connections
|
|
||||||
should now have no impact on other users.
|
|
||||||
- Profile scheduling allows to set up band-hopping if you are running background services.
|
|
||||||
- APRS now has the ability to show symbols on the map, if a corresponding symbol set has been installed. Check the
|
|
||||||
config!
|
|
||||||
- Debug logging has been disabled in a handful of modules, expect vastly reduced output on the shell.
|
|
||||||
|
|
||||||
**2019-09-13**
|
|
||||||
- New set of APRS-related features
|
|
||||||
- Decode Packet transmissions using [direwolf](https://github.com/wb2osz/direwolf) (1k2 only for now)
|
|
||||||
- APRS packets are mostly decoded and shown both in a new panel and on the map
|
|
||||||
- APRS is also available as a background service
|
|
||||||
- direwolfs I-gate functionality can be enabled, which allows your receiver to work as a receive-only I-gate for the
|
|
||||||
APRS network in the background
|
|
||||||
- Demodulation for background services has been optimized to use less total bandwidth, saving CPU
|
|
||||||
- More metrics have been added; they can be used together with collectd and its curl_json plugin for now, with some
|
|
||||||
limitations.
|
|
||||||
|
|
||||||
**2019-07-21**
|
|
||||||
- Latest Features:
|
|
||||||
- More WSJT-X modes have been added, including the new FT4 mode
|
|
||||||
- I started adding a bandplan feature, the first thing visible is the "dial" indicator that brings you right to the
|
|
||||||
dial frequency for digital modes
|
|
||||||
- fixed some bugs in the websocket communication which broke the map
|
|
||||||
|
|
||||||
**2019-07-13**
|
|
||||||
- Latest Features:
|
|
||||||
- FT8 Integration (using wsjt-x demodulators)
|
|
||||||
- New Map Feature that shows both decoded grid squares from FT8 and Locations decoded from YSF digital voice
|
|
||||||
- New Feature report that will show what functionality is available
|
|
||||||
- There's a new Raspbian SD Card image available (see below)
|
|
||||||
|
|
||||||
**2019-06-30**
|
|
||||||
- I have done some major rework on the openwebrx core, and I am planning to continue adding more features in the near
|
|
||||||
future. Please check this place for updates.
|
|
||||||
- My work has not been accepted into the upstream repository, so you will need to chose between my fork and the official
|
|
||||||
version.
|
|
||||||
- I have enabled the issue tracker on this project, so feel free to file bugs or suggest enhancements there!
|
|
||||||
- This version sports the following new and amazing features:
|
|
||||||
- Support of multiple SDR devices simultaneously
|
|
||||||
- Support for multiple profiles per SDR that allow the user to listen to different frequencies
|
|
||||||
- Support for digital voice decoding
|
|
||||||
- Feature detection that will disable functionality when dependencies are not available (if you're missing the digital
|
|
||||||
buttons, this is probably why)
|
|
||||||
- Raspbian SD Card Images and Docker builds available (see below)
|
|
||||||
- I am currently working on the feature set for a stable release, but you are more than welcome to test development
|
|
||||||
versions!
|
|
15
CONTRIBUTING.md
Normal file
15
CONTRIBUTING.md
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
First of all, thank you for taking the time to contribute to this project!
|
||||||
|
|
||||||
|
Before I can accept your contributions, I need a signed copy of the Individual Contributor License Agreement (ICLA) from you, which is available <a href="ICLA.txt">here</a>.
|
||||||
|
|
||||||
|
The ICLA is needed because it will allow me to dual license the OpenWebRX project under AGPL and a commercial license.
|
||||||
|
I will also apply dual licensing to csdr, but only those parts that are original work (e.g. without the parts enabled by `-DUSE_IMA_ADPCM`; code taken from other projects is clearly separable).
|
||||||
|
|
||||||
|
However, even if there is commercial interest in the projects, I promise to keep them as open as possible, keeping my original intention to provide an open-source web-based SDR receiver software to the amateur radio operators and SDR enthusiasts.
|
||||||
|
|
||||||
|
This contributor agreement is based on the one of Apache Software Foundation, with some modifications. (You can review differences <a href="https://gist.github.com/ha7ilm/9e981006d24659e336c7/revisions">here</a>).
|
||||||
|
When you contribute for the first time, I will send you the ICLA. Replying with only the information requested and the text "I Agree" is sufficient.
|
||||||
|
|
||||||
|
Thanks,
|
||||||
|
|
||||||
|
Andras, HA7ILM
|
5
CONTRIBUTORS
Normal file
5
CONTRIBUTORS
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
This is a list of the great people who contributed code to the OpenWebRX repository. (Names are sorted alphabetically.)
|
||||||
|
|
||||||
|
Gnoxter <gnoxter@linuxlounge.net>
|
||||||
|
John Seamons, ZL/KF6VO <jks@jks.com>
|
||||||
|
|
128
ICLA.txt
Normal file
128
ICLA.txt
Normal file
@ -0,0 +1,128 @@
|
|||||||
|
Individual Contributor License Agreement ("Agreement")
|
||||||
|
|
||||||
|
In order to clarify the intellectual property license granted
|
||||||
|
with Contributions from any person or entity, Retzler András
|
||||||
|
(hereinafter referred to as "Project Owner") must have a
|
||||||
|
Contributor License Agreement ("CLA") on file that has
|
||||||
|
been signed by each Contributor, indicating agreement to the license
|
||||||
|
terms below. This license is for your protection as a Contributor as
|
||||||
|
well as the protection of the Project Owner; it does not change your
|
||||||
|
rights to use your own Contributions for any other purpose.
|
||||||
|
Please read this document carefully before signing and keep a copy
|
||||||
|
for your records.
|
||||||
|
|
||||||
|
Full name: ______________________________________________________
|
||||||
|
|
||||||
|
(optional) Public name: _________________________________________
|
||||||
|
|
||||||
|
Mailing Address: ________________________________________________
|
||||||
|
|
||||||
|
________________________________________________
|
||||||
|
|
||||||
|
Country: ______________________________________________________
|
||||||
|
|
||||||
|
(optional) Telephone: ___________________________________________
|
||||||
|
|
||||||
|
E-Mail: ______________________________________________________
|
||||||
|
|
||||||
|
You accept and agree to the following terms and conditions for Your
|
||||||
|
present and future Contributions submitted to the Project Owner.
|
||||||
|
|
||||||
|
Except for the license granted herein to the Project Owner and recipients
|
||||||
|
of software distributed by the Project Owner, You reserve all right, title,
|
||||||
|
and interest in and to Your Contributions.
|
||||||
|
|
||||||
|
1. Definitions.
|
||||||
|
|
||||||
|
"You" (or "Your") shall mean the copyright owner or legal entity
|
||||||
|
authorized by the copyright owner that is making this Agreement
|
||||||
|
with the Project Owner. For legal entities, the entity making a
|
||||||
|
Contribution and all other entities that control, are controlled
|
||||||
|
by, or are under common control with that entity are considered to
|
||||||
|
be a single Contributor. For the purposes of this definition,
|
||||||
|
"control" means (i) the power, direct or indirect, to cause the
|
||||||
|
direction or management of such entity, whether by contract or
|
||||||
|
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||||
|
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||||
|
|
||||||
|
"Contribution" shall mean any original work of authorship,
|
||||||
|
including any modifications or additions to an existing work, that
|
||||||
|
is intentionally submitted by You to the Project Owner for inclusion
|
||||||
|
in, or documentation of, any of the products owned or managed by
|
||||||
|
the Project Owner (the "Work"). For the purposes of this definition,
|
||||||
|
"submitted" means any form of electronic, verbal, or written
|
||||||
|
communication sent to the Project Owner or its representatives,
|
||||||
|
including but not limited to communication on electronic mailing
|
||||||
|
lists, source code control systems, and issue tracking systems that
|
||||||
|
are managed by, or on behalf of, the Project Owner for the purpose of
|
||||||
|
discussing and improving the Work, but excluding communication that
|
||||||
|
is conspicuously marked or otherwise designated in writing by You
|
||||||
|
as "Not a Contribution."
|
||||||
|
|
||||||
|
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||||
|
this Agreement, You hereby grant to the Project Owner and to
|
||||||
|
recipients of software distributed by the Project Owner a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
copyright license to reproduce, prepare derivative works of,
|
||||||
|
publicly display, publicly perform, sublicense, and distribute Your
|
||||||
|
Contributions and such derivative works.
|
||||||
|
|
||||||
|
3. Grant of Patent License. Subject to the terms and conditions of
|
||||||
|
this Agreement, You hereby grant to the Project Owner and to
|
||||||
|
recipients of software distributed by the Project Owner a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
(except as stated in this section) patent license to make, have
|
||||||
|
made, use, offer to sell, sell, import, and otherwise transfer the
|
||||||
|
Work, where such license applies only to those patent claims
|
||||||
|
licensable by You that are necessarily infringed by Your
|
||||||
|
Contribution(s) alone or by combination of Your Contribution(s)
|
||||||
|
with the Work to which such Contribution(s) was submitted. If any
|
||||||
|
entity institutes patent litigation against You or any other entity
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging
|
||||||
|
that your Contribution, or the Work to which you have contributed,
|
||||||
|
constitutes direct or contributory patent infringement, then any
|
||||||
|
patent licenses granted to that entity under this Agreement for
|
||||||
|
that Contribution or Work shall terminate as of the date such
|
||||||
|
litigation is filed.
|
||||||
|
|
||||||
|
4. You represent that you are legally entitled to grant the above
|
||||||
|
license. If your employer(s) has rights to intellectual property
|
||||||
|
that you create that includes your Contributions, you represent
|
||||||
|
that you have received permission to make Contributions on behalf
|
||||||
|
of that employer, that your employer has waived such rights for
|
||||||
|
your Contributions to the Project Owner, or that your employer has
|
||||||
|
executed a separate Corporate CLA with the Project Owner.
|
||||||
|
|
||||||
|
5. You represent that each of Your Contributions is Your original
|
||||||
|
creation (see section 7 for submissions on behalf of others). You
|
||||||
|
represent that Your Contribution submissions include complete
|
||||||
|
details of any third-party license or other restriction (including,
|
||||||
|
but not limited to, related patents and trademarks) of which you
|
||||||
|
are personally aware and which are associated with any part of Your
|
||||||
|
Contributions.
|
||||||
|
|
||||||
|
6. You are not expected to provide support for Your Contributions,
|
||||||
|
except to the extent You desire to provide support. You may provide
|
||||||
|
support for free, for a fee, or not at all. Unless required by
|
||||||
|
applicable law or agreed to in writing, You provide Your
|
||||||
|
Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
|
||||||
|
OF ANY KIND, either express or implied, including, without
|
||||||
|
limitation, any warranties or conditions of TITLE, NON-
|
||||||
|
INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
|
||||||
|
7. Should You wish to submit work that is not Your original creation,
|
||||||
|
You may submit it to the Project Owner separately from any
|
||||||
|
Contribution, identifying the complete details of its source and of
|
||||||
|
any license or other restriction (including, but not limited to,
|
||||||
|
related patents, trademarks, and license agreements) of which you
|
||||||
|
are personally aware, and conspicuously marking the work as
|
||||||
|
"Submitted on behalf of a third-party: [named here]".
|
||||||
|
|
||||||
|
8. You agree to notify the Project Owner of any facts or circumstances of
|
||||||
|
which you become aware that would make these representations
|
||||||
|
inaccurate in any respect.
|
||||||
|
|
||||||
|
Please sign: __________________________________ Date: ________________
|
||||||
|
|
||||||
|
Text derived from the Apache Individual Contributor License Agreement
|
||||||
|
("Agreement") V2.0, available at http://apache.org/licenses/icla.txt
|
121
README.md
121
README.md
@ -1,47 +1,94 @@
|
|||||||
OpenWebRX
|
# OpenWebRX
|
||||||
=========
|
|
||||||
|
|
||||||
OpenWebRX is a multi-user SDR receiver software with a web interface.
|
OpenWebRX is a multi-user SDR receiver software with a web interface.
|
||||||
|
|
||||||
![OpenWebRX](https://www.openwebrx.de/gfx/openwebrx-screenshot.png)
|
----
|
||||||
|
|
||||||
|
### ⚠️ From 2019-12-29 OpenWebRX development is discontinued. ⚠️
|
||||||
|
|
||||||
|
I'm would like to say a big thanks to everyone who supported me during this project, including those who contributed either code or donations. It has been a very fruitful 6 years, but now it's time to move on to other projects. See also my [blog](https://blog.sdr.hu) about that.
|
||||||
|
|
||||||
|
(@simonyiszk, please keep this GitHub repo for historic purposes.)
|
||||||
|
|
||||||
|
Know limitations of the last version:
|
||||||
|
|
||||||
|
- Python 2.7, a main dependency of the project, will be not be officially maintained from 1 January 2020. By time, probably it will not be secure to use this version on public servers, unless someone still provides security patches for Python 2.
|
||||||
|
- Some specific parts of the DSP code could be improved for better SNR.
|
||||||
|
|
||||||
|
Even though these limitations are probably acceptable in an amateur radio project, I would not build critical infrastructure on it.
|
||||||
|
|
||||||
|
For commercial inquiries (e.g. if someone wants me to develop an improved version without these limitations), I'm still open, [drop me an e-mail](mailto:randras@sdr.hu).
|
||||||
|
|
||||||
|
----
|
||||||
|
|
||||||
|
[:floppy_disk: Setup guide for Ubuntu](http://blog.sdr.hu/2015/06/30/quick-setup-openwebrx.html) | [:blue_book: Knowledge base on the Wiki](https://github.com/simonyiszk/openwebrx/wiki/) | [:earth_americas: Receivers on SDR.hu](http://sdr.hu/)
|
||||||
|
|
||||||
|
![OpenWebRX](http://blog.sdr.hu/images/openwebrx/screenshot.png)
|
||||||
|
|
||||||
It has the following features:
|
It has the following features:
|
||||||
|
|
||||||
- [csdr](https://github.com/jketterl/csdr) based demodulators (AM/FM/SSB/CW/BPSK31/BPSK63)
|
- <a href="https://github.com/simonyiszk/csdr">csdr</a> based demodulators (AM/FM/SSB/CW/BPSK31),
|
||||||
- filter passband can be set from GUI
|
- filter passband can be set from GUI,
|
||||||
- it extensively uses HTML5 features like WebSocket, Web Audio API, and Canvas
|
- waterfall display can be shifted back in time,
|
||||||
- it works in Google Chrome, Chromium and Mozilla Firefox
|
- it extensively uses HTML5 features like WebSocket, Web Audio API, and <canvas>,
|
||||||
- supports a wide range of [SDR hardware](https://github.com/jketterl/openwebrx/wiki/Supported-Hardware#sdr-devices)
|
- it works in Google Chrome, Chromium (above version 37) and Mozilla Firefox (above version 28),
|
||||||
- Multiple SDR devices can be used simultaneously
|
- currently supports RTL-SDR, HackRF, SDRplay, AirSpy and many other devices, see the <a href="https://github.com/simonyiszk/openwebrx/wiki/">OpenWebRX Wiki</a>,
|
||||||
- [digiham](https://github.com/jketterl/digiham) based demodularors (DMR, YSF, Pocsag, D-Star, NXDN)
|
- it has a 3D waterfall display:
|
||||||
- [wsjt-x](https://wsjt.sourceforge.io/) based demodulators (FT8, FT4, WSPR, JT65, JT9, FST4,
|
|
||||||
FST4W)
|
![OpenWebRX 3D waterfall](http://blog.sdr.hu/images/openwebrx/screenshot-3d.gif)
|
||||||
- [direwolf](https://github.com/wb2osz/direwolf) based demodulation of APRS packets
|
|
||||||
- [JS8Call](http://js8call.com/) support
|
**News (2015-08-18)**
|
||||||
- [DRM](https://github.com/jketterl/openwebrx/wiki/DRM-demodulator-notes) support
|
- My BSc. thesis written on OpenWebRX is <a href="https://sdr.hu/static/bsc-thesis.pdf">available here.</a>
|
||||||
- [FreeDV](https://github.com/jketterl/openwebrx/wiki/FreeDV-demodulator-notes) support
|
- Several bugs were fixed to improve reliability and stability.
|
||||||
- M17 support based on [m17-cxx-demod](https://github.com/mobilinkd/m17-cxx-demod)
|
- OpenWebRX now supports compression of audio and waterfall stream, so the required network uplink bandwidth has been decreased from 2 Mbit/s to about 200 kbit/s per client! (Measured with the default settings. It is also dependent on `fft_size`.)
|
||||||
|
- OpenWebRX now uses <a href="https://github.com/simonyiszk/csdr#sdrjs">sdr.js</a> (*libcsdr* compiled to JavaScript) for some client-side DSP tasks.
|
||||||
|
- Receivers can now be listed on <a href="http://sdr.hu/">SDR.hu</a>.
|
||||||
|
- License for OpenWebRX is now Affero GPL v3.
|
||||||
|
|
||||||
|
**News (2016-02-14)**
|
||||||
|
- The DDC in *csdr* has been manually optimized for ARM NEON, so it runs around 3 times faster on the Raspberry Pi 2 than before.
|
||||||
|
- Also we use *ncat* instead of *rtl_mus*, and it is 3 times faster in some cases.
|
||||||
|
- OpenWebRX now supports URLs like: `http://localhost:8073/#freq=145555000,mod=usb`
|
||||||
|
- UI improvements were made, thanks to John Seamons and Gnoxter.
|
||||||
|
|
||||||
|
**News (2017-04-04)**
|
||||||
|
- *ncat* has been replaced with a custom implementation called *nmux* due to a bug that caused regular crashes on some machines. The *nmux* tool is part of the *csdr* package.
|
||||||
|
- Most consumer SDR devices are supported via <a href="https://github.com/rxseger/rx_tools">rx_tools</a>, see the <a href="https://github.com/simonyiszk/openwebrx/wiki/Using-rx_tools-with-OpenWebRX">OpenWebRX Wiki</a> on that.
|
||||||
|
|
||||||
|
**News (2017-07-12)**
|
||||||
|
- OpenWebRX now has a BPSK31 demodulator and a 3D waterfall display.
|
||||||
|
|
||||||
|
> When upgrading OpenWebRX, please make sure that you also upgrade *csdr*!
|
||||||
|
|
||||||
|
## OpenWebRX servers on SDR.hu
|
||||||
|
|
||||||
|
[SDR.hu](http://sdr.hu) is a site which lists the active, public OpenWebRX servers. Your receiver [can also be part of it](http://sdr.hu/openwebrx), if you want.
|
||||||
|
|
||||||
|
![sdr.hu](http://blog.sdr.hu/images/openwebrx/screenshot-sdrhu.png)
|
||||||
|
|
||||||
## Setup
|
## Setup
|
||||||
|
|
||||||
The following methods of setting up a receiver are currently available:
|
OpenWebRX currently requires Linux and python 2.7 to run.
|
||||||
|
|
||||||
- Raspberry Pi SD card images
|
First you will need to install the dependencies:
|
||||||
- Debian repository
|
|
||||||
- Docker images
|
|
||||||
- Manual installation
|
|
||||||
|
|
||||||
Please checkout the [setup guide on the wiki](https://github.com/jketterl/openwebrx/wiki/Setup-Guide) for more details
|
- <a href="https://github.com/simonyiszk/csdr">libcsdr</a>
|
||||||
on the respective methods.
|
- <a href="http://sdr.osmocom.org/trac/wiki/rtl-sdr">rtl-sdr</a>
|
||||||
|
|
||||||
## Community
|
After cloning this repository and connecting an RTL-SDR dongle to your computer, you can run the server:
|
||||||
|
|
||||||
If you have trouble setting up or configuring your receiver, you have some great idea you want to see implemented, or
|
python openwebrx.py
|
||||||
you just generally want to have some OpenWebRX-related chat, come visit us over on
|
|
||||||
[our groups.io group](https://groups.io/g/openwebrx).
|
|
||||||
|
|
||||||
If you want to hang out, chat, or get in touch directly with the developers, receiver operators or users, feel free to
|
You can now open the GUI at <a href="http://localhost:8073">http://localhost:8073</a>.
|
||||||
drop by in [our Discord server](https://discord.gg/gnE9hPz).
|
|
||||||
|
Please note that the server is also listening on the following ports (on localhost only):
|
||||||
|
|
||||||
|
- port 4951 for the multi-user I/Q server.
|
||||||
|
|
||||||
|
Now the next step is to customize the parameters of your server in `config_webrx.py`.
|
||||||
|
|
||||||
|
Actually, if you do something cool with OpenWebRX, please drop me a mail:
|
||||||
|
*Andras Retzler, HA7ILM <randras@sdr.hu>*
|
||||||
|
|
||||||
## Usage tips
|
## Usage tips
|
||||||
|
|
||||||
@ -51,10 +98,16 @@ The filter envelope can be dragged at its ends and moved around to set the passb
|
|||||||
|
|
||||||
However, if you hold down the shift key, you can drag the center line (BFO) or the whole passband (PBS).
|
However, if you hold down the shift key, you can drag the center line (BFO) or the whole passband (PBS).
|
||||||
|
|
||||||
|
## Setup tips
|
||||||
|
|
||||||
|
If you have any problems installing OpenWebRX, you should check out the <a href="https://github.com/simonyiszk/openwebrx/wiki">Wiki</a> about it, which has a page on the <a href="https://github.com/simonyiszk/openwebrx/wiki/Common-problems-and-their-solutions">common problems and their solutions</a>.
|
||||||
|
|
||||||
|
Sometimes the actual error message is not at the end of the terminal output, you may have to look at the whole output to find it.
|
||||||
|
|
||||||
|
If you want to run OpenWebRX on a remote server instead of *localhost*, do not forget to set *server_hostname* in `config_webrx.py`.
|
||||||
|
|
||||||
## Licensing
|
## Licensing
|
||||||
|
|
||||||
OpenWebRX is available under Affero GPL v3 license
|
OpenWebRX is available under Affero GPL v3 license (<a href="https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)">summary</a>).
|
||||||
([summary](https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0))).
|
|
||||||
|
|
||||||
OpenWebRX is also available under a commercial license on request. Please contact me at the address
|
OpenWebRX is also available under a commercial license on request. Please contact me at the address *<randras@sdr.hu>* for licensing options.
|
||||||
*<randras@sdr.hu>* for licensing options.
|
|
||||||
|
371
bands.json
371
bands.json
@ -1,371 +0,0 @@
|
|||||||
[
|
|
||||||
{
|
|
||||||
"name": "2190m",
|
|
||||||
"lower_bound": 135700,
|
|
||||||
"upper_bound": 137800,
|
|
||||||
"frequencies": {
|
|
||||||
"fst4": 136000,
|
|
||||||
"fst4w": 136000
|
|
||||||
},
|
|
||||||
"tags": ["hamradio"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "630m",
|
|
||||||
"lower_bound": 472000,
|
|
||||||
"upper_bound": 479000,
|
|
||||||
"frequencies": {
|
|
||||||
"fst4": 474200,
|
|
||||||
"fst4w": 474200
|
|
||||||
},
|
|
||||||
"tags": ["hamradio"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "160m",
|
|
||||||
"lower_bound": 1810000,
|
|
||||||
"upper_bound": 2000000,
|
|
||||||
"frequencies": {
|
|
||||||
"bpsk31": 1838000,
|
|
||||||
"ft8": 1840000,
|
|
||||||
"wspr": 1836600,
|
|
||||||
"jt65": 1838000,
|
|
||||||
"jt9": 1839000,
|
|
||||||
"js8": 1842000,
|
|
||||||
"fst4": 1839000,
|
|
||||||
"fst4w": 1836800
|
|
||||||
},
|
|
||||||
"tags": ["hamradio"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "80m",
|
|
||||||
"lower_bound": 3500000,
|
|
||||||
"upper_bound": 3800000,
|
|
||||||
"frequencies": {
|
|
||||||
"bpsk31": 3580000,
|
|
||||||
"ft8": 3573000,
|
|
||||||
"wspr": 3568600,
|
|
||||||
"jt65": 3570000,
|
|
||||||
"jt9": 3572000,
|
|
||||||
"ft4": [3568000, 3575000],
|
|
||||||
"js8": 3578000
|
|
||||||
},
|
|
||||||
"tags": ["hamradio"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "60m",
|
|
||||||
"lower_bound": 5351500,
|
|
||||||
"upper_bound": 5366500,
|
|
||||||
"frequencies": {
|
|
||||||
"ft8": 5357000,
|
|
||||||
"wspr": [5287200, 5364700]
|
|
||||||
},
|
|
||||||
"tags": ["hamradio"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "40m",
|
|
||||||
"lower_bound": 7000000,
|
|
||||||
"upper_bound": 7200000,
|
|
||||||
"frequencies": {
|
|
||||||
"bpsk31": 7040000,
|
|
||||||
"ft8": 7074000,
|
|
||||||
"wspr": 7038600,
|
|
||||||
"jt65": 7076000,
|
|
||||||
"jt9": 7078000,
|
|
||||||
"ft4": 7047500,
|
|
||||||
"js8": 7078000
|
|
||||||
},
|
|
||||||
"tags": ["hamradio"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "30m",
|
|
||||||
"lower_bound": 10100000,
|
|
||||||
"upper_bound": 10150000,
|
|
||||||
"frequencies": {
|
|
||||||
"bpsk31": 10141000,
|
|
||||||
"ft8": 10136000,
|
|
||||||
"wspr": 10138700,
|
|
||||||
"jt65": 10138000,
|
|
||||||
"jt9": 10140000,
|
|
||||||
"ft4": 10140000,
|
|
||||||
"js8": 10130000
|
|
||||||
},
|
|
||||||
"tags": ["hamradio"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "20m",
|
|
||||||
"lower_bound": 14000000,
|
|
||||||
"upper_bound": 14350000,
|
|
||||||
"frequencies": {
|
|
||||||
"bpsk31": 14070000,
|
|
||||||
"ft8": 14074000,
|
|
||||||
"wspr": 14095600,
|
|
||||||
"jt65": 14076000,
|
|
||||||
"jt9": 14078000,
|
|
||||||
"ft4": 14080000,
|
|
||||||
"js8": 14078000
|
|
||||||
},
|
|
||||||
"tags": ["hamradio"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "17m",
|
|
||||||
"lower_bound": 18068000,
|
|
||||||
"upper_bound": 18168000,
|
|
||||||
"frequencies": {
|
|
||||||
"bpsk31": 18098000,
|
|
||||||
"ft8": 18100000,
|
|
||||||
"wspr": 18104600,
|
|
||||||
"jt65": 18102000,
|
|
||||||
"jt9": 18104000,
|
|
||||||
"ft4": 18104000,
|
|
||||||
"js8": 18104000
|
|
||||||
},
|
|
||||||
"tags": ["hamradio"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "15m",
|
|
||||||
"lower_bound": 21000000,
|
|
||||||
"upper_bound": 21450000,
|
|
||||||
"frequencies": {
|
|
||||||
"bpsk31": 21070000,
|
|
||||||
"ft8": 21074000,
|
|
||||||
"wspr": 21094600,
|
|
||||||
"jt65": 21076000,
|
|
||||||
"jt9": 21078000,
|
|
||||||
"ft4": 21140000,
|
|
||||||
"js8": 21078000
|
|
||||||
},
|
|
||||||
"tags": ["hamradio"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "12m",
|
|
||||||
"lower_bound": 24890000,
|
|
||||||
"upper_bound": 24990000,
|
|
||||||
"frequencies": {
|
|
||||||
"bpsk31": 24920000,
|
|
||||||
"ft8": 24915000,
|
|
||||||
"wspr": 24924600,
|
|
||||||
"jt65": 24917000,
|
|
||||||
"jt9": 24919000,
|
|
||||||
"ft4": 24919000,
|
|
||||||
"js8": 24922000
|
|
||||||
},
|
|
||||||
"tags": ["hamradio"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "10m",
|
|
||||||
"lower_bound": 28000000,
|
|
||||||
"upper_bound": 29700000,
|
|
||||||
"frequencies": {
|
|
||||||
"bpsk31": [28070000, 28120000],
|
|
||||||
"ft8": 28074000,
|
|
||||||
"wspr": 28124600,
|
|
||||||
"jt65": 28076000,
|
|
||||||
"jt9": 28078000,
|
|
||||||
"ft4": 28180000,
|
|
||||||
"js8": 28078000
|
|
||||||
},
|
|
||||||
"tags": ["hamradio"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "6m",
|
|
||||||
"lower_bound": 50030000,
|
|
||||||
"upper_bound": 51000000,
|
|
||||||
"frequencies": {
|
|
||||||
"bpsk31": 50305000,
|
|
||||||
"ft8": 50313000,
|
|
||||||
"wspr": 50293000,
|
|
||||||
"jt65": 50310000,
|
|
||||||
"jt9": 50312000,
|
|
||||||
"ft4": 50318000,
|
|
||||||
"js8": 50318000,
|
|
||||||
"q65": [50211000, 50275000],
|
|
||||||
"msk144": 50260000
|
|
||||||
},
|
|
||||||
"tags": ["hamradio"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "4m",
|
|
||||||
"lower_bound": 70150000,
|
|
||||||
"upper_bound": 70200000,
|
|
||||||
"frequencies": {
|
|
||||||
"wspr": 70091000,
|
|
||||||
"msk144": 70230000
|
|
||||||
},
|
|
||||||
"tags": ["hamradio"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "2m",
|
|
||||||
"lower_bound": 144000000,
|
|
||||||
"upper_bound": 146000000,
|
|
||||||
"frequencies": {
|
|
||||||
"wspr": 144489000,
|
|
||||||
"ft8": 144174000,
|
|
||||||
"ft4": 144170000,
|
|
||||||
"jt65": 144120000,
|
|
||||||
"packet": 144800000,
|
|
||||||
"q65": 144116000,
|
|
||||||
"msk144": 144360000
|
|
||||||
},
|
|
||||||
"tags": ["hamradio"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "70cm",
|
|
||||||
"lower_bound": 430000000,
|
|
||||||
"upper_bound": 440000000,
|
|
||||||
"frequencies": {
|
|
||||||
"pocsag": 439987500,
|
|
||||||
"q65": 432065000,
|
|
||||||
"msk144": 432360000
|
|
||||||
},
|
|
||||||
"tags": ["hamradio"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "23cm",
|
|
||||||
"lower_bound": 1240000000,
|
|
||||||
"upper_bound": 1300000000,
|
|
||||||
"frequencies": {
|
|
||||||
"q65": 1296065000
|
|
||||||
},
|
|
||||||
"tags": ["hamradio"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "13cm",
|
|
||||||
"lower_bound": 2320000000,
|
|
||||||
"upper_bound": 2450000000,
|
|
||||||
"frequencies": {
|
|
||||||
"q65": [2301065000, 2304065000, 2320065000]
|
|
||||||
},
|
|
||||||
"tags": ["hamradio"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "9cm",
|
|
||||||
"lower_bound": 3400000000,
|
|
||||||
"upper_bound": 3475000000,
|
|
||||||
"frequencies": {
|
|
||||||
"q65": 3400065000
|
|
||||||
},
|
|
||||||
"tags": ["hamradio"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "6cm",
|
|
||||||
"lower_bound": 5650000000,
|
|
||||||
"upper_bound": 5850000000,
|
|
||||||
"frequencies": {
|
|
||||||
"q65": 5760200000
|
|
||||||
},
|
|
||||||
"tags": ["hamradio"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "3cm",
|
|
||||||
"lower_bound": 10000000000,
|
|
||||||
"upper_bound": 10500000000,
|
|
||||||
"frequencies": {
|
|
||||||
"q65": 10368200000
|
|
||||||
},
|
|
||||||
"tags": ["hamradio"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "120m Broadcast",
|
|
||||||
"lower_bound": 2300000,
|
|
||||||
"upper_bound": 2495000,
|
|
||||||
"tags": ["broadcast"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "90m Broadcast",
|
|
||||||
"lower_bound": 3200000,
|
|
||||||
"upper_bound": 3400000,
|
|
||||||
"tags": ["broadcast"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "75m Broadcast",
|
|
||||||
"lower_bound": 3900000,
|
|
||||||
"upper_bound": 4000000,
|
|
||||||
"tags": ["broadcast"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "60m Broadcast",
|
|
||||||
"lower_bound": 4750000,
|
|
||||||
"upper_bound": 4995000,
|
|
||||||
"tags": ["broadcast"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "49m Broadcast",
|
|
||||||
"lower_bound": 5900000,
|
|
||||||
"upper_bound": 6200000,
|
|
||||||
"tags": ["broadcast"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "41m Broadcast",
|
|
||||||
"lower_bound": 7200000,
|
|
||||||
"upper_bound": 7450000,
|
|
||||||
"tags": ["broadcast"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "31m Broadcast",
|
|
||||||
"lower_bound": 9400000,
|
|
||||||
"upper_bound": 9900000,
|
|
||||||
"tags": ["broadcast"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "25m Broadcast",
|
|
||||||
"lower_bound": 11600000,
|
|
||||||
"upper_bound": 12100000,
|
|
||||||
"tags": ["broadcast"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "22m Broadcast",
|
|
||||||
"lower_bound": 13570000,
|
|
||||||
"upper_bound": 13870000,
|
|
||||||
"tags": ["broadcast"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "19m Broadcast",
|
|
||||||
"lower_bound": 15100000,
|
|
||||||
"upper_bound": 15830000,
|
|
||||||
"tags": ["broadcast"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "16m Broadcast",
|
|
||||||
"lower_bound": 17480000,
|
|
||||||
"upper_bound": 17900000,
|
|
||||||
"tags": ["broadcast"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "15m Broadcast",
|
|
||||||
"lower_bound": 18900000,
|
|
||||||
"upper_bound": 19020000,
|
|
||||||
"tags": ["broadcast"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "13m Broadcast",
|
|
||||||
"lower_bound": 21450000,
|
|
||||||
"upper_bound": 21850000,
|
|
||||||
"tags": ["broadcast"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "11m Broadcast",
|
|
||||||
"lower_bound": 25670000,
|
|
||||||
"upper_bound": 26100000,
|
|
||||||
"tags": ["broadcast"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "FM Broadcast",
|
|
||||||
"lower_bound": 87500000,
|
|
||||||
"upper_bound": 108000000,
|
|
||||||
"tags": ["broadcast"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "11m CB",
|
|
||||||
"lower_bound": 26965000,
|
|
||||||
"upper_bound": 27405000,
|
|
||||||
"frequencies": {
|
|
||||||
"js8": 27245000
|
|
||||||
},
|
|
||||||
"tags": ["public"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "PMR446",
|
|
||||||
"lower_bound": 446000000,
|
|
||||||
"upper_bound": 446200000,
|
|
||||||
"tags": ["public"]
|
|
||||||
}
|
|
||||||
]
|
|
216
config_webrx.py
Normal file
216
config_webrx.py
Normal file
@ -0,0 +1,216 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
"""
|
||||||
|
config_webrx: configuration options for OpenWebRX
|
||||||
|
|
||||||
|
This file is part of OpenWebRX,
|
||||||
|
an open-source SDR receiver software with a web UI.
|
||||||
|
Copyright (c) 2013-2015 by Andras Retzler <randras@sdr.hu>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as
|
||||||
|
published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
|
||||||
|
In addition, as a special exception, the copyright holders
|
||||||
|
state that config_rtl.py and config_webrx.py are not part of the
|
||||||
|
Corresponding Source defined in GNU AGPL version 3 section 1.
|
||||||
|
|
||||||
|
(It means that you do not have to redistribute config_rtl.py and
|
||||||
|
config_webrx.py if you make any changes to these two configuration files,
|
||||||
|
and use them for running your web service with OpenWebRX.)
|
||||||
|
"""
|
||||||
|
|
||||||
|
# NOTE: you can find additional information about configuring OpenWebRX in the Wiki:
|
||||||
|
# https://github.com/simonyiszk/openwebrx/wiki
|
||||||
|
|
||||||
|
# ==== Server settings ====
|
||||||
|
web_port=8073
|
||||||
|
server_hostname="localhost" # If this contains an incorrect value, the web UI may freeze on load (it can't open websocket)
|
||||||
|
max_clients=20
|
||||||
|
|
||||||
|
# ==== Web GUI configuration ====
|
||||||
|
receiver_name="[Callsign]"
|
||||||
|
receiver_location="Budapest, Hungary"
|
||||||
|
receiver_qra="JN97ML"
|
||||||
|
receiver_asl=200
|
||||||
|
receiver_ant="Longwire"
|
||||||
|
receiver_device="RTL-SDR"
|
||||||
|
receiver_admin="example@example.com"
|
||||||
|
receiver_gps=(47.000000,19.000000)
|
||||||
|
photo_height=350
|
||||||
|
photo_title="Panorama of Budapest from Schönherz Zoltán Dormitory"
|
||||||
|
photo_desc="""
|
||||||
|
You can add your own background photo and receiver information.<br />
|
||||||
|
Receiver is operated by: <a href="mailto:%[RX_ADMIN]">%[RX_ADMIN]</a><br/>
|
||||||
|
Device: %[RX_DEVICE]<br />
|
||||||
|
Antenna: %[RX_ANT]<br />
|
||||||
|
Website: <a href="http://localhost" target="_blank">http://localhost</a>
|
||||||
|
"""
|
||||||
|
|
||||||
|
# ==== sdr.hu listing ====
|
||||||
|
# If you want your ham receiver to be listed publicly on sdr.hu, then take the following steps:
|
||||||
|
# 1. Register at: http://sdr.hu/register
|
||||||
|
# 2. You will get an unique key by email. Copy it and paste here:
|
||||||
|
sdrhu_key = ""
|
||||||
|
# 3. Set this setting to True to enable listing:
|
||||||
|
sdrhu_public_listing = False
|
||||||
|
|
||||||
|
# ==== DSP/RX settings ====
|
||||||
|
fft_fps=9
|
||||||
|
fft_size=4096 #Should be power of 2
|
||||||
|
fft_voverlap_factor=0.3 #If fft_voverlap_factor is above 0, multiple FFTs will be used for creating a line on the diagram.
|
||||||
|
|
||||||
|
# samp_rate = 250000
|
||||||
|
samp_rate = 2400000
|
||||||
|
center_freq = 144250000
|
||||||
|
rf_gain = 5 #in dB. For an RTL-SDR, rf_gain=0 will set the tuner to auto gain mode, else it will be in manual gain mode.
|
||||||
|
ppm = 0
|
||||||
|
|
||||||
|
audio_compression="adpcm" #valid values: "adpcm", "none"
|
||||||
|
fft_compression="adpcm" #valid values: "adpcm", "none"
|
||||||
|
|
||||||
|
digimodes_enable=True #Decoding digimodes come with higher CPU usage.
|
||||||
|
digimodes_fft_size=1024
|
||||||
|
|
||||||
|
start_rtl_thread=True
|
||||||
|
|
||||||
|
"""
|
||||||
|
Note: if you experience audio underruns while CPU usage is 100%, you can:
|
||||||
|
- decrease `samp_rate`,
|
||||||
|
- set `fft_voverlap_factor` to 0,
|
||||||
|
- decrease `fft_fps` and `fft_size`,
|
||||||
|
- limit the number of users by decreasing `max_clients`.
|
||||||
|
"""
|
||||||
|
|
||||||
|
# ==== I/Q sources ====
|
||||||
|
# (Uncomment the appropriate by removing # characters at the beginning of the corresponding lines.)
|
||||||
|
|
||||||
|
#################################################################################################
|
||||||
|
# Is my SDR hardware supported? #
|
||||||
|
# Check here: https://github.com/simonyiszk/openwebrx/wiki#guides-for-receiver-hardware-support #
|
||||||
|
#################################################################################################
|
||||||
|
|
||||||
|
# You can use other SDR hardware as well, by giving your own command that outputs the I/Q samples... Some examples of configuration are available here (default is RTL-SDR):
|
||||||
|
|
||||||
|
# >> RTL-SDR via rtl_sdr
|
||||||
|
start_rtl_command="rtl_sdr -s {samp_rate} -f {center_freq} -p {ppm} -g {rf_gain} -".format(rf_gain=rf_gain, center_freq=center_freq, samp_rate=samp_rate, ppm=ppm)
|
||||||
|
format_conversion="csdr convert_u8_f"
|
||||||
|
|
||||||
|
#lna_gain=8
|
||||||
|
#rf_amp=1
|
||||||
|
#start_rtl_command="hackrf_transfer -s {samp_rate} -f {center_freq} -g {rf_gain} -l{lna_gain} -a{rf_amp} -r-".format(rf_gain=rf_gain, center_freq=center_freq, samp_rate=samp_rate, ppm=ppm, rf_amp=rf_amp, lna_gain=lna_gain)
|
||||||
|
#format_conversion="csdr convert_s8_f"
|
||||||
|
"""
|
||||||
|
To use a HackRF, compile the HackRF host tools from its "stdout" branch:
|
||||||
|
git clone https://github.com/mossmann/hackrf/
|
||||||
|
cd hackrf
|
||||||
|
git fetch
|
||||||
|
git checkout origin/stdout
|
||||||
|
cd host
|
||||||
|
mkdir build
|
||||||
|
cd build
|
||||||
|
cmake .. -DINSTALL_UDEV_RULES=ON
|
||||||
|
make
|
||||||
|
sudo make install
|
||||||
|
"""
|
||||||
|
|
||||||
|
# >> Sound card SDR (needs ALSA)
|
||||||
|
# I did not have the chance to properly test it.
|
||||||
|
#samp_rate = 96000
|
||||||
|
#start_rtl_command="arecord -f S16_LE -r {samp_rate} -c2 -".format(samp_rate=samp_rate)
|
||||||
|
#format_conversion="csdr convert_s16_f | csdr gain_ff 30"
|
||||||
|
|
||||||
|
# >> /dev/urandom test signal source
|
||||||
|
# samp_rate = 2400000
|
||||||
|
# start_rtl_command="cat /dev/urandom | (pv -qL `python -c 'print int({samp_rate} * 2.2)'` 2>&1)".format(rf_gain=rf_gain, center_freq=center_freq, samp_rate=samp_rate)
|
||||||
|
# format_conversion="csdr convert_u8_f"
|
||||||
|
|
||||||
|
# >> Pre-recorded raw I/Q file as signal source
|
||||||
|
# You will have to correctly specify: samp_rate, center_freq, format_conversion in order to correctly play an I/Q file.
|
||||||
|
#start_rtl_command="(while true; do cat my_iq_file.raw; done) | csdr flowcontrol {sr} 20 ".format(sr=samp_rate*2*1.05)
|
||||||
|
#format_conversion="csdr convert_u8_f"
|
||||||
|
|
||||||
|
#>> The rx_sdr command works with a variety of SDR harware: RTL-SDR, HackRF, SDRplay, UHD, Airspy, Red Pitaya, audio devices, etc.
|
||||||
|
# It will auto-detect your SDR hardware if the following tools are installed:
|
||||||
|
# * the vendor provided driver and library,
|
||||||
|
# * the vendor-specific SoapySDR wrapper library,
|
||||||
|
# * and SoapySDR itself.
|
||||||
|
# Check out this article on the OpenWebRX Wiki: https://github.com/simonyiszk/openwebrx/wiki/Using-rx_tools-with-OpenWebRX/
|
||||||
|
#start_rtl_command="rx_sdr -F CF32 -s {samp_rate} -f {center_freq} -p {ppm} -g {rf_gain} -".format(rf_gain=rf_gain, center_freq=center_freq, samp_rate=samp_rate, ppm=ppm)
|
||||||
|
#format_conversion=""
|
||||||
|
|
||||||
|
# >> gr-osmosdr signal source using GNU Radio (follow this guide: https://github.com/simonyiszk/openwebrx/wiki/Using-GrOsmoSDR-as-signal-source)
|
||||||
|
#start_rtl_command="cat /tmp/osmocom_fifo"
|
||||||
|
#format_conversion=""
|
||||||
|
|
||||||
|
# ==== Misc settings ====
|
||||||
|
|
||||||
|
shown_center_freq = center_freq #you can change this if you use an upconverter
|
||||||
|
|
||||||
|
client_audio_buffer_size = 5
|
||||||
|
#increasing client_audio_buffer_size will:
|
||||||
|
# - also increase the latency
|
||||||
|
# - decrease the chance of audio underruns
|
||||||
|
|
||||||
|
start_freq = center_freq
|
||||||
|
start_mod = "nfm" #nfm, am, lsb, usb, cw
|
||||||
|
|
||||||
|
iq_server_port = 4951 #TCP port for ncat to listen on. It will send I/Q data over its connections, for internal use in OpenWebRX. It is only accessible from the localhost by default.
|
||||||
|
|
||||||
|
#access_log = "~/openwebrx_access.log"
|
||||||
|
|
||||||
|
# ==== Color themes ====
|
||||||
|
|
||||||
|
#A guide is available to help you set these values: https://github.com/simonyiszk/openwebrx/wiki/Calibrating-waterfall-display-levels
|
||||||
|
|
||||||
|
### default theme by teejez:
|
||||||
|
waterfall_colors = "[0x000000ff,0x0000ffff,0x00ffffff,0x00ff00ff,0xffff00ff,0xff0000ff,0xff00ffff,0xffffffff]"
|
||||||
|
waterfall_min_level = -88 #in dB
|
||||||
|
waterfall_max_level = -20
|
||||||
|
waterfall_auto_level_margin = (5, 40)
|
||||||
|
### old theme by HA7ILM:
|
||||||
|
#waterfall_colors = "[0x000000ff,0x2e6893ff, 0x69a5d0ff, 0x214b69ff, 0x9dc4e0ff, 0xfff775ff, 0xff8a8aff, 0xb20000ff]"
|
||||||
|
#waterfall_min_level = -115 #in dB
|
||||||
|
#waterfall_max_level = 0
|
||||||
|
#waterfall_auto_level_margin = (20, 30)
|
||||||
|
##For the old colors, you might also want to set [fft_voverlap_factor] to 0.
|
||||||
|
|
||||||
|
#Note: When the auto waterfall level button is clicked, the following happens:
|
||||||
|
# [waterfall_min_level] = [current_min_power_level] - [waterfall_auto_level_margin[0]]
|
||||||
|
# [waterfall_max_level] = [current_max_power_level] + [waterfall_auto_level_margin[1]]
|
||||||
|
#
|
||||||
|
# ___|____________________________________|____________________________________|____________________________________|___> signal power
|
||||||
|
# \_waterfall_auto_level_margin[0]_/ |__ current_min_power_level | \_waterfall_auto_level_margin[1]_/
|
||||||
|
# current_max_power_level __|
|
||||||
|
|
||||||
|
# 3D view settings
|
||||||
|
mathbox_waterfall_frequency_resolution = 128 #bins
|
||||||
|
mathbox_waterfall_history_length = 10 #seconds
|
||||||
|
mathbox_waterfall_colors = "[0x000000ff,0x2e6893ff, 0x69a5d0ff, 0x214b69ff, 0x9dc4e0ff, 0xfff775ff, 0xff8a8aff, 0xb20000ff]"
|
||||||
|
|
||||||
|
# === Experimental settings ===
|
||||||
|
#Warning! The settings below are very experimental.
|
||||||
|
csdr_dynamic_bufsize = False # This allows you to change the buffering mode of csdr.
|
||||||
|
csdr_print_bufsizes = False # This prints the buffer sizes used for csdr processes.
|
||||||
|
csdr_through = False # Setting this True will print out how much data is going into the DSP chains.
|
||||||
|
|
||||||
|
nmux_memory = 50 #in megabytes. This sets the approximate size of the circular buffer used by nmux.
|
||||||
|
|
||||||
|
#Look up external IP address automatically from icanhazip.com, and use it as [server_hostname]
|
||||||
|
"""
|
||||||
|
print "[openwebrx-config] Detecting external IP address..."
|
||||||
|
import urllib2
|
||||||
|
server_hostname=urllib2.urlopen("http://icanhazip.com").read()[:-1]
|
||||||
|
print "[openwebrx-config] External IP address detected:", server_hostname
|
||||||
|
"""
|
424
csdr.py
Executable file
424
csdr.py
Executable file
@ -0,0 +1,424 @@
|
|||||||
|
"""
|
||||||
|
OpenWebRX csdr plugin: do the signal processing with csdr
|
||||||
|
|
||||||
|
This file is part of OpenWebRX,
|
||||||
|
an open-source SDR receiver software with a web UI.
|
||||||
|
Copyright (c) 2013-2015 by Andras Retzler <randras@sdr.hu>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as
|
||||||
|
published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
import subprocess
|
||||||
|
import time
|
||||||
|
import os
|
||||||
|
import code
|
||||||
|
import signal
|
||||||
|
import fcntl
|
||||||
|
|
||||||
|
class dsp:
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
self.samp_rate = 250000
|
||||||
|
self.output_rate = 11025 #this is default, and cannot be set at the moment
|
||||||
|
self.fft_size = 1024
|
||||||
|
self.fft_fps = 5
|
||||||
|
self.offset_freq = 0
|
||||||
|
self.low_cut = -4000
|
||||||
|
self.high_cut = 4000
|
||||||
|
self.bpf_transition_bw = 320 #Hz, and this is a constant
|
||||||
|
self.ddc_transition_bw_rate = 0.15 # of the IF sample rate
|
||||||
|
self.running = False
|
||||||
|
self.secondary_processes_running = False
|
||||||
|
self.audio_compression = "none"
|
||||||
|
self.fft_compression = "none"
|
||||||
|
self.demodulator = "nfm"
|
||||||
|
self.name = "csdr"
|
||||||
|
self.format_conversion = "csdr convert_u8_f"
|
||||||
|
self.base_bufsize = 512
|
||||||
|
self.nc_port = 4951
|
||||||
|
self.csdr_dynamic_bufsize = False
|
||||||
|
self.csdr_print_bufsizes = False
|
||||||
|
self.csdr_through = False
|
||||||
|
self.squelch_level = 0
|
||||||
|
self.fft_averages = 50
|
||||||
|
self.iqtee = False
|
||||||
|
self.iqtee2 = False
|
||||||
|
self.secondary_demodulator = None
|
||||||
|
self.secondary_fft_size = 1024
|
||||||
|
self.secondary_process_fft = None
|
||||||
|
self.secondary_process_demod = None
|
||||||
|
self.pipe_names=["bpf_pipe", "shift_pipe", "squelch_pipe", "smeter_pipe", "iqtee_pipe", "iqtee2_pipe"]
|
||||||
|
self.secondary_pipe_names=["secondary_shift_pipe"]
|
||||||
|
self.secondary_offset_freq = 1000
|
||||||
|
|
||||||
|
def chain(self,which):
|
||||||
|
any_chain_base="nc -v 127.0.0.1 {nc_port} | "
|
||||||
|
if self.csdr_dynamic_bufsize: any_chain_base+="csdr setbuf {start_bufsize} | "
|
||||||
|
if self.csdr_through: any_chain_base+="csdr through | "
|
||||||
|
any_chain_base+=self.format_conversion+(" | " if self.format_conversion!="" else "") ##"csdr flowcontrol {flowcontrol} auto 1.5 10 | "
|
||||||
|
if which == "fft":
|
||||||
|
fft_chain_base = any_chain_base+"csdr fft_cc {fft_size} {fft_block_size} | " + \
|
||||||
|
("csdr logpower_cf -70 | " if self.fft_averages == 0 else "csdr logaveragepower_cf -70 {fft_size} {fft_averages} | ") + \
|
||||||
|
"csdr fft_exchange_sides_ff {fft_size}"
|
||||||
|
if self.fft_compression=="adpcm":
|
||||||
|
return fft_chain_base+" | csdr compress_fft_adpcm_f_u8 {fft_size}"
|
||||||
|
else:
|
||||||
|
return fft_chain_base
|
||||||
|
chain_begin=any_chain_base+"csdr shift_addition_cc --fifo {shift_pipe} | csdr fir_decimate_cc {decimation} {ddc_transition_bw} HAMMING | csdr bandpass_fir_fft_cc --fifo {bpf_pipe} {bpf_transition_bw} HAMMING | csdr squelch_and_smeter_cc --fifo {squelch_pipe} --outfifo {smeter_pipe} 5 1 | "
|
||||||
|
if self.secondary_demodulator:
|
||||||
|
chain_begin+="csdr tee {iqtee_pipe} | "
|
||||||
|
chain_begin+="csdr tee {iqtee2_pipe} | "
|
||||||
|
chain_end = ""
|
||||||
|
if self.audio_compression=="adpcm":
|
||||||
|
chain_end = " | csdr encode_ima_adpcm_i16_u8"
|
||||||
|
if which == "nfm": return chain_begin + "csdr fmdemod_quadri_cf | csdr limit_ff | csdr old_fractional_decimator_ff {last_decimation} | csdr deemphasis_nfm_ff 11025 | csdr fastagc_ff 1024 | csdr convert_f_s16"+chain_end
|
||||||
|
elif which == "am": return chain_begin + "csdr amdemod_cf | csdr fastdcblock_ff | csdr old_fractional_decimator_ff {last_decimation} | csdr agc_ff | csdr limit_ff | csdr convert_f_s16"+chain_end
|
||||||
|
elif which == "ssb": return chain_begin + "csdr realpart_cf | csdr old_fractional_decimator_ff {last_decimation} | csdr agc_ff | csdr limit_ff | csdr convert_f_s16"+chain_end
|
||||||
|
|
||||||
|
def secondary_chain(self, which):
|
||||||
|
secondary_chain_base="cat {input_pipe} | "
|
||||||
|
if which == "fft":
|
||||||
|
return secondary_chain_base+"csdr realpart_cf | csdr fft_fc {secondary_fft_input_size} {secondary_fft_block_size} | csdr logpower_cf -70 " + (" | csdr compress_fft_adpcm_f_u8 {secondary_fft_size}" if self.fft_compression=="adpcm" else "")
|
||||||
|
elif which == "bpsk31":
|
||||||
|
return secondary_chain_base + "csdr shift_addition_cc --fifo {secondary_shift_pipe} | " + \
|
||||||
|
"csdr bandpass_fir_fft_cc $(csdr '=-(31.25)/{if_samp_rate}') $(csdr '=(31.25)/{if_samp_rate}') $(csdr '=31.25/{if_samp_rate}') | " + \
|
||||||
|
"csdr simple_agc_cc 0.001 0.5 | " + \
|
||||||
|
"csdr timing_recovery_cc GARDNER {secondary_samples_per_bits} 0.5 2 --add_q | " + \
|
||||||
|
"CSDR_FIXED_BUFSIZE=1 csdr dbpsk_decoder_c_u8 | " + \
|
||||||
|
"CSDR_FIXED_BUFSIZE=1 csdr psk31_varicode_decoder_u8_u8"
|
||||||
|
|
||||||
|
def set_secondary_demodulator(self, what):
|
||||||
|
self.secondary_demodulator = what
|
||||||
|
|
||||||
|
def secondary_fft_block_size(self):
|
||||||
|
return (self.samp_rate/self.decimation)/(self.fft_fps*2) #*2 is there because we do FFT on real signal here
|
||||||
|
|
||||||
|
def secondary_decimation(self):
|
||||||
|
return 1 #currently unused
|
||||||
|
|
||||||
|
def secondary_bpf_cutoff(self):
|
||||||
|
if self.secondary_demodulator == "bpsk31":
|
||||||
|
return (31.25/2) / self.if_samp_rate()
|
||||||
|
return 0
|
||||||
|
|
||||||
|
def secondary_bpf_transition_bw(self):
|
||||||
|
if self.secondary_demodulator == "bpsk31":
|
||||||
|
return (31.25/2) / self.if_samp_rate()
|
||||||
|
return 0
|
||||||
|
|
||||||
|
def secondary_samples_per_bits(self):
|
||||||
|
if self.secondary_demodulator == "bpsk31":
|
||||||
|
return int(round(self.if_samp_rate()/31.25))&~3
|
||||||
|
return 0
|
||||||
|
|
||||||
|
def secondary_bw(self):
|
||||||
|
if self.secondary_demodulator == "bpsk31":
|
||||||
|
return 31.25
|
||||||
|
|
||||||
|
def start_secondary_demodulator(self):
|
||||||
|
if(not self.secondary_demodulator): return
|
||||||
|
print "[openwebrx] starting secondary demodulator from IF input sampled at %d"%self.if_samp_rate()
|
||||||
|
secondary_command_fft=self.secondary_chain("fft")
|
||||||
|
secondary_command_demod=self.secondary_chain(self.secondary_demodulator)
|
||||||
|
self.try_create_pipes(self.secondary_pipe_names, secondary_command_demod + secondary_command_fft)
|
||||||
|
|
||||||
|
secondary_command_fft=secondary_command_fft.format( \
|
||||||
|
input_pipe=self.iqtee_pipe, \
|
||||||
|
secondary_fft_input_size=self.secondary_fft_size, \
|
||||||
|
secondary_fft_size=self.secondary_fft_size, \
|
||||||
|
secondary_fft_block_size=self.secondary_fft_block_size(), \
|
||||||
|
)
|
||||||
|
secondary_command_demod=secondary_command_demod.format( \
|
||||||
|
input_pipe=self.iqtee2_pipe, \
|
||||||
|
secondary_shift_pipe=self.secondary_shift_pipe, \
|
||||||
|
secondary_decimation=self.secondary_decimation(), \
|
||||||
|
secondary_samples_per_bits=self.secondary_samples_per_bits(), \
|
||||||
|
secondary_bpf_cutoff=self.secondary_bpf_cutoff(), \
|
||||||
|
secondary_bpf_transition_bw=self.secondary_bpf_transition_bw(), \
|
||||||
|
if_samp_rate=self.if_samp_rate()
|
||||||
|
)
|
||||||
|
|
||||||
|
print "[openwebrx-dsp-plugin:csdr] secondary command (fft) =", secondary_command_fft
|
||||||
|
print "[openwebrx-dsp-plugin:csdr] secondary command (demod) =", secondary_command_demod
|
||||||
|
#code.interact(local=locals())
|
||||||
|
my_env=os.environ.copy()
|
||||||
|
#if self.csdr_dynamic_bufsize: my_env["CSDR_DYNAMIC_BUFSIZE_ON"]="1";
|
||||||
|
if self.csdr_print_bufsizes: my_env["CSDR_PRINT_BUFSIZES"]="1";
|
||||||
|
self.secondary_process_fft = subprocess.Popen(secondary_command_fft, stdout=subprocess.PIPE, shell=True, preexec_fn=os.setpgrp, env=my_env)
|
||||||
|
print "[openwebrx-dsp-plugin:csdr] Popen on secondary command (fft)"
|
||||||
|
self.secondary_process_demod = subprocess.Popen(secondary_command_demod, stdout=subprocess.PIPE, shell=True, preexec_fn=os.setpgrp, env=my_env) #TODO digimodes
|
||||||
|
print "[openwebrx-dsp-plugin:csdr] Popen on secondary command (demod)" #TODO digimodes
|
||||||
|
self.secondary_processes_running = True
|
||||||
|
|
||||||
|
#open control pipes for csdr and send initialization data
|
||||||
|
# print "==========> 1"
|
||||||
|
if self.secondary_shift_pipe != None: #TODO digimodes
|
||||||
|
# print "==========> 2", self.secondary_shift_pipe
|
||||||
|
self.secondary_shift_pipe_file=open(self.secondary_shift_pipe,"w") #TODO digimodes
|
||||||
|
# print "==========> 3"
|
||||||
|
self.set_secondary_offset_freq(self.secondary_offset_freq) #TODO digimodes
|
||||||
|
# print "==========> 4"
|
||||||
|
|
||||||
|
self.set_pipe_nonblocking(self.secondary_process_demod.stdout)
|
||||||
|
self.set_pipe_nonblocking(self.secondary_process_fft.stdout)
|
||||||
|
|
||||||
|
def set_secondary_offset_freq(self, value):
|
||||||
|
self.secondary_offset_freq=value
|
||||||
|
if self.secondary_processes_running:
|
||||||
|
self.secondary_shift_pipe_file.write("%g\n"%(-float(self.secondary_offset_freq)/self.if_samp_rate()))
|
||||||
|
self.secondary_shift_pipe_file.flush()
|
||||||
|
|
||||||
|
def stop_secondary_demodulator(self):
|
||||||
|
if self.secondary_processes_running == False: return
|
||||||
|
self.try_delete_pipes(self.secondary_pipe_names)
|
||||||
|
if self.secondary_process_fft: os.killpg(os.getpgid(self.secondary_process_fft.pid), signal.SIGTERM)
|
||||||
|
if self.secondary_process_demod: os.killpg(os.getpgid(self.secondary_process_demod.pid), signal.SIGTERM)
|
||||||
|
self.secondary_processes_running = False
|
||||||
|
|
||||||
|
def read_secondary_demod(self, size):
|
||||||
|
return self.secondary_process_demod.stdout.read(size)
|
||||||
|
|
||||||
|
def read_secondary_fft(self, size):
|
||||||
|
return self.secondary_process_fft.stdout.read(size)
|
||||||
|
|
||||||
|
def get_secondary_demodulator(self):
|
||||||
|
return self.secondary_demodulator
|
||||||
|
|
||||||
|
def set_secondary_fft_size(self,secondary_fft_size):
|
||||||
|
#to change this, restart is required
|
||||||
|
self.secondary_fft_size=secondary_fft_size
|
||||||
|
|
||||||
|
def set_audio_compression(self,what):
|
||||||
|
self.audio_compression = what
|
||||||
|
|
||||||
|
def set_fft_compression(self,what):
|
||||||
|
self.fft_compression = what
|
||||||
|
|
||||||
|
def get_fft_bytes_to_read(self):
|
||||||
|
if self.fft_compression=="none": return self.fft_size*4
|
||||||
|
if self.fft_compression=="adpcm": return (self.fft_size/2)+(10/2)
|
||||||
|
|
||||||
|
def get_secondary_fft_bytes_to_read(self):
|
||||||
|
if self.fft_compression=="none": return self.secondary_fft_size*4
|
||||||
|
if self.fft_compression=="adpcm": return (self.secondary_fft_size/2)+(10/2)
|
||||||
|
|
||||||
|
def set_samp_rate(self,samp_rate):
|
||||||
|
#to change this, restart is required
|
||||||
|
self.samp_rate=samp_rate
|
||||||
|
self.decimation=1
|
||||||
|
while self.samp_rate/(self.decimation+1)>self.output_rate:
|
||||||
|
self.decimation+=1
|
||||||
|
self.last_decimation=float(self.if_samp_rate())/self.output_rate
|
||||||
|
|
||||||
|
def if_samp_rate(self):
|
||||||
|
return self.samp_rate/self.decimation
|
||||||
|
|
||||||
|
def get_name(self):
|
||||||
|
return self.name
|
||||||
|
|
||||||
|
def get_output_rate(self):
|
||||||
|
return self.output_rate
|
||||||
|
|
||||||
|
def set_output_rate(self,output_rate):
|
||||||
|
self.output_rate=output_rate
|
||||||
|
self.set_samp_rate(self.samp_rate) #as it depends on output_rate
|
||||||
|
|
||||||
|
def set_demodulator(self,demodulator):
|
||||||
|
#to change this, restart is required
|
||||||
|
self.demodulator=demodulator
|
||||||
|
|
||||||
|
def get_demodulator(self):
|
||||||
|
return self.demodulator
|
||||||
|
|
||||||
|
def set_fft_size(self,fft_size):
|
||||||
|
#to change this, restart is required
|
||||||
|
self.fft_size=fft_size
|
||||||
|
|
||||||
|
def set_fft_fps(self,fft_fps):
|
||||||
|
#to change this, restart is required
|
||||||
|
self.fft_fps=fft_fps
|
||||||
|
|
||||||
|
def set_fft_averages(self,fft_averages):
|
||||||
|
#to change this, restart is required
|
||||||
|
self.fft_averages=fft_averages
|
||||||
|
|
||||||
|
def fft_block_size(self):
|
||||||
|
if self.fft_averages == 0: return self.samp_rate/self.fft_fps
|
||||||
|
else: return self.samp_rate/self.fft_fps/self.fft_averages
|
||||||
|
|
||||||
|
def set_format_conversion(self,format_conversion):
|
||||||
|
self.format_conversion=format_conversion
|
||||||
|
|
||||||
|
def set_offset_freq(self,offset_freq):
|
||||||
|
self.offset_freq=offset_freq
|
||||||
|
if self.running:
|
||||||
|
self.shift_pipe_file.write("%g\n"%(-float(self.offset_freq)/self.samp_rate))
|
||||||
|
self.shift_pipe_file.flush()
|
||||||
|
|
||||||
|
def set_bpf(self,low_cut,high_cut):
|
||||||
|
self.low_cut=low_cut
|
||||||
|
self.high_cut=high_cut
|
||||||
|
if self.running:
|
||||||
|
self.bpf_pipe_file.write( "%g %g\n"%(float(self.low_cut)/self.if_samp_rate(), float(self.high_cut)/self.if_samp_rate()) )
|
||||||
|
self.bpf_pipe_file.flush()
|
||||||
|
|
||||||
|
def get_bpf(self):
|
||||||
|
return [self.low_cut, self.high_cut]
|
||||||
|
|
||||||
|
def set_squelch_level(self, squelch_level):
|
||||||
|
self.squelch_level=squelch_level
|
||||||
|
if self.running:
|
||||||
|
self.squelch_pipe_file.write( "%g\n"%(float(self.squelch_level)) )
|
||||||
|
self.squelch_pipe_file.flush()
|
||||||
|
|
||||||
|
def get_smeter_level(self):
|
||||||
|
if self.running:
|
||||||
|
line=self.smeter_pipe_file.readline()
|
||||||
|
return float(line[:-1])
|
||||||
|
|
||||||
|
def mkfifo(self,path):
|
||||||
|
try:
|
||||||
|
os.unlink(path)
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
os.mkfifo(path)
|
||||||
|
|
||||||
|
def ddc_transition_bw(self):
|
||||||
|
return self.ddc_transition_bw_rate*(self.if_samp_rate()/float(self.samp_rate))
|
||||||
|
|
||||||
|
def try_create_pipes(self, pipe_names, command_base):
|
||||||
|
# print "try_create_pipes"
|
||||||
|
for pipe_name in pipe_names:
|
||||||
|
# print "\t"+pipe_name
|
||||||
|
if "{"+pipe_name+"}" in command_base:
|
||||||
|
setattr(self, pipe_name, self.pipe_base_path+pipe_name)
|
||||||
|
self.mkfifo(getattr(self, pipe_name))
|
||||||
|
else:
|
||||||
|
setattr(self, pipe_name, None)
|
||||||
|
|
||||||
|
def try_delete_pipes(self, pipe_names):
|
||||||
|
for pipe_name in pipe_names:
|
||||||
|
pipe_path = getattr(self,pipe_name,None)
|
||||||
|
if pipe_path:
|
||||||
|
try: os.unlink(pipe_path)
|
||||||
|
except Exception as e: print "[openwebrx-dsp-plugin:csdr] try_delete_pipes() ::", e
|
||||||
|
|
||||||
|
def set_pipe_nonblocking(self, pipe):
|
||||||
|
flags = fcntl.fcntl(pipe, fcntl.F_GETFL)
|
||||||
|
fcntl.fcntl(pipe, fcntl.F_SETFL, flags | os.O_NONBLOCK)
|
||||||
|
|
||||||
|
def start(self):
|
||||||
|
command_base=self.chain(self.demodulator)
|
||||||
|
|
||||||
|
#create control pipes for csdr
|
||||||
|
self.pipe_base_path="/tmp/openwebrx_pipe_{myid}_".format(myid=id(self))
|
||||||
|
# self.bpf_pipe = self.shift_pipe = self.squelch_pipe = self.smeter_pipe = None
|
||||||
|
|
||||||
|
self.try_create_pipes(self.pipe_names, command_base)
|
||||||
|
|
||||||
|
# if "{bpf_pipe}" in command_base:
|
||||||
|
# self.bpf_pipe=pipe_base_path+"bpf"
|
||||||
|
# self.mkfifo(self.bpf_pipe)
|
||||||
|
# if "{shift_pipe}" in command_base:
|
||||||
|
# self.shift_pipe=pipe_base_path+"shift"
|
||||||
|
# self.mkfifo(self.shift_pipe)
|
||||||
|
# if "{squelch_pipe}" in command_base:
|
||||||
|
# self.squelch_pipe=pipe_base_path+"squelch"
|
||||||
|
# self.mkfifo(self.squelch_pipe)
|
||||||
|
# if "{smeter_pipe}" in command_base:
|
||||||
|
# self.smeter_pipe=pipe_base_path+"smeter"
|
||||||
|
# self.mkfifo(self.smeter_pipe)
|
||||||
|
# if "{iqtee_pipe}" in command_base:
|
||||||
|
# self.iqtee_pipe=pipe_base_path+"iqtee"
|
||||||
|
# self.mkfifo(self.iqtee_pipe)
|
||||||
|
# if "{iqtee2_pipe}" in command_base:
|
||||||
|
# self.iqtee2_pipe=pipe_base_path+"iqtee2"
|
||||||
|
# self.mkfifo(self.iqtee2_pipe)
|
||||||
|
|
||||||
|
#run the command
|
||||||
|
command=command_base.format( bpf_pipe=self.bpf_pipe, shift_pipe=self.shift_pipe, decimation=self.decimation, \
|
||||||
|
last_decimation=self.last_decimation, fft_size=self.fft_size, fft_block_size=self.fft_block_size(), fft_averages=self.fft_averages, \
|
||||||
|
bpf_transition_bw=float(self.bpf_transition_bw)/self.if_samp_rate(), ddc_transition_bw=self.ddc_transition_bw(), \
|
||||||
|
flowcontrol=int(self.samp_rate*2), start_bufsize=self.base_bufsize*self.decimation, nc_port=self.nc_port, \
|
||||||
|
squelch_pipe=self.squelch_pipe, smeter_pipe=self.smeter_pipe, iqtee_pipe=self.iqtee_pipe, iqtee2_pipe=self.iqtee2_pipe )
|
||||||
|
|
||||||
|
print "[openwebrx-dsp-plugin:csdr] Command =",command
|
||||||
|
#code.interact(local=locals())
|
||||||
|
my_env=os.environ.copy()
|
||||||
|
if self.csdr_dynamic_bufsize: my_env["CSDR_DYNAMIC_BUFSIZE_ON"]="1";
|
||||||
|
if self.csdr_print_bufsizes: my_env["CSDR_PRINT_BUFSIZES"]="1";
|
||||||
|
self.process = subprocess.Popen(command, stdout=subprocess.PIPE, shell=True, preexec_fn=os.setpgrp, env=my_env)
|
||||||
|
self.running = True
|
||||||
|
|
||||||
|
#open control pipes for csdr and send initialization data
|
||||||
|
if self.bpf_pipe != None:
|
||||||
|
self.bpf_pipe_file=open(self.bpf_pipe,"w")
|
||||||
|
self.set_bpf(self.low_cut,self.high_cut)
|
||||||
|
if self.shift_pipe != None:
|
||||||
|
self.shift_pipe_file=open(self.shift_pipe,"w")
|
||||||
|
self.set_offset_freq(self.offset_freq)
|
||||||
|
if self.squelch_pipe != None:
|
||||||
|
self.squelch_pipe_file=open(self.squelch_pipe,"w")
|
||||||
|
self.set_squelch_level(self.squelch_level)
|
||||||
|
if self.smeter_pipe != None:
|
||||||
|
self.smeter_pipe_file=open(self.smeter_pipe,"r")
|
||||||
|
self.set_pipe_nonblocking(self.smeter_pipe_file)
|
||||||
|
|
||||||
|
self.start_secondary_demodulator()
|
||||||
|
|
||||||
|
def read(self,size):
|
||||||
|
return self.process.stdout.read(size)
|
||||||
|
|
||||||
|
def stop(self):
|
||||||
|
os.killpg(os.getpgid(self.process.pid), signal.SIGTERM)
|
||||||
|
self.stop_secondary_demodulator()
|
||||||
|
#if(self.process.poll()!=None):return # returns None while subprocess is running
|
||||||
|
#while(self.process.poll()==None):
|
||||||
|
# #self.process.kill()
|
||||||
|
# print "killproc",os.getpgid(self.process.pid),self.process.pid
|
||||||
|
# os.killpg(self.process.pid, signal.SIGTERM)
|
||||||
|
#
|
||||||
|
# time.sleep(0.1)
|
||||||
|
|
||||||
|
self.try_delete_pipes(self.pipe_names)
|
||||||
|
|
||||||
|
# if self.bpf_pipe:
|
||||||
|
# try: os.unlink(self.bpf_pipe)
|
||||||
|
# except: print "[openwebrx-dsp-plugin:csdr] stop() :: unlink failed: " + self.bpf_pipe
|
||||||
|
# if self.shift_pipe:
|
||||||
|
# try: os.unlink(self.shift_pipe)
|
||||||
|
# except: print "[openwebrx-dsp-plugin:csdr] stop() :: unlink failed: " + self.shift_pipe
|
||||||
|
# if self.squelch_pipe:
|
||||||
|
# try: os.unlink(self.squelch_pipe)
|
||||||
|
# except: print "[openwebrx-dsp-plugin:csdr] stop() :: unlink failed: " + self.squelch_pipe
|
||||||
|
# if self.smeter_pipe:
|
||||||
|
# try: os.unlink(self.smeter_pipe)
|
||||||
|
# except: print "[openwebrx-dsp-plugin:csdr] stop() :: unlink failed: " + self.smeter_pipe
|
||||||
|
# if self.iqtee_pipe:
|
||||||
|
# try: os.unlink(self.iqtee_pipe)
|
||||||
|
# except: print "[openwebrx-dsp-plugin:csdr] stop() :: unlink failed: " + self.iqtee_pipe
|
||||||
|
# if self.iqtee2_pipe:
|
||||||
|
# try: os.unlink(self.iqtee2_pipe)
|
||||||
|
# except: print "[openwebrx-dsp-plugin:csdr] stop() :: unlink failed: " + self.iqtee2_pipe
|
||||||
|
|
||||||
|
self.running = False
|
||||||
|
|
||||||
|
def restart(self):
|
||||||
|
self.stop()
|
||||||
|
self.start()
|
||||||
|
|
||||||
|
def __del__(self):
|
||||||
|
self.stop()
|
||||||
|
del(self.process)
|
@ -1,142 +0,0 @@
|
|||||||
from csdr.module import Module
|
|
||||||
from pycsdr.modules import Buffer
|
|
||||||
from pycsdr.types import Format
|
|
||||||
from typing import Union, Callable, Optional
|
|
||||||
|
|
||||||
|
|
||||||
class Chain(Module):
|
|
||||||
def __init__(self, workers):
|
|
||||||
super().__init__()
|
|
||||||
self.workers = workers
|
|
||||||
for i in range(1, len(self.workers)):
|
|
||||||
self._connect(self.workers[i - 1], self.workers[i])
|
|
||||||
|
|
||||||
def empty(self):
|
|
||||||
return not self.workers
|
|
||||||
|
|
||||||
def _connect(self, w1, w2, buffer: Optional[Buffer] = None) -> None:
|
|
||||||
if buffer is None:
|
|
||||||
buffer = Buffer(w1.getOutputFormat())
|
|
||||||
w1.setWriter(buffer)
|
|
||||||
w2.setReader(buffer.getReader())
|
|
||||||
|
|
||||||
def setReader(self, reader):
|
|
||||||
if self.reader is reader:
|
|
||||||
return
|
|
||||||
super().setReader(reader)
|
|
||||||
if self.workers:
|
|
||||||
self.workers[0].setReader(reader)
|
|
||||||
|
|
||||||
def setWriter(self, writer):
|
|
||||||
if self.writer is writer:
|
|
||||||
return
|
|
||||||
super().setWriter(writer)
|
|
||||||
if self.workers:
|
|
||||||
self.workers[-1].setWriter(writer)
|
|
||||||
|
|
||||||
def indexOf(self, search: Union[Callable, object]) -> int:
|
|
||||||
def searchFn(x):
|
|
||||||
if callable(search):
|
|
||||||
return search(x)
|
|
||||||
else:
|
|
||||||
return x is search
|
|
||||||
|
|
||||||
try:
|
|
||||||
return next(i for i, v in enumerate(self.workers) if searchFn(v))
|
|
||||||
except StopIteration:
|
|
||||||
return -1
|
|
||||||
|
|
||||||
def replace(self, index, newWorker):
|
|
||||||
if index >= len(self.workers):
|
|
||||||
raise IndexError("Index {} does not exist".format(index))
|
|
||||||
|
|
||||||
self.workers[index].stop()
|
|
||||||
self.workers[index] = newWorker
|
|
||||||
|
|
||||||
error = None
|
|
||||||
|
|
||||||
if index == 0:
|
|
||||||
if self.reader is not None:
|
|
||||||
newWorker.setReader(self.reader)
|
|
||||||
else:
|
|
||||||
try:
|
|
||||||
previousWorker = self.workers[index - 1]
|
|
||||||
self._connect(previousWorker, newWorker)
|
|
||||||
except ValueError as e:
|
|
||||||
# store error for later raising, but still attempt the second connection
|
|
||||||
error = e
|
|
||||||
|
|
||||||
if index == len(self.workers) - 1:
|
|
||||||
if self.writer is not None:
|
|
||||||
newWorker.setWriter(self.writer)
|
|
||||||
else:
|
|
||||||
try:
|
|
||||||
nextWorker = self.workers[index + 1]
|
|
||||||
self._connect(newWorker, nextWorker)
|
|
||||||
except ValueError as e:
|
|
||||||
error = e
|
|
||||||
|
|
||||||
if error is not None:
|
|
||||||
raise error
|
|
||||||
|
|
||||||
def append(self, newWorker):
|
|
||||||
previousWorker = None
|
|
||||||
if self.workers:
|
|
||||||
previousWorker = self.workers[-1]
|
|
||||||
|
|
||||||
self.workers.append(newWorker)
|
|
||||||
|
|
||||||
if previousWorker:
|
|
||||||
self._connect(previousWorker, newWorker)
|
|
||||||
elif self.reader is not None:
|
|
||||||
newWorker.setReader(self.reader)
|
|
||||||
|
|
||||||
if self.writer is not None:
|
|
||||||
newWorker.setWriter(self.writer)
|
|
||||||
|
|
||||||
def insert(self, newWorker):
|
|
||||||
nextWorker = None
|
|
||||||
if self.workers:
|
|
||||||
nextWorker = self.workers[0]
|
|
||||||
|
|
||||||
self.workers.insert(0, newWorker)
|
|
||||||
|
|
||||||
if nextWorker:
|
|
||||||
self._connect(newWorker, nextWorker)
|
|
||||||
elif self.writer is not None:
|
|
||||||
newWorker.setWriter(self.writer)
|
|
||||||
|
|
||||||
if self.reader is not None:
|
|
||||||
newWorker.setReader(self.reader)
|
|
||||||
|
|
||||||
def remove(self, index):
|
|
||||||
removedWorker = self.workers[index]
|
|
||||||
self.workers.remove(removedWorker)
|
|
||||||
removedWorker.stop()
|
|
||||||
|
|
||||||
if index == 0:
|
|
||||||
if self.reader is not None and len(self.workers):
|
|
||||||
self.workers[0].setReader(self.reader)
|
|
||||||
elif index == len(self.workers):
|
|
||||||
if self.writer is not None:
|
|
||||||
self.workers[-1].setWriter(self.writer)
|
|
||||||
else:
|
|
||||||
previousWorker = self.workers[index - 1]
|
|
||||||
nextWorker = self.workers[index]
|
|
||||||
self._connect(previousWorker, nextWorker)
|
|
||||||
|
|
||||||
def stop(self):
|
|
||||||
for w in self.workers:
|
|
||||||
w.stop()
|
|
||||||
|
|
||||||
def getInputFormat(self) -> Format:
|
|
||||||
if self.workers:
|
|
||||||
return self.workers[0].getInputFormat()
|
|
||||||
else:
|
|
||||||
raise BufferError("getInputFormat on empty chain")
|
|
||||||
|
|
||||||
def getOutputFormat(self) -> Format:
|
|
||||||
if self.workers:
|
|
||||||
return self.workers[-1].getOutputFormat()
|
|
||||||
else:
|
|
||||||
raise BufferError("getOutputFormat on empty chain")
|
|
@ -1,76 +0,0 @@
|
|||||||
from csdr.chain.demodulator import BaseDemodulatorChain, FixedIfSampleRateChain, HdAudio, DeemphasisTauChain
|
|
||||||
from pycsdr.modules import AmDemod, DcBlock, FmDemod, Limit, NfmDeemphasis, Agc, WfmDeemphasis, FractionalDecimator, RealPart
|
|
||||||
from pycsdr.types import Format, AgcProfile
|
|
||||||
|
|
||||||
|
|
||||||
class Am(BaseDemodulatorChain):
|
|
||||||
def __init__(self):
|
|
||||||
agc = Agc(Format.FLOAT)
|
|
||||||
agc.setProfile(AgcProfile.SLOW)
|
|
||||||
agc.setInitialGain(200)
|
|
||||||
workers = [
|
|
||||||
AmDemod(),
|
|
||||||
DcBlock(),
|
|
||||||
agc,
|
|
||||||
]
|
|
||||||
|
|
||||||
super().__init__(workers)
|
|
||||||
|
|
||||||
|
|
||||||
class NFm(BaseDemodulatorChain):
|
|
||||||
def __init__(self, sampleRate: int):
|
|
||||||
self.sampleRate = sampleRate
|
|
||||||
agc = Agc(Format.FLOAT)
|
|
||||||
agc.setProfile(AgcProfile.SLOW)
|
|
||||||
agc.setMaxGain(3)
|
|
||||||
workers = [
|
|
||||||
FmDemod(),
|
|
||||||
Limit(),
|
|
||||||
NfmDeemphasis(sampleRate),
|
|
||||||
agc,
|
|
||||||
]
|
|
||||||
super().__init__(workers)
|
|
||||||
|
|
||||||
def setSampleRate(self, sampleRate: int) -> None:
|
|
||||||
if sampleRate == self.sampleRate:
|
|
||||||
return
|
|
||||||
self.sampleRate = sampleRate
|
|
||||||
self.replace(2, NfmDeemphasis(sampleRate))
|
|
||||||
|
|
||||||
|
|
||||||
class WFm(BaseDemodulatorChain, FixedIfSampleRateChain, DeemphasisTauChain, HdAudio):
|
|
||||||
def __init__(self, sampleRate: int, tau: float):
|
|
||||||
self.sampleRate = sampleRate
|
|
||||||
self.tau = tau
|
|
||||||
workers = [
|
|
||||||
FmDemod(),
|
|
||||||
Limit(),
|
|
||||||
FractionalDecimator(Format.FLOAT, 200000.0 / self.sampleRate, prefilter=True),
|
|
||||||
WfmDeemphasis(self.sampleRate, self.tau),
|
|
||||||
]
|
|
||||||
super().__init__(workers)
|
|
||||||
|
|
||||||
def getFixedIfSampleRate(self):
|
|
||||||
return 200000
|
|
||||||
|
|
||||||
def setDeemphasisTau(self, tau: float) -> None:
|
|
||||||
if tau == self.tau:
|
|
||||||
return
|
|
||||||
self.tau = tau
|
|
||||||
self.replace(3, WfmDeemphasis(self.sampleRate, self.tau))
|
|
||||||
|
|
||||||
def setSampleRate(self, sampleRate: int) -> None:
|
|
||||||
if sampleRate == self.sampleRate:
|
|
||||||
return
|
|
||||||
self.sampleRate = sampleRate
|
|
||||||
self.replace(2, FractionalDecimator(Format.FLOAT, 200000.0 / self.sampleRate, prefilter=True))
|
|
||||||
self.replace(3, WfmDeemphasis(self.sampleRate, self.tau))
|
|
||||||
|
|
||||||
|
|
||||||
class Ssb(BaseDemodulatorChain):
|
|
||||||
def __init__(self):
|
|
||||||
workers = [
|
|
||||||
RealPart(),
|
|
||||||
Agc(Format.FLOAT),
|
|
||||||
]
|
|
||||||
super().__init__(workers)
|
|
@ -1,72 +0,0 @@
|
|||||||
from csdr.chain import Chain
|
|
||||||
from pycsdr.modules import AudioResampler, Convert, AdpcmEncoder, Limit
|
|
||||||
from pycsdr.types import Format
|
|
||||||
|
|
||||||
|
|
||||||
class Converter(Chain):
|
|
||||||
def __init__(self, format: Format, inputRate: int, clientRate: int):
|
|
||||||
workers = []
|
|
||||||
if inputRate != clientRate:
|
|
||||||
# we only have an audio resampler for float ATM so if we need to resample, we need to convert
|
|
||||||
if format != Format.FLOAT:
|
|
||||||
workers += [Convert(format, Format.FLOAT)]
|
|
||||||
workers += [AudioResampler(inputRate, clientRate), Limit(), Convert(Format.FLOAT, Format.SHORT)]
|
|
||||||
elif format != Format.SHORT:
|
|
||||||
workers += [Convert(format, Format.SHORT)]
|
|
||||||
super().__init__(workers)
|
|
||||||
|
|
||||||
|
|
||||||
class ClientAudioChain(Chain):
|
|
||||||
def __init__(self, format: Format, inputRate: int, clientRate: int, compression: str):
|
|
||||||
self.format = format
|
|
||||||
self.inputRate = inputRate
|
|
||||||
self.clientRate = clientRate
|
|
||||||
workers = []
|
|
||||||
converter = self._buildConverter()
|
|
||||||
if not converter.empty():
|
|
||||||
workers += [converter]
|
|
||||||
if compression == "adpcm":
|
|
||||||
workers += [AdpcmEncoder(sync=True)]
|
|
||||||
super().__init__(workers)
|
|
||||||
|
|
||||||
def _buildConverter(self):
|
|
||||||
return Converter(self.format, self.inputRate, self.clientRate)
|
|
||||||
|
|
||||||
def _updateConverter(self):
|
|
||||||
converter = self._buildConverter()
|
|
||||||
index = self.indexOf(lambda x: isinstance(x, Converter))
|
|
||||||
if converter.empty():
|
|
||||||
if index >= 0:
|
|
||||||
self.remove(index)
|
|
||||||
else:
|
|
||||||
if index >= 0:
|
|
||||||
self.replace(index, converter)
|
|
||||||
else:
|
|
||||||
self.insert(converter)
|
|
||||||
|
|
||||||
def setFormat(self, format: Format) -> None:
|
|
||||||
if format == self.format:
|
|
||||||
return
|
|
||||||
self.format = format
|
|
||||||
self._updateConverter()
|
|
||||||
|
|
||||||
def setInputRate(self, inputRate: int) -> None:
|
|
||||||
if inputRate == self.inputRate:
|
|
||||||
return
|
|
||||||
self.inputRate = inputRate
|
|
||||||
self._updateConverter()
|
|
||||||
|
|
||||||
def setClientRate(self, clientRate: int) -> None:
|
|
||||||
if clientRate == self.clientRate:
|
|
||||||
return
|
|
||||||
self.clientRate = clientRate
|
|
||||||
self._updateConverter()
|
|
||||||
|
|
||||||
def setAudioCompression(self, compression: str) -> None:
|
|
||||||
index = self.indexOf(lambda x: isinstance(x, AdpcmEncoder))
|
|
||||||
if compression == "adpcm":
|
|
||||||
if index < 0:
|
|
||||||
self.append(AdpcmEncoder(sync=True))
|
|
||||||
else:
|
|
||||||
if index >= 0:
|
|
||||||
self.remove(index)
|
|
@ -1,73 +0,0 @@
|
|||||||
from csdr.chain import Chain
|
|
||||||
from abc import ABC, ABCMeta, abstractmethod
|
|
||||||
from pycsdr.modules import Writer
|
|
||||||
|
|
||||||
|
|
||||||
class FixedAudioRateChain(ABC):
|
|
||||||
@abstractmethod
|
|
||||||
def getFixedAudioRate(self) -> int:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class FixedIfSampleRateChain(ABC):
|
|
||||||
@abstractmethod
|
|
||||||
def getFixedIfSampleRate(self) -> int:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class DialFrequencyReceiver(ABC):
|
|
||||||
@abstractmethod
|
|
||||||
def setDialFrequency(self, frequency: int) -> None:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
# marker interface
|
|
||||||
class HdAudio:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class MetaProvider(ABC):
|
|
||||||
@abstractmethod
|
|
||||||
def setMetaWriter(self, writer: Writer) -> None:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class SlotFilterChain(ABC):
|
|
||||||
@abstractmethod
|
|
||||||
def setSlotFilter(self, filter: int) -> None:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class SecondarySelectorChain(ABC):
|
|
||||||
def getBandwidth(self) -> float:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class DeemphasisTauChain(ABC):
|
|
||||||
@abstractmethod
|
|
||||||
def setDeemphasisTau(self, tau: float) -> None:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class BaseDemodulatorChain(Chain):
|
|
||||||
def supportsSquelch(self) -> bool:
|
|
||||||
return True
|
|
||||||
|
|
||||||
def setSampleRate(self, sampleRate: int) -> None:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class SecondaryDemodulator(Chain):
|
|
||||||
def supportsSquelch(self) -> bool:
|
|
||||||
return True
|
|
||||||
|
|
||||||
def setSampleRate(self, sampleRate: int) -> None:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class ServiceDemodulator(SecondaryDemodulator, FixedAudioRateChain, metaclass=ABCMeta):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class DemodulatorError(Exception):
|
|
||||||
pass
|
|
@ -1,133 +0,0 @@
|
|||||||
from csdr.chain.demodulator import BaseDemodulatorChain, FixedAudioRateChain, FixedIfSampleRateChain, DialFrequencyReceiver, MetaProvider, SlotFilterChain, DemodulatorError, ServiceDemodulator
|
|
||||||
from pycsdr.modules import FmDemod, Agc, Writer, Buffer
|
|
||||||
from pycsdr.types import Format
|
|
||||||
from digiham.modules import DstarDecoder, DcBlock, FskDemodulator, GfskDemodulator, DigitalVoiceFilter, MbeSynthesizer, NarrowRrcFilter, NxdnDecoder, DmrDecoder, WideRrcFilter, YsfDecoder, PocsagDecoder
|
|
||||||
from digiham.ambe import Modes, ServerError
|
|
||||||
from owrx.meta import MetaParser
|
|
||||||
from owrx.pocsag import PocsagParser
|
|
||||||
|
|
||||||
|
|
||||||
class DigihamChain(BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain, DialFrequencyReceiver, MetaProvider):
|
|
||||||
def __init__(self, fskDemodulator, decoder, mbeMode, filter=None, codecserver: str = ""):
|
|
||||||
self.decoder = decoder
|
|
||||||
if codecserver is None:
|
|
||||||
codecserver = ""
|
|
||||||
agc = Agc(Format.SHORT)
|
|
||||||
agc.setMaxGain(30)
|
|
||||||
agc.setInitialGain(3)
|
|
||||||
workers = [FmDemod(), DcBlock()]
|
|
||||||
if filter is not None:
|
|
||||||
workers += [filter]
|
|
||||||
try:
|
|
||||||
mbeSynthesizer = MbeSynthesizer(mbeMode, codecserver)
|
|
||||||
except ConnectionError as ce:
|
|
||||||
raise DemodulatorError("Connection to codecserver failed: {}".format(ce))
|
|
||||||
except ServerError as se:
|
|
||||||
raise DemodulatorError("Codecserver error: {}".format(se))
|
|
||||||
workers += [
|
|
||||||
fskDemodulator,
|
|
||||||
decoder,
|
|
||||||
mbeSynthesizer,
|
|
||||||
DigitalVoiceFilter(),
|
|
||||||
agc
|
|
||||||
]
|
|
||||||
self.metaParser = None
|
|
||||||
self.dialFrequency = None
|
|
||||||
super().__init__(workers)
|
|
||||||
|
|
||||||
def getFixedIfSampleRate(self):
|
|
||||||
return 48000
|
|
||||||
|
|
||||||
def getFixedAudioRate(self):
|
|
||||||
return 8000
|
|
||||||
|
|
||||||
def setMetaWriter(self, writer: Writer) -> None:
|
|
||||||
if self.metaParser is None:
|
|
||||||
self.metaParser = MetaParser()
|
|
||||||
buffer = Buffer(Format.CHAR)
|
|
||||||
self.decoder.setMetaWriter(buffer)
|
|
||||||
self.metaParser.setReader(buffer.getReader())
|
|
||||||
if self.dialFrequency is not None:
|
|
||||||
self.metaParser.setDialFrequency(self.dialFrequency)
|
|
||||||
self.metaParser.setWriter(writer)
|
|
||||||
|
|
||||||
def supportsSquelch(self):
|
|
||||||
return False
|
|
||||||
|
|
||||||
def setDialFrequency(self, frequency: int) -> None:
|
|
||||||
self.dialFrequency = frequency
|
|
||||||
if self.metaParser is None:
|
|
||||||
return
|
|
||||||
self.metaParser.setDialFrequency(frequency)
|
|
||||||
|
|
||||||
def stop(self):
|
|
||||||
if self.metaParser is not None:
|
|
||||||
self.metaParser.stop()
|
|
||||||
super().stop()
|
|
||||||
|
|
||||||
|
|
||||||
class Dstar(DigihamChain):
|
|
||||||
def __init__(self, codecserver: str = ""):
|
|
||||||
super().__init__(
|
|
||||||
fskDemodulator=FskDemodulator(samplesPerSymbol=10),
|
|
||||||
decoder=DstarDecoder(),
|
|
||||||
mbeMode=Modes.DStarMode,
|
|
||||||
codecserver=codecserver
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class Nxdn(DigihamChain):
|
|
||||||
def __init__(self, codecserver: str = ""):
|
|
||||||
super().__init__(
|
|
||||||
fskDemodulator=GfskDemodulator(samplesPerSymbol=20),
|
|
||||||
decoder=NxdnDecoder(),
|
|
||||||
mbeMode=Modes.NxdnMode,
|
|
||||||
filter=NarrowRrcFilter(),
|
|
||||||
codecserver=codecserver
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class Dmr(DigihamChain, SlotFilterChain):
|
|
||||||
def __init__(self, codecserver: str = ""):
|
|
||||||
super().__init__(
|
|
||||||
fskDemodulator=GfskDemodulator(samplesPerSymbol=10),
|
|
||||||
decoder=DmrDecoder(),
|
|
||||||
mbeMode=Modes.DmrMode,
|
|
||||||
filter=WideRrcFilter(),
|
|
||||||
codecserver=codecserver,
|
|
||||||
)
|
|
||||||
|
|
||||||
def setSlotFilter(self, slotFilter: int) -> None:
|
|
||||||
self.decoder.setSlotFilter(slotFilter)
|
|
||||||
|
|
||||||
|
|
||||||
class Ysf(DigihamChain):
|
|
||||||
def __init__(self, codecserver: str = ""):
|
|
||||||
super().__init__(
|
|
||||||
fskDemodulator=GfskDemodulator(samplesPerSymbol=10),
|
|
||||||
decoder=YsfDecoder(),
|
|
||||||
mbeMode=Modes.YsfMode,
|
|
||||||
filter=WideRrcFilter(),
|
|
||||||
codecserver=codecserver
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class PocsagDemodulator(ServiceDemodulator, DialFrequencyReceiver):
|
|
||||||
def __init__(self):
|
|
||||||
self.parser = PocsagParser()
|
|
||||||
workers = [
|
|
||||||
FmDemod(),
|
|
||||||
FskDemodulator(samplesPerSymbol=40, invert=True),
|
|
||||||
PocsagDecoder(),
|
|
||||||
self.parser,
|
|
||||||
]
|
|
||||||
super().__init__(workers)
|
|
||||||
|
|
||||||
def supportsSquelch(self) -> bool:
|
|
||||||
return False
|
|
||||||
|
|
||||||
def getFixedAudioRate(self) -> int:
|
|
||||||
return 48000
|
|
||||||
|
|
||||||
def setDialFrequency(self, frequency: int) -> None:
|
|
||||||
self.parser.setDialFrequency(frequency)
|
|
@ -1,86 +0,0 @@
|
|||||||
from csdr.chain.demodulator import ServiceDemodulator, SecondaryDemodulator, DialFrequencyReceiver, SecondarySelectorChain
|
|
||||||
from csdr.module.msk144 import Msk144Module, ParserAdapter
|
|
||||||
from owrx.audio.chopper import AudioChopper, AudioChopperParser
|
|
||||||
from owrx.aprs.kiss import KissDeframer
|
|
||||||
from owrx.aprs import Ax25Parser, AprsParser
|
|
||||||
from pycsdr.modules import Convert, FmDemod, Agc, TimingRecovery, DBPskDecoder, VaricodeDecoder
|
|
||||||
from pycsdr.types import Format
|
|
||||||
from owrx.aprs.module import DirewolfModule
|
|
||||||
|
|
||||||
|
|
||||||
class AudioChopperDemodulator(ServiceDemodulator, DialFrequencyReceiver):
|
|
||||||
def __init__(self, mode: str, parser: AudioChopperParser):
|
|
||||||
self.chopper = AudioChopper(mode, parser)
|
|
||||||
workers = [Convert(Format.FLOAT, Format.SHORT), self.chopper]
|
|
||||||
super().__init__(workers)
|
|
||||||
|
|
||||||
def getFixedAudioRate(self):
|
|
||||||
return 12000
|
|
||||||
|
|
||||||
def setDialFrequency(self, frequency: int) -> None:
|
|
||||||
self.chopper.setDialFrequency(frequency)
|
|
||||||
|
|
||||||
|
|
||||||
class Msk144Demodulator(ServiceDemodulator, DialFrequencyReceiver):
|
|
||||||
def __init__(self):
|
|
||||||
self.parser = ParserAdapter()
|
|
||||||
workers = [
|
|
||||||
Convert(Format.FLOAT, Format.SHORT),
|
|
||||||
Msk144Module(),
|
|
||||||
self.parser,
|
|
||||||
]
|
|
||||||
super().__init__(workers)
|
|
||||||
|
|
||||||
def getFixedAudioRate(self) -> int:
|
|
||||||
return 12000
|
|
||||||
|
|
||||||
def setDialFrequency(self, frequency: int) -> None:
|
|
||||||
self.parser.setDialFrequency(frequency)
|
|
||||||
|
|
||||||
|
|
||||||
class PacketDemodulator(ServiceDemodulator, DialFrequencyReceiver):
|
|
||||||
def __init__(self, service: bool = False):
|
|
||||||
self.parser = AprsParser()
|
|
||||||
workers = [
|
|
||||||
FmDemod(),
|
|
||||||
Convert(Format.FLOAT, Format.SHORT),
|
|
||||||
DirewolfModule(service=service),
|
|
||||||
KissDeframer(),
|
|
||||||
Ax25Parser(),
|
|
||||||
self.parser,
|
|
||||||
]
|
|
||||||
super().__init__(workers)
|
|
||||||
|
|
||||||
def supportsSquelch(self) -> bool:
|
|
||||||
return False
|
|
||||||
|
|
||||||
def getFixedAudioRate(self) -> int:
|
|
||||||
return 48000
|
|
||||||
|
|
||||||
def setDialFrequency(self, frequency: int) -> None:
|
|
||||||
self.parser.setDialFrequency(frequency)
|
|
||||||
|
|
||||||
|
|
||||||
class PskDemodulator(SecondaryDemodulator, SecondarySelectorChain):
|
|
||||||
def __init__(self, baudRate: float):
|
|
||||||
self.baudRate = baudRate
|
|
||||||
# this is an assumption, we will adjust in setSampleRate
|
|
||||||
self.sampleRate = 12000
|
|
||||||
secondary_samples_per_bits = int(round(self.sampleRate / self.baudRate)) & ~3
|
|
||||||
workers = [
|
|
||||||
Agc(Format.COMPLEX_FLOAT),
|
|
||||||
TimingRecovery(secondary_samples_per_bits, 0.5, 2, useQ=True),
|
|
||||||
DBPskDecoder(),
|
|
||||||
VaricodeDecoder(),
|
|
||||||
]
|
|
||||||
super().__init__(workers)
|
|
||||||
|
|
||||||
def getBandwidth(self):
|
|
||||||
return self.baudRate
|
|
||||||
|
|
||||||
def setSampleRate(self, sampleRate: int) -> None:
|
|
||||||
if sampleRate == self.sampleRate:
|
|
||||||
return
|
|
||||||
self.sampleRate = sampleRate
|
|
||||||
secondary_samples_per_bits = int(round(self.sampleRate / self.baudRate)) & ~3
|
|
||||||
self.replace(1, TimingRecovery(secondary_samples_per_bits, 0.5, 2, useQ=True))
|
|
@ -1,19 +0,0 @@
|
|||||||
from csdr.chain.demodulator import BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain
|
|
||||||
from pycsdr.modules import Convert, Downmix
|
|
||||||
from pycsdr.types import Format
|
|
||||||
from csdr.module.drm import DrmModule
|
|
||||||
|
|
||||||
|
|
||||||
class Drm(BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain):
|
|
||||||
def __init__(self):
|
|
||||||
workers = [Convert(Format.COMPLEX_FLOAT, Format.COMPLEX_SHORT), DrmModule(), Downmix()]
|
|
||||||
super().__init__(workers)
|
|
||||||
|
|
||||||
def supportsSquelch(self) -> bool:
|
|
||||||
return False
|
|
||||||
|
|
||||||
def getFixedIfSampleRate(self) -> int:
|
|
||||||
return 48000
|
|
||||||
|
|
||||||
def getFixedAudioRate(self) -> int:
|
|
||||||
return 48000
|
|
@ -1,14 +0,0 @@
|
|||||||
from pycsdr.types import Format
|
|
||||||
from csdr.chain import Module
|
|
||||||
|
|
||||||
|
|
||||||
class DummyDemodulator(Module):
|
|
||||||
def __init__(self, outputFormat: Format):
|
|
||||||
self.outputFormat = outputFormat
|
|
||||||
super().__init__()
|
|
||||||
|
|
||||||
def getInputFormat(self) -> Format:
|
|
||||||
return Format.COMPLEX_FLOAT
|
|
||||||
|
|
||||||
def getOutputFormat(self) -> Format:
|
|
||||||
return self.outputFormat
|
|
@ -1,96 +0,0 @@
|
|||||||
from csdr.chain import Chain
|
|
||||||
from pycsdr.modules import Fft, LogPower, LogAveragePower, FftSwap, FftAdpcm
|
|
||||||
|
|
||||||
|
|
||||||
class FftAverager(Chain):
|
|
||||||
def __init__(self, fft_size, fft_averages):
|
|
||||||
self.fftSize = fft_size
|
|
||||||
self.fftAverages = fft_averages
|
|
||||||
workers = [self._getWorker()]
|
|
||||||
super().__init__(workers)
|
|
||||||
|
|
||||||
def setFftAverages(self, fft_averages):
|
|
||||||
if self.fftAverages == fft_averages:
|
|
||||||
return
|
|
||||||
self.fftAverages = fft_averages
|
|
||||||
self.replace(0, self._getWorker())
|
|
||||||
|
|
||||||
def _getWorker(self):
|
|
||||||
if self.fftAverages == 0:
|
|
||||||
return LogPower(add_db=-70)
|
|
||||||
else:
|
|
||||||
return LogAveragePower(add_db=-70, fft_size=self.fftSize, avg_number=self.fftAverages)
|
|
||||||
|
|
||||||
|
|
||||||
class FftChain(Chain):
|
|
||||||
def __init__(self, samp_rate, fft_size, fft_v_overlap_factor, fft_fps, fft_compression):
|
|
||||||
self.sampleRate = samp_rate
|
|
||||||
self.vOverlapFactor = fft_v_overlap_factor
|
|
||||||
self.fps = fft_fps
|
|
||||||
self.size = fft_size
|
|
||||||
|
|
||||||
self.blockSize = 0
|
|
||||||
|
|
||||||
self.fft = Fft(size=self.size, every_n_samples=self.blockSize)
|
|
||||||
self.averager = FftAverager(fft_size=self.size, fft_averages=10)
|
|
||||||
self.fftExchangeSides = FftSwap(fft_size=self.size)
|
|
||||||
workers = [
|
|
||||||
self.fft,
|
|
||||||
self.averager,
|
|
||||||
self.fftExchangeSides,
|
|
||||||
]
|
|
||||||
self.compressFftAdpcm = None
|
|
||||||
if fft_compression == "adpcm":
|
|
||||||
self.compressFftAdpcm = FftAdpcm(fft_size=self.size)
|
|
||||||
workers += [self.compressFftAdpcm]
|
|
||||||
|
|
||||||
self._updateParameters()
|
|
||||||
|
|
||||||
super().__init__(workers)
|
|
||||||
|
|
||||||
def _setBlockSize(self, fft_block_size):
|
|
||||||
if self.blockSize == int(fft_block_size):
|
|
||||||
return
|
|
||||||
self.blockSize = int(fft_block_size)
|
|
||||||
self.fft.setEveryNSamples(self.blockSize)
|
|
||||||
|
|
||||||
def setVOverlapFactor(self, fft_v_overlap_factor):
|
|
||||||
if self.vOverlapFactor == fft_v_overlap_factor:
|
|
||||||
return
|
|
||||||
self.vOverlapFactor = fft_v_overlap_factor
|
|
||||||
self._updateParameters()
|
|
||||||
|
|
||||||
def setFps(self, fft_fps):
|
|
||||||
if self.fps == fft_fps:
|
|
||||||
return
|
|
||||||
self.fps = fft_fps
|
|
||||||
self._updateParameters()
|
|
||||||
|
|
||||||
def setSampleRate(self, samp_rate):
|
|
||||||
if self.sampleRate == samp_rate:
|
|
||||||
return
|
|
||||||
self.sampleRate = samp_rate
|
|
||||||
self._updateParameters()
|
|
||||||
|
|
||||||
def _updateParameters(self):
|
|
||||||
fftAverages = 0
|
|
||||||
|
|
||||||
if self.vOverlapFactor > 0:
|
|
||||||
fftAverages = int(round(1.0 * self.sampleRate / self.size / self.fps / (1.0 - self.vOverlapFactor)))
|
|
||||||
self.averager.setFftAverages(fftAverages)
|
|
||||||
|
|
||||||
if fftAverages == 0:
|
|
||||||
self._setBlockSize(self.sampleRate / self.fps)
|
|
||||||
else:
|
|
||||||
self._setBlockSize(self.sampleRate / self.fps / fftAverages)
|
|
||||||
|
|
||||||
def setCompression(self, compression: str) -> None:
|
|
||||||
if compression == "adpcm" and not self.compressFftAdpcm:
|
|
||||||
self.compressFftAdpcm = FftAdpcm(self.size)
|
|
||||||
# should always be at the end
|
|
||||||
self.append(self.compressFftAdpcm)
|
|
||||||
elif compression == "none" and self.compressFftAdpcm:
|
|
||||||
self.compressFftAdpcm.stop()
|
|
||||||
self.compressFftAdpcm = None
|
|
||||||
# should always be at that position (right?)
|
|
||||||
self.remove(3)
|
|
@ -1,28 +0,0 @@
|
|||||||
from csdr.chain.demodulator import BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain
|
|
||||||
from csdr.module.freedv import FreeDVModule
|
|
||||||
from pycsdr.modules import RealPart, Agc, Convert
|
|
||||||
from pycsdr.types import Format
|
|
||||||
|
|
||||||
|
|
||||||
class FreeDV(BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain):
|
|
||||||
def __init__(self):
|
|
||||||
agc = Agc(Format.SHORT)
|
|
||||||
agc.setMaxGain(30)
|
|
||||||
agc.setInitialGain(3)
|
|
||||||
workers = [
|
|
||||||
RealPart(),
|
|
||||||
Agc(Format.FLOAT),
|
|
||||||
Convert(Format.FLOAT, Format.SHORT),
|
|
||||||
FreeDVModule(),
|
|
||||||
agc,
|
|
||||||
]
|
|
||||||
super().__init__(workers)
|
|
||||||
|
|
||||||
def getFixedIfSampleRate(self) -> int:
|
|
||||||
return 8000
|
|
||||||
|
|
||||||
def getFixedAudioRate(self) -> int:
|
|
||||||
return 8000
|
|
||||||
|
|
||||||
def supportsSquelch(self) -> bool:
|
|
||||||
return False
|
|
@ -1,30 +0,0 @@
|
|||||||
from csdr.chain.demodulator import BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain, MetaProvider
|
|
||||||
from csdr.module.m17 import M17Module
|
|
||||||
from pycsdr.modules import FmDemod, Limit, Convert, Writer
|
|
||||||
from pycsdr.types import Format
|
|
||||||
from digiham.modules import DcBlock
|
|
||||||
|
|
||||||
|
|
||||||
class M17(BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain, MetaProvider):
|
|
||||||
def __init__(self):
|
|
||||||
self.module = M17Module()
|
|
||||||
workers = [
|
|
||||||
FmDemod(),
|
|
||||||
DcBlock(),
|
|
||||||
Limit(),
|
|
||||||
Convert(Format.FLOAT, Format.SHORT),
|
|
||||||
self.module,
|
|
||||||
]
|
|
||||||
super().__init__(workers)
|
|
||||||
|
|
||||||
def getFixedIfSampleRate(self) -> int:
|
|
||||||
return 48000
|
|
||||||
|
|
||||||
def getFixedAudioRate(self) -> int:
|
|
||||||
return 8000
|
|
||||||
|
|
||||||
def supportsSquelch(self) -> bool:
|
|
||||||
return False
|
|
||||||
|
|
||||||
def setMetaWriter(self, writer: Writer) -> None:
|
|
||||||
self.module.setMetaWriter(writer)
|
|
@ -1,160 +0,0 @@
|
|||||||
from csdr.chain import Chain
|
|
||||||
from pycsdr.modules import Shift, FirDecimate, Bandpass, Squelch, FractionalDecimator, Writer
|
|
||||||
from pycsdr.types import Format
|
|
||||||
import math
|
|
||||||
|
|
||||||
|
|
||||||
class Decimator(Chain):
|
|
||||||
def __init__(self, inputRate: int, outputRate: int):
|
|
||||||
if outputRate > inputRate:
|
|
||||||
raise ValueError("impossible decimation: cannot upsample {} to {}".format(inputRate, outputRate))
|
|
||||||
self.inputRate = inputRate
|
|
||||||
self.outputRate = outputRate
|
|
||||||
|
|
||||||
decimation, fraction = self._getDecimation(outputRate)
|
|
||||||
transition = 0.15 * (outputRate / float(self.inputRate))
|
|
||||||
# set the cutoff on the fist decimation stage lower so that the resulting output
|
|
||||||
# is already prepared for the second (fractional) decimation stage.
|
|
||||||
# this spares us a second filter.
|
|
||||||
cutoff = 0.5 * decimation / (self.inputRate / outputRate)
|
|
||||||
|
|
||||||
workers = [
|
|
||||||
FirDecimate(decimation, transition, cutoff),
|
|
||||||
]
|
|
||||||
|
|
||||||
if fraction != 1.0:
|
|
||||||
workers += [FractionalDecimator(Format.COMPLEX_FLOAT, fraction)]
|
|
||||||
|
|
||||||
super().__init__(workers)
|
|
||||||
|
|
||||||
def _getDecimation(self, outputRate: int) -> (int, float):
|
|
||||||
d = self.inputRate / outputRate
|
|
||||||
dInt = int(d)
|
|
||||||
dFloat = float(self.inputRate / dInt) / outputRate
|
|
||||||
return dInt, dFloat
|
|
||||||
|
|
||||||
def _reconfigure(self):
|
|
||||||
decimation, fraction = self._getDecimation(self.outputRate)
|
|
||||||
transition = 0.15 * (self.outputRate / float(self.inputRate))
|
|
||||||
cutoff = 0.5 * decimation / (self.inputRate / self.outputRate)
|
|
||||||
self.replace(0, FirDecimate(decimation, transition, cutoff))
|
|
||||||
index = self.indexOf(lambda x: isinstance(x, FractionalDecimator))
|
|
||||||
if fraction != 1.0:
|
|
||||||
decimator = FractionalDecimator(Format.COMPLEX_FLOAT, fraction)
|
|
||||||
if index >= 0:
|
|
||||||
self.replace(index, decimator)
|
|
||||||
else:
|
|
||||||
self.append(decimator)
|
|
||||||
elif index >= 0:
|
|
||||||
self.remove(index)
|
|
||||||
|
|
||||||
def setOutputRate(self, outputRate: int) -> None:
|
|
||||||
if outputRate == self.outputRate:
|
|
||||||
return
|
|
||||||
self.outputRate = outputRate
|
|
||||||
self._reconfigure()
|
|
||||||
|
|
||||||
def setInputRate(self, inputRate: int) -> None:
|
|
||||||
if inputRate == self.inputRate:
|
|
||||||
return
|
|
||||||
self.inputRate = inputRate
|
|
||||||
self._reconfigure()
|
|
||||||
|
|
||||||
|
|
||||||
class Selector(Chain):
|
|
||||||
def __init__(self, inputRate: int, outputRate: int, withSquelch: bool = True):
|
|
||||||
self.inputRate = inputRate
|
|
||||||
self.outputRate = outputRate
|
|
||||||
self.frequencyOffset = 0
|
|
||||||
|
|
||||||
self.shift = Shift(0.0)
|
|
||||||
|
|
||||||
self.decimation = Decimator(inputRate, outputRate)
|
|
||||||
|
|
||||||
self.bandpass = self._buildBandpass()
|
|
||||||
self.bandpassCutoffs = None
|
|
||||||
self.setBandpass(-4000, 4000)
|
|
||||||
|
|
||||||
workers = [self.shift, self.decimation, self.bandpass]
|
|
||||||
|
|
||||||
if withSquelch:
|
|
||||||
self.readings_per_second = 4
|
|
||||||
# s-meter readings are available every 1024 samples
|
|
||||||
# the reporting interval is measured in those 1024-sample blocks
|
|
||||||
self.squelch = Squelch(5, int(outputRate / (self.readings_per_second * 1024)))
|
|
||||||
workers += [self.squelch]
|
|
||||||
|
|
||||||
super().__init__(workers)
|
|
||||||
|
|
||||||
def _buildBandpass(self) -> Bandpass:
|
|
||||||
bp_transition = 320.0 / self.outputRate
|
|
||||||
return Bandpass(transition=bp_transition, use_fft=True)
|
|
||||||
|
|
||||||
def setFrequencyOffset(self, offset: int) -> None:
|
|
||||||
if offset == self.frequencyOffset:
|
|
||||||
return
|
|
||||||
self.frequencyOffset = offset
|
|
||||||
self._updateShift()
|
|
||||||
|
|
||||||
def _updateShift(self):
|
|
||||||
shift = -self.frequencyOffset / self.inputRate
|
|
||||||
self.shift.setRate(shift)
|
|
||||||
|
|
||||||
def _convertToLinear(self, db: float) -> float:
|
|
||||||
return float(math.pow(10, db / 10))
|
|
||||||
|
|
||||||
def setSquelchLevel(self, level: float) -> None:
|
|
||||||
self.squelch.setSquelchLevel(self._convertToLinear(level))
|
|
||||||
|
|
||||||
def setBandpass(self, lowCut: float, highCut: float) -> None:
|
|
||||||
self.bandpassCutoffs = [lowCut, highCut]
|
|
||||||
scaled = [x / self.outputRate for x in self.bandpassCutoffs]
|
|
||||||
self.bandpass.setBandpass(*scaled)
|
|
||||||
|
|
||||||
def setLowCut(self, lowCut: float) -> None:
|
|
||||||
self.bandpassCutoffs[0] = lowCut
|
|
||||||
self.setBandpass(*self.bandpassCutoffs)
|
|
||||||
|
|
||||||
def setHighCut(self, highCut: float) -> None:
|
|
||||||
self.bandpassCutoffs[1] = highCut
|
|
||||||
self.setBandpass(*self.bandpassCutoffs)
|
|
||||||
|
|
||||||
def setPowerWriter(self, writer: Writer) -> None:
|
|
||||||
self.squelch.setPowerWriter(writer)
|
|
||||||
|
|
||||||
def setOutputRate(self, outputRate: int) -> None:
|
|
||||||
if outputRate == self.outputRate:
|
|
||||||
return
|
|
||||||
self.outputRate = outputRate
|
|
||||||
|
|
||||||
self.decimation.setOutputRate(outputRate)
|
|
||||||
self.squelch.setReportInterval(int(outputRate / (self.readings_per_second * 1024)))
|
|
||||||
self.bandpass = self._buildBandpass()
|
|
||||||
self.setBandpass(*self.bandpassCutoffs)
|
|
||||||
self.replace(2, self.bandpass)
|
|
||||||
|
|
||||||
def setInputRate(self, inputRate: int) -> None:
|
|
||||||
if inputRate == self.inputRate:
|
|
||||||
return
|
|
||||||
self.inputRate = inputRate
|
|
||||||
self.decimation.setInputRate(inputRate)
|
|
||||||
self._updateShift()
|
|
||||||
|
|
||||||
|
|
||||||
class SecondarySelector(Chain):
|
|
||||||
def __init__(self, sampleRate: int, bandwidth: float):
|
|
||||||
self.sampleRate = sampleRate
|
|
||||||
self.frequencyOffset = 0
|
|
||||||
self.shift = Shift(0.0)
|
|
||||||
cutoffRate = bandwidth / sampleRate
|
|
||||||
self.bandpass = Bandpass(-cutoffRate, cutoffRate, cutoffRate, use_fft=True)
|
|
||||||
workers = [self.shift, self.bandpass]
|
|
||||||
super().__init__(workers)
|
|
||||||
|
|
||||||
def setFrequencyOffset(self, offset: int) -> None:
|
|
||||||
if offset == self.frequencyOffset:
|
|
||||||
return
|
|
||||||
self.frequencyOffset = offset
|
|
||||||
if self.frequencyOffset is None:
|
|
||||||
return
|
|
||||||
self.shift.setRate(-offset / self.sampleRate)
|
|
@ -1,136 +0,0 @@
|
|||||||
from pycsdr.modules import Module as BaseModule
|
|
||||||
from pycsdr.modules import Reader, Writer
|
|
||||||
from pycsdr.types import Format
|
|
||||||
from abc import ABCMeta, abstractmethod
|
|
||||||
from threading import Thread
|
|
||||||
from io import BytesIO
|
|
||||||
from subprocess import Popen, PIPE
|
|
||||||
from functools import partial
|
|
||||||
import pickle
|
|
||||||
|
|
||||||
|
|
||||||
class Module(BaseModule, metaclass=ABCMeta):
|
|
||||||
def __init__(self):
|
|
||||||
self.reader = None
|
|
||||||
self.writer = None
|
|
||||||
super().__init__()
|
|
||||||
|
|
||||||
def setReader(self, reader: Reader) -> None:
|
|
||||||
self.reader = reader
|
|
||||||
|
|
||||||
def setWriter(self, writer: Writer) -> None:
|
|
||||||
self.writer = writer
|
|
||||||
|
|
||||||
@abstractmethod
|
|
||||||
def getInputFormat(self) -> Format:
|
|
||||||
pass
|
|
||||||
|
|
||||||
@abstractmethod
|
|
||||||
def getOutputFormat(self) -> Format:
|
|
||||||
pass
|
|
||||||
|
|
||||||
def pump(self, read, write):
|
|
||||||
def copy():
|
|
||||||
while True:
|
|
||||||
data = None
|
|
||||||
try:
|
|
||||||
data = read()
|
|
||||||
except ValueError:
|
|
||||||
pass
|
|
||||||
except BrokenPipeError:
|
|
||||||
break
|
|
||||||
if data is None or isinstance(data, bytes) and len(data) == 0:
|
|
||||||
break
|
|
||||||
write(data)
|
|
||||||
|
|
||||||
return copy
|
|
||||||
|
|
||||||
|
|
||||||
class AutoStartModule(Module, metaclass=ABCMeta):
|
|
||||||
def _checkStart(self) -> None:
|
|
||||||
if self.reader is not None and self.writer is not None:
|
|
||||||
self.start()
|
|
||||||
|
|
||||||
def setReader(self, reader: Reader) -> None:
|
|
||||||
super().setReader(reader)
|
|
||||||
self._checkStart()
|
|
||||||
|
|
||||||
def setWriter(self, writer: Writer) -> None:
|
|
||||||
super().setWriter(writer)
|
|
||||||
self._checkStart()
|
|
||||||
|
|
||||||
@abstractmethod
|
|
||||||
def start(self):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class ThreadModule(AutoStartModule, Thread, metaclass=ABCMeta):
|
|
||||||
def __init__(self):
|
|
||||||
self.doRun = True
|
|
||||||
super().__init__()
|
|
||||||
Thread.__init__(self)
|
|
||||||
|
|
||||||
@abstractmethod
|
|
||||||
def run(self):
|
|
||||||
pass
|
|
||||||
|
|
||||||
def stop(self):
|
|
||||||
self.doRun = False
|
|
||||||
self.reader.stop()
|
|
||||||
|
|
||||||
def start(self):
|
|
||||||
Thread.start(self)
|
|
||||||
|
|
||||||
|
|
||||||
class PickleModule(ThreadModule):
|
|
||||||
def getInputFormat(self) -> Format:
|
|
||||||
return Format.CHAR
|
|
||||||
|
|
||||||
def getOutputFormat(self) -> Format:
|
|
||||||
return Format.CHAR
|
|
||||||
|
|
||||||
def run(self):
|
|
||||||
while self.doRun:
|
|
||||||
data = self.reader.read()
|
|
||||||
if data is None:
|
|
||||||
self.doRun = False
|
|
||||||
break
|
|
||||||
io = BytesIO(data.tobytes())
|
|
||||||
try:
|
|
||||||
while True:
|
|
||||||
output = self.process(pickle.load(io))
|
|
||||||
if output is not None:
|
|
||||||
self.writer.write(pickle.dumps(output))
|
|
||||||
except EOFError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
@abstractmethod
|
|
||||||
def process(self, input):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class PopenModule(AutoStartModule, metaclass=ABCMeta):
|
|
||||||
def __init__(self):
|
|
||||||
self.process = None
|
|
||||||
super().__init__()
|
|
||||||
|
|
||||||
@abstractmethod
|
|
||||||
def getCommand(self):
|
|
||||||
pass
|
|
||||||
|
|
||||||
def _getProcess(self):
|
|
||||||
return Popen(self.getCommand(), stdin=PIPE, stdout=PIPE)
|
|
||||||
|
|
||||||
def start(self):
|
|
||||||
self.process = self._getProcess()
|
|
||||||
# resume in case the reader has been stop()ed before
|
|
||||||
self.reader.resume()
|
|
||||||
Thread(target=self.pump(self.reader.read, self.process.stdin.write)).start()
|
|
||||||
Thread(target=self.pump(partial(self.process.stdout.read1, 1024), self.writer.write)).start()
|
|
||||||
|
|
||||||
def stop(self):
|
|
||||||
if self.process is not None:
|
|
||||||
self.process.terminate()
|
|
||||||
self.process.wait()
|
|
||||||
self.process = None
|
|
||||||
self.reader.stop()
|
|
@ -1,14 +0,0 @@
|
|||||||
from csdr.module import PopenModule
|
|
||||||
from pycsdr.types import Format
|
|
||||||
|
|
||||||
|
|
||||||
class DrmModule(PopenModule):
|
|
||||||
def getInputFormat(self) -> Format:
|
|
||||||
return Format.COMPLEX_FLOAT
|
|
||||||
|
|
||||||
def getOutputFormat(self) -> Format:
|
|
||||||
return Format.SHORT
|
|
||||||
|
|
||||||
def getCommand(self):
|
|
||||||
# dream -c 6 --sigsrate 48000 --audsrate 48000 -I - -O -
|
|
||||||
return ["dream", "-c", "6", "--sigsrate", "48000", "--audsrate", "48000", "-I", "-", "-O", "-"]
|
|
@ -1,13 +0,0 @@
|
|||||||
from pycsdr.types import Format
|
|
||||||
from csdr.module import PopenModule
|
|
||||||
|
|
||||||
|
|
||||||
class FreeDVModule(PopenModule):
|
|
||||||
def getInputFormat(self) -> Format:
|
|
||||||
return Format.SHORT
|
|
||||||
|
|
||||||
def getOutputFormat(self) -> Format:
|
|
||||||
return Format.SHORT
|
|
||||||
|
|
||||||
def getCommand(self):
|
|
||||||
return ["freedv_rx", "1600", "-", "-"]
|
|
@ -1,58 +0,0 @@
|
|||||||
from csdr.module import PopenModule
|
|
||||||
from pycsdr.types import Format
|
|
||||||
from pycsdr.modules import Writer
|
|
||||||
from subprocess import Popen, PIPE
|
|
||||||
from threading import Thread
|
|
||||||
|
|
||||||
import re
|
|
||||||
import pickle
|
|
||||||
|
|
||||||
|
|
||||||
class M17Module(PopenModule):
|
|
||||||
lsfRegex = re.compile("SRC: ([a-zA-Z0-9]+), DEST: ([a-zA-Z0-9]+)")
|
|
||||||
|
|
||||||
def __init__(self):
|
|
||||||
super().__init__()
|
|
||||||
self.metawriter = None
|
|
||||||
|
|
||||||
def getInputFormat(self) -> Format:
|
|
||||||
return Format.SHORT
|
|
||||||
|
|
||||||
def getOutputFormat(self) -> Format:
|
|
||||||
return Format.SHORT
|
|
||||||
|
|
||||||
def getCommand(self):
|
|
||||||
return ["m17-demod", "-l"]
|
|
||||||
|
|
||||||
def _getProcess(self):
|
|
||||||
return Popen(self.getCommand(), stdin=PIPE, stdout=PIPE, stderr=PIPE)
|
|
||||||
|
|
||||||
def start(self):
|
|
||||||
super().start()
|
|
||||||
Thread(target=self._readOutput).start()
|
|
||||||
|
|
||||||
def _readOutput(self):
|
|
||||||
while True:
|
|
||||||
line = self.process.stderr.readline()
|
|
||||||
if not line:
|
|
||||||
break
|
|
||||||
self.parseOutput(line.decode())
|
|
||||||
|
|
||||||
def parseOutput(self, line):
|
|
||||||
if self.metawriter is None:
|
|
||||||
return
|
|
||||||
matches = self.lsfRegex.match(line)
|
|
||||||
msg = {"protocol": "M17"}
|
|
||||||
if matches:
|
|
||||||
# fake sync
|
|
||||||
msg["sync"] = "voice"
|
|
||||||
msg["source"] = matches.group(1)
|
|
||||||
msg["destination"] = matches.group(2)
|
|
||||||
elif line.startswith("EOS"):
|
|
||||||
pass
|
|
||||||
else:
|
|
||||||
return
|
|
||||||
self.metawriter.write(pickle.dumps(msg))
|
|
||||||
|
|
||||||
def setMetaWriter(self, writer: Writer) -> None:
|
|
||||||
self.metawriter = writer
|
|
@ -1,57 +0,0 @@
|
|||||||
from pycsdr.types import Format
|
|
||||||
from csdr.module import PopenModule, ThreadModule
|
|
||||||
from owrx.wsjt import WsjtParser, Msk144Profile
|
|
||||||
import pickle
|
|
||||||
|
|
||||||
import logging
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class Msk144Module(PopenModule):
|
|
||||||
def getCommand(self):
|
|
||||||
return ["msk144decoder"]
|
|
||||||
|
|
||||||
def getInputFormat(self) -> Format:
|
|
||||||
return Format.SHORT
|
|
||||||
|
|
||||||
def getOutputFormat(self) -> Format:
|
|
||||||
return Format.CHAR
|
|
||||||
|
|
||||||
|
|
||||||
class ParserAdapter(ThreadModule):
|
|
||||||
def __init__(self):
|
|
||||||
self.retained = bytes()
|
|
||||||
self.parser = WsjtParser()
|
|
||||||
self.dialFrequency = 0
|
|
||||||
super().__init__()
|
|
||||||
|
|
||||||
def run(self):
|
|
||||||
profile = Msk144Profile()
|
|
||||||
|
|
||||||
while self.doRun:
|
|
||||||
data = self.reader.read()
|
|
||||||
if data is None:
|
|
||||||
self.doRun = False
|
|
||||||
else:
|
|
||||||
self.retained += data
|
|
||||||
lines = self.retained.split(b"\n")
|
|
||||||
|
|
||||||
# keep the last line
|
|
||||||
# this should either be empty if the last char was \n
|
|
||||||
# or an incomplete line if the read returned early
|
|
||||||
self.retained = lines[-1]
|
|
||||||
|
|
||||||
# parse all completed lines
|
|
||||||
for line in lines[0:-1]:
|
|
||||||
# actual messages from msk144decoder should start with "*** "
|
|
||||||
if line[0:4] == b"*** ":
|
|
||||||
self.writer.write(pickle.dumps(self.parser.parse(profile, self.dialFrequency, line[4:])))
|
|
||||||
|
|
||||||
def getInputFormat(self) -> Format:
|
|
||||||
return Format.CHAR
|
|
||||||
|
|
||||||
def getOutputFormat(self) -> Format:
|
|
||||||
return Format.CHAR
|
|
||||||
|
|
||||||
def setDialFrequency(self, frequency: int) -> None:
|
|
||||||
self.dialFrequency = frequency
|
|
241
debian/changelog
vendored
241
debian/changelog
vendored
@ -1,241 +0,0 @@
|
|||||||
openwebrx (1.3.0) UNRELEASED; urgency=low
|
|
||||||
* SDR device log messages are now available in the web configuration to
|
|
||||||
simplify troubleshooting
|
|
||||||
* Added support for the MSK144 digimode
|
|
||||||
|
|
||||||
-- Jakob Ketterl <jakob.ketterl@gmx.de> Fri, 30 Sep 2022 16:47:00 +0000
|
|
||||||
|
|
||||||
openwebrx (1.2.1) bullseye jammy; urgency=low
|
|
||||||
|
|
||||||
* FifiSDR support fixed (pipeline formats now line up correctly)
|
|
||||||
* Added "Device" input for FifiSDR devices for sound card selection
|
|
||||||
|
|
||||||
-- Jakob Ketterl <jakob.ketterl@gmx.de> Tue, 20 Sep 2022 16:01:00 +0000
|
|
||||||
|
|
||||||
openwebrx (1.2.0) bullseye jammy; urgency=low
|
|
||||||
|
|
||||||
* Major rewrite of all demodulation components to make use of the new
|
|
||||||
csdr/pycsdr and digiham/pydigiham demodulator modules
|
|
||||||
* Preliminary display of M17 callsign information
|
|
||||||
* New devices supported:
|
|
||||||
- Blade RF
|
|
||||||
|
|
||||||
-- Jakob Ketterl <jakob.ketterl@gmx.de> Wed, 15 Jun 2022 16:20:00 +0000
|
|
||||||
|
|
||||||
openwebrx (1.1.0) buster hirsute; urgency=low
|
|
||||||
|
|
||||||
* Reworked most graphical elements as SVGs for faster loadtimes and crispier
|
|
||||||
display on hi-dpi displays
|
|
||||||
* Updated pipelines to match changes in digiham
|
|
||||||
* Changed D-Star and NXDN integrations to use new decoder from digiham
|
|
||||||
* Added D-Star and NXDN metadata display
|
|
||||||
|
|
||||||
-- Jakob Ketterl <jakob.ketterl@gmx.de> Mon, 02 Aug 2021 16:24:00 +0000
|
|
||||||
|
|
||||||
openwebrx (1.0.0) buster hirsute; urgency=low
|
|
||||||
* Introduced `squelch_auto_margin` config option that allows configuring the
|
|
||||||
auto squelch level
|
|
||||||
* Removed `port` configuration option; `rtltcp_compat` takes the port number
|
|
||||||
with the new connectors
|
|
||||||
* Added support for new WSJT-X modes FST4, FST4W (only available with WSJT-X
|
|
||||||
2.3) and Q65 (only available with WSJT-X 2.4)
|
|
||||||
* Added support for demodulating M17 digital voice signals using
|
|
||||||
m17-cxx-demod
|
|
||||||
* New reporting infrastructure, allowing WSPR and FST4W spots to be sent to
|
|
||||||
wsprnet.org
|
|
||||||
* Add some basic filtering capabilities to the map
|
|
||||||
* New arguments to the `openwebrx` command-line to facilitate the
|
|
||||||
administration of users (try `openwebrx admin`)
|
|
||||||
* New command-line tool `openwebrx-admin` that facilitates the
|
|
||||||
administration of users
|
|
||||||
* Default bandwidth changes:
|
|
||||||
- "WFM" changed to 150kHz
|
|
||||||
- "Packet" (APRS) changed to 12.5kHz
|
|
||||||
* Configuration rework:
|
|
||||||
- New: fully web-based configuration interface
|
|
||||||
- System configuration parameters have been moved to a new, separate
|
|
||||||
`openwebrx.conf` file
|
|
||||||
- Remaining parameters are now editable in the web configuration
|
|
||||||
- Existing `config_webrx.py` files will still be read, but changes made in
|
|
||||||
the web configuration will be written to a new storage system
|
|
||||||
- Added upload of avatar and panorama image via web configuration
|
|
||||||
* New devices supported:
|
|
||||||
- HPSDR devices (Hermes Lite 2) thanks to @jancona
|
|
||||||
- BBRF103 / RX666 / RX888 devices supported by libsddc
|
|
||||||
- R&S devices using the EB200 or Ammos protocols
|
|
||||||
|
|
||||||
-- Jakob Ketterl <jakob.ketterl@gmx.de> Thu, 06 May 2021 17:22:00 +0000
|
|
||||||
|
|
||||||
openwebrx (0.20.3) buster focal; urgency=low
|
|
||||||
|
|
||||||
* Fix a compatibility issue with python versions <= 3.6
|
|
||||||
|
|
||||||
-- Jakob Ketterl <jakob.ketterl@gmx.de> Tue, 26 Jan 2021 15:28:00 +0000
|
|
||||||
|
|
||||||
openwebrx (0.20.2) buster focal; urgency=high
|
|
||||||
|
|
||||||
* Fix a security problem that allowed arbitrary commands to be executed on
|
|
||||||
the receiver (See github issue #215:
|
|
||||||
https://github.com/jketterl/openwebrx/issues/215)
|
|
||||||
|
|
||||||
-- Jakob Ketterl <jakob.ketterl@gmx.de> Sun, 24 Jan 2021 22:50:00 +0000
|
|
||||||
|
|
||||||
openwebrx (0.20.1) buster focal; urgency=low
|
|
||||||
|
|
||||||
* Remove broken OSM map fallback
|
|
||||||
|
|
||||||
-- Jakob Ketterl <jakob.ketterl@gmx.de> Mon, 30 Nov 2020 17:29:00 +0000
|
|
||||||
|
|
||||||
openwebrx (0.20.0) buster focal; urgency=low
|
|
||||||
|
|
||||||
* Added the ability to sign multiple keys in a single request, thus enabling
|
|
||||||
multiple users to claim a single receiver on receiverbook.de
|
|
||||||
* Fixed file descriptor leaks to prevent "too many open files" errors
|
|
||||||
* Add new demodulator chain for FreeDV
|
|
||||||
* Added new HD audio streaming mode along with a new WFM demodulator
|
|
||||||
* Reworked AGC code for better results in AM, SSB and digital modes
|
|
||||||
* Added support for demodulation of "Digital Radio Mondiale" (DRM) broadcast
|
|
||||||
using the "dream" decoder.
|
|
||||||
* New default waterfall color scheme
|
|
||||||
* Prototype of a continuous automatic waterfall calibration mode
|
|
||||||
* New devices supported:
|
|
||||||
- FunCube Dongle Pro+ (`"type": "fcdpp"`)
|
|
||||||
- Support for connections to rtl_tcp (`"type": "rtl_tcp"`)
|
|
||||||
|
|
||||||
-- Jakob Ketterl <jakob.ketterl@gmx.de> Sun, 11 Oct 2020 13:02:00 +0000
|
|
||||||
|
|
||||||
openwebrx (0.19.1) buster focal; urgency=low
|
|
||||||
|
|
||||||
* Added ability to authenticate receivers with listing sites using
|
|
||||||
"receiver id" tokens
|
|
||||||
|
|
||||||
-- Jakob Ketterl <jakob.ketterl@gmx.de> Sat, 13 Jun 2020 16:46:00 +0000
|
|
||||||
|
|
||||||
openwebrx (0.19.0) buster focal; urgency=low
|
|
||||||
* Fix direwolf connection setup by implementing a retry loop
|
|
||||||
* Pass direct sampling mode changes for rtl_sdr_soapy to owrx_connector
|
|
||||||
* OSM maps instead of Google when google_maps_api_key is not set (thanks
|
|
||||||
@jquagga)
|
|
||||||
* Improved logic to pass parameters to soapy devices.
|
|
||||||
- `rtl_sdr_soapy`: added support for `bias_tee`
|
|
||||||
- `sdrplay`: added support for `bias_tee`, `rf_notch` and `dab_notch`
|
|
||||||
- `airspy`: added support for `bitpack`
|
|
||||||
* Added support for Perseus-SDR devices, (thanks @amontefusco)
|
|
||||||
* Property System has been rewritten so that defaults on sdr behave as
|
|
||||||
expected
|
|
||||||
* Waterfall range auto-adjustment now only takes the center 80% of the
|
|
||||||
spectrum into account, which should work better with SDRs that oversample
|
|
||||||
or have rather flat filter curves towards the spectrum edges
|
|
||||||
* Bugfix for negative network usage
|
|
||||||
* FiFi SDR: prevent arecord from shutting down after 2GB of data has been
|
|
||||||
sent
|
|
||||||
* Added support for bias tee control on rtl_sdr devices
|
|
||||||
* All connector driven SDRs now support `"rf_gain": "auto"` to enable AGC
|
|
||||||
* `rtl_sdr` type now also supports the `direct_sampling` option
|
|
||||||
* Added decoding implementation for for digimode "JS8Call" (requires an
|
|
||||||
installation of js8call and the js8py library)
|
|
||||||
* Reorganization of the frontend demodulator code
|
|
||||||
* Improve receiver load time by concatenating javascript assets
|
|
||||||
* HackRF support is now based on SoapyHackRF
|
|
||||||
* Removed sdr.hu server listing support since the site has been shut down
|
|
||||||
* Added support for Radioberry 2 Rasbperry Pi SDR Cape
|
|
||||||
|
|
||||||
-- Jakob Ketterl <jakob.ketterl@gmx.de> Mon, 01 Jun 2020 17:02:00 +0000
|
|
||||||
|
|
||||||
openwebrx (0.18.0) buster; urgency=low
|
|
||||||
|
|
||||||
* Compression, resampling and filtering in the frontend have been rewritten
|
|
||||||
in javascript, sdr.js has been removed
|
|
||||||
* Decoding of Pocsag modulation is now possible
|
|
||||||
* Removed the 3D waterfall since it had no real application and required ~1MB
|
|
||||||
of javascript code to be downloaded
|
|
||||||
* Improved the frontend handling of the "too many users" scenario
|
|
||||||
* PSK63 digimode is now available (same decoding pipeline as PSK31, but with
|
|
||||||
adopted parameters)
|
|
||||||
* The frequency can now be manipulated with the mousewheel, which should
|
|
||||||
allow the user to tune more precise. The tuning step size is determined by
|
|
||||||
the digit the mouse cursor is hovering over.
|
|
||||||
* Clicking on the frequency now opens an input for direct frequency selection
|
|
||||||
* URL hashes have been fixed and improved: They are now updated
|
|
||||||
automatically, so a shared URL will include frequency and demodulator,
|
|
||||||
which allows for improved sharing and linking.
|
|
||||||
* New daylight scheduler for background decoding, allows profiles to be
|
|
||||||
selected by local sunrise / sunset times
|
|
||||||
* The owrx_connector is now the default way of communicating with sdr
|
|
||||||
devices. The old sdr types have been replaced, all `_connector` suffixes on
|
|
||||||
the type must be removed!
|
|
||||||
* The sources have been refactored, making it a lot easier to add support for
|
|
||||||
other devices
|
|
||||||
* SDR device failure handling has been improved, including user feedback
|
|
||||||
* New devices supported:
|
|
||||||
* wsjt-x updated to 2.1.2
|
|
||||||
* The rtl_tcp compatibility mode of the owrx_connector is now configurable
|
|
||||||
using the `rtltcp_compat` flag
|
|
||||||
* explicit device filter for soapy devices for multi-device setups
|
|
||||||
* compatibility fixes for safari browsers (ios and mac)
|
|
||||||
* Offset tuning using the `lfo_offset` has been reworked in a way that
|
|
||||||
`center_freq` has to be set to the frequency you actually want to listen
|
|
||||||
to. If you're using an `lfo_offset` already, you will probably need to
|
|
||||||
change its sign.
|
|
||||||
* `initial_squelch_level` can now be set on each profile.
|
|
||||||
* Part of the frontend code has been reworked
|
|
||||||
- Audio buffer minimums have been completely stripped. As a result, you
|
|
||||||
should get better latency. Unfortunately, this also means there will be
|
|
||||||
some skipping when audio starts.
|
|
||||||
- Now also supports AudioWorklets (for those browser that have it).
|
|
||||||
- Mousewheel controls for the receiver sliders
|
|
||||||
* Error handling for failed SDR devices
|
|
||||||
* One of the most-requested features is finally coming to OpenWebRX:
|
|
||||||
Bookmarks (sometimes also referred to as labels).
|
|
||||||
There's two kinds of bookmarks available:
|
|
||||||
- Serverside bookmarks that are set up by the receiver administrator.
|
|
||||||
Check the file `bookmarks.json` for examples!
|
|
||||||
- Clientside bookmarks which every user can store for themselves. They are
|
|
||||||
stored in the browser's localStorage.
|
|
||||||
* Automatic reporting of spots to [pskreporter](https://pskreporter.info/) is
|
|
||||||
now possible. Please have a look at the configuration on how to set it up.
|
|
||||||
* Websocket communication has been overhauled in large parts. It should now
|
|
||||||
be more reliable, and failing connections should now have no impact on
|
|
||||||
other users.
|
|
||||||
* Profile scheduling allows to set up band-hopping if you are running
|
|
||||||
background services.
|
|
||||||
* APRS now has the ability to show symbols on the map, if a corresponding
|
|
||||||
symbol set has been installed. Check the config!
|
|
||||||
* Debug logging has been disabled in a handful of modules, expect vastly
|
|
||||||
reduced output on the shell.
|
|
||||||
* New set of APRS-related features
|
|
||||||
- Decode Packet transmissions using direwolf (1k2 only for now)
|
|
||||||
- APRS packets are mostly decoded and shown both in a new panel and on the
|
|
||||||
map
|
|
||||||
- APRS is also available as a background service
|
|
||||||
- direwolfs I-gate functionality can be enabled, which allows your receiver
|
|
||||||
to work as a receive-only I-gate for the APRS network in the background
|
|
||||||
* Demodulation for background services has been optimized to use less total
|
|
||||||
bandwidth, saving CPU
|
|
||||||
* More metrics have been added; they can be used together with collectd and
|
|
||||||
its curl_json plugin for now, with some limitations.
|
|
||||||
* New bandplan feature, the first thing visible is the "dial" indicator that
|
|
||||||
brings you right to the dial frequency for digital modes
|
|
||||||
* fixed some bugs in the websocket communication which broke the map
|
|
||||||
* WSJT-X integration (FT8, FT4, WSPR, JT65, JT9 using wsjt-x demodulators)
|
|
||||||
* New Map Feature that shows both decoded grid squares from FT8 and Locations
|
|
||||||
decoded from YSF digital voice
|
|
||||||
* New Feature report that will show what functionality is available
|
|
||||||
* major rework on the openwebrx core
|
|
||||||
* Support of multiple SDR devices simultaneously
|
|
||||||
* Support for multiple profiles per SDR that allow the user to listen to
|
|
||||||
different frequencies
|
|
||||||
* Support for digital voice decoding
|
|
||||||
* Feature detection that will disable functionality when dependencies are not
|
|
||||||
available (if you're missing the digital
|
|
||||||
buttons, this is probably why)
|
|
||||||
* Support added for the following SDR sources:
|
|
||||||
- LimeSDR (`"type": "lime_sdr"`)
|
|
||||||
- PlutoSDR (`"type": "pluto_sdr"`)
|
|
||||||
- RTL_SDR via Soapy (`"type": "rtl_sdr_soapy"`) on special request to allow
|
|
||||||
use of the direct sampling mode
|
|
||||||
- SoapyRemote (`"type": "soapy_remote"`)
|
|
||||||
- FiFiSDR (`"type": "fifi_sdr"`)
|
|
||||||
- airspyhf devices (Airspy HF+ / Discovery) (`"type": "airspyhf"`)
|
|
||||||
|
|
||||||
-- Jakob Ketterl <jakob.ketterl@gmx.de> Tue, 18 Feb 2020 20:09:00 +0000
|
|
1
debian/compat
vendored
1
debian/compat
vendored
@ -1 +0,0 @@
|
|||||||
10
|
|
16
debian/control
vendored
16
debian/control
vendored
@ -1,16 +0,0 @@
|
|||||||
Source: openwebrx
|
|
||||||
Maintainer: Jakob Ketterl <jakob.ketterl@gmx.de>
|
|
||||||
Section: hamradio
|
|
||||||
Priority: optional
|
|
||||||
Standards-Version: 4.2.0
|
|
||||||
Build-Depends: debhelper (>= 11), dh-python, python3-all (>= 3.5), python3-setuptools
|
|
||||||
Homepage: https://www.openwebrx.de/
|
|
||||||
Vcs-Browser: https://github.com/jketterl/openwebrx
|
|
||||||
Vcs-Git: https://github.com/jketterl/openwebrx.git
|
|
||||||
|
|
||||||
Package: openwebrx
|
|
||||||
Architecture: all
|
|
||||||
Depends: adduser, python3 (>= 3.5), python3-pkg-resources, owrx-connector (>= 0.5), soapysdr-tools, python3-csdr (>= 0.18), ${python3:Depends}, ${misc:Depends}
|
|
||||||
Recommends: python3-digiham (>= 0.6), direwolf (>= 1.4), wsjtx, js8call, runds-connector (>= 0.2), hpsdrconnector, aprs-symbols, m17-demod, js8call, python3-js8py (>= 0.2), nmux (>= 0.18), codecserver (>= 0.1), msk144decoder
|
|
||||||
Description: multi-user web sdr
|
|
||||||
Open source, multi-user SDR receiver with a web interface
|
|
8
debian/openwebrx.config
vendored
8
debian/openwebrx.config
vendored
@ -1,8 +0,0 @@
|
|||||||
#!/bin/sh -e
|
|
||||||
. /usr/share/debconf/confmodule
|
|
||||||
|
|
||||||
db_get openwebrx/admin_user_configured
|
|
||||||
if [ "${1:-}" = "reconfigure" ] || [ "${RET}" != true ]; then
|
|
||||||
db_input high openwebrx/admin_user_password || true
|
|
||||||
db_go
|
|
||||||
fi
|
|
1
debian/openwebrx.dirs
vendored
1
debian/openwebrx.dirs
vendored
@ -1 +0,0 @@
|
|||||||
/etc/openwebrx/openwebrx.conf.d
|
|
3
debian/openwebrx.install
vendored
3
debian/openwebrx.install
vendored
@ -1,3 +0,0 @@
|
|||||||
bands.json etc/openwebrx/
|
|
||||||
openwebrx.conf etc/openwebrx/
|
|
||||||
systemd/openwebrx.service lib/systemd/system/
|
|
59
debian/openwebrx.postinst
vendored
59
debian/openwebrx.postinst
vendored
@ -1,59 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
. /usr/share/debconf/confmodule
|
|
||||||
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
OWRX_USER="openwebrx"
|
|
||||||
OWRX_DATADIR="/var/lib/openwebrx"
|
|
||||||
OWRX_USERS_FILE="${OWRX_DATADIR}/users.json"
|
|
||||||
OWRX_SETTINGS_FILE="${OWRX_DATADIR}/settings.json"
|
|
||||||
OWRX_BOOKMARKS_FILE="${OWRX_DATADIR}/bookmarks.json"
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
configure|reconfigure)
|
|
||||||
adduser --system --group --no-create-home --home /nonexistent --quiet "${OWRX_USER}"
|
|
||||||
usermod -aG plugdev "${OWRX_USER}"
|
|
||||||
|
|
||||||
# create OpenWebRX data directory and set the correct permissions
|
|
||||||
if [ ! -d "${OWRX_DATADIR}" ] && [ ! -L "${OWRX_DATADIR}" ]; then mkdir "${OWRX_DATADIR}"; fi
|
|
||||||
chown "${OWRX_USER}". ${OWRX_DATADIR}
|
|
||||||
|
|
||||||
# create empty config files now to avoid permission problems later
|
|
||||||
if [ ! -e "${OWRX_USERS_FILE}" ]; then
|
|
||||||
echo "[]" > "${OWRX_USERS_FILE}"
|
|
||||||
chown "${OWRX_USER}". "${OWRX_USERS_FILE}"
|
|
||||||
chmod 0600 "${OWRX_USERS_FILE}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -e "${OWRX_SETTINGS_FILE}" ]; then
|
|
||||||
echo "{}" > "${OWRX_SETTINGS_FILE}"
|
|
||||||
chown "${OWRX_USER}". "${OWRX_SETTINGS_FILE}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -e "${OWRX_BOOKMARKS_FILE}" ]; then
|
|
||||||
touch "${OWRX_BOOKMARKS_FILE}"
|
|
||||||
chown "${OWRX_USER}". "${OWRX_BOOKMARKS_FILE}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
db_get openwebrx/admin_user_password
|
|
||||||
if [ ! -z "${RET}" ]; then
|
|
||||||
if ! openwebrx admin --silent hasuser admin; then
|
|
||||||
# create initial openwebrx user
|
|
||||||
OWRX_PASSWORD="${RET}" openwebrx admin --noninteractive adduser admin
|
|
||||||
else
|
|
||||||
# change existing user's password
|
|
||||||
OWRX_PASSWORD="${RET}" openwebrx admin --noninteractive resetpassword admin
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
# remove password from debconf database
|
|
||||||
db_unregister openwebrx/admin_user_password
|
|
||||||
# set a marker that admin is configured to avoid future questions
|
|
||||||
db_set openwebrx/admin_user_configured true
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "postinst called with unknown argument '$1'" 1>&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
#DEBHELPER#
|
|
8
debian/openwebrx.postrm
vendored
8
debian/openwebrx.postrm
vendored
@ -1,8 +0,0 @@
|
|||||||
#!/bin/sh -e
|
|
||||||
|
|
||||||
if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then
|
|
||||||
. /usr/share/debconf/confmodule
|
|
||||||
db_purge
|
|
||||||
fi
|
|
||||||
|
|
||||||
#DEBHELPER#
|
|
23
debian/openwebrx.templates
vendored
23
debian/openwebrx.templates
vendored
@ -1,23 +0,0 @@
|
|||||||
Template: openwebrx/admin_user_password
|
|
||||||
Type: password
|
|
||||||
Description: OpenWebRX "admin" user password:
|
|
||||||
The system can create a user for the OpenWebRX web configuration interface for
|
|
||||||
you. Using this user, you will be able to log into the "settings" area of
|
|
||||||
OpenWebRX to configure your receiver conveniently through your browser.
|
|
||||||
.
|
|
||||||
The name of the created user will be "admin".
|
|
||||||
.
|
|
||||||
If you do not wish to create a web admin user right now, you can leave this
|
|
||||||
empty for now. You can return to this prompt at a later time by running the
|
|
||||||
command "sudo dpkg-reconfigure openwebrx".
|
|
||||||
.
|
|
||||||
You can also use the "openwebrx admin" command to create, delete or manage
|
|
||||||
existing users. More information is available in by running the command
|
|
||||||
"openwebrx admin --help".
|
|
||||||
|
|
||||||
Template: openwebrx/admin_user_configured
|
|
||||||
Type: boolean
|
|
||||||
Default: false
|
|
||||||
Description: OpenWebRX "admin" user previously configured?
|
|
||||||
Marker used internally by the config scripts to remember if an admin user has
|
|
||||||
been created.
|
|
8
debian/rules
vendored
8
debian/rules
vendored
@ -1,8 +0,0 @@
|
|||||||
#!/usr/bin/make -f
|
|
||||||
export PYBUILD_NAME=openwebrx
|
|
||||||
|
|
||||||
%:
|
|
||||||
dh $@ --with python3 --buildsystem=pybuild --with systemd
|
|
||||||
|
|
||||||
override_dh_strip_nondeterminism:
|
|
||||||
dh_strip_nondeterminism -X.png
|
|
1
debian/source/format
vendored
1
debian/source/format
vendored
@ -1 +0,0 @@
|
|||||||
3.0 (native)
|
|
97
docker.sh
97
docker.sh
@ -1,97 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
ARCH=$(uname -m)
|
|
||||||
IMAGES="openwebrx-rtlsdr openwebrx-sdrplay openwebrx-hackrf openwebrx-airspy openwebrx-rtlsdr-soapy openwebrx-plutosdr openwebrx-limesdr openwebrx-soapyremote openwebrx-perseus openwebrx-fcdpp openwebrx-radioberry openwebrx-uhd openwebrx-rtltcp openwebrx-runds openwebrx-hpsdr openwebrx-bladerf openwebrx-full openwebrx"
|
|
||||||
ALL_ARCHS="x86_64 armv7l aarch64"
|
|
||||||
TAG=${TAG:-"latest"}
|
|
||||||
ARCHTAG="${TAG}-${ARCH}"
|
|
||||||
|
|
||||||
usage () {
|
|
||||||
echo "Usage: ${0} [command]"
|
|
||||||
echo "Available commands:"
|
|
||||||
echo " help Show this usage information"
|
|
||||||
echo " build Build all docker images"
|
|
||||||
echo " push Push built docker images to the docker hub"
|
|
||||||
echo " manifest Compile the docker hub manifest (combines arm and x86 tags into one)"
|
|
||||||
echo " tag Tag a release"
|
|
||||||
}
|
|
||||||
|
|
||||||
build () {
|
|
||||||
# build the base images
|
|
||||||
docker build --pull -t openwebrx-base:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-base .
|
|
||||||
docker build --build-arg ARCHTAG=${ARCHTAG} -t openwebrx-soapysdr-base:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-soapysdr .
|
|
||||||
|
|
||||||
for image in ${IMAGES}; do
|
|
||||||
i=${image:10}
|
|
||||||
# "openwebrx" is a special image that gets tag-aliased later on
|
|
||||||
if [[ ! -z "${i}" ]] ; then
|
|
||||||
docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/${image}:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-${i} .
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# tag openwebrx alias image
|
|
||||||
docker tag jketterl/openwebrx-full:${ARCHTAG} jketterl/openwebrx:${ARCHTAG}
|
|
||||||
}
|
|
||||||
|
|
||||||
push () {
|
|
||||||
for image in ${IMAGES}; do
|
|
||||||
docker push jketterl/${image}:${ARCHTAG}
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
manifest () {
|
|
||||||
for image in ${IMAGES}; do
|
|
||||||
# there's no docker manifest rm command, and the create --amend does not work, so we have to clean up manually
|
|
||||||
rm -rf "${HOME}/.docker/manifests/docker.io_jketterl_${image}-${TAG}"
|
|
||||||
IMAGE_LIST=""
|
|
||||||
for a in ${ALL_ARCHS}; do
|
|
||||||
IMAGE_LIST="${IMAGE_LIST} jketterl/${image}:${TAG}-${a}"
|
|
||||||
done
|
|
||||||
docker manifest create jketterl/${image}:${TAG} ${IMAGE_LIST}
|
|
||||||
docker manifest push --purge jketterl/${image}:${TAG}
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
tag () {
|
|
||||||
if [[ -x ${1:-} || -z ${2:-} ]] ; then
|
|
||||||
echo "Usage: ${0} tag [SRC_TAG] [TARGET_TAG]"
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
local SRC_TAG=${1}
|
|
||||||
local TARGET_TAG=${2}
|
|
||||||
|
|
||||||
for image in ${IMAGES}; do
|
|
||||||
# there's no docker manifest rm command, and the create --amend does not work, so we have to clean up manually
|
|
||||||
rm -rf "${HOME}/.docker/manifests/docker.io_jketterl_${image}-${TARGET_TAG}"
|
|
||||||
IMAGE_LIST=""
|
|
||||||
for a in ${ALL_ARCHS}; do
|
|
||||||
docker pull jketterl/${image}:${SRC_TAG}-${a}
|
|
||||||
docker tag jketterl/${image}:${SRC_TAG}-${a} jketterl/${image}:${TARGET_TAG}-${a}
|
|
||||||
docker push jketterl/${image}:${TARGET_TAG}-${a}
|
|
||||||
IMAGE_LIST="${IMAGE_LIST} jketterl/${image}:${TARGET_TAG}-${a}"
|
|
||||||
done
|
|
||||||
docker manifest create jketterl/${image}:${TARGET_TAG} ${IMAGE_LIST}
|
|
||||||
docker manifest push --purge jketterl/${image}:${TARGET_TAG}
|
|
||||||
docker pull jketterl/${image}:${TARGET_TAG}
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
case ${1:-} in
|
|
||||||
build)
|
|
||||||
build
|
|
||||||
;;
|
|
||||||
push)
|
|
||||||
push
|
|
||||||
;;
|
|
||||||
manifest)
|
|
||||||
manifest
|
|
||||||
;;
|
|
||||||
tag)
|
|
||||||
tag ${@:2}
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
usage
|
|
||||||
;;
|
|
||||||
esac
|
|
@ -1,8 +0,0 @@
|
|||||||
ARG ARCHTAG
|
|
||||||
FROM openwebrx-soapysdr-base:$ARCHTAG
|
|
||||||
|
|
||||||
COPY docker/scripts/install-dependencies-airspy.sh /
|
|
||||||
RUN /install-dependencies-airspy.sh &&\
|
|
||||||
rm /install-dependencies-airspy.sh
|
|
||||||
|
|
||||||
ADD . /opt/openwebrx
|
|
@ -1,28 +0,0 @@
|
|||||||
FROM debian:bullseye-slim
|
|
||||||
|
|
||||||
COPY docker/files/js8call/js8call-hamlib.patch \
|
|
||||||
docker/files/wsjtx/wsjtx.patch \
|
|
||||||
docker/files/wsjtx/wsjtx-hamlib.patch \
|
|
||||||
docker/files/dream/dream.patch \
|
|
||||||
docker/files/direwolf/direwolf-hamlib.patch \
|
|
||||||
docker/scripts/install-dependencies.sh /
|
|
||||||
RUN /install-dependencies.sh && \
|
|
||||||
rm /install-dependencies.sh && \
|
|
||||||
rm /*.patch
|
|
||||||
COPY docker/scripts/install-owrx-tools.sh /
|
|
||||||
RUN /install-owrx-tools.sh && \
|
|
||||||
rm /install-owrx-tools.sh
|
|
||||||
|
|
||||||
COPY docker/files/services/codecserver /etc/services.d/codecserver
|
|
||||||
|
|
||||||
ENTRYPOINT ["/init"]
|
|
||||||
|
|
||||||
WORKDIR /opt/openwebrx
|
|
||||||
|
|
||||||
VOLUME /etc/openwebrx
|
|
||||||
VOLUME /var/lib/openwebrx
|
|
||||||
|
|
||||||
ENV S6_CMD_ARG0="/opt/openwebrx/docker/scripts/run.sh"
|
|
||||||
CMD []
|
|
||||||
|
|
||||||
EXPOSE 8073
|
|
@ -1,8 +0,0 @@
|
|||||||
ARG ARCHTAG
|
|
||||||
FROM openwebrx-soapysdr-base:$ARCHTAG
|
|
||||||
|
|
||||||
COPY docker/scripts/install-dependencies-bladerf.sh /
|
|
||||||
RUN /install-dependencies-bladerf.sh &&\
|
|
||||||
rm /install-dependencies-bladerf.sh
|
|
||||||
|
|
||||||
COPY . /opt/openwebrx
|
|
@ -1,8 +0,0 @@
|
|||||||
ARG ARCHTAG
|
|
||||||
FROM openwebrx-soapysdr-base:$ARCHTAG
|
|
||||||
|
|
||||||
COPY docker/scripts/install-dependencies-fcdpp.sh /
|
|
||||||
RUN /install-dependencies-fcdpp.sh &&\
|
|
||||||
rm /install-dependencies-fcdpp.sh
|
|
||||||
|
|
||||||
COPY . /opt/openwebrx
|
|
@ -1,31 +0,0 @@
|
|||||||
ARG ARCHTAG
|
|
||||||
FROM openwebrx-base:$ARCHTAG
|
|
||||||
|
|
||||||
COPY docker/scripts/install-dependencies-*.sh \
|
|
||||||
docker/files/sdrplay/install-lib.*.patch \
|
|
||||||
docker/scripts/install-connectors.sh /
|
|
||||||
|
|
||||||
RUN /install-dependencies-rtlsdr.sh &&\
|
|
||||||
/install-dependencies-soapysdr.sh &&\
|
|
||||||
/install-dependencies-hackrf.sh &&\
|
|
||||||
/install-dependencies-sdrplay.sh &&\
|
|
||||||
/install-dependencies-airspy.sh &&\
|
|
||||||
/install-dependencies-rtlsdr-soapy.sh &&\
|
|
||||||
/install-dependencies-plutosdr.sh &&\
|
|
||||||
/install-dependencies-limesdr.sh &&\
|
|
||||||
/install-dependencies-soapyremote.sh &&\
|
|
||||||
/install-dependencies-perseus.sh &&\
|
|
||||||
/install-dependencies-fcdpp.sh &&\
|
|
||||||
/install-dependencies-radioberry.sh &&\
|
|
||||||
/install-dependencies-uhd.sh &&\
|
|
||||||
/install-dependencies-hpsdr.sh &&\
|
|
||||||
/install-dependencies-bladerf.sh &&\
|
|
||||||
/install-connectors.sh &&\
|
|
||||||
/install-dependencies-runds.sh &&\
|
|
||||||
rm /install-dependencies-*.sh &&\
|
|
||||||
rm /install-lib.*.patch && \
|
|
||||||
rm /install-connectors.sh
|
|
||||||
|
|
||||||
COPY docker/files/services/sdrplay /etc/services.d/sdrplay
|
|
||||||
|
|
||||||
ADD . /opt/openwebrx
|
|
@ -1,8 +0,0 @@
|
|||||||
ARG ARCHTAG
|
|
||||||
FROM openwebrx-soapysdr-base:$ARCHTAG
|
|
||||||
|
|
||||||
COPY docker/scripts/install-dependencies-hackrf.sh /
|
|
||||||
RUN /install-dependencies-hackrf.sh &&\
|
|
||||||
rm /install-dependencies-hackrf.sh
|
|
||||||
|
|
||||||
COPY . /opt/openwebrx
|
|
@ -1,9 +0,0 @@
|
|||||||
ARG ARCHTAG
|
|
||||||
FROM openwebrx-base:$ARCHTAG
|
|
||||||
|
|
||||||
COPY docker/scripts/install-dependencies-hpsdr.sh /
|
|
||||||
|
|
||||||
RUN /install-dependencies-hpsdr.sh &&\
|
|
||||||
rm /install-dependencies-hpsdr.sh
|
|
||||||
|
|
||||||
COPY . /opt/openwebrx
|
|
@ -1,8 +0,0 @@
|
|||||||
ARG ARCHTAG
|
|
||||||
FROM openwebrx-soapysdr-base:$ARCHTAG
|
|
||||||
|
|
||||||
COPY docker/scripts/install-dependencies-limesdr.sh /
|
|
||||||
RUN /install-dependencies-limesdr.sh &&\
|
|
||||||
rm /install-dependencies-limesdr.sh
|
|
||||||
|
|
||||||
COPY . /opt/openwebrx
|
|
@ -1,8 +0,0 @@
|
|||||||
ARG ARCHTAG
|
|
||||||
FROM openwebrx-base:$ARCHTAG
|
|
||||||
|
|
||||||
COPY docker/scripts/install-dependencies-perseus.sh /
|
|
||||||
RUN /install-dependencies-perseus.sh &&\
|
|
||||||
rm /install-dependencies-perseus.sh
|
|
||||||
|
|
||||||
COPY . /opt/openwebrx
|
|
@ -1,8 +0,0 @@
|
|||||||
ARG ARCHTAG
|
|
||||||
FROM openwebrx-soapysdr-base:$ARCHTAG
|
|
||||||
|
|
||||||
COPY docker/scripts/install-dependencies-plutosdr.sh /
|
|
||||||
RUN /install-dependencies-plutosdr.sh &&\
|
|
||||||
rm /install-dependencies-plutosdr.sh
|
|
||||||
|
|
||||||
COPY . /opt/openwebrx
|
|
@ -1,8 +0,0 @@
|
|||||||
ARG ARCHTAG
|
|
||||||
FROM openwebrx-soapysdr-base:$ARCHTAG
|
|
||||||
|
|
||||||
COPY docker/scripts/install-dependencies-radioberry.sh /
|
|
||||||
RUN /install-dependencies-radioberry.sh &&\
|
|
||||||
rm /install-dependencies-radioberry.sh
|
|
||||||
|
|
||||||
COPY . /opt/openwebrx
|
|
@ -1,12 +0,0 @@
|
|||||||
ARG ARCHTAG
|
|
||||||
FROM openwebrx-base:$ARCHTAG
|
|
||||||
|
|
||||||
COPY docker/scripts/install-dependencies-rtlsdr.sh \
|
|
||||||
docker/scripts/install-connectors.sh /
|
|
||||||
|
|
||||||
RUN /install-dependencies-rtlsdr.sh &&\
|
|
||||||
rm /install-dependencies-rtlsdr.sh &&\
|
|
||||||
/install-connectors.sh &&\
|
|
||||||
rm /install-connectors.sh
|
|
||||||
|
|
||||||
COPY . /opt/openwebrx
|
|
@ -1,8 +0,0 @@
|
|||||||
ARG ARCHTAG
|
|
||||||
FROM openwebrx-soapysdr-base:$ARCHTAG
|
|
||||||
|
|
||||||
COPY docker/scripts/install-dependencies-rtlsdr-soapy.sh /
|
|
||||||
RUN /install-dependencies-rtlsdr-soapy.sh &&\
|
|
||||||
rm /install-dependencies-rtlsdr-soapy.sh
|
|
||||||
|
|
||||||
COPY . /opt/openwebrx
|
|
@ -1,9 +0,0 @@
|
|||||||
ARG ARCHTAG
|
|
||||||
FROM openwebrx-base:$ARCHTAG
|
|
||||||
|
|
||||||
COPY docker/scripts/install-connectors.sh /
|
|
||||||
|
|
||||||
RUN /install-connectors.sh &&\
|
|
||||||
rm /install-connectors.sh
|
|
||||||
|
|
||||||
COPY . /opt/openwebrx
|
|
@ -1,12 +0,0 @@
|
|||||||
ARG ARCHTAG
|
|
||||||
FROM openwebrx-base:$ARCHTAG
|
|
||||||
|
|
||||||
COPY docker/scripts/install-connectors.sh \
|
|
||||||
docker/scripts/install-dependencies-runds.sh /
|
|
||||||
|
|
||||||
RUN /install-connectors.sh &&\
|
|
||||||
rm /install-connectors.sh && \
|
|
||||||
/install-dependencies-runds.sh && \
|
|
||||||
rm /install-dependencies-runds.sh
|
|
||||||
|
|
||||||
COPY . /opt/openwebrx
|
|
@ -1,12 +0,0 @@
|
|||||||
ARG ARCHTAG
|
|
||||||
FROM openwebrx-soapysdr-base:$ARCHTAG
|
|
||||||
|
|
||||||
COPY docker/scripts/install-dependencies-sdrplay.sh \
|
|
||||||
docker/files/sdrplay/install-lib.*.patch /
|
|
||||||
RUN /install-dependencies-sdrplay.sh &&\
|
|
||||||
rm /install-dependencies-sdrplay.sh &&\
|
|
||||||
rm /install-lib.*.patch
|
|
||||||
|
|
||||||
COPY docker/files/services/sdrplay /etc/services.d/sdrplay
|
|
||||||
|
|
||||||
COPY . /opt/openwebrx
|
|
@ -1,8 +0,0 @@
|
|||||||
ARG ARCHTAG
|
|
||||||
FROM openwebrx-soapysdr-base:$ARCHTAG
|
|
||||||
|
|
||||||
COPY docker/scripts/install-dependencies-soapyremote.sh /
|
|
||||||
RUN /install-dependencies-soapyremote.sh &&\
|
|
||||||
rm /install-dependencies-soapyremote.sh
|
|
||||||
|
|
||||||
COPY . /opt/openwebrx
|
|
@ -1,9 +0,0 @@
|
|||||||
ARG ARCHTAG
|
|
||||||
FROM openwebrx-base:$ARCHTAG
|
|
||||||
|
|
||||||
COPY docker/scripts/install-dependencies-soapysdr.sh \
|
|
||||||
docker/scripts/install-connectors.sh /
|
|
||||||
RUN /install-dependencies-soapysdr.sh &&\
|
|
||||||
rm /install-dependencies-soapysdr.sh &&\
|
|
||||||
/install-connectors.sh &&\
|
|
||||||
rm /install-connectors.sh
|
|
@ -1,8 +0,0 @@
|
|||||||
ARG ARCHTAG
|
|
||||||
FROM openwebrx-soapysdr-base:$ARCHTAG
|
|
||||||
|
|
||||||
COPY docker/scripts/install-dependencies-uhd.sh /
|
|
||||||
RUN /install-dependencies-uhd.sh &&\
|
|
||||||
rm /install-dependencies-uhd.sh
|
|
||||||
|
|
||||||
COPY . /opt/openwebrx
|
|
@ -1,20 +0,0 @@
|
|||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index 9e710f5..da90b43 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -257,13 +257,8 @@ else()
|
|
||||||
set(GPSD_LIBRARIES "")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
-find_package(hamlib)
|
|
||||||
-if(HAMLIB_FOUND)
|
|
||||||
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_HAMLIB")
|
|
||||||
-else()
|
|
||||||
- set(HAMLIB_INCLUDE_DIRS "")
|
|
||||||
- set(HAMLIB_LIBRARIES "")
|
|
||||||
-endif()
|
|
||||||
+set(HAMLIB_INCLUDE_DIRS "")
|
|
||||||
+set(HAMLIB_LIBRARIES "")
|
|
||||||
|
|
||||||
if(LINUX)
|
|
||||||
find_package(ALSA REQUIRED)
|
|
@ -1,96 +0,0 @@
|
|||||||
--- dream.pro.org 2020-09-04 22:51:51.579926191 +0200
|
|
||||||
+++ dream.pro 2020-09-04 22:52:57.609434707 +0200
|
|
||||||
@@ -70,9 +70,6 @@
|
|
||||||
exists(/opt/local/include/speex/speex_preprocess.h) {
|
|
||||||
CONFIG += speexdsp
|
|
||||||
}
|
|
||||||
- exists(/opt/local/include/hamlib/rig.h) {
|
|
||||||
- CONFIG += hamlib
|
|
||||||
- }
|
|
||||||
contains(QT_VERSION, ^4\\.7.*) {
|
|
||||||
QT += phonon opengl svg
|
|
||||||
DEFINES -= QWT_NO_SVG
|
|
||||||
@@ -138,12 +135,6 @@
|
|
||||||
packagesExist(sndfile) {
|
|
||||||
CONFIG += sndfile
|
|
||||||
}
|
|
||||||
- packagesExist(hamlib) {
|
|
||||||
- CONFIG += hamlib
|
|
||||||
- }
|
|
||||||
- packagesExist(gpsd) {
|
|
||||||
- CONFIG += gps
|
|
||||||
- }
|
|
||||||
packagesExist(pcap) {
|
|
||||||
CONFIG += pcap
|
|
||||||
}
|
|
||||||
@@ -159,14 +150,6 @@
|
|
||||||
exists(/usr/local/include/sndfile.h) {
|
|
||||||
CONFIG += sndfile
|
|
||||||
}
|
|
||||||
- exists(/usr/include/hamlib/rig.h) | \
|
|
||||||
- exists(/usr/local/include/hamlib/rig.h) {
|
|
||||||
- CONFIG += hamlib
|
|
||||||
- }
|
|
||||||
- exists(/usr/include/gps.h) | \
|
|
||||||
- exists(/usr/local/include/gps.h) {
|
|
||||||
- CONFIG += gps
|
|
||||||
- }
|
|
||||||
exists(/usr/include/pcap.h) | \
|
|
||||||
exists(/usr/local/include/pcap.h) {
|
|
||||||
CONFIG += pcap
|
|
||||||
@@ -194,9 +177,6 @@
|
|
||||||
exists($$OUT_PWD/include/speex/speex_preprocess.h) {
|
|
||||||
CONFIG += speexdsp
|
|
||||||
}
|
|
||||||
- exists($$OUT_PWD/include/hamlib/rig.h) {
|
|
||||||
- CONFIG += hamlib
|
|
||||||
- }
|
|
||||||
exists($$OUT_PWD/include/pcap.h) {
|
|
||||||
CONFIG += pcap
|
|
||||||
}
|
|
||||||
@@ -225,7 +205,7 @@
|
|
||||||
LIBS += -lz
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-exists($$OUT_PWD/include/neaacdec.h) {
|
|
||||||
+exists(/usr/include/neaacdec.h) {
|
|
||||||
DEFINES += HAVE_LIBFAAD \
|
|
||||||
USE_FAAD2_LIBRARY
|
|
||||||
LIBS += -lfaad_drm
|
|
||||||
@@ -257,11 +237,6 @@
|
|
||||||
win32:LIBS += libspeexdsp.lib
|
|
||||||
message("with libspeexdsp")
|
|
||||||
}
|
|
||||||
-gps {
|
|
||||||
- DEFINES += HAVE_LIBGPS
|
|
||||||
- unix:LIBS += -lgps
|
|
||||||
- message("with gps")
|
|
||||||
-}
|
|
||||||
pcap {
|
|
||||||
DEFINES += HAVE_LIBPCAP
|
|
||||||
unix:LIBS += -lpcap
|
|
||||||
@@ -269,24 +244,6 @@
|
|
||||||
win32-g++:LIBS += -lwpcap -lpacket
|
|
||||||
message("with pcap")
|
|
||||||
}
|
|
||||||
-hamlib {
|
|
||||||
- DEFINES += HAVE_LIBHAMLIB
|
|
||||||
- macx:LIBS += -framework IOKit
|
|
||||||
- unix:LIBS += -lhamlib
|
|
||||||
- win32:LIBS += libhamlib-2.lib
|
|
||||||
- HEADERS += src/util/Hamlib.h
|
|
||||||
- SOURCES += src/util/Hamlib.cpp
|
|
||||||
- qt {
|
|
||||||
- HEADERS += src/util-QT/Rig.h
|
|
||||||
- SOURCES += src/util-QT/Rig.cpp
|
|
||||||
- }
|
|
||||||
- gui {
|
|
||||||
- HEADERS += src/GUI-QT/RigDlg.h
|
|
||||||
- SOURCES += src/GUI-QT/RigDlg.cpp
|
|
||||||
- FORMS += RigDlg.ui
|
|
||||||
- }
|
|
||||||
- message("with hamlib")
|
|
||||||
-}
|
|
||||||
qwt {
|
|
||||||
DEFINES += QWT_NO_SVG
|
|
||||||
macx {
|
|
@ -1,151 +0,0 @@
|
|||||||
diff -ur js8call-orig/CMake/Modules/Findhamlib.cmake js8call/CMake/Modules/Findhamlib.cmake
|
|
||||||
--- js8call-orig/CMake/Modules/Findhamlib.cmake 2020-07-22 18:14:18.014499840 +0200
|
|
||||||
+++ js8call/CMake/Modules/Findhamlib.cmake 2020-07-22 18:16:07.200375473 +0200
|
|
||||||
@@ -78,4 +78,4 @@
|
|
||||||
# Handle the QUIETLY and REQUIRED arguments and set HAMLIB_FOUND to
|
|
||||||
# TRUE if all listed variables are TRUE
|
|
||||||
include (FindPackageHandleStandardArgs)
|
|
||||||
-find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES hamlib_LIBRARY_DIRS)
|
|
||||||
+find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES)
|
|
||||||
diff -ur js8call-orig/CMakeLists.txt js8call/CMakeLists.txt
|
|
||||||
--- js8call-orig/CMakeLists.txt 2020-07-22 18:14:18.014499840 +0200
|
|
||||||
+++ js8call/CMakeLists.txt 2020-07-22 18:17:55.629633825 +0200
|
|
||||||
@@ -558,7 +558,7 @@
|
|
||||||
#
|
|
||||||
# libhamlib setup
|
|
||||||
#
|
|
||||||
-set (hamlib_STATIC 1)
|
|
||||||
+set (hamlib_STATIC 0)
|
|
||||||
find_package (hamlib 3 REQUIRED)
|
|
||||||
find_program (RIGCTL_EXE rigctl)
|
|
||||||
find_program (RIGCTLD_EXE rigctld)
|
|
||||||
@@ -911,56 +911,6 @@
|
|
||||||
target_link_libraries (js8 wsjt_fort wsjt_cxx Qt5::Core)
|
|
||||||
endif (${OPENMP_FOUND} OR APPLE)
|
|
||||||
|
|
||||||
-# build the main application
|
|
||||||
-add_executable (js8call MACOSX_BUNDLE
|
|
||||||
- ${sqlite3_CSRCS}
|
|
||||||
- ${wsjtx_CXXSRCS}
|
|
||||||
- ${wsjtx_GENUISRCS}
|
|
||||||
- wsjtx.rc
|
|
||||||
- ${WSJTX_ICON_FILE}
|
|
||||||
- ${wsjtx_RESOURCES_RCC}
|
|
||||||
- images.qrc
|
|
||||||
- )
|
|
||||||
-
|
|
||||||
-if (WSJT_CREATE_WINMAIN)
|
|
||||||
- set_target_properties (js8call PROPERTIES WIN32_EXECUTABLE ON)
|
|
||||||
-endif (WSJT_CREATE_WINMAIN)
|
|
||||||
-
|
|
||||||
-set_target_properties (js8call PROPERTIES
|
|
||||||
- MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Darwin/Info.plist.in"
|
|
||||||
- MACOSX_BUNDLE_INFO_STRING "${WSJTX_DESCRIPTION_SUMMARY}"
|
|
||||||
- MACOSX_BUNDLE_ICON_FILE "${WSJTX_ICON_FILE}"
|
|
||||||
- MACOSX_BUNDLE_BUNDLE_VERSION ${wsjtx_VERSION}
|
|
||||||
- MACOSX_BUNDLE_SHORT_VERSION_STRING "v${wsjtx_VERSION}"
|
|
||||||
- MACOSX_BUNDLE_LONG_VERSION_STRING "Version ${wsjtx_VERSION}"
|
|
||||||
- MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}"
|
|
||||||
- MACOSX_BUNDLE_BUNDLE_EXECUTABLE_NAME "${PROJECT_NAME}"
|
|
||||||
- MACOSX_BUNDLE_COPYRIGHT "${PROJECT_COPYRIGHT}"
|
|
||||||
- MACOSX_BUNDLE_GUI_IDENTIFIER "org.kn4crd.js8call"
|
|
||||||
- )
|
|
||||||
-
|
|
||||||
-target_include_directories (js8call PRIVATE ${FFTW3_INCLUDE_DIRS})
|
|
||||||
-if (APPLE)
|
|
||||||
- target_link_libraries (js8call wsjt_fort wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
|
|
||||||
-else ()
|
|
||||||
- target_link_libraries (js8call wsjt_fort_omp wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
|
|
||||||
- if (OpenMP_C_FLAGS)
|
|
||||||
- set_target_properties (js8call PROPERTIES
|
|
||||||
- COMPILE_FLAGS "${OpenMP_C_FLAGS}"
|
|
||||||
- LINK_FLAGS "${OpenMP_C_FLAGS}"
|
|
||||||
- )
|
|
||||||
- endif ()
|
|
||||||
- set_target_properties (js8call PROPERTIES
|
|
||||||
- Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/fortran_modules_omp
|
|
||||||
- )
|
|
||||||
- if (WIN32)
|
|
||||||
- set_target_properties (js8call PROPERTIES
|
|
||||||
- LINK_FLAGS -Wl,--stack,16777216
|
|
||||||
- )
|
|
||||||
- endif ()
|
|
||||||
-endif ()
|
|
||||||
-qt5_use_modules (js8call SerialPort) # not sure why the interface link library syntax above doesn't work
|
|
||||||
-
|
|
||||||
# if (UNIX)
|
|
||||||
# if (NOT WSJT_SKIP_MANPAGES)
|
|
||||||
# add_subdirectory (manpages)
|
|
||||||
@@ -976,38 +926,10 @@
|
|
||||||
#
|
|
||||||
# installation
|
|
||||||
#
|
|
||||||
-install (TARGETS js8call
|
|
||||||
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
|
|
||||||
- BUNDLE DESTINATION . COMPONENT runtime
|
|
||||||
- )
|
|
||||||
-
|
|
||||||
install (TARGETS js8 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
|
|
||||||
BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
|
|
||||||
)
|
|
||||||
|
|
||||||
-install (PROGRAMS
|
|
||||||
- ${RIGCTL_EXE}
|
|
||||||
- DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
||||||
- #COMPONENT runtime
|
|
||||||
- RENAME rigctl-local${CMAKE_EXECUTABLE_SUFFIX}
|
|
||||||
- )
|
|
||||||
-
|
|
||||||
-install (PROGRAMS
|
|
||||||
- ${RIGCTLD_EXE}
|
|
||||||
- DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
||||||
- #COMPONENT runtime
|
|
||||||
- RENAME rigctld-local${CMAKE_EXECUTABLE_SUFFIX}
|
|
||||||
- )
|
|
||||||
-
|
|
||||||
-install (FILES
|
|
||||||
- README
|
|
||||||
- COPYING
|
|
||||||
- INSTALL
|
|
||||||
- INSTALL-WSJTX
|
|
||||||
- DESTINATION ${CMAKE_INSTALL_DOCDIR}
|
|
||||||
- #COMPONENT runtime
|
|
||||||
- )
|
|
||||||
-
|
|
||||||
install (FILES
|
|
||||||
contrib/Ephemeris/JPLEPH
|
|
||||||
DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}
|
|
||||||
@@ -1061,32 +983,6 @@
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/wsjtx_config.h"
|
|
||||||
)
|
|
||||||
|
|
||||||
-
|
|
||||||
-if (NOT WIN32 AND NOT APPLE)
|
|
||||||
- # install a desktop file so js8call appears in the application start
|
|
||||||
- # menu with an icon
|
|
||||||
- install (
|
|
||||||
- FILES js8call.desktop
|
|
||||||
- DESTINATION /usr/share/applications
|
|
||||||
- #COMPONENT runtime
|
|
||||||
- )
|
|
||||||
- install (
|
|
||||||
- FILES icons/Unix/js8call_icon.png
|
|
||||||
- DESTINATION /usr/share/pixmaps
|
|
||||||
- #COMPONENT runtime
|
|
||||||
- )
|
|
||||||
-
|
|
||||||
- IF("${CMAKE_INSTALL_PREFIX}" STREQUAL "/opt/js8call")
|
|
||||||
- execute_process(COMMAND ln -s /opt/js8call/bin/js8call ljs8call)
|
|
||||||
-
|
|
||||||
- install(FILES
|
|
||||||
- ${CMAKE_BINARY_DIR}/ljs8call DESTINATION /usr/bin/ RENAME js8call
|
|
||||||
- #COMPONENT runtime
|
|
||||||
- )
|
|
||||||
- endif()
|
|
||||||
-endif (NOT WIN32 AND NOT APPLE)
|
|
||||||
-
|
|
||||||
-
|
|
||||||
#
|
|
||||||
# bundle fixup only done in Release or MinSizeRel configurations
|
|
||||||
#
|
|
||||||
Only in js8call/: .idea
|
|
@ -1,23 +0,0 @@
|
|||||||
diff -ur sdrplay-orig/install_lib.sh sdrplay/install_lib.sh
|
|
||||||
--- sdrplay-orig/install_lib.sh 2020-05-24 14:30:06.022483867 +0000
|
|
||||||
+++ sdrplay/install_lib.sh 2020-05-24 14:30:49.093435726 +0000
|
|
||||||
@@ -4,19 +4,6 @@
|
|
||||||
export MAJVERS="3"
|
|
||||||
|
|
||||||
echo "Installing SDRplay RSP API library ${VERS}..."
|
|
||||||
-read -p "Press RETURN to view the license agreement" ret
|
|
||||||
-
|
|
||||||
-more sdrplay_license.txt
|
|
||||||
-
|
|
||||||
-while true; do
|
|
||||||
- echo "Press y and RETURN to accept the license agreement and continue with"
|
|
||||||
- read -p "the installation, or press n and RETURN to exit the installer [y/n] " yn
|
|
||||||
- case $yn in
|
|
||||||
- [Yy]* ) break;;
|
|
||||||
- [Nn]* ) exit;;
|
|
||||||
- * ) echo "Please answer y or n";;
|
|
||||||
- esac
|
|
||||||
-done
|
|
||||||
|
|
||||||
export ARCH=`uname -m`
|
|
||||||
|
|
@ -1,40 +0,0 @@
|
|||||||
diff -ur sdrplay-orig/install_lib.sh sdrplay/install_lib.sh
|
|
||||||
--- sdrplay-orig/install_lib.sh 2020-05-24 14:13:04.561271707 +0000
|
|
||||||
+++ sdrplay/install_lib.sh 2020-05-24 14:16:20.068329040 +0000
|
|
||||||
@@ -4,19 +4,6 @@
|
|
||||||
MAJVERS="3"
|
|
||||||
|
|
||||||
echo "Installing SDRplay RSP API library ${VERS}..."
|
|
||||||
-read -p "Press RETURN to view the license agreement" ret
|
|
||||||
-
|
|
||||||
-more sdrplay_license.txt
|
|
||||||
-
|
|
||||||
-while true; do
|
|
||||||
- echo "Press y and RETURN to accept the license agreement and continue with"
|
|
||||||
- read -p "the installation, or press n and RETURN to exit the installer [y/n] " yn
|
|
||||||
- case $yn in
|
|
||||||
- [Yy]* ) break;;
|
|
||||||
- [Nn]* ) exit;;
|
|
||||||
- * ) echo "Please answer y or n";;
|
|
||||||
- esac
|
|
||||||
-done
|
|
||||||
|
|
||||||
ARCH=`uname -m`
|
|
||||||
|
|
||||||
@@ -141,16 +128,6 @@
|
|
||||||
echo "SDRplay API ${VERS} Installation Finished"
|
|
||||||
echo " "
|
|
||||||
|
|
||||||
-while true; do
|
|
||||||
- echo "Would you like to add SDRplay USB IDs to the local database for easier
|
|
||||||
-"
|
|
||||||
- read -p "identification in applications such as lsusb? [y/n] " yn
|
|
||||||
- case $yn in
|
|
||||||
- [Yy]* ) break;;
|
|
||||||
- [Nn]* ) exit;;
|
|
||||||
- * ) echo "Please answer y or n";;
|
|
||||||
- esac
|
|
||||||
-done
|
|
||||||
sudo cp scripts/sdrplay_usbids.sh ${INSTALLBINDIR}/.
|
|
||||||
sudo chmod 755 ${INSTALLBINDIR}/sdrplay_usbids.sh
|
|
||||||
sudo cp scripts/sdrplay_ids.txt ${INSTALLBINDIR}/.
|
|
@ -1,39 +0,0 @@
|
|||||||
diff -ur sdrplay-orig/install_lib.sh sdrplay/install_lib.sh
|
|
||||||
--- sdrplay-orig/install_lib.sh 2020-05-24 13:56:56.622000041 +0000
|
|
||||||
+++ sdrplay/install_lib.sh 2020-05-24 13:58:51.837801559 +0000
|
|
||||||
@@ -4,19 +4,6 @@
|
|
||||||
MAJVERS="3"
|
|
||||||
|
|
||||||
echo "Installing SDRplay RSP API library ${VERS}..."
|
|
||||||
-read -p "Press RETURN to view the license agreement" ret
|
|
||||||
-
|
|
||||||
-more sdrplay_license.txt
|
|
||||||
-
|
|
||||||
-while true; do
|
|
||||||
- echo "Press y and RETURN to accept the license agreement and continue with"
|
|
||||||
- read -p "the installation, or press n and RETURN to exit the installer [y/n] " yn
|
|
||||||
- case $yn in
|
|
||||||
- [Yy]* ) break;;
|
|
||||||
- [Nn]* ) exit;;
|
|
||||||
- * ) echo "Please answer y or n";;
|
|
||||||
- esac
|
|
||||||
-done
|
|
||||||
|
|
||||||
ARCH=`uname -m`
|
|
||||||
OSDIST="Unknown"
|
|
||||||
@@ -157,15 +144,6 @@
|
|
||||||
echo " "
|
|
||||||
echo "SDRplay API ${VERS} Installation Finished"
|
|
||||||
echo " "
|
|
||||||
-while true; do
|
|
||||||
- echo "Would you like to add SDRplay USB IDs to the local database for easier"
|
|
||||||
- read -p "identification in applications such as lsusb? [y/n] " yn
|
|
||||||
- case $yn in
|
|
||||||
- [Yy]* ) break;;
|
|
||||||
- [Nn]* ) exit;;
|
|
||||||
- * ) echo "Please answer y or n";;
|
|
||||||
- esac
|
|
||||||
-done
|
|
||||||
sudo cp scripts/sdrplay_usbids.sh ${INSTALLBINDIR}/.
|
|
||||||
sudo chmod 755 ${INSTALLBINDIR}/sdrplay_usbids.sh
|
|
||||||
sudo cp scripts/sdrplay_ids.txt ${INSTALLBINDIR}/.
|
|
@ -1,2 +0,0 @@
|
|||||||
#!/usr/bin/execlineb -P
|
|
||||||
/usr/local/bin/codecserver
|
|
@ -1,2 +0,0 @@
|
|||||||
#!/usr/bin/execlineb -P
|
|
||||||
/usr/local/bin/sdrplay_apiService
|
|
@ -1,50 +0,0 @@
|
|||||||
--- CMakeLists.txt.orig 2021-09-28 14:33:14.329598412 +0200
|
|
||||||
+++ CMakeLists.txt 2021-09-28 14:34:23.052345270 +0200
|
|
||||||
@@ -106,24 +106,6 @@
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
-# build and install hamlib locally so it can be referenced by the
|
|
||||||
-# WSJT-X build
|
|
||||||
-#
|
|
||||||
-ExternalProject_Add (hamlib
|
|
||||||
- GIT_REPOSITORY ${hamlib_repo}
|
|
||||||
- GIT_TAG ${hamlib_TAG}
|
|
||||||
- GIT_SHALLOW False
|
|
||||||
- URL ${CMAKE_CURRENT_SOURCE_DIR}/src/${__hamlib_upstream}.tar.gz
|
|
||||||
- URL_HASH MD5=${hamlib_md5sum}
|
|
||||||
- #UPDATE_COMMAND ${CMAKE_COMMAND} -E env "[ -f ./bootstrap ] && ./bootstrap"
|
|
||||||
- PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 -N < ${CMAKE_CURRENT_SOURCE_DIR}/hamlib.patch
|
|
||||||
- CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --disable-shared --enable-static --without-cxx-binding ${EXTRA_FLAGS} # LIBUSB_LIBS=${USB_LIBRARY}
|
|
||||||
- BUILD_COMMAND $(MAKE) all V=1 # $(MAKE) is ExternalProject_Add() magic to do recursive make
|
|
||||||
- INSTALL_COMMAND $(MAKE) install-strip V=1 DESTDIR=""
|
|
||||||
- STEP_TARGETS update install
|
|
||||||
- )
|
|
||||||
-
|
|
||||||
-#
|
|
||||||
# custom target to make a hamlib source tarball
|
|
||||||
#
|
|
||||||
add_custom_target (hamlib_sources
|
|
||||||
@@ -161,7 +143,6 @@
|
|
||||||
# build and optionally install WSJT-X using the hamlib package built
|
|
||||||
# above
|
|
||||||
#
|
|
||||||
-ExternalProject_Get_Property (hamlib INSTALL_DIR)
|
|
||||||
ExternalProject_Add (wsjtx
|
|
||||||
GIT_REPOSITORY ${wsjtx_repo}
|
|
||||||
GIT_TAG ${WSJTX_TAG}
|
|
||||||
@@ -186,14 +167,8 @@
|
|
||||||
DEPENDEES build
|
|
||||||
)
|
|
||||||
|
|
||||||
-set_target_properties (hamlib PROPERTIES EXCLUDE_FROM_ALL 1)
|
|
||||||
set_target_properties (wsjtx PROPERTIES EXCLUDE_FROM_ALL 1)
|
|
||||||
|
|
||||||
-add_dependencies (wsjtx-configure hamlib-install)
|
|
||||||
-add_dependencies (wsjtx-build hamlib-install)
|
|
||||||
-add_dependencies (wsjtx-install hamlib-install)
|
|
||||||
-add_dependencies (wsjtx-package hamlib-install)
|
|
||||||
-
|
|
||||||
# export traditional targets
|
|
||||||
add_custom_target (build ALL DEPENDS wsjtx-build)
|
|
||||||
add_custom_target (install DEPENDS wsjtx-install)
|
|
@ -1,341 +0,0 @@
|
|||||||
diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
|
|
||||||
--- wsjtx-orig/CMakeLists.txt 2023-01-28 17:43:05.586124507 +0100
|
|
||||||
+++ wsjtx/CMakeLists.txt 2023-01-28 17:56:07.108634912 +0100
|
|
||||||
@@ -122,7 +122,7 @@
|
|
||||||
option (WSJT_QDEBUG_TO_FILE "Redirect Qt debuging messages to a trace file.")
|
|
||||||
option (WSJT_SOFT_KEYING "Apply a ramp to CW keying envelope to reduce transients." ON)
|
|
||||||
option (WSJT_SKIP_MANPAGES "Skip *nix manpage generation.")
|
|
||||||
-option (WSJT_GENERATE_DOCS "Generate documentation files." ON)
|
|
||||||
+option (WSJT_GENERATE_DOCS "Generate documentation files.")
|
|
||||||
option (WSJT_RIG_NONE_CAN_SPLIT "Allow split operation with \"None\" as rig.")
|
|
||||||
option (WSJT_TRACE_UDP "Debugging option that turns on UDP message protocol diagnostics.")
|
|
||||||
option (WSJT_BUILD_UTILS "Build simulators and code demonstrators." ON)
|
|
||||||
@@ -170,77 +170,7 @@
|
|
||||||
)
|
|
||||||
|
|
||||||
set (wsjt_qt_CXXSRCS
|
|
||||||
- helper_functions.cpp
|
|
||||||
- qt_helpers.cpp
|
|
||||||
- widgets/MessageBox.cpp
|
|
||||||
- MetaDataRegistry.cpp
|
|
||||||
- Network/NetworkServerLookup.cpp
|
|
||||||
revision_utils.cpp
|
|
||||||
- L10nLoader.cpp
|
|
||||||
- WFPalette.cpp
|
|
||||||
- Radio.cpp
|
|
||||||
- RadioMetaType.cpp
|
|
||||||
- NonInheritingProcess.cpp
|
|
||||||
- models/IARURegions.cpp
|
|
||||||
- models/Bands.cpp
|
|
||||||
- models/Modes.cpp
|
|
||||||
- models/FrequencyList.cpp
|
|
||||||
- models/StationList.cpp
|
|
||||||
- widgets/FrequencyLineEdit.cpp
|
|
||||||
- widgets/FrequencyDeltaLineEdit.cpp
|
|
||||||
- item_delegates/CandidateKeyFilter.cpp
|
|
||||||
- item_delegates/ForeignKeyDelegate.cpp
|
|
||||||
- item_delegates/MessageItemDelegate.cpp
|
|
||||||
- validators/LiveFrequencyValidator.cpp
|
|
||||||
- GetUserId.cpp
|
|
||||||
- Audio/AudioDevice.cpp
|
|
||||||
- Transceiver/Transceiver.cpp
|
|
||||||
- Transceiver/TransceiverBase.cpp
|
|
||||||
- Transceiver/EmulateSplitTransceiver.cpp
|
|
||||||
- Transceiver/TransceiverFactory.cpp
|
|
||||||
- Transceiver/PollingTransceiver.cpp
|
|
||||||
- Transceiver/HamlibTransceiver.cpp
|
|
||||||
- Transceiver/HRDTransceiver.cpp
|
|
||||||
- Transceiver/DXLabSuiteCommanderTransceiver.cpp
|
|
||||||
- Network/NetworkMessage.cpp
|
|
||||||
- Network/MessageClient.cpp
|
|
||||||
- widgets/LettersSpinBox.cpp
|
|
||||||
- widgets/HintedSpinBox.cpp
|
|
||||||
- widgets/RestrictedSpinBox.cpp
|
|
||||||
- widgets/HelpTextWindow.cpp
|
|
||||||
- SampleDownloader.cpp
|
|
||||||
- SampleDownloader/DirectoryDelegate.cpp
|
|
||||||
- SampleDownloader/Directory.cpp
|
|
||||||
- SampleDownloader/FileNode.cpp
|
|
||||||
- SampleDownloader/RemoteFile.cpp
|
|
||||||
- DisplayManual.cpp
|
|
||||||
- MultiSettings.cpp
|
|
||||||
- validators/MaidenheadLocatorValidator.cpp
|
|
||||||
- validators/CallsignValidator.cpp
|
|
||||||
- widgets/SplashScreen.cpp
|
|
||||||
- EqualizationToolsDialog.cpp
|
|
||||||
- widgets/DoubleClickablePushButton.cpp
|
|
||||||
- widgets/DoubleClickableRadioButton.cpp
|
|
||||||
- Network/LotWUsers.cpp
|
|
||||||
- models/DecodeHighlightingModel.cpp
|
|
||||||
- widgets/DecodeHighlightingListView.cpp
|
|
||||||
- models/FoxLog.cpp
|
|
||||||
- widgets/AbstractLogWindow.cpp
|
|
||||||
- widgets/FoxLogWindow.cpp
|
|
||||||
- widgets/CabrilloLogWindow.cpp
|
|
||||||
- item_delegates/CallsignDelegate.cpp
|
|
||||||
- item_delegates/MaidenheadLocatorDelegate.cpp
|
|
||||||
- item_delegates/FrequencyDelegate.cpp
|
|
||||||
- item_delegates/FrequencyDeltaDelegate.cpp
|
|
||||||
- item_delegates/SQLiteDateTimeDelegate.cpp
|
|
||||||
- models/CabrilloLog.cpp
|
|
||||||
- logbook/AD1CCty.cpp
|
|
||||||
- logbook/WorkedBefore.cpp
|
|
||||||
- logbook/Multiplier.cpp
|
|
||||||
- Network/NetworkAccessManager.cpp
|
|
||||||
- widgets/LazyFillComboBox.cpp
|
|
||||||
- widgets/CheckableItemComboBox.cpp
|
|
||||||
- widgets/BandComboBox.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
set (wsjt_qtmm_CXXSRCS
|
|
||||||
@@ -1089,9 +1019,6 @@
|
|
||||||
if (WSJT_GENERATE_DOCS)
|
|
||||||
add_subdirectory (doc)
|
|
||||||
endif (WSJT_GENERATE_DOCS)
|
|
||||||
-if (EXISTS ${CMAKE_SOURCE_DIR}/tests AND IS_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
|
|
||||||
- add_subdirectory (tests)
|
|
||||||
-endif ()
|
|
||||||
|
|
||||||
# build a library of package functionality (without and optionally with OpenMP support)
|
|
||||||
add_library (wsjt_cxx STATIC ${wsjt_CSRCS} ${wsjt_CXXSRCS})
|
|
||||||
@@ -1357,10 +1284,7 @@
|
|
||||||
add_library (wsjt_qt STATIC ${wsjt_qt_CXXSRCS} ${wsjt_qt_GENUISRCS} ${GENAXSRCS})
|
|
||||||
# set wsjtx_udp exports to static variants
|
|
||||||
target_compile_definitions (wsjt_qt PUBLIC UDP_STATIC_DEFINE)
|
|
||||||
-target_link_libraries (wsjt_qt Hamlib::Hamlib Boost::log qcp Qt5::Widgets Qt5::Network Qt5::Sql)
|
|
||||||
-if (WIN32)
|
|
||||||
- target_link_libraries (wsjt_qt Qt5::AxContainer Qt5::AxBase)
|
|
||||||
-endif (WIN32)
|
|
||||||
+target_link_libraries (wsjt_qt Qt5::Core)
|
|
||||||
|
|
||||||
# build a library of package Qt functionality used in Fortran utilities
|
|
||||||
add_library (fort_qt STATIC ${fort_qt_CXXSRCS})
|
|
||||||
@@ -1425,90 +1349,6 @@
|
|
||||||
add_subdirectory (map65)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
-# build the main application
|
|
||||||
-generate_version_info (wsjtx_VERSION_RESOURCES
|
|
||||||
- NAME wsjtx
|
|
||||||
- BUNDLE ${PROJECT_BUNDLE_NAME}
|
|
||||||
- ICON ${WSJTX_ICON_FILE}
|
|
||||||
- )
|
|
||||||
-
|
|
||||||
-add_executable (wsjtx MACOSX_BUNDLE
|
|
||||||
- ${wsjtx_CXXSRCS}
|
|
||||||
- ${wsjtx_GENUISRCS}
|
|
||||||
- ${WSJTX_ICON_FILE}
|
|
||||||
- ${wsjtx_RESOURCES_RCC}
|
|
||||||
- ${wsjtx_VERSION_RESOURCES}
|
|
||||||
- )
|
|
||||||
-
|
|
||||||
-if (WSJT_CREATE_WINMAIN)
|
|
||||||
- set_target_properties (wsjtx PROPERTIES WIN32_EXECUTABLE ON)
|
|
||||||
-endif (WSJT_CREATE_WINMAIN)
|
|
||||||
-
|
|
||||||
-set_target_properties (wsjtx PROPERTIES
|
|
||||||
- MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Darwin/Info.plist.in"
|
|
||||||
- MACOSX_BUNDLE_INFO_STRING "${PROJECT_DESCRIPTION}"
|
|
||||||
- MACOSX_BUNDLE_ICON_FILE "${WSJTX_ICON_FILE}"
|
|
||||||
- MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
|
|
||||||
- MACOSX_BUNDLE_SHORT_VERSION_STRING "v${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
|
|
||||||
- MACOSX_BUNDLE_LONG_VERSION_STRING "Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${SCS_VERSION_STR}"
|
|
||||||
- MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_BUNDLE_NAME}"
|
|
||||||
- MACOSX_BUNDLE_BUNDLE_EXECUTABLE_NAME "${PROJECT_NAME}"
|
|
||||||
- MACOSX_BUNDLE_COPYRIGHT "${PROJECT_COPYRIGHT}"
|
|
||||||
- MACOSX_BUNDLE_GUI_IDENTIFIER "org.k1jt.wsjtx"
|
|
||||||
- )
|
|
||||||
-
|
|
||||||
-target_include_directories (wsjtx PRIVATE ${FFTW3_INCLUDE_DIRS})
|
|
||||||
-if ((NOT ${OPENMP_FOUND}) OR APPLE)
|
|
||||||
- target_link_libraries (wsjtx wsjt_fort)
|
|
||||||
-else ()
|
|
||||||
- target_link_libraries (wsjtx wsjt_fort_omp)
|
|
||||||
- if (OpenMP_C_FLAGS)
|
|
||||||
- set_target_properties (wsjtx PROPERTIES
|
|
||||||
- COMPILE_FLAGS "${OpenMP_C_FLAGS}"
|
|
||||||
- LINK_FLAGS "${OpenMP_C_FLAGS}"
|
|
||||||
- )
|
|
||||||
- endif ()
|
|
||||||
- set_target_properties (wsjtx PROPERTIES
|
|
||||||
- Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/fortran_modules_omp
|
|
||||||
- )
|
|
||||||
- if (WIN32)
|
|
||||||
- set_target_properties (wsjtx PROPERTIES
|
|
||||||
- LINK_FLAGS -Wl,--stack,0x1000000,--heap,0x20000000
|
|
||||||
- )
|
|
||||||
- endif ()
|
|
||||||
-endif ()
|
|
||||||
-target_link_libraries (wsjtx Qt5::SerialPort wsjt_cxx wsjt_qt wsjt_qtmm ${FFTW3_LIBRARIES} ${LIBM_LIBRARIES})
|
|
||||||
-
|
|
||||||
-# make a library for WSJT-X UDP servers
|
|
||||||
-# add_library (wsjtx_udp SHARED ${UDP_library_CXXSRCS})
|
|
||||||
-add_library (wsjtx_udp-static STATIC ${UDP_library_CXXSRCS})
|
|
||||||
-#target_include_directories (wsjtx_udp
|
|
||||||
-# INTERFACE
|
|
||||||
-# $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/wsjtx>
|
|
||||||
-# )
|
|
||||||
-target_include_directories (wsjtx_udp-static
|
|
||||||
- INTERFACE
|
|
||||||
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/wsjtx>
|
|
||||||
- )
|
|
||||||
-#set_target_properties (wsjtx_udp PROPERTIES
|
|
||||||
-# PUBLIC_HEADER "${UDP_library_HEADERS}"
|
|
||||||
-# )
|
|
||||||
-set_target_properties (wsjtx_udp-static PROPERTIES
|
|
||||||
- OUTPUT_NAME wsjtx_udp
|
|
||||||
- )
|
|
||||||
-target_compile_definitions (wsjtx_udp-static PUBLIC UDP_STATIC_DEFINE)
|
|
||||||
-target_link_libraries (wsjtx_udp-static Qt5::Network Qt5::Gui)
|
|
||||||
-generate_export_header (wsjtx_udp-static BASE_NAME udp)
|
|
||||||
-
|
|
||||||
-generate_version_info (udp_daemon_VERSION_RESOURCES
|
|
||||||
- NAME udp_daemon
|
|
||||||
- BUNDLE ${PROJECT_BUNDLE_NAME}
|
|
||||||
- ICON ${WSJTX_ICON_FILE}
|
|
||||||
- FILE_DESCRIPTION "Example WSJT-X UDP Message Protocol daemon"
|
|
||||||
- )
|
|
||||||
-add_executable (udp_daemon UDPExamples/UDPDaemon.cpp ${udp_daemon_VERSION_RESOURCES})
|
|
||||||
-target_link_libraries (udp_daemon wsjtx_udp-static)
|
|
||||||
-
|
|
||||||
generate_version_info (wsjtx_app_version_VERSION_RESOURCES
|
|
||||||
NAME wsjtx_app_version
|
|
||||||
BUNDLE ${PROJECT_BUNDLE_NAME}
|
|
||||||
@@ -1518,47 +1358,9 @@
|
|
||||||
add_executable (wsjtx_app_version AppVersion/AppVersion.cpp ${wsjtx_app_version_VERSION_RESOURCES})
|
|
||||||
target_link_libraries (wsjtx_app_version wsjt_qt)
|
|
||||||
|
|
||||||
-generate_version_info (message_aggregator_VERSION_RESOURCES
|
|
||||||
- NAME message_aggregator
|
|
||||||
- BUNDLE ${PROJECT_BUNDLE_NAME}
|
|
||||||
- ICON ${WSJTX_ICON_FILE}
|
|
||||||
- FILE_DESCRIPTION "Example WSJT-X UDP Message Protocol application"
|
|
||||||
- )
|
|
||||||
-add_resources (message_aggregator_RESOURCES /qss ${message_aggregator_STYLESHEETS})
|
|
||||||
-configure_file (UDPExamples/message_aggregator.qrc.in message_aggregator.qrc @ONLY)
|
|
||||||
-qt5_add_resources (message_aggregator_RESOURCES_RCC
|
|
||||||
- ${CMAKE_CURRENT_BINARY_DIR}/message_aggregator.qrc
|
|
||||||
- contrib/QDarkStyleSheet/qdarkstyle/style.qrc
|
|
||||||
- )
|
|
||||||
-add_executable (message_aggregator
|
|
||||||
- ${message_aggregator_CXXSRCS}
|
|
||||||
- ${message_aggregator_RESOURCES_RCC}
|
|
||||||
- ${message_aggregator_VERSION_RESOURCES}
|
|
||||||
- )
|
|
||||||
-target_link_libraries (message_aggregator wsjt_qt Qt5::Widgets wsjtx_udp-static)
|
|
||||||
-
|
|
||||||
-if (WSJT_CREATE_WINMAIN)
|
|
||||||
- set_target_properties (message_aggregator PROPERTIES WIN32_EXECUTABLE ON)
|
|
||||||
-endif (WSJT_CREATE_WINMAIN)
|
|
||||||
-
|
|
||||||
-if (UNIX)
|
|
||||||
- if (NOT WSJT_SKIP_MANPAGES)
|
|
||||||
- add_subdirectory (manpages)
|
|
||||||
- add_dependencies (wsjtx manpages)
|
|
||||||
- endif (NOT WSJT_SKIP_MANPAGES)
|
|
||||||
- if (NOT APPLE)
|
|
||||||
- add_subdirectory (debian)
|
|
||||||
- add_dependencies (wsjtx debian)
|
|
||||||
- endif (NOT APPLE)
|
|
||||||
-endif (UNIX)
|
|
||||||
-
|
|
||||||
#
|
|
||||||
# installation
|
|
||||||
#
|
|
||||||
-install (TARGETS wsjtx
|
|
||||||
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
|
|
||||||
- BUNDLE DESTINATION . COMPONENT runtime
|
|
||||||
- )
|
|
||||||
|
|
||||||
# install (TARGETS wsjtx_udp EXPORT udp
|
|
||||||
# RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
||||||
@@ -1577,12 +1379,7 @@
|
|
||||||
# DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/wsjtx
|
|
||||||
# )
|
|
||||||
|
|
||||||
-install (TARGETS udp_daemon message_aggregator wsjtx_app_version
|
|
||||||
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
|
|
||||||
- BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
|
|
||||||
- )
|
|
||||||
-
|
|
||||||
-install (TARGETS jt9 wsprd fmtave fcal fmeasure
|
|
||||||
+install (TARGETS wsjtx_app_version jt9 wsprd
|
|
||||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
|
|
||||||
BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
|
|
||||||
)
|
|
||||||
@@ -1595,38 +1392,6 @@
|
|
||||||
)
|
|
||||||
endif(WSJT_BUILD_UTILS)
|
|
||||||
|
|
||||||
-install (PROGRAMS
|
|
||||||
- ${RIGCTL_EXE}
|
|
||||||
- DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
||||||
- #COMPONENT runtime
|
|
||||||
- RENAME rigctl-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
|
|
||||||
- )
|
|
||||||
-
|
|
||||||
-install (PROGRAMS
|
|
||||||
- ${RIGCTLD_EXE}
|
|
||||||
- DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
||||||
- #COMPONENT runtime
|
|
||||||
- RENAME rigctld-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
|
|
||||||
- )
|
|
||||||
-
|
|
||||||
-install (PROGRAMS
|
|
||||||
- ${RIGCTLCOM_EXE}
|
|
||||||
- DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
||||||
- #COMPONENT runtime
|
|
||||||
- RENAME rigctlcom-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
|
|
||||||
- )
|
|
||||||
-
|
|
||||||
-install (FILES
|
|
||||||
- README
|
|
||||||
- COPYING
|
|
||||||
- AUTHORS
|
|
||||||
- THANKS
|
|
||||||
- NEWS
|
|
||||||
- BUGS
|
|
||||||
- DESTINATION ${CMAKE_INSTALL_DOCDIR}
|
|
||||||
- #COMPONENT runtime
|
|
||||||
- )
|
|
||||||
-
|
|
||||||
install (FILES
|
|
||||||
cty.dat
|
|
||||||
cty.dat_copyright.txt
|
|
||||||
@@ -1635,13 +1400,6 @@
|
|
||||||
#COMPONENT runtime
|
|
||||||
)
|
|
||||||
|
|
||||||
-install (DIRECTORY
|
|
||||||
- example_log_configurations
|
|
||||||
- DESTINATION ${CMAKE_INSTALL_DOCDIR}
|
|
||||||
- FILES_MATCHING REGEX "^.*[^~]$"
|
|
||||||
- #COMPONENT runtime
|
|
||||||
- )
|
|
||||||
-
|
|
||||||
#
|
|
||||||
# Mac installer files
|
|
||||||
#
|
|
||||||
@@ -1693,22 +1451,6 @@
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/wsjtx_config.h"
|
|
||||||
)
|
|
||||||
|
|
||||||
-
|
|
||||||
-if (NOT WIN32 AND NOT APPLE)
|
|
||||||
- # install a desktop file so wsjtx appears in the application start
|
|
||||||
- # menu with an icon
|
|
||||||
- install (
|
|
||||||
- FILES wsjtx.desktop message_aggregator.desktop
|
|
||||||
- DESTINATION share/applications
|
|
||||||
- #COMPONENT runtime
|
|
||||||
- )
|
|
||||||
- install (
|
|
||||||
- FILES icons/Unix/wsjtx_icon.png
|
|
||||||
- DESTINATION share/pixmaps
|
|
||||||
- #COMPONENT runtime
|
|
||||||
- )
|
|
||||||
-endif (NOT WIN32 AND NOT APPLE)
|
|
||||||
-
|
|
||||||
if (APPLE)
|
|
||||||
set (CMAKE_POSTFLIGHT_SCRIPT
|
|
||||||
"${wsjtx_BINARY_DIR}/postflight.sh")
|
|
@ -1,32 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -euxo pipefail
|
|
||||||
export MAKEFLAGS="-j4"
|
|
||||||
|
|
||||||
function cmakebuild() {
|
|
||||||
cd $1
|
|
||||||
if [[ ! -z "${2:-}" ]]; then
|
|
||||||
git checkout $2
|
|
||||||
fi
|
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
cmake ..
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
cd ../..
|
|
||||||
rm -rf $1
|
|
||||||
}
|
|
||||||
|
|
||||||
cd /tmp
|
|
||||||
|
|
||||||
BUILD_PACKAGES="git cmake make gcc g++ libsamplerate-dev libfftw3-dev"
|
|
||||||
|
|
||||||
apt-get update
|
|
||||||
apt-get -y install --no-install-recommends $BUILD_PACKAGES
|
|
||||||
|
|
||||||
git clone https://github.com/jketterl/owrx_connector.git
|
|
||||||
# latest develop as of 2022-12-11 (std::endl implicit flushing)
|
|
||||||
cmakebuild owrx_connector bca362707131289f91441c8080fd368fdc067b6d
|
|
||||||
|
|
||||||
apt-get -y purge --autoremove $BUILD_PACKAGES
|
|
||||||
apt-get clean
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
@ -1,44 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -euxo pipefail
|
|
||||||
export MAKEFLAGS="-j4"
|
|
||||||
|
|
||||||
function cmakebuild() {
|
|
||||||
cd $1
|
|
||||||
if [[ ! -z "${2:-}" ]]; then
|
|
||||||
git checkout $2
|
|
||||||
fi
|
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
cmake ..
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
cd ../..
|
|
||||||
rm -rf $1
|
|
||||||
}
|
|
||||||
|
|
||||||
cd /tmp
|
|
||||||
|
|
||||||
STATIC_PACKAGES="libusb-1.0-0"
|
|
||||||
BUILD_PACKAGES="git libusb-1.0-0-dev cmake make gcc g++ pkg-config"
|
|
||||||
|
|
||||||
apt-get update
|
|
||||||
apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
|
|
||||||
|
|
||||||
git clone https://github.com/airspy/airspyone_host.git
|
|
||||||
# latest from master as of 2020-09-04
|
|
||||||
cmakebuild airspyone_host 652fd7f1a8f85687641e0bd91f739694d7258ecc
|
|
||||||
|
|
||||||
git clone https://github.com/pothosware/SoapyAirspy.git
|
|
||||||
cmakebuild SoapyAirspy 10d697b209e7f1acc8b2c8d24851d46170ef77e3
|
|
||||||
|
|
||||||
git clone https://github.com/airspy/airspyhf.git
|
|
||||||
# latest from master as of 2020-09-04
|
|
||||||
cmakebuild airspyhf 8891387edddcd185e2949e9814e9ef35f46f0722
|
|
||||||
|
|
||||||
git clone https://github.com/pothosware/SoapyAirspyHF.git
|
|
||||||
# latest from master as of 2020-09-04
|
|
||||||
cmakebuild SoapyAirspyHF 5488dac5b44f1432ce67b40b915f7e61d3bd4853
|
|
||||||
|
|
||||||
apt-get -y purge --autoremove $BUILD_PACKAGES
|
|
||||||
apt-get clean
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
@ -1,36 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -euxo pipefail
|
|
||||||
export MAKEFLAGS="-j4"
|
|
||||||
|
|
||||||
function cmakebuild() {
|
|
||||||
cd $1
|
|
||||||
if [[ ! -z "${2:-}" ]]; then
|
|
||||||
git checkout $2
|
|
||||||
fi
|
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
cmake ..
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
cd ../..
|
|
||||||
rm -rf $1
|
|
||||||
}
|
|
||||||
|
|
||||||
cd /tmp
|
|
||||||
|
|
||||||
STATIC_PACKAGES="libusb-1.0-0"
|
|
||||||
BUILD_PACKAGES="git cmake make gcc g++ libusb-1.0-0-dev"
|
|
||||||
|
|
||||||
apt-get update
|
|
||||||
apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
|
|
||||||
|
|
||||||
git clone https://github.com/Nuand/bladeRF.git
|
|
||||||
cmakebuild bladeRF 2021.10
|
|
||||||
|
|
||||||
git clone https://github.com/pothosware/SoapyBladeRF.git
|
|
||||||
# latest from master as of 2022-01-12
|
|
||||||
cmakebuild SoapyBladeRF 70505a5cdf8c9deabc4af3eb3384aa82a7b6f021
|
|
||||||
|
|
||||||
apt-get -y purge --autoremove $BUILD_PACKAGES
|
|
||||||
apt-get clean
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
@ -1,32 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -euxo pipefail
|
|
||||||
export MAKEFLAGS="-j4"
|
|
||||||
|
|
||||||
function cmakebuild() {
|
|
||||||
cd $1
|
|
||||||
if [[ ! -z "${2:-}" ]]; then
|
|
||||||
git checkout $2
|
|
||||||
fi
|
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
cmake ..
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
cd ../..
|
|
||||||
rm -rf $1
|
|
||||||
}
|
|
||||||
|
|
||||||
cd /tmp
|
|
||||||
|
|
||||||
STATIC_PACKAGES="libhidapi-hidraw0 libhidapi-libusb0 libasound2"
|
|
||||||
BUILD_PACKAGES="git cmake make gcc g++ libhidapi-dev libasound2-dev"
|
|
||||||
|
|
||||||
apt-get update
|
|
||||||
apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
|
|
||||||
|
|
||||||
git clone https://github.com/pothosware/SoapyFCDPP.git
|
|
||||||
cmakebuild SoapyFCDPP soapy-fcdpp-0.1.1
|
|
||||||
|
|
||||||
apt-get -y purge --autoremove $BUILD_PACKAGES
|
|
||||||
apt-get clean
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
@ -1,41 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -euxo pipefail
|
|
||||||
export MAKEFLAGS="-j4"
|
|
||||||
|
|
||||||
function cmakebuild() {
|
|
||||||
cd $1
|
|
||||||
if [[ ! -z "${2:-}" ]]; then
|
|
||||||
git checkout $2
|
|
||||||
fi
|
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
cmake ..
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
cd ../..
|
|
||||||
rm -rf $1
|
|
||||||
}
|
|
||||||
|
|
||||||
cd /tmp
|
|
||||||
|
|
||||||
STATIC_PACKAGES="libusb-1.0-0 libfftw3-3 udev"
|
|
||||||
BUILD_PACKAGES="git cmake make patch wget sudo gcc g++ libusb-1.0-0-dev libfftw3-dev pkg-config"
|
|
||||||
|
|
||||||
apt-get update
|
|
||||||
apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
|
|
||||||
|
|
||||||
git clone https://github.com/mossmann/hackrf.git
|
|
||||||
cd hackrf
|
|
||||||
# latest from master as of 2020-09-04
|
|
||||||
git checkout 6e5cbda2945c3bab0e6e1510eae418eda60c358e
|
|
||||||
cmakebuild host
|
|
||||||
cd ..
|
|
||||||
rm -rf hackrf
|
|
||||||
|
|
||||||
git clone https://github.com/pothosware/SoapyHackRF.git
|
|
||||||
# latest from master as of 2020-09-04
|
|
||||||
cmakebuild SoapyHackRF 7d530872f96c1cbe0ed62617c32c48ce7e103e1d
|
|
||||||
|
|
||||||
SUDO_FORCE_REMOVE=yes apt-get -y purge --autoremove $BUILD_PACKAGES
|
|
||||||
apt-get clean
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
@ -1,46 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -euxo pipefail
|
|
||||||
export MAKEFLAGS="-j4"
|
|
||||||
|
|
||||||
BUILD_PACKAGES="git wget gcc libc6-dev"
|
|
||||||
|
|
||||||
apt-get update
|
|
||||||
apt-get -y install --no-install-recommends $BUILD_PACKAGES
|
|
||||||
|
|
||||||
pushd /tmp
|
|
||||||
|
|
||||||
ARCH=$(uname -m)
|
|
||||||
GOVERSION=1.15.5
|
|
||||||
|
|
||||||
case ${ARCH} in
|
|
||||||
x86_64)
|
|
||||||
PACKAGE=go${GOVERSION}.linux-amd64.tar.gz
|
|
||||||
;;
|
|
||||||
armv*)
|
|
||||||
PACKAGE=go${GOVERSION}.linux-armv6l.tar.gz
|
|
||||||
;;
|
|
||||||
aarch64)
|
|
||||||
PACKAGE=go${GOVERSION}.linux-arm64.tar.gz
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
wget https://golang.org/dl/${PACKAGE}
|
|
||||||
tar xfz $PACKAGE
|
|
||||||
|
|
||||||
git clone https://github.com/jancona/hpsdrconnector.git
|
|
||||||
pushd hpsdrconnector
|
|
||||||
git checkout v0.6.1
|
|
||||||
/tmp/go/bin/go build
|
|
||||||
install -m 0755 hpsdrconnector /usr/local/bin
|
|
||||||
|
|
||||||
popd
|
|
||||||
|
|
||||||
rm -rf hpsdrconnector
|
|
||||||
rm -rf go
|
|
||||||
rm $PACKAGE
|
|
||||||
|
|
||||||
popd
|
|
||||||
|
|
||||||
apt-get -y purge --autoremove $BUILD_PACKAGES
|
|
||||||
apt-get clean
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
@ -1,32 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -euo pipefail
|
|
||||||
export MAKEFLAGS="-j4"
|
|
||||||
|
|
||||||
cd /tmp
|
|
||||||
|
|
||||||
STATIC_PACKAGES="libusb-1.0-0 libatomic1"
|
|
||||||
BUILD_PACKAGES="git libusb-1.0-0-dev cmake make gcc g++"
|
|
||||||
|
|
||||||
apt-get update
|
|
||||||
apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
|
|
||||||
|
|
||||||
SIMD_FLAGS=""
|
|
||||||
if [[ 'x86_64' == `uname -m` ]] ; then
|
|
||||||
SIMD_FLAGS="-DDEFAULT_SIMD_FLAGS=SSE3"
|
|
||||||
fi
|
|
||||||
|
|
||||||
git clone https://github.com/myriadrf/LimeSuite.git
|
|
||||||
cd LimeSuite
|
|
||||||
# latest from master as of 2020-09-04
|
|
||||||
git checkout 9526621f8b4c9e2a7f638b5ef50c45560dcad22a
|
|
||||||
mkdir builddir
|
|
||||||
cd builddir
|
|
||||||
cmake .. -DENABLE_EXAMPLES=OFF -DENABLE_DESKTOP=OFF -DENABLE_LIME_UTIL=OFF -DENABLE_QUICKTEST=OFF -DENABLE_OCTAVE=OFF -DENABLE_GUI=OFF -DCMAKE_CXX_STANDARD_LIBRARIES="-latomic" ${SIMD_FLAGS}
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
cd ../..
|
|
||||||
rm -rf LimeSuite
|
|
||||||
|
|
||||||
apt-get -y purge --autoremove $BUILD_PACKAGES
|
|
||||||
apt-get clean
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
@ -1,27 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -euxo pipefail
|
|
||||||
export MAKEFLAGS="-j4"
|
|
||||||
|
|
||||||
cd /tmp
|
|
||||||
|
|
||||||
STATIC_PACKAGES="libusb-1.0-0 libudev1"
|
|
||||||
BUILD_PACKAGES="git make gcc autoconf automake libtool libusb-1.0-0-dev xxd"
|
|
||||||
|
|
||||||
apt-get update
|
|
||||||
apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
|
|
||||||
|
|
||||||
git clone https://github.com/Microtelecom/libperseus-sdr.git
|
|
||||||
cd libperseus-sdr
|
|
||||||
# latest from master as of 2020-09-04
|
|
||||||
git checkout c2c95daeaa08bf0daed0e8ada970ab17cc264e1b
|
|
||||||
./bootstrap.sh
|
|
||||||
./configure
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
ldconfig /etc/ld.so.conf.d
|
|
||||||
cd ..
|
|
||||||
rm -rf libperseus-sdr
|
|
||||||
|
|
||||||
apt-get -y purge --autoremove $BUILD_PACKAGES
|
|
||||||
apt-get clean
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
@ -1,39 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -euo pipefail
|
|
||||||
export MAKEFLAGS="-j4"
|
|
||||||
|
|
||||||
function cmakebuild() {
|
|
||||||
cd $1
|
|
||||||
if [[ ! -z "${2:-}" ]]; then
|
|
||||||
git checkout $2
|
|
||||||
fi
|
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
cmake .. ${3:-}
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
cd ../..
|
|
||||||
rm -rf $1
|
|
||||||
}
|
|
||||||
|
|
||||||
cd /tmp
|
|
||||||
|
|
||||||
STATIC_PACKAGES="libusb-1.0-0 libxml2"
|
|
||||||
BUILD_PACKAGES="git libusb-1.0-0-dev cmake make gcc g++ libxml2-dev flex bison pkg-config"
|
|
||||||
|
|
||||||
apt-get update
|
|
||||||
apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
|
|
||||||
|
|
||||||
git clone https://github.com/analogdevicesinc/libiio.git
|
|
||||||
cmakebuild libiio v0.21 -DCMAKE_INSTALL_PREFIX=/usr/local
|
|
||||||
|
|
||||||
git clone https://github.com/analogdevicesinc/libad9361-iio.git
|
|
||||||
cmakebuild libad9361-iio v0.2
|
|
||||||
|
|
||||||
git clone https://github.com/pothosware/SoapyPlutoSDR.git
|
|
||||||
# latest from master as of 2020-09-04
|
|
||||||
cmakebuild SoapyPlutoSDR 93717b32ef052e0dfa717aa2c1a4eb27af16111f
|
|
||||||
|
|
||||||
apt-get -y purge --autoremove $BUILD_PACKAGES
|
|
||||||
apt-get clean
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
@ -1,37 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -euxo pipefail
|
|
||||||
export MAKEFLAGS="-j4"
|
|
||||||
|
|
||||||
function cmakebuild() {
|
|
||||||
cd $1
|
|
||||||
if [[ ! -z "${2:-}" ]]; then
|
|
||||||
git checkout $2
|
|
||||||
fi
|
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
cmake ..
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
cd ../..
|
|
||||||
rm -rf $1
|
|
||||||
}
|
|
||||||
|
|
||||||
cd /tmp
|
|
||||||
|
|
||||||
STATIC_PACKAGES="libusb-1.0-0 libfftw3-3 udev"
|
|
||||||
BUILD_PACKAGES="git cmake make patch wget sudo gcc g++ libusb-1.0-0-dev libfftw3-dev pkg-config"
|
|
||||||
|
|
||||||
apt-get update
|
|
||||||
apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
|
|
||||||
|
|
||||||
git clone https://github.com/pa3gsb/Radioberry-2.x
|
|
||||||
cd Radioberry-2.x/SBC/rpi-4
|
|
||||||
|
|
||||||
# latest from master as of 2020-09-04
|
|
||||||
cmakebuild SoapyRadioberrySDR 8d17de6b4dc076e628900a82f05c7cf0b16cbe24
|
|
||||||
cd ../../..
|
|
||||||
rm -rf Radioberry-2.x
|
|
||||||
|
|
||||||
SUDO_FORCE_REMOVE=yes apt-get -y purge --autoremove $BUILD_PACKAGES
|
|
||||||
apt-get clean
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
@ -1,36 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -euo pipefail
|
|
||||||
export MAKEFLAGS="-j4"
|
|
||||||
|
|
||||||
function cmakebuild() {
|
|
||||||
cd $1
|
|
||||||
if [[ ! -z "${2:-}" ]]; then
|
|
||||||
git checkout $2
|
|
||||||
fi
|
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
cmake ..
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
cd ../..
|
|
||||||
rm -rf $1
|
|
||||||
}
|
|
||||||
|
|
||||||
cd /tmp
|
|
||||||
|
|
||||||
STATIC_PACKAGES="libusb-1.0-0"
|
|
||||||
BUILD_PACKAGES="git libusb-1.0-0-dev cmake make gcc g++ pkg-config"
|
|
||||||
|
|
||||||
apt-get update
|
|
||||||
apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
|
|
||||||
|
|
||||||
git clone https://github.com/osmocom/rtl-sdr.git
|
|
||||||
# latest from master as of 2020-09-04
|
|
||||||
cmakebuild rtl-sdr ed0317e6a58c098874ac58b769cf2e609c18d9a5
|
|
||||||
|
|
||||||
git clone https://github.com/pothosware/SoapyRTLSDR.git
|
|
||||||
cmakebuild SoapyRTLSDR soapy-rtl-sdr-0.3.1
|
|
||||||
|
|
||||||
apt-get -y purge --autoremove $BUILD_PACKAGES
|
|
||||||
apt-get clean
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
@ -1,33 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -euxo pipefail
|
|
||||||
export MAKEFLAGS="-j4"
|
|
||||||
|
|
||||||
function cmakebuild() {
|
|
||||||
cd $1
|
|
||||||
if [[ ! -z "${2:-}" ]]; then
|
|
||||||
git checkout $2
|
|
||||||
fi
|
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
cmake ..
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
cd ../..
|
|
||||||
rm -rf $1
|
|
||||||
}
|
|
||||||
|
|
||||||
cd /tmp
|
|
||||||
|
|
||||||
STATIC_PACKAGES="libusb-1.0.0"
|
|
||||||
BUILD_PACKAGES="git libusb-1.0.0-dev cmake make gcc g++ pkg-config"
|
|
||||||
|
|
||||||
apt-get update
|
|
||||||
apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
|
|
||||||
|
|
||||||
git clone https://github.com/osmocom/rtl-sdr.git
|
|
||||||
# latest from master as of 2020-09-04
|
|
||||||
cmakebuild rtl-sdr ed0317e6a58c098874ac58b769cf2e609c18d9a5
|
|
||||||
|
|
||||||
apt-get -y purge --autoremove $BUILD_PACKAGES
|
|
||||||
apt-get clean
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
@ -1,33 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -euxo pipefail
|
|
||||||
export MAKEFLAGS="-j4"
|
|
||||||
|
|
||||||
function cmakebuild() {
|
|
||||||
cd $1
|
|
||||||
if [[ ! -z "${2:-}" ]]; then
|
|
||||||
git checkout $2
|
|
||||||
fi
|
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
cmake ..
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
cd ../..
|
|
||||||
rm -rf $1
|
|
||||||
}
|
|
||||||
|
|
||||||
cd /tmp
|
|
||||||
|
|
||||||
STATIC_PACKAGES=""
|
|
||||||
BUILD_PACKAGES="git cmake make gcc g++ pkg-config"
|
|
||||||
|
|
||||||
apt-get update
|
|
||||||
apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
|
|
||||||
|
|
||||||
git clone https://github.com/jketterl/runds_connector.git
|
|
||||||
# latest develop as of 2022-12-11 (std::endl implicit flushing)
|
|
||||||
cmakebuild runds_connector 06ca993a3c81ddb0a2581b1474895da07752a9e1
|
|
||||||
|
|
||||||
apt-get -y purge --autoremove $BUILD_PACKAGES
|
|
||||||
apt-get clean
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
@ -1,57 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -euxo pipefail
|
|
||||||
export MAKEFLAGS="-j4"
|
|
||||||
|
|
||||||
function cmakebuild() {
|
|
||||||
cd $1
|
|
||||||
if [[ ! -z "${2:-}" ]]; then
|
|
||||||
git checkout $2
|
|
||||||
fi
|
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
cmake ..
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
cd ../..
|
|
||||||
rm -rf $1
|
|
||||||
}
|
|
||||||
|
|
||||||
cd /tmp
|
|
||||||
|
|
||||||
STATIC_PACKAGES="libusb-1.0.0 udev"
|
|
||||||
BUILD_PACKAGES="git cmake make patch wget sudo gcc g++ libusb-1.0-0-dev"
|
|
||||||
|
|
||||||
apt-get update
|
|
||||||
apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
|
|
||||||
|
|
||||||
ARCH=$(uname -m)
|
|
||||||
|
|
||||||
case $ARCH in
|
|
||||||
x86_64)
|
|
||||||
BINARY=SDRplay_RSP_API-Linux-3.07.1.run
|
|
||||||
;;
|
|
||||||
armv*)
|
|
||||||
BINARY=SDRplay_RSP_API-ARM32-3.07.2.run
|
|
||||||
;;
|
|
||||||
aarch64)
|
|
||||||
BINARY=SDRplay_RSP_API-ARM64-3.07.1.run
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
wget --no-http-keep-alive https://www.sdrplay.com/software/$BINARY
|
|
||||||
sh $BINARY --noexec --target sdrplay
|
|
||||||
patch --verbose -Np0 < /install-lib.$ARCH.patch
|
|
||||||
|
|
||||||
cd sdrplay
|
|
||||||
./install_lib.sh
|
|
||||||
cd ..
|
|
||||||
rm -rf sdrplay
|
|
||||||
rm $BINARY
|
|
||||||
|
|
||||||
git clone https://github.com/pothosware/SoapySDRPlay3.git
|
|
||||||
# latest from master as of 2021-06-19 (reliability fixes)
|
|
||||||
cmakebuild SoapySDRPlay3 a869f25364a1f0d5b16169ff908aa21a2ace475d
|
|
||||||
|
|
||||||
SUDO_FORCE_REMOVE=yes apt-get -y purge --autoremove $BUILD_PACKAGES
|
|
||||||
apt-get clean
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
@ -1,32 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -euo pipefail
|
|
||||||
export MAKEFLAGS="-j4"
|
|
||||||
|
|
||||||
function cmakebuild() {
|
|
||||||
cd $1
|
|
||||||
if [[ ! -z "${2:-}" ]]; then
|
|
||||||
git checkout $2
|
|
||||||
fi
|
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
cmake ..
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
cd ../..
|
|
||||||
rm -rf $1
|
|
||||||
}
|
|
||||||
|
|
||||||
cd /tmp
|
|
||||||
|
|
||||||
STATIC_PACKAGES="avahi-daemon libavahi-client3"
|
|
||||||
BUILD_PACKAGES="git cmake make gcc g++ libavahi-client-dev"
|
|
||||||
|
|
||||||
apt-get update
|
|
||||||
apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
|
|
||||||
|
|
||||||
git clone https://github.com/pothosware/SoapyRemote.git
|
|
||||||
cmakebuild SoapyRemote soapy-remote-0.5.2
|
|
||||||
|
|
||||||
apt-get -y purge --autoremove $BUILD_PACKAGES
|
|
||||||
apt-get clean
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
@ -1,33 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -euxo pipefail
|
|
||||||
export MAKEFLAGS="-j4"
|
|
||||||
|
|
||||||
function cmakebuild() {
|
|
||||||
cd $1
|
|
||||||
if [[ ! -z "${2:-}" ]]; then
|
|
||||||
git checkout $2
|
|
||||||
fi
|
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
cmake ..
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
cd ../..
|
|
||||||
rm -rf $1
|
|
||||||
}
|
|
||||||
|
|
||||||
cd /tmp
|
|
||||||
|
|
||||||
STATIC_PACKAGES="libudev1"
|
|
||||||
BUILD_PACKAGES="git cmake make patch wget sudo gcc g++"
|
|
||||||
|
|
||||||
apt-get update
|
|
||||||
apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
|
|
||||||
|
|
||||||
git clone https://github.com/pothosware/SoapySDR
|
|
||||||
# latest from master as of 2020-09-04
|
|
||||||
cmakebuild SoapySDR 580b94f3dad46899f34ec0a060dbb4534e844e57
|
|
||||||
|
|
||||||
SUDO_FORCE_REMOVE=yes apt-get -y purge --autoremove $BUILD_PACKAGES
|
|
||||||
apt-get clean
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
@ -1,59 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -euo pipefail
|
|
||||||
export MAKEFLAGS="-j4"
|
|
||||||
|
|
||||||
function cmakebuild() {
|
|
||||||
cd $1
|
|
||||||
if [[ ! -z "${2:-}" ]]; then
|
|
||||||
git checkout $2
|
|
||||||
fi
|
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
cmake ..
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
cd ../..
|
|
||||||
rm -rf $1
|
|
||||||
}
|
|
||||||
|
|
||||||
cd /tmp
|
|
||||||
|
|
||||||
STATIC_PACKAGES="libusb-1.0.0 libboost-chrono1.74.0 libboost-date-time1.74.0 libboost-filesystem1.74.0 libboost-program-options1.74.0 libboost-regex1.74.0 libboost-test1.74.0 libboost-serialization1.74.0 libboost-thread1.74.0 libboost-system1.74.0 python3-numpy python3-mako"
|
|
||||||
BUILD_PACKAGES="git cmake make gcc g++ libusb-1.0-0-dev libboost-dev libboost-chrono-dev libboost-date-time-dev libboost-filesystem-dev libboost-program-options-dev libboost-regex-dev libboost-test-dev libboost-serialization-dev libboost-thread-dev libboost-system-dev"
|
|
||||||
|
|
||||||
apt-get update
|
|
||||||
apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
|
|
||||||
|
|
||||||
git clone https://github.com/EttusResearch/uhd.git
|
|
||||||
mkdir -p uhd/host/build
|
|
||||||
cd uhd/host/build
|
|
||||||
git checkout v4.1.0.4
|
|
||||||
# see https://github.com/EttusResearch/uhd/issues/350
|
|
||||||
case `uname -m` in
|
|
||||||
arm*)
|
|
||||||
cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_UTILS=OFF -DENABLE_PYTHON_API=OFF -DENABLE_EXAMPLES=OFF -DENABLE_TESTS=OFF -DENABLE_OCTOCLOCK=OFF -DENABLE_MAN_PAGES=OFF -DSTRIP_BINARIES=ON \
|
|
||||||
-DCMAKE_CXX_FLAGS:STRING="-march=armv7-a -mfloat-abi=hard -mfpu=neon -mtune=cortex-a8 -Wno-psabi" \
|
|
||||||
-DCMAKE_C_FLAGS:STRING="-march=armv7-a -mfloat-abi=hard -mfpu=neon -mtune=cortex-a8 -Wno-psabi" \
|
|
||||||
-DCMAKE_ASM_FLAGS:STRING="-march=armv7-a -mfloat-abi=hard -mfpu=neon -mtune=cortex-a8 -g" ..
|
|
||||||
;;
|
|
||||||
aarch64*)
|
|
||||||
cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_UTILS=OFF -DENABLE_PYTHON_API=OFF -DENABLE_EXAMPLES=OFF -DENABLE_TESTS=OFF -DENABLE_OCTOCLOCK=OFF -DENABLE_MAN_PAGES=OFF -DSTRIP_BINARIES=ON \
|
|
||||||
-DCMAKE_CXX_FLAGS:STRING="-march=armv8-a -mtune=cortex-a72 -Wno-psabi" \
|
|
||||||
-DCMAKE_C_FLAGS:STRING="-march=armv8-a -mtune=cortex-a72 -Wno-psabi" \
|
|
||||||
-DCMAKE_ASM_FLAGS:STRING="-march=armv8-a -mtune=cortex-a72 -g" ..
|
|
||||||
;;
|
|
||||||
x86_64)
|
|
||||||
cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_UTILS=OFF -DENABLE_PYTHON_API=OFF -DENABLE_EXAMPLES=OFF -DENABLE_TESTS=OFF -DENABLE_OCTOCLOCK=OFF -DENABLE_MAN_PAGES=OFF -DSTRIP_BINARIES=ON ..
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
cd ../../..
|
|
||||||
rm -rf uhd
|
|
||||||
|
|
||||||
git clone https://github.com/pothosware/SoapyUHD.git
|
|
||||||
cmakebuild SoapyUHD soapy-uhd-0.4.1
|
|
||||||
|
|
||||||
SUDO_FORCE_REMOVE=yes apt-get -y purge --autoremove $BUILD_PACKAGES
|
|
||||||
apt-get clean
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
@ -1,123 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -euxo pipefail
|
|
||||||
export MAKEFLAGS="-j4"
|
|
||||||
|
|
||||||
function cmakebuild() {
|
|
||||||
cd $1
|
|
||||||
if [[ ! -z "${2:-}" ]]; then
|
|
||||||
git checkout $2
|
|
||||||
fi
|
|
||||||
if [[ -f ".gitmodules" ]]; then
|
|
||||||
git submodule update --init
|
|
||||||
fi
|
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
cmake ${CMAKE_ARGS:-} ..
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
cd ../..
|
|
||||||
rm -rf $1
|
|
||||||
}
|
|
||||||
|
|
||||||
cd /tmp
|
|
||||||
|
|
||||||
STATIC_PACKAGES="libfftw3-bin python3 python3-setuptools netcat-openbsd libsndfile1 liblapack3 libusb-1.0-0 libqt5core5a libreadline8 libgfortran5 libgomp1 libasound2 libudev1 ca-certificates libpulse0 libfaad2 libopus0 libboost-program-options1.74.0 libboost-log1.74.0 libcurl4"
|
|
||||||
BUILD_PACKAGES="wget git libsndfile1-dev libfftw3-dev cmake make gcc g++ liblapack-dev texinfo gfortran libusb-1.0-0-dev qtbase5-dev qtmultimedia5-dev qttools5-dev libqt5serialport5-dev qttools5-dev-tools asciidoctor asciidoc libasound2-dev libudev-dev libhamlib-dev patch xsltproc qt5-qmake libfaad-dev libopus-dev libboost-dev libboost-program-options-dev libboost-log-dev libboost-regex-dev libpulse-dev libcurl4-openssl-dev"
|
|
||||||
apt-get update
|
|
||||||
apt-get -y install auto-apt-proxy
|
|
||||||
apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
|
|
||||||
|
|
||||||
case `uname -m` in
|
|
||||||
arm*)
|
|
||||||
PLATFORM=armhf
|
|
||||||
;;
|
|
||||||
aarch64*)
|
|
||||||
PLATFORM=aarch64
|
|
||||||
;;
|
|
||||||
x86_64*)
|
|
||||||
PLATFORM=amd64
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
wget https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-${PLATFORM}.tar.gz
|
|
||||||
tar xzf s6-overlay-${PLATFORM}.tar.gz -C /
|
|
||||||
rm s6-overlay-${PLATFORM}.tar.gz
|
|
||||||
|
|
||||||
JS8CALL_VERSION=2.2.0
|
|
||||||
JS8CALL_DIR=js8call
|
|
||||||
JS8CALL_TGZ=js8call-${JS8CALL_VERSION}.tgz
|
|
||||||
wget http://files.js8call.com/${JS8CALL_VERSION}/${JS8CALL_TGZ}
|
|
||||||
tar xfz ${JS8CALL_TGZ}
|
|
||||||
# patch allows us to build against the packaged hamlib
|
|
||||||
patch -Np1 -d ${JS8CALL_DIR} < /js8call-hamlib.patch
|
|
||||||
rm /js8call-hamlib.patch
|
|
||||||
cmakebuild ${JS8CALL_DIR}
|
|
||||||
rm ${JS8CALL_TGZ}
|
|
||||||
|
|
||||||
WSJT_DIR=wsjtx-2.6.1
|
|
||||||
WSJT_TGZ=${WSJT_DIR}.tgz
|
|
||||||
wget https://downloads.sourceforge.net/project/wsjt/${WSJT_DIR}/${WSJT_TGZ}
|
|
||||||
tar xfz ${WSJT_TGZ}
|
|
||||||
patch -Np0 -d ${WSJT_DIR} < /wsjtx-hamlib.patch
|
|
||||||
mv /wsjtx.patch ${WSJT_DIR}
|
|
||||||
cmakebuild ${WSJT_DIR}
|
|
||||||
rm ${WSJT_TGZ}
|
|
||||||
|
|
||||||
git clone https://github.com/alexander-sholohov/msk144decoder.git
|
|
||||||
# latest from main as of 2023-02-21
|
|
||||||
MAKEFLAGS="" cmakebuild msk144decoder fe2991681e455636e258e83c29fd4b2a72d16095
|
|
||||||
|
|
||||||
git clone --depth 1 -b 1.6 https://github.com/wb2osz/direwolf.git
|
|
||||||
cd direwolf
|
|
||||||
# hamlib is present (necessary for the wsjt-x and js8call builds) and would be used, but there's no real need.
|
|
||||||
# this patch prevents direwolf from linking to it, and it can be stripped at the end of the script.
|
|
||||||
patch -Np1 < /direwolf-hamlib.patch
|
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
cmake ..
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
cd ../..
|
|
||||||
rm -rf direwolf
|
|
||||||
# strip lots of generic documentation that will never be read inside a docker container
|
|
||||||
rm /usr/local/share/doc/direwolf/*.pdf
|
|
||||||
# examples are pointless, too
|
|
||||||
rm -rf /usr/local/share/doc/direwolf/examples/
|
|
||||||
|
|
||||||
git clone https://github.com/drowe67/codec2.git
|
|
||||||
cd codec2
|
|
||||||
# latest commit from master as of 2020-10-04
|
|
||||||
git checkout 55d7bb8d1bddf881bdbfcb971a718b83e6344598
|
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
cmake ..
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
install -m 0755 src/freedv_rx /usr/local/bin
|
|
||||||
cd ../..
|
|
||||||
rm -rf codec2
|
|
||||||
|
|
||||||
wget https://downloads.sourceforge.net/project/drm/dream/2.1.1/dream-2.1.1-svn808.tar.gz
|
|
||||||
tar xvfz dream-2.1.1-svn808.tar.gz
|
|
||||||
pushd dream
|
|
||||||
patch -Np0 < /dream.patch
|
|
||||||
qmake CONFIG+=console
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
popd
|
|
||||||
rm -rf dream
|
|
||||||
rm dream-2.1.1-svn808.tar.gz
|
|
||||||
|
|
||||||
git clone https://github.com/mobilinkd/m17-cxx-demod.git
|
|
||||||
cmakebuild m17-cxx-demod v2.3
|
|
||||||
|
|
||||||
git clone https://github.com/hessu/aprs-symbols /usr/share/aprs-symbols
|
|
||||||
pushd /usr/share/aprs-symbols
|
|
||||||
git checkout 5c2abe2658ee4d2563f3c73b90c6f59124839802
|
|
||||||
# remove unused files (including git meta information)
|
|
||||||
rm -rf .git aprs-symbols.ai aprs-sym-export.js
|
|
||||||
popd
|
|
||||||
|
|
||||||
apt-get -y purge --autoremove $BUILD_PACKAGES
|
|
||||||
apt-get clean
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
@ -1,61 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -euxo pipefail
|
|
||||||
export MAKEFLAGS="-j4"
|
|
||||||
|
|
||||||
function cmakebuild() {
|
|
||||||
cd $1
|
|
||||||
if [[ ! -z "${2:-}" ]]; then
|
|
||||||
git checkout $2
|
|
||||||
fi
|
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
cmake ${CMAKE_ARGS:-} ..
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
cd ../..
|
|
||||||
rm -rf $1
|
|
||||||
}
|
|
||||||
|
|
||||||
cd /tmp
|
|
||||||
|
|
||||||
STATIC_PACKAGES="libfftw3-bin libprotobuf23 libsamplerate0 libicu67 libudev1"
|
|
||||||
BUILD_PACKAGES="git autoconf automake libtool libfftw3-dev pkg-config cmake make gcc g++ libprotobuf-dev protobuf-compiler libsamplerate-dev libicu-dev libpython3-dev libudev-dev"
|
|
||||||
apt-get update
|
|
||||||
apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
|
|
||||||
|
|
||||||
git clone https://github.com/jketterl/js8py.git
|
|
||||||
pushd js8py
|
|
||||||
# latest develop as of 2022-11-30 (structured callsign data)
|
|
||||||
git checkout f7e394b7892d26cbdcce5d43c0b4081a2a6a48f6
|
|
||||||
python3 setup.py install
|
|
||||||
popd
|
|
||||||
rm -rf js8py
|
|
||||||
|
|
||||||
git clone https://github.com/jketterl/csdr.git
|
|
||||||
cmakebuild csdr 0.18.1
|
|
||||||
|
|
||||||
git clone https://github.com/jketterl/pycsdr.git
|
|
||||||
cd pycsdr
|
|
||||||
git checkout 0.18.1
|
|
||||||
./setup.py install install_headers
|
|
||||||
cd ..
|
|
||||||
rm -rf pycsdr
|
|
||||||
|
|
||||||
git clone https://github.com/jketterl/codecserver.git
|
|
||||||
mkdir -p /usr/local/etc/codecserver
|
|
||||||
cp codecserver/conf/codecserver.conf /usr/local/etc/codecserver
|
|
||||||
cmakebuild codecserver 0.2.0
|
|
||||||
|
|
||||||
git clone https://github.com/jketterl/digiham.git
|
|
||||||
cmakebuild digiham 0.6.1
|
|
||||||
|
|
||||||
git clone https://github.com/jketterl/pydigiham.git
|
|
||||||
cd pydigiham
|
|
||||||
git checkout 0.6.1
|
|
||||||
./setup.py install
|
|
||||||
cd ..
|
|
||||||
rm -rf pydigiham
|
|
||||||
|
|
||||||
apt-get -y purge --autoremove $BUILD_PACKAGES
|
|
||||||
apt-get clean
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
@ -1,37 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
mkdir -p /etc/openwebrx/openwebrx.conf.d
|
|
||||||
mkdir -p /var/lib/openwebrx
|
|
||||||
mkdir -p /tmp/openwebrx/
|
|
||||||
if [[ ! -f /etc/openwebrx/openwebrx.conf.d/20-temporary-directory.conf ]] ; then
|
|
||||||
cat << EOF > /etc/openwebrx/openwebrx.conf.d/20-temporary-directory.conf
|
|
||||||
[core]
|
|
||||||
temporary_directory = /tmp/openwebrx
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
if [[ ! -f /etc/openwebrx/bands.json ]] ; then
|
|
||||||
cp bands.json /etc/openwebrx/
|
|
||||||
fi
|
|
||||||
if [[ ! -f /etc/openwebrx/openwebrx.conf ]] ; then
|
|
||||||
cp openwebrx.conf /etc/openwebrx/
|
|
||||||
fi
|
|
||||||
if [[ ! -z "${OPENWEBRX_ADMIN_USER:-}" ]] && [[ ! -z "${OPENWEBRX_ADMIN_PASSWORD:-}" ]] ; then
|
|
||||||
if ! python3 openwebrx.py admin --silent hasuser "${OPENWEBRX_ADMIN_USER}" ; then
|
|
||||||
OWRX_PASSWORD="${OPENWEBRX_ADMIN_PASSWORD}" python3 openwebrx.py admin --noninteractive adduser "${OPENWEBRX_ADMIN_USER}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
_term() {
|
|
||||||
echo "Caught signal!"
|
|
||||||
kill -TERM "$child" 2>/dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
trap _term SIGTERM SIGINT
|
|
||||||
|
|
||||||
python3 openwebrx.py $@ &
|
|
||||||
|
|
||||||
child=$!
|
|
||||||
wait "$child"
|
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 17 KiB |
@ -1,166 +0,0 @@
|
|||||||
@import url("openwebrx-header.css");
|
|
||||||
@import url("openwebrx-globals.css");
|
|
||||||
|
|
||||||
html, body {
|
|
||||||
height: unset;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
margin-bottom: 5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
hr {
|
|
||||||
background: #444;
|
|
||||||
}
|
|
||||||
|
|
||||||
.buttons {
|
|
||||||
position: fixed;
|
|
||||||
bottom: 0;
|
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
background-color: #222;
|
|
||||||
z-index: 2;
|
|
||||||
padding: 10px;
|
|
||||||
text-align: right;
|
|
||||||
border-top: 1px solid #444;
|
|
||||||
}
|
|
||||||
|
|
||||||
.row .map-input {
|
|
||||||
margin: 15px 15px 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.settings-section h3 {
|
|
||||||
margin-top: 1em;
|
|
||||||
margin-bottom: 1em;
|
|
||||||
}
|
|
||||||
|
|
||||||
h1 {
|
|
||||||
margin: 1em 0;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.matrix {
|
|
||||||
display: grid;
|
|
||||||
}
|
|
||||||
|
|
||||||
.q65-matrix {
|
|
||||||
grid-template-columns: repeat(5, auto);
|
|
||||||
}
|
|
||||||
|
|
||||||
.imageupload .image-container {
|
|
||||||
max-width: 100%;
|
|
||||||
padding: 7px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.imageupload img.webrx-top-photo {
|
|
||||||
max-height: 350px;
|
|
||||||
max-width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.settings-grid > div {
|
|
||||||
padding: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.settings-grid .btn {
|
|
||||||
width: 100%;
|
|
||||||
height: 100px;
|
|
||||||
padding: 20px;
|
|
||||||
font-size: 1.2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tab-body {
|
|
||||||
overflow: auto;
|
|
||||||
border: 1px solid #444;
|
|
||||||
border-top: none;
|
|
||||||
border-bottom-left-radius: 0.25rem;
|
|
||||||
border-bottom-right-radius: 0.25rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tab-body .form-group {
|
|
||||||
padding-right: 15px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bookmarks table .frequency, .bookmark-list table .frequency {
|
|
||||||
text-align: right;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bookmarks table input, .bookmarks table select {
|
|
||||||
width: initial;
|
|
||||||
text-align: inherit;
|
|
||||||
display: initial;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bookmark-list table .form-check-input {
|
|
||||||
margin-left: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.actions {
|
|
||||||
margin: 1rem 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.actions .btn {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wsjt-decoding-depths-table {
|
|
||||||
width: auto;
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wsjt-decoding-depths-table td:first-child {
|
|
||||||
padding-left: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sdr-device-list .list-group-item,
|
|
||||||
.sdr-profile-list .list-group-item {
|
|
||||||
background: initial;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sdr-device-list .sdr-profile-list {
|
|
||||||
max-height: 20rem;
|
|
||||||
overflow-y: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.removable-group.removable, .add-group {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
}
|
|
||||||
|
|
||||||
.removable-group.removable .removable-item, .add-group .add-group-select {
|
|
||||||
flex: 1 0 auto;
|
|
||||||
margin-right: .25rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.removable-group.removable .option-remove-button, .add-group .option-add-button {
|
|
||||||
flex: 0 0 70px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.option-add-button, .option-remove-button {
|
|
||||||
width: 70px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.scheduler-static-time-inputs {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
}
|
|
||||||
|
|
||||||
.scheduler-static-time-inputs > * {
|
|
||||||
flex: 0 0 auto;
|
|
||||||
width: unset;
|
|
||||||
}
|
|
||||||
|
|
||||||
.scheduler-static-time-inputs > select {
|
|
||||||
flex: 1 0 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.breadcrumb {
|
|
||||||
margin-top: .5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.imageupload.is-invalid ~ .invalid-feedback {
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
|
|
||||||
.device-log-messages {
|
|
||||||
max-height: 500px;
|
|
||||||
}
|
|
12
htdocs/css/bootstrap.min.css
vendored
12
htdocs/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
@ -1,34 +0,0 @@
|
|||||||
@import url("openwebrx-header.css");
|
|
||||||
@import url("openwebrx-globals.css");
|
|
||||||
|
|
||||||
body {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
|
|
||||||
.login-container {
|
|
||||||
flex: 1;
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
.login {
|
|
||||||
position: absolute;
|
|
||||||
left: 50%;
|
|
||||||
top: 50%;
|
|
||||||
transform: translate(-50%, -50%);
|
|
||||||
|
|
||||||
width: 500px;
|
|
||||||
|
|
||||||
padding: 20px;
|
|
||||||
border-radius: 10px;
|
|
||||||
border: 1px solid #575757;
|
|
||||||
box-shadow: 0 0 20px #000;
|
|
||||||
}
|
|
||||||
|
|
||||||
.login .btn {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn-login {
|
|
||||||
height: 50px;
|
|
||||||
}
|
|
@ -1,65 +0,0 @@
|
|||||||
@import url("openwebrx-header.css");
|
|
||||||
@import url("openwebrx-globals.css");
|
|
||||||
|
|
||||||
body {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
|
|
||||||
.openwebrx-map {
|
|
||||||
flex: 1 1 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
h3 {
|
|
||||||
margin: 10px 0;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
ul {
|
|
||||||
margin-block-start: 5px;
|
|
||||||
margin-block-end: 5px;
|
|
||||||
padding-inline-start: 25px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* don't show the filter in it's initial position */
|
|
||||||
.openwebrx-map-legend {
|
|
||||||
display: none;
|
|
||||||
background-color: #fff;
|
|
||||||
padding: 10px;
|
|
||||||
margin: 10px;
|
|
||||||
user-select: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* show it as soon as google maps has moved it to its container */
|
|
||||||
.openwebrx-map .openwebrx-map-legend {
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
|
|
||||||
.openwebrx-map-legend ul {
|
|
||||||
list-style-type: none;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.openwebrx-map-legend ul li {
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
.openwebrx-map-legend ul li.disabled {
|
|
||||||
opacity: .3;
|
|
||||||
filter: grayscale(70%);
|
|
||||||
}
|
|
||||||
|
|
||||||
.openwebrx-map-legend li.square .illustration {
|
|
||||||
display: inline-block;
|
|
||||||
width: 30px;
|
|
||||||
height: 20px;
|
|
||||||
margin-right: 10px;
|
|
||||||
border-width: 2px;
|
|
||||||
border-style: solid;
|
|
||||||
}
|
|
||||||
|
|
||||||
.openwebrx-map-legend select {
|
|
||||||
background-color: #FFF;
|
|
||||||
border-color: #DDD;
|
|
||||||
padding: 5px;
|
|
||||||
}
|
|
@ -1,7 +0,0 @@
|
|||||||
html, body
|
|
||||||
{
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
height: 100%;
|
|
||||||
font-family: "DejaVu Sans", Verdana, Geneva, sans-serif;
|
|
||||||
}
|
|
@ -1,227 +0,0 @@
|
|||||||
.webrx-top-container {
|
|
||||||
position: relative;
|
|
||||||
z-index:1000;
|
|
||||||
background-color: #575757;
|
|
||||||
|
|
||||||
background-image: url(../gfx/openwebrx-top-photo.jpg);
|
|
||||||
background-position-x: center;
|
|
||||||
background-position-y: top;
|
|
||||||
background-repeat: no-repeat;
|
|
||||||
background-size: cover;
|
|
||||||
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
.openwebrx-description-container {
|
|
||||||
transition-property: height, opacity;
|
|
||||||
transition-duration: 1s;
|
|
||||||
transition-timing-function: ease-out;
|
|
||||||
opacity: 0;
|
|
||||||
height: 0;
|
|
||||||
/* originally, top-bar + description was 350px */
|
|
||||||
max-height: 283px;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
.openwebrx-description-container.expanded {
|
|
||||||
opacity: 1;
|
|
||||||
height: 283px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.webrx-top-bar {
|
|
||||||
height:67px;
|
|
||||||
|
|
||||||
background: rgba(128, 128, 128, 0.15);
|
|
||||||
margin:0;
|
|
||||||
padding:0;
|
|
||||||
user-select: none;
|
|
||||||
-webkit-touch-callout: none;
|
|
||||||
-webkit-user-select: none;
|
|
||||||
-khtml-user-select: none;
|
|
||||||
-moz-user-select: none;
|
|
||||||
-ms-user-select: none;
|
|
||||||
overflow: hidden;
|
|
||||||
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
}
|
|
||||||
|
|
||||||
.webrx-top-bar > * {
|
|
||||||
flex: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.webrx-top-container, .webrx-top-container * {
|
|
||||||
line-height: initial;
|
|
||||||
box-sizing: initial;
|
|
||||||
}
|
|
||||||
|
|
||||||
.webrx-top-logo {
|
|
||||||
width: 261px;
|
|
||||||
padding: 12px;
|
|
||||||
filter: drop-shadow(0 0 2.5px rgba(0, 0, 0, .9));
|
|
||||||
/* overwritten by media queries */
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.webrx-rx-avatar {
|
|
||||||
background-color: rgba(154, 154, 154, .5);
|
|
||||||
margin: 7px;
|
|
||||||
|
|
||||||
width: 46px;
|
|
||||||
height: 46px;
|
|
||||||
padding: 4px;
|
|
||||||
border-radius: 8px;
|
|
||||||
box-sizing: content-box;
|
|
||||||
}
|
|
||||||
|
|
||||||
.webrx-rx-texts {
|
|
||||||
/* minimum layout width */
|
|
||||||
width: 0;
|
|
||||||
/* will be getting wider with flex */
|
|
||||||
flex: 1;
|
|
||||||
overflow: hidden;
|
|
||||||
margin: auto 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.webrx-rx-texts div, .webrx-rx-texts h1 {
|
|
||||||
margin: 0 10px;
|
|
||||||
padding: 3px;
|
|
||||||
white-space:nowrap;
|
|
||||||
overflow: hidden;
|
|
||||||
color: #909090;
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
.webrx-rx-title {
|
|
||||||
font-family: "DejaVu Sans", Verdana, Geneva, sans-serif;
|
|
||||||
font-size: 11pt;
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
|
|
||||||
.webrx-rx-desc {
|
|
||||||
font-size: 10pt;
|
|
||||||
}
|
|
||||||
|
|
||||||
.openwebrx-main-buttons .button {
|
|
||||||
display: block;
|
|
||||||
width: 55px;
|
|
||||||
cursor:pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
.openwebrx-main-buttons .button[data-toggle-panel] {
|
|
||||||
/* will be enabled by javascript if the panel is present in the DOM */
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.openwebrx-main-buttons .button img,
|
|
||||||
.openwebrx-main-buttons .button svg {
|
|
||||||
height: 38px;
|
|
||||||
filter: drop-shadow(0 0 4px rgba(0, 0, 0, 0.5));
|
|
||||||
}
|
|
||||||
|
|
||||||
.openwebrx-main-buttons a {
|
|
||||||
color: inherit;
|
|
||||||
text-decoration: inherit;
|
|
||||||
}
|
|
||||||
|
|
||||||
.openwebrx-main-buttons .button:hover {
|
|
||||||
background-color: rgba(255, 255, 255, 0.3);
|
|
||||||
}
|
|
||||||
|
|
||||||
.openwebrx-main-buttons .button:active {
|
|
||||||
background-color: rgba(255, 255, 255, 0.55);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
.openwebrx-main-buttons {
|
|
||||||
padding: 5px 15px;
|
|
||||||
display: flex;
|
|
||||||
list-style: none;
|
|
||||||
margin:0;
|
|
||||||
color: white;
|
|
||||||
text-shadow: 0px 0px 4px #000000;
|
|
||||||
text-align: center;
|
|
||||||
font-size: 9pt;
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
|
|
||||||
.webrx-rx-photo-title {
|
|
||||||
margin: 10px 15px;
|
|
||||||
color: white;
|
|
||||||
font-size: 16pt;
|
|
||||||
text-shadow: 1px 1px 4px #444;
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.webrx-rx-photo-desc {
|
|
||||||
margin: 10px 15px;
|
|
||||||
color: white;
|
|
||||||
font-size: 10pt;
|
|
||||||
font-weight: bold;
|
|
||||||
text-shadow: 0px 0px 6px #444;
|
|
||||||
opacity: 1;
|
|
||||||
line-height: 1.5em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.webrx-rx-photo-desc a {
|
|
||||||
color: #5ca8ff;
|
|
||||||
text-shadow: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.openwebrx-photo-trigger {
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Responsive stuff
|
|
||||||
*/
|
|
||||||
|
|
||||||
@media (min-width: 576px) {
|
|
||||||
.webrx-rx-texts {
|
|
||||||
display: initial;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (min-width: 768px) {
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (min-width: 992px) {
|
|
||||||
.webrx-top-logo {
|
|
||||||
display: initial;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (min-width: 1200px) {
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* RX details arrow up/down switching
|
|
||||||
*/
|
|
||||||
|
|
||||||
.openwebrx-rx-details-arrow {
|
|
||||||
position: absolute;
|
|
||||||
bottom: 0;
|
|
||||||
left: 50%;
|
|
||||||
transform: translate(-50%, 0);
|
|
||||||
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
line-height: 0;
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
|
|
||||||
.openwebrx-rx-details-arrow svg {
|
|
||||||
height: 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.openwebrx-rx-details-arrow .up {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.openwebrx-rx-details-arrow--up .down {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.openwebrx-rx-details-arrow--up .up {
|
|
||||||
display: initial;
|
|
||||||
}
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user