From ebc69434ab2caba03f3b55194bafa54eb8c78c2e Mon Sep 17 00:00:00 2001 From: Elliott Liggett Date: Sat, 3 Apr 2021 01:26:28 -0700 Subject: [PATCH] Started work on the tone mode interface. --- repeaterattributes.h | 13 +++++++++++++ repeatersetup.cpp | 19 +++++++++++++++++-- repeatersetup.h | 5 +++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/repeaterattributes.h b/repeaterattributes.h index 50c2b39..24ec45f 100644 --- a/repeaterattributes.h +++ b/repeaterattributes.h @@ -13,6 +13,19 @@ enum duplexMode { dmDupAutoOff=0x36 }; +// Here, T=tone, D=DCS, N=none +// And the naming convention order is Transmit Receive +enum rptAccessTxRx { + ratrNone=0x00, + ratrTN=0x01, // "TONE" (T only) + ratrNT=0x02, // "TSQL" (R only) + ratrDD=0x03, // "DTCS" (TR) + ratrDN=0x06, // "DTCS(T)" + ratrTD=0x07, // "TONE(T) / TSQL(R)" + ratrDT=0x08, // "DTCS(T) / TSQL(R)" + ratrTT=0x09 // "TONE(T) / TSQL(R)" +}; + Q_DECLARE_METATYPE(enum duplexMode) #endif // REPEATERATTRIBUTES_H diff --git a/repeatersetup.cpp b/repeatersetup.cpp index b943438..6db969e 100644 --- a/repeatersetup.cpp +++ b/repeatersetup.cpp @@ -209,6 +209,21 @@ void repeaterSetup::receiveDuplexMode(duplexMode dm) } } +void repeaterSetup::handleToneMode(rptAccessTxRx tmode) +{ + (void)tmode; +} + +void repeaterSetup::handleCTCSS(quint16 tone) +{ + (void)tone; +} + +void repeaterSetup::handleDCS(quint16 dcode) +{ + (void)dcode; +} + void repeaterSetup::on_rptSimplexBtn_clicked() { // Simplex @@ -245,13 +260,13 @@ void repeaterSetup::on_rptReadRigBtn_clicked() void repeaterSetup::on_rptToneCombo_activated(int index) { quint16 ctcss=0; - ctcss = ui->rptToneCombo->itemData(index); + ctcss = ui->rptToneCombo->itemData(index).toUInt(); emit setCTCSS(ctcss); } void repeaterSetup::on_rptDTCSCombo_activated(int index) { quint16 dcode=0; - dcode = ui->rptDTCSCombo->itemData(index); + dcode = ui->rptDTCSCombo->itemData(index).toUInt(); emit setDCS(dcode); } diff --git a/repeatersetup.h b/repeatersetup.h index fcfa176..f7c0ef8 100644 --- a/repeatersetup.h +++ b/repeatersetup.h @@ -22,9 +22,14 @@ signals: void setDuplexMode(duplexMode dm); void setCTCSS(quint16 tone); void setDCS(quint16 dcode); + void setToneMode(rptAccessTxRx tmode); + void getToneMode(); public slots: void receiveDuplexMode(duplexMode dm); + void handleToneMode(rptAccessTxRx tmode); + void handleCTCSS(quint16 tone); + void handleDCS(quint16 dcode); private slots: