From e22cb0edf203d0668865df331605c68a317f24ff Mon Sep 17 00:00:00 2001 From: Elliott Liggett Date: Mon, 5 Apr 2021 22:34:40 -0700 Subject: [PATCH] Tone, Tone Squelch, and D(T)CS seem to work as expected. Mode can be selected. --- repeatersetup.cpp | 46 +++++++++++++++++++++++++++++++++++++++------- repeatersetup.h | 8 ++++++++ 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/repeatersetup.cpp b/repeatersetup.cpp index c6e4180..3e281fd 100644 --- a/repeatersetup.cpp +++ b/repeatersetup.cpp @@ -239,9 +239,9 @@ void repeaterSetup::handleTone(quint16 tone) void repeaterSetup::handleTSQL(quint16 tsql) { - //int tindex = ui->rptToneCombo->findData(tone); - //ui->rptToneCombo->setCurrentIndex(tindex); - (void)tsql; + // TODO: Consider a second combo box for the TSQL + int tindex = ui->rptToneCombo->findData(tsql); + ui->rptToneCombo->setCurrentIndex(tindex); } void repeaterSetup::handleDTCS(quint16 dcode, bool tinv, bool rinv) @@ -287,10 +287,14 @@ void repeaterSetup::on_rptReadRigBtn_clicked() void repeaterSetup::on_rptToneCombo_activated(int index) { - quint16 tsql=0; - tsql = (quint16)ui->rptToneCombo->itemData(index).toUInt(); - //if(selected mode == TSQL)... send this way... otherwise if just tone, send other way... - emit setTone(tsql); + quint16 tone=0; + tone = (quint16)ui->rptToneCombo->itemData(index).toUInt(); + if(ui->toneTone->isChecked()) + { + emit setTone(tone); + } else if (ui->toneTSQL->isChecked()) { + emit setTSQL(tone); + } } void repeaterSetup::on_rptDTCSCombo_activated(int index) @@ -309,3 +313,31 @@ void repeaterSetup::on_debugBtn_clicked() //emit getDTCS(); emit getRptAccessMode(); } + +void repeaterSetup::on_toneNone_clicked() +{ + rptAccessTxRx rm; + rm = ratrNN; + emit setRptAccessMode(rm); +} + +void repeaterSetup::on_toneTone_clicked() +{ + rptAccessTxRx rm; + rm = ratrTN; + emit setRptAccessMode(rm); +} + +void repeaterSetup::on_toneTSQL_clicked() +{ + rptAccessTxRx rm; + rm = ratrTT; + emit setRptAccessMode(rm); +} + +void repeaterSetup::on_toneDTCS_clicked() +{ + rptAccessTxRx rm; + rm = ratrDD; + emit setRptAccessMode(rm); +} diff --git a/repeatersetup.h b/repeatersetup.h index 18d14ae..a1f04a3 100644 --- a/repeatersetup.h +++ b/repeatersetup.h @@ -47,6 +47,14 @@ private slots: void on_debugBtn_clicked(); + void on_toneNone_clicked(); + + void on_toneTone_clicked(); + + void on_toneTSQL_clicked(); + + void on_toneDTCS_clicked(); + private: Ui::repeaterSetup *ui;