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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Add 2020B to multi-RX feature #312

Merged
merged 5 commits into from
Dec 19, 2022
Merged

Add 2020B to multi-RX feature #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
64f8a29
Confirmed that 2020B can be added to multi-RX.
tmiw Dec 10, 2022
07f631c
Add PR #312 to changelog.
tmiw Dec 10, 2022
0a9102c
latest user manual PDF
tmiw Dec 10, 2022
a8ddfdd
Merge branch 'master' into ms-2020b-multi-rx
tmiw Dec 19, 2022
5008fdc
latest user manual PDF
tmiw Dec 19, 2022
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
4 changes: 4 additions & 0 deletions USER_MANUAL.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,10 @@ <h2 data-number="16.1" id="tbd-tbd-tbd"><span class="header-section-number">16.1
<ul>
<li>Suppress documentation generation when tagging releases. (PR #314)</li>
</ul></li>
<li>Enhancements:
<ul>
<li>Add 2020B to multi-RX feature to enable RX and TX without restarting session. (PR #312)</li>
</ul></li>
</ol>
<h2 data-number="16.2" id="v1.8.5-december-2022"><span class="header-section-number">16.2</span> V1.8.5 December 2022</h2>
<ol type="1">
Expand Down
2 changes: 2 additions & 0 deletions USER_MANUAL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,6 +785,8 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes

1. Build system:
* Suppress documentation generation when tagging releases. (PR #314)
2. Enhancements:
* Add 2020B to multi-RX feature to enable RX and TX without restarting session. (PR #312)

## V1.8.5 December 2022

Expand Down
Binary file modified USER_MANUAL.pdf
View file
Open in desktop
Binary file not shown.
9 changes: 3 additions & 6 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1736,9 +1736,6 @@ void MainFrame::OnTogBtnOnOff(wxCommandEvent& event)
m_togBtnVoiceKeyer->Enable();

if (g_mode == FREEDV_MODE_2400B || g_mode == FREEDV_MODE_800XA ||
#if defined(FREEDV_MODE_2020B)
g_mode == FREEDV_MODE_2020B || /* note: 2020B don't play well with multi-RX atm */
#endif // FREEDV_MODE_2020B
!wxGetApp().m_boolMultipleRx)
{
m_rb1600->Disable();
Expand All @@ -1758,6 +1755,9 @@ void MainFrame::OnTogBtnOnOff(wxCommandEvent& event)
if(wxGetApp().m_2020Allowed)
{
freedvInterface.addRxMode(FREEDV_MODE_2020);
#if defined(FREEDV_MODE_2020B)
freedvInterface.addRxMode(FREEDV_MODE_2020B);
#endif // FREEDV_MODE_2020B
}

int rxModes[] = {
Expand All @@ -1779,9 +1779,6 @@ void MainFrame::OnTogBtnOnOff(wxCommandEvent& event)

m_rb800xa->Disable();
m_rb2400b->Disable();
#if defined(FREEDV_MODE_2020B)
m_rb2020b->Disable();
#endif // FREEDV_MODE_2020B
}

// Default voice keyer sample rate to 8K. The exact voice keyer
Expand Down