w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-24 02:12:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Another tweak to make temporary manual rig control work as intended."

Browse Source 
This reverts commit 1b7830825a356eb3436998b51f6cf071da9763ab.
This commit is contained in:
Joe Taylor 2023-02-02 12:18:00 -05:00
parent 1816e80707
commit 0c0ecd893b
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
widgets/mainwindow.cpp
View File

@ -7802,18 +7802,17 @@ void MainWindow::on_readFreq_clicked()
// CTRL+click on the rig-mode button to allow temporary manual rig control. // CTRL+click on the rig-mode button to allow temporary manual rig control.
bool b=QApplication::keyboardModifiers().testFlag(Qt::ControlModifier); bool b=QApplication::keyboardModifiers().testFlag(Qt::ControlModifier);
if(b) { if(b and m_config.is_transceiver_online()) {
if(m_config.is_transceiver_online()) {
m_config.transceiver_offline(); m_config.transceiver_offline();
update_dynamic_property (ui->readFreq, "state", "manual"); update_dynamic_property (ui->readFreq, "state", "manual");
ui->readFreq->setText("M"); ui->readFreq->setText("M");
} else { return;
m_config.transceiver_online();
update_dynamic_property (ui->readFreq, "state", "ok");
ui->readFreq->setText(m_rigState.split() ? "S" : "");
} }
if (m_config.transceiver_online ())
{
m_config.sync_transceiver (true, true);
} }
if (m_config.is_transceiver_online()) m_config.sync_transceiver(true, true);
} }
void MainWindow::setXIT(int n, Frequency base) void MainWindow::setXIT(int n, Frequency base)
@ -7883,7 +7882,6 @@ void MainWindow::setFreq4(int rxFreq, int txFreq)
void MainWindow::handle_transceiver_update (Transceiver::TransceiverState const& s) void MainWindow::handle_transceiver_update (Transceiver::TransceiverState const& s)
{ {
if(ui->readFreq->text()=="M") return; //Manual rig control is active, do nothing here
Transceiver::TransceiverState old_state {m_rigState}; Transceiver::TransceiverState old_state {m_rigState};
//transmitDisplay (s.ptt ()); //transmitDisplay (s.ptt ());
if (s.ptt () // && !m_rigState.ptt () if (s.ptt () // && !m_rigState.ptt ()