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

Improve labeling of PTT/CAT control options. #550

Merged
merged 4 commits into from
Sep 21, 2023
Merged

Improve labeling of PTT/CAT control options. #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ee4848
Improve labeling of PTT/CAT control options.
tmiw Sep 21, 2023
fc161ed
Update user manual to reflect PR changes.
tmiw Sep 21, 2023
40e4b09
Add PR #550 to changelog.
tmiw Sep 21, 2023
19126dc
Merge branch 'master' into ms-ux-cat-control
tmiw Sep 21, 2023
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
11 changes: 6 additions & 5 deletions USER_MANUAL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ Hitting **Refresh** in the lower left hand corner of the Tools/Audio Config will

Another solution is to re-start FreeDV and check Tools/Audio Config again after changing any audio hardware.

### PTT Configuration
### CAT/PTT Configuration

The Tools - PTT dialog supports three different ways to control PTT on
The Tools->CAT and PTT Config dialog supports three different ways to control PTT on
your radio:

+ VOX: sends a tone to the left channel of the Transmit/To Radio sound card
Expand Down Expand Up @@ -797,11 +797,11 @@ seconds.

## PTT doesn't work. It works with Fldigi and other Hamlib applications.

Many people struggle with initial PTT setup:
Many people struggle with initial CAT control and PTT setup:

1. Read the PTT Configuration section above.
1. Read the "CAT/PTT Configuration" section above.

1. Try the Tools - PTT Test function.
1. Try the "Test PTT" button inside Tools->CAT and PTT Config.

1. Check your rig serial settings. Did you change them from defaults
for another program?
Expand Down Expand Up @@ -918,6 +918,7 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes
* FreeDV Reporter: Fix regression preventing proper display of "RX Only" stations. (PR #542)
* Default to the audio from the current TX mode if no modes decode (works around Codec2 bug with 1600 mode). (PR #544)
* Fix bug preventing proper restore of selected tabs. (PR #548)
* Improve labeling of PTT/CAT control options. (PR #550)
* Clarify behavior of "On Top" menu option. (PR #549)
2. Enhancements:
* Add configuration for background/foreground colors in FreeDV Reporter. (PR #545)
Expand Down
2 changes: 1 addition & 1 deletion src/dlg_ptt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ ComPortsDlg::ComPortsDlg(wxWindow* parent, wxWindowID id, const wxString& title,

/* Use Hamlib for PTT checkbox. */

m_ckUseHamlibPTT = new wxCheckBox(hamlibBox, wxID_ANY, _("Use Hamlib PTT"), wxDefaultPosition, wxSize(-1, -1), 0);
m_ckUseHamlibPTT = new wxCheckBox(hamlibBox, wxID_ANY, _("Enable CAT control via Hamlib"), wxDefaultPosition, wxSize(-1, -1), 0);
m_ckUseHamlibPTT->SetValue(false);
gridSizerhl->Add(m_ckUseHamlibPTT, 0, wxALIGN_CENTER_VERTICAL, 0);
gridSizerhl->Add(new wxStaticText(hamlibBox, -1, wxT("")), 0, wxEXPAND);
Expand Down
2 changes: 1 addition & 1 deletion src/dlg_ptt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
class ComPortsDlg : public wxDialog
{
public:
ComPortsDlg(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("PTT Config"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(450,300), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
ComPortsDlg(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("CAT and PTT Config"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(450,300), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
virtual ~ComPortsDlg();
void ExchangeData(int inout);

Expand Down
2 changes: 1 addition & 1 deletion src/topFrame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const
tools->Append(m_menuItemAudio);

wxMenuItem* m_menuItemRigCtrlCfg;
m_menuItemRigCtrlCfg = new wxMenuItem(tools, wxID_ANY, wxString(_("P&TT Config...")) , _("Configures FreeDV integration with radio"), wxITEM_NORMAL);
m_menuItemRigCtrlCfg = new wxMenuItem(tools, wxID_ANY, wxString(_("CAT and P&TT Config...")) , _("Configures FreeDV integration with radio"), wxITEM_NORMAL);
tools->Append(m_menuItemRigCtrlCfg);

wxMenuItem* m_menuItemOptions;
Expand Down