From e4bbf62474d5faac84f852c06aa272948f44e40f Mon Sep 17 00:00:00 2001 From: Elliott Liggett Date: Sun, 4 Apr 2021 23:46:44 -0700 Subject: [PATCH] We can now read the repeater access mode and update the UI. What remains is to be able to set the mode. --- repeatersetup.cpp | 21 ++++++++++++++++++++- repeatersetup.ui | 8 ++++---- rigcommander.cpp | 12 ++++++++++++ rigcommander.h | 1 + 4 files changed, 37 insertions(+), 5 deletions(-) diff --git a/repeatersetup.cpp b/repeatersetup.cpp index 5f38579..a21a0f4 100644 --- a/repeatersetup.cpp +++ b/repeatersetup.cpp @@ -210,6 +210,24 @@ void repeaterSetup::receiveDuplexMode(duplexMode dm) void repeaterSetup::handleRptAccessMode(rptAccessTxRx tmode) { + switch(tmode) + { + case ratrNN: + ui->toneNone->setChecked(true); + break; + case ratrTT: + ui->toneTSQL->setChecked(true); + break; + case ratrTN: + ui->toneTone->setChecked(true); + break; + case ratrDD: + ui->toneDTCS->setChecked(true); + break; + default: + break; + } + (void)tmode; } @@ -288,5 +306,6 @@ void repeaterSetup::on_debugBtn_clicked() { //emit getTone(); //emit getTSQL(); - emit getDTCS(); + //emit getDTCS(); + emit getRptAccessMode(); } diff --git a/repeatersetup.ui b/repeatersetup.ui index cf17876..ffb72f5 100644 --- a/repeatersetup.ui +++ b/repeatersetup.ui @@ -126,7 +126,7 @@ - + None @@ -136,7 +136,7 @@ - + Transmit Tone only @@ -146,7 +146,7 @@ - + Tone Squelch @@ -156,7 +156,7 @@ - + DTCS diff --git a/rigcommander.cpp b/rigcommander.cpp index 5983b1a..d02dc59 100644 --- a/rigcommander.cpp +++ b/rigcommander.cpp @@ -1065,6 +1065,9 @@ void rigCommander::parseCommand() // Metering such as s, power, etc parseLevels(); break; + case '\x16': + parseRptrAccessMode(); + break; case '\x19': // qDebug(logRig()) << "Have rig ID: " << (unsigned int)payloadIn[2]; // printHex(payloadIn, false, true); @@ -1955,6 +1958,15 @@ void rigCommander::parseRegister1B() } } +void rigCommander::parseRptrAccessMode() +{ + //"INDEX: 00 01 02 03 " + //"DATA: 16 5d 00 fd " + // ^-- mode info here + + emit haveRptAccessMode((rptAccessTxRx)payloadIn.at(2)); +} + void rigCommander::parseBandStackReg() { // qDebug(logRig()) << "Band stacking register response received: "; diff --git a/rigcommander.h b/rigcommander.h index c6c4a53..9d93036 100644 --- a/rigcommander.h +++ b/rigcommander.h @@ -297,6 +297,7 @@ private: void parseRegisters1A(); void parseRegister1B(); void parseRegisters1C(); + void parseRptrAccessMode(); void parseBandStackReg(); void parsePTT(); void parseATU();