Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

PSK Reporter encoding/decoding improvements #156

Merged
merged 36 commits into from
Sep 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
e7702a7
Simplify syncing with callsign data stream by using a maximum of 6 ch…
tmiw Aug 14, 2021
2b56fe9
Increase limit to 8 characters (e.g. for VK Foundation licenses, etc.)
tmiw Aug 14, 2021
5833a78
Update mode display in status bar on PTT start/stop.
tmiw Aug 15, 2021
0424672
Update the loop guard to ensure that all deque indexes don't cause as…
tmiw Aug 15, 2021
c17df14
Reset window color back to default when unknown or disabled.
tmiw Aug 18, 2021
19a2af2
WIP: use reliable_text instead of CallsignEncoder class.
tmiw Aug 23, 2021
78ccfb1
Disable text callback functions if PSK Reporter is enabled.
tmiw Aug 23, 2021
4f70d6d
Set callsign on session start.
tmiw Aug 23, 2021
82a7edc
Fixed crashes in reliable_text due to varicode code# going out of sync.
tmiw Aug 23, 2021
2676931
Use live PSK Reporter server again.
tmiw Aug 24, 2021
2c11487
Generate Windows test builds from new Codec2 branch.
tmiw Aug 24, 2021
63b9ce7
Use PortAudio Git repo when building static PortAudio.
tmiw Aug 24, 2021
b59e26d
Forgot to remove URL from Apple PortAudio build.
tmiw Aug 24, 2021
b245ccf
Allow manual frequency entry for PSK Reporter support.
tmiw Aug 26, 2021
d7ced23
Fix compiler error.
tmiw Aug 26, 2021
0eac367
Remove requirement for Hamlib from PSK Reporter section of the manual.
tmiw Aug 26, 2021
66ffcfe
Merge branch 'ms-ui-sideband' into ms-pskreporter-improvements
tmiw Aug 26, 2021
b1209cd
latest user manual PDF
tmiw Aug 26, 2021
266d0f9
Save and restore user-entered frequency value.
tmiw Aug 26, 2021
673d9ad
Merge branch 'ms-pskreporter-improvements' of github.com:drowe67/free…
tmiw Aug 26, 2021
349ab70
Update manual to reflect when the Report Frequency text box updates.
tmiw Aug 26, 2021
1441c93
latest user manual PDF
tmiw Aug 26, 2021
8fb43b3
Widen Report Frequency field.
tmiw Aug 27, 2021
9cf12e0
Display frequency one place after the decimal point.
tmiw Aug 27, 2021
53952f9
Make invalid frequency entries red.
tmiw Aug 27, 2021
e152636
Update documentation.
tmiw Aug 27, 2021
f7d2bfe
latest user manual PDF
tmiw Aug 27, 2021
72d0293
Increase width of Report Frequency field for Linux.
tmiw Aug 27, 2021
ead6ca9
Test: temporarily change CODEC2_BRANCH to allow GitHub action to work.
tmiw Aug 27, 2021
202ce39
Fix issue with saving/loading Report Frequency on Windows.
tmiw Aug 27, 2021
b34b4a2
Use lower-case k instead of capital for 'kHz'.
tmiw Aug 27, 2021
0ea9fa9
latest user manual PDF
tmiw Aug 27, 2021
8cb7353
Remove mode from client name sent to PSK Reporter.
tmiw Aug 30, 2021
18d3ed5
latest user manual PDF
tmiw Aug 30, 2021
c8da94d
Switch branches back to master in build scripts prior to merge.
tmiw Sep 2, 2021
f00abd4
Merge branch 'ms-pskreporter-improvements' of github.com:drowe67/free…
tmiw Sep 2, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions USER_MANUAL.html
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,7 @@ <h1 id="multiple-configurations"><span class="header-section-number">5</span> Mu
<h1 id="psk-reporter-experimental"><span class="header-section-number">6</span> PSK Reporter (Experimental)</h1>
<p>FreeDV has the ability to send FreeDV signal reports to <a href="https://pskreporter.info/">PSK Reporter</a> by enabling the option in Tools-Options and specifying your callsign and grid square. When enabled, this causes FreeDV to disable the free form <strong>Txt Msg</strong> field and only transmit the <strong>Callsign</strong> field.</p>
<p>FreeDV validates the received information before submitting a position report to PSK Reporter. This is to ensure that FreeDV does not report invalid callsigns to the service (e.g. ones that don’t exist or that correspond to real non-FreeDV users). However, all received text will display in the main window even if it has errors.</p>
<p>Reports sent to PSK Reporter will display using the mode “FREEDV” for ease of filtering. The user’s current mode (e.g. 700D, 1600, etc.) will also appear in the “Using” field when hovering over or clicking on a reception report.</p>
<p>Note that Hamlib must be enabled so PSK Reporter can read your radio’s frequency. A message will appear on pushing Start if this is not the case.</p>
<p>Reports sent to PSK Reporter will display using the mode “FREEDV” for ease of filtering. The frequency that FreeDV reports to PSK Reporter is set by changing the “Report Frequency” text box in the main window. This is in kilohertz (kHz) and will turn red if the entered value is invalid. If Hamlib support is also enabled, this frequency will automatically update on start/stop as well as when switching between transmit and receive.</p>
<h1 id="multiple-mode-support-experimental"><span class="header-section-number">7</span> Multiple Mode Support (Experimental)</h1>
<p>FreeDV can simultaneously decode the following modes when selected prior to pushing “Start”:</p>
<ul>
Expand Down
9 changes: 4 additions & 5 deletions USER_MANUAL.md
Original file line number Diff line number Diff line change
Expand Up @@ -374,11 +374,10 @@ FreeDV to disable the free form **Txt Msg** field and only transmit the **Callsi

FreeDV validates the received information before submitting a position report to PSK Reporter. This is to ensure that FreeDV does not report invalid callsigns to the service (e.g. ones that don't exist or that correspond to real non-FreeDV users). However, all received text will display in the main window even if it has errors.

Reports sent to PSK Reporter will display using the mode "FREEDV" for ease of filtering. The user's
current mode (e.g. 700D, 1600, etc.) will also appear in the "Using" field when hovering over or
clicking on a reception report.

Note that Hamlib must be enabled so PSK Reporter can read your radio's frequency. A message will appear on pushing Start if this is not the case.
Reports sent to PSK Reporter will display using the mode "FREEDV" for ease of filtering. The frequency that
FreeDV reports to PSK Reporter is set by changing the "Report Frequency" text box in the main window. This
is in kilohertz (kHz) and will turn red if the entered value is invalid. If Hamlib support is also enabled,
this frequency will automatically update on start/stop as well as when switching between transmit and receive.

# Multiple Mode Support (Experimental)

Expand Down
Binary file modified USER_MANUAL.pdf
Binary file not shown.
8 changes: 5 additions & 3 deletions cmake/Buildportaudio-2.0.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
set(PORTAUDIO_TARBALL "pa_snapshot")
set(PORTAUDIO_GIT "https://github.com/PortAudio/portaudio.git")

# required linking libraries on linux. Not sure about windows.
find_library(ALSA_LIBRARIES asound)
Expand Down Expand Up @@ -28,7 +28,8 @@ endif()
include(ExternalProject)
if(APPLE)
ExternalProject_Add(portaudio
URL http://files.portaudio.com/archives/${PORTAUDIO_TARBALL}.tgz
GIT_REPOSITORY ${PORTAUDIO_GIT}
GIT_TAG origin/master
BUILD_IN_SOURCE 1
INSTALL_DIR external/dist
CONFIGURE_COMMAND ${CONFIGURE_COMMAND}
Expand All @@ -38,7 +39,8 @@ ExternalProject_Add(portaudio
)
else()
ExternalProject_Add(portaudio
URL http://files.portaudio.com/archives/${PORTAUDIO_TARBALL}.tgz
GIT_REPOSITORY ${PORTAUDIO_GIT}
GIT_TAG origin/master
BUILD_IN_SOURCE 1
INSTALL_DIR external/dist
CONFIGURE_COMMAND ${CONFIGURE_COMMAND}
Expand Down
2 changes: 0 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ set(FREEDV_SOURCES
osx_interface.h
pskreporter.cpp
pskreporter.h
callsign_encoder.cpp
callsign_encoder.h
udp.cpp
util.cpp
eq.cpp
Expand Down
Loading