From cecaee397deead4942cf79f9e82dd561106b3e99 Mon Sep 17 00:00:00 2001 From: Elliott Liggett Date: Fri, 5 Nov 2021 10:09:31 -0700 Subject: [PATCH] Added support for IF Shift and Twin Pass-Band Filters. Currently accessable only via the debug button. --- rigcommander.cpp | 71 ++++++++++++++++++++++++++++++ rigcommander.h | 9 ++++ rigidentities.h | 2 + transceiveradjustments.cpp | 57 ++++++++++++++++++++++++ transceiveradjustments.h | 23 ++++++++++ transceiveradjustments.ui | 76 +++++++++++++++++++++++++++++--- wfmain.cpp | 90 +++++++++++++++++++++++++++++++++++++- wfmain.h | 32 +++++++++++--- wfmain.ui | 8 ++-- 9 files changed, 353 insertions(+), 15 deletions(-) diff --git a/rigcommander.cpp b/rigcommander.cpp index 193407f..c6e72e0 100644 --- a/rigcommander.cpp +++ b/rigcommander.cpp @@ -1362,6 +1362,17 @@ void rigCommander::parseLevels() emit haveSql(level); rigState.squelch = level; break; + case '\x07': + // Twin BPF Inner, or, IF-Shift level + if(rigCaps.hasTBPF) + emit haveTPBFInner(level); + else + emit haveIFShift(level); + break; + case '\x08': + // Twin BPF Outer + emit haveTPBFOuter(level); + break; case '\x09': // CW Pitch - ignore for now break; @@ -1469,6 +1480,27 @@ void rigCommander::parseLevels() } +void rigCommander::setIFShift(unsigned char level) +{ + QByteArray payload("\x14\x07"); + payload.append(bcdEncodeInt(level)); + prepDataAndSend(payload); +} + +void rigCommander::setTPBFInner(unsigned char level) +{ + QByteArray payload("\x14\x07"); + payload.append(bcdEncodeInt(level)); + prepDataAndSend(payload); +} + +void rigCommander::setTPBFOuter(unsigned char level) +{ + QByteArray payload("\x14\x08"); + payload.append(bcdEncodeInt(level)); + prepDataAndSend(payload); +} + void rigCommander::setTxPower(unsigned char power) { QByteArray payload("\x14\x0A"); @@ -1892,6 +1924,24 @@ void rigCommander::getAfGain() prepDataAndSend(payload); } +void rigCommander::getIFShift() +{ + QByteArray payload("\x14\x07"); + prepDataAndSend(payload); +} + +void rigCommander::getTPBFInner() +{ + QByteArray payload("\x14\x07"); + prepDataAndSend(payload); +} + +void rigCommander::getTPBFOuter() +{ + QByteArray payload("\x14\x08"); + prepDataAndSend(payload); +} + void rigCommander::getSql() { QByteArray payload("\x14\x03"); @@ -2827,6 +2877,9 @@ void rigCommander::determineRigCaps() rigCaps.hasCTCSS = false; rigCaps.hasDTCS = false; + rigCaps.hasTBPF = false; + rigCaps.hasIFShift = false; + rigCaps.spectSeqMax = 0; rigCaps.spectAmpMax = 0; rigCaps.spectLenMax = 0; @@ -2897,6 +2950,7 @@ void rigCommander::determineRigCaps() rigCaps.hasWiFi = false; rigCaps.hasATU = true; rigCaps.hasCTCSS = true; + rigCaps.hasTBPF = true; rigCaps.attenuators.push_back('\x20'); rigCaps.preamps.push_back('\x01'); rigCaps.preamps.push_back('\x02'); @@ -2925,6 +2979,7 @@ void rigCommander::determineRigCaps() rigCaps.hasCTCSS = true; rigCaps.hasDTCS = true; rigCaps.hasDV = true; + rigCaps.hasTBPF = true; rigCaps.attenuators.push_back('\x10'); rigCaps.attenuators.push_back('\x20'); rigCaps.attenuators.push_back('\x30'); @@ -2962,6 +3017,7 @@ void rigCommander::determineRigCaps() rigCaps.hasDV = true; rigCaps.hasCTCSS = true; rigCaps.hasDTCS = true; + rigCaps.hasTBPF = true; rigCaps.attenuators.push_back('\x10'); rigCaps.preamps.push_back('\x01'); rigCaps.bands = standardVU; @@ -3010,6 +3066,7 @@ void rigCommander::determineRigCaps() rigCaps.hasATU = true; rigCaps.hasCTCSS = false; rigCaps.hasDTCS = false; + rigCaps.hasTBPF = true; rigCaps.attenuators.insert(rigCaps.attenuators.end(), {0x00, 0x06, 0x12, 0x18}); rigCaps.preamps.push_back('\x01'); rigCaps.preamps.push_back('\x02'); @@ -3036,6 +3093,7 @@ void rigCommander::determineRigCaps() rigCaps.hasEthernet = true; rigCaps.hasWiFi = false; rigCaps.hasCTCSS = true; + rigCaps.hasTBPF = true; rigCaps.attenuators.insert(rigCaps.attenuators.end(), {'\x03', '\x06', '\x09', '\x12',\ '\x15', '\x18', '\x21', '\x24',\ @@ -3070,6 +3128,7 @@ void rigCommander::determineRigCaps() rigCaps.hasWiFi = false; rigCaps.hasATU = true; rigCaps.hasCTCSS = true; + rigCaps.hasTBPF = true; rigCaps.attenuators.insert(rigCaps.attenuators.end(), {'\x03', '\x06', '\x09', '\x12', '\x15', '\x18', '\x21'}); @@ -3104,6 +3163,7 @@ void rigCommander::determineRigCaps() rigCaps.hasATU = true; rigCaps.hasCTCSS = true; rigCaps.hasDTCS = true; + rigCaps.hasTBPF = true; rigCaps.attenuators.insert(rigCaps.attenuators.end(),{ '\x10' , '\x20'}); rigCaps.preamps.push_back('\x01'); rigCaps.preamps.push_back('\x02'); @@ -3136,6 +3196,7 @@ void rigCommander::determineRigCaps() rigCaps.hasATU = true; rigCaps.hasCTCSS = true; rigCaps.hasDTCS = true; + rigCaps.hasTBPF = true; rigCaps.attenuators.push_back('\x12'); rigCaps.preamps.push_back('\x01'); rigCaps.bands = standardHF; @@ -3159,6 +3220,7 @@ void rigCommander::determineRigCaps() rigCaps.hasATU = true; rigCaps.hasCTCSS = true; rigCaps.hasDTCS = true; + rigCaps.hasTBPF = true; rigCaps.attenuators.push_back('\x20'); rigCaps.preamps.push_back('\x01'); rigCaps.preamps.push_back('\x02'); @@ -3182,6 +3244,7 @@ void rigCommander::determineRigCaps() rigCaps.hasATU = true; rigCaps.hasCTCSS = true; rigCaps.hasDTCS = true; + rigCaps.hasTBPF = true; rigCaps.attenuators.push_back('\x12'); rigCaps.preamps.push_back('\x01'); rigCaps.preamps.push_back('\x02'); @@ -3210,6 +3273,7 @@ void rigCommander::determineRigCaps() rigCaps.hasATU = true; rigCaps.hasCTCSS = true; rigCaps.hasDTCS = true; + rigCaps.hasTBPF = true; rigCaps.attenuators.push_back('\x20'); rigCaps.preamps.push_back('\x01'); rigCaps.bands = standardHF; @@ -3229,6 +3293,7 @@ void rigCommander::determineRigCaps() rigCaps.hasEthernet = true; rigCaps.hasWiFi = false; rigCaps.hasCTCSS = true; + rigCaps.hasTBPF = true; rigCaps.attenuators.insert(rigCaps.attenuators.end(), {'\x06', '\x12', '\x18'}); rigCaps.preamps.push_back('\x01'); @@ -3276,6 +3341,7 @@ void rigCommander::determineRigCaps() rigCaps.hasFDcomms = false; rigCaps.hasATU = false; rigCaps.hasPTTCommand = false; + rigCaps.hasIFShift = true; rigCaps.hasDataModes = false; rigCaps.attenuators.push_back('\x20'); rigCaps.preamps.push_back('\x01'); @@ -3301,6 +3367,7 @@ void rigCommander::determineRigCaps() rigCaps.hasATU = false; rigCaps.hasPTTCommand = false; rigCaps.hasDataModes = false; + rigCaps.hasIFShift = true; // untested rigCaps.attenuators.push_back('\x20'); rigCaps.preamps.push_back('\x01'); rigCaps.bands = standardHF; @@ -3319,6 +3386,7 @@ void rigCommander::determineRigCaps() rigCaps.hasWiFi = false; rigCaps.hasFDcomms = false; rigCaps.hasATU = true; + rigCaps.hasTBPF = true; rigCaps.preamps.push_back('\x01'); rigCaps.preamps.push_back('\x02'); rigCaps.attenuators.insert(rigCaps.attenuators.end(),{ '\x06' , '\x12', '\x18'}); @@ -3339,6 +3407,7 @@ void rigCommander::determineRigCaps() rigCaps.hasWiFi = false; rigCaps.hasFDcomms = false; rigCaps.hasATU = true; + rigCaps.hasTBPF = true; rigCaps.preamps.push_back('\x01'); rigCaps.preamps.push_back('\x02'); rigCaps.attenuators.insert(rigCaps.attenuators.end(),{ '\x06' , '\x12', '\x18'}); @@ -3359,6 +3428,7 @@ void rigCommander::determineRigCaps() rigCaps.hasWiFi = false; rigCaps.hasFDcomms = false; rigCaps.hasATU = true; + rigCaps.hasTBPF = true; rigCaps.preamps.push_back('\x01'); rigCaps.preamps.push_back('\x02'); rigCaps.attenuators.insert(rigCaps.attenuators.end(),{ '\x06' , '\x12', '\x18'}); @@ -3381,6 +3451,7 @@ void rigCommander::determineRigCaps() rigCaps.hasFDcomms = false; rigCaps.hasATU = true; rigCaps.hasDV = true; + rigCaps.hasTBPF = true; rigCaps.preamps.push_back('\x01'); rigCaps.preamps.push_back('\x02'); rigCaps.attenuators.insert(rigCaps.attenuators.end(),{ '\x20' }); diff --git a/rigcommander.h b/rigcommander.h index 1486028..1abc38f 100644 --- a/rigcommander.h +++ b/rigcommander.h @@ -215,6 +215,9 @@ public slots: void getRfGain(); void getAfGain(); void getSql(); + void getIFShift(); + void getTPBFInner(); + void getTPBFOuter(); void getTxLevel(); void getMicGain(); void getCompLevel(); @@ -232,6 +235,9 @@ public slots: void setSquelch(unsigned char level); void setRfGain(unsigned char level); void setAfGain(unsigned char level); + void setIFShift(unsigned char level); + void setTPBFInner(unsigned char level); + void setTPBFOuter(unsigned char level); void setTxPower(unsigned char power); void setMicGain(unsigned char gain); void setUSBGain(unsigned char gain); @@ -356,6 +362,9 @@ signals: void haveRfGain(unsigned char level); void haveAfGain(unsigned char level); void haveSql(unsigned char level); + void haveTPBFInner(unsigned char level); + void haveTPBFOuter(unsigned char level); + void haveIFShift(unsigned char level); void haveTxPower(unsigned char level); void haveMicGain(unsigned char level); void haveCompLevel(unsigned char level); diff --git a/rigidentities.h b/rigidentities.h index fd155e8..a87d9ec 100644 --- a/rigidentities.h +++ b/rigidentities.h @@ -122,6 +122,8 @@ struct rigCapabilities { bool hasPreamp; bool hasAntennaSel; bool hasDataModes; + bool hasIFShift; + bool hasTBPF; bool hasRXAntenna; diff --git a/transceiveradjustments.cpp b/transceiveradjustments.cpp index 5779f5f..319b305 100644 --- a/transceiveradjustments.cpp +++ b/transceiveradjustments.cpp @@ -12,5 +12,62 @@ transceiverAdjustments::transceiverAdjustments(QWidget *parent) : transceiverAdjustments::~transceiverAdjustments() { + rigCaps.inputs.clear(); + rigCaps.preamps.clear(); + rigCaps.attenuators.clear(); + rigCaps.antennas.clear(); + delete ui; } + +void transceiverAdjustments::on_IFShiftSlider_valueChanged(int value) +{ + emit setIFShift(value); +} + +void transceiverAdjustments::on_TPBFInnerSlider_valueChanged(int value) +{ + emit setTPBFInner(value); +} + +void transceiverAdjustments::on_TPBFOuterSlider_valueChanged(int value) +{ + emit setTPBFOuter(value); +} + +void transceiverAdjustments::setRig(rigCapabilities rig) +{ + this->rigCaps = rig; + ui->IFShiftSlider->setVisible(rigCaps.hasIFShift); + ui->IFShiftLabel->setVisible(rigCaps.hasIFShift); + + ui->TPBFInnerSlider->setVisible(rigCaps.hasTBPF); + ui->TPBFInnerLabel->setVisible(rigCaps.hasTBPF); + + ui->TPBFOuterSlider->setVisible(rigCaps.hasTBPF); + ui->TPBFInnerLabel->setVisible(rigCaps.hasTBPF); + + haveRigCaps = true; +} + +// These are accessed by wfmain when we receive new values from rigCommander: +void transceiverAdjustments::updateIFShift(unsigned char level) +{ + ui->IFShiftSlider->blockSignals(true); + ui->IFShiftSlider->setValue(level); + ui->IFShiftSlider->blockSignals(false); +} + +void transceiverAdjustments::updateTPBFInner(unsigned char level) +{ + ui->TPBFInnerSlider->blockSignals(true); + ui->TPBFInnerSlider->setValue(level); + ui->TPBFInnerSlider->blockSignals(false); +} + +void transceiverAdjustments::updateTPBFOuter(unsigned char level) +{ + ui->TPBFOuterSlider->blockSignals(true); + ui->TPBFOuterSlider->setValue(level); + ui->TPBFOuterSlider->blockSignals(false); +} diff --git a/transceiveradjustments.h b/transceiveradjustments.h index 2eee158..2411d4d 100644 --- a/transceiveradjustments.h +++ b/transceiveradjustments.h @@ -2,6 +2,8 @@ #define TRANSCEIVERADJUSTMENTS_H #include +#include "rigidentities.h" + namespace Ui { class transceiverAdjustments; @@ -15,8 +17,29 @@ public: explicit transceiverAdjustments(QWidget *parent = 0); ~transceiverAdjustments(); +signals: + void setIFShift(unsigned char level); + void setTPBFInner(unsigned char level); + void setTPBFOuter(unsigned char level); + +public slots: + void setRig(rigCapabilities rig); + void updateIFShift(unsigned char level); + void updateTPBFInner(unsigned char level); + void updateTPBFOuter(unsigned char level); + +private slots: + + void on_IFShiftSlider_valueChanged(int value); + + void on_TPBFInnerSlider_valueChanged(int value); + + void on_TPBFOuterSlider_valueChanged(int value); + private: Ui::transceiverAdjustments *ui; + rigCapabilities rigCaps; + bool haveRigCaps = false; }; #endif // TRANSCEIVERADJUSTMENTS_H diff --git a/transceiveradjustments.ui b/transceiveradjustments.ui index 9e8bb32..415b7bb 100644 --- a/transceiveradjustments.ui +++ b/transceiveradjustments.ui @@ -6,8 +6,8 @@ 0 0 - 680 - 339 + 832 + 337 @@ -194,16 +194,16 @@ - + - + Qt::Vertical - + IF Shift @@ -211,6 +211,72 @@ + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + 255 + + + Qt::Vertical + + + + + + + PBF Inner + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + 255 + + + Qt::Vertical + + + + + + + PBF Outer + + + + + diff --git a/wfmain.cpp b/wfmain.cpp index 95d8353..c338533 100644 --- a/wfmain.cpp +++ b/wfmain.cpp @@ -291,6 +291,9 @@ void wfmain::rigConnections() connect(this, SIGNAL(getRfGain()), rig, SLOT(getRfGain())); connect(this, SIGNAL(getAfGain()), rig, SLOT(getAfGain())); connect(this, SIGNAL(getSql()), rig, SLOT(getSql())); + connect(this, SIGNAL(getIfShift()), rig, SLOT(getIFShift())); + connect(this, SIGNAL(getTPBFInner()), rig, SLOT(getTPBFInner())); + connect(this, SIGNAL(getTPBFOuter()), rig, SLOT(getTPBFOuter())); connect(this, SIGNAL(getTxPower()), rig, SLOT(getTxLevel())); connect(this, SIGNAL(getMicGain()), rig, SLOT(getMicGain())); connect(this, SIGNAL(getSpectrumRefLevel()), rig, SLOT(getSpectrumRefLevel())); @@ -301,6 +304,9 @@ void wfmain::rigConnections() connect(this, SIGNAL(setRfGain(unsigned char)), rig, SLOT(setRfGain(unsigned char))); connect(this, SIGNAL(setAfGain(unsigned char)), rig, SLOT(setAfGain(unsigned char))); connect(this, SIGNAL(setSql(unsigned char)), rig, SLOT(setSquelch(unsigned char))); + connect(this, SIGNAL(setIFShift(unsigned char)), rig, SLOT(setIFShift(unsigned char))); + connect(this, SIGNAL(setTPBFInner(unsigned char)), rig, SLOT(setTPBFInner(unsigned char))); + connect(this, SIGNAL(setTPBFOuter(unsigned char)), rig, SLOT(setTPBFOuter(unsigned char))); connect(this, SIGNAL(setTxPower(unsigned char)), rig, SLOT(setTxPower(unsigned char))); connect(this, SIGNAL(setMicGain(unsigned char)), rig, SLOT(setMicGain(unsigned char))); connect(this, SIGNAL(setMonitorLevel(unsigned char)), rig, SLOT(setMonitorLevel(unsigned char))); @@ -313,6 +319,9 @@ void wfmain::rigConnections() connect(rig, SIGNAL(haveRfGain(unsigned char)), this, SLOT(receiveRfGain(unsigned char))); connect(rig, SIGNAL(haveAfGain(unsigned char)), this, SLOT(receiveAfGain(unsigned char))); connect(rig, SIGNAL(haveSql(unsigned char)), this, SLOT(receiveSql(unsigned char))); + connect(rig, SIGNAL(haveIFShift(unsigned char)), trxadj, SLOT(updateIFShift(unsigned char))); + connect(rig, SIGNAL(haveTPBFInner(unsigned char)), trxadj, SLOT(updateTPBFInner(unsigned char))); + connect(rig, SIGNAL(haveTPBFOuter(unsigned char)), trxadj, SLOT(updateTPBFOuter(unsigned char))); connect(rig, SIGNAL(haveTxPower(unsigned char)), this, SLOT(receiveTxPower(unsigned char))); connect(rig, SIGNAL(haveMicGain(unsigned char)), this, SLOT(receiveMicGain(unsigned char))); connect(rig, SIGNAL(haveSpectrumRefLevel(int)), this, SLOT(receiveSpectrumRefLevel(int))); @@ -802,6 +811,20 @@ void wfmain::setupMainUI() [=](const int &newValue) { statusFromSliderRaw("Waterfall Length", newValue);} ); + connect(this->trxadj, &transceiverAdjustments::setIFShift, + [=](const unsigned char &newValue) { issueCmd(cmdSetIFShift, newValue);} + ); + + connect(this->trxadj, &transceiverAdjustments::setTPBFInner, + [=](const unsigned char &newValue) { issueCmd(cmdSetTPBFInner, newValue);} + ); + + connect(this->trxadj, &transceiverAdjustments::setTPBFOuter, + [=](const unsigned char &newValue) { issueCmd(cmdSetTPBFOuter, newValue);} + ); + + + } void wfmain::updateSizes(int tabIndex) @@ -2203,6 +2226,14 @@ void wfmain:: getInitialRigState() issueDelayedCommand(cmdGetRitEnabled); issueDelayedCommand(cmdGetRitValue); + if(rigCaps.hasIFShift) + issueDelayedCommand(cmdGetIFShift); + if(rigCaps.hasTBPF) + { + issueDelayedCommand(cmdGetTPBFInner); + issueDelayedCommand(cmdGetTPBFOuter); + } + if(rigCaps.hasSpectrum) { issueDelayedCommand(cmdGetSpectrumMode); @@ -2404,6 +2435,24 @@ void wfmain::doCmd(commandtype cmddata) emit setSql(sqlLevel); break; } + case cmdSetIFShift: + { + unsigned char IFShiftLevel = (*std::static_pointer_cast(data)); + emit setIFShift(IFShiftLevel); + break; + } + case cmdSetTPBFInner: + { + unsigned char innterLevel = (*std::static_pointer_cast(data)); + emit setTPBFInner(innterLevel); + break; + } + case cmdSetTPBFOuter: + { + unsigned char outerLevel = (*std::static_pointer_cast(data)); + emit setTPBFOuter(outerLevel); + break; + } case cmdSetPTT: { bool pttrequest = (*std::static_pointer_cast(data)); @@ -2546,6 +2595,15 @@ void wfmain::doCmd(cmds cmd) case cmdGetSql: emit getSql(); break; + case cmdGetIFShift: + emit getIfShift(); + break; + case cmdGetTPBFInner: + emit getTPBFInner(); + break; + case cmdGetTPBFOuter: + emit getTPBFOuter(); + break; case cmdGetTxPower: emit getTxPower(); break; @@ -2871,6 +2929,7 @@ void wfmain::receiveRigID(rigCapabilities rigCaps) // Added so that server receives rig capabilities. emit sendRigCaps(rigCaps); rpt->setRig(rigCaps); + trxadj->setRig(rigCaps); // Set the mode combo box up: @@ -2992,6 +3051,7 @@ void wfmain::receiveRigID(rigCapabilities rigCaps) setBandButtons(); + ui->tuneEnableChk->setEnabled(rigCaps.hasATU); ui->tuneNowBtn->setEnabled(rigCaps.hasATU); @@ -4054,6 +4114,21 @@ void wfmain::receiveSql(unsigned char level) ui->sqlSlider->setValue(level); } +void wfmain::receiveIFShift(unsigned char level) +{ + trxadj->updateIFShift(level); +} + +void wfmain::receiveTBPFInner(unsigned char level) +{ + trxadj->updateTPBFInner(level); +} + +void wfmain::receiveTBPFOuter(unsigned char level) +{ + trxadj->updateTPBFOuter(level); +} + void wfmain::on_tuneNowBtn_clicked() { issueDelayedCommand(cmdStartATU); @@ -4315,6 +4390,19 @@ void wfmain::on_sqlSlider_valueChanged(int value) issueCmd(cmdSetSql, (unsigned char)value); //emit setSql((unsigned char)value); } +// These three are from the transceiver adjustment window: +void wfmain::changeIFShift(unsigned char level) +{ + issueCmd(cmdSetIFShift, level); +} +void wfmain::changeTPBFInner(unsigned char level) +{ + issueCmd(cmdSetTPBFInner, level); +} +void wfmain::changeTPBFOuter(unsigned char level) +{ + issueCmd(cmdSetTPBFOuter, level); +} void wfmain::on_modeFilterCombo_activated(int index) { @@ -5343,7 +5431,7 @@ void wfmain::on_rigctldPortTxt_editingFinished() void wfmain::on_debugBtn_clicked() { qInfo(logSystem()) << "Debug button pressed."; - //trxadj->show(); + trxadj->show(); //setRadioTimeDatePrep(); //wf->setInteraction(QCP::iRangeZoom, true); //wf->setInteraction(QCP::iRangeDrag, true); diff --git a/wfmain.h b/wfmain.h index b921b9c..ac66e8e 100644 --- a/wfmain.h +++ b/wfmain.h @@ -85,6 +85,9 @@ signals: void getRfGain(); void getAfGain(); void getSql(); + void getIfShift(); + void getTPBFInner(); + void getTPBFOuter(); void getTxPower(); void getMicGain(); void getSpectrumRefLevel(); @@ -94,6 +97,13 @@ signals: void setRfGain(unsigned char level); void setAfGain(unsigned char level); void setSql(unsigned char level); + void setIFShift(unsigned char level); + void setTPBFInner(unsigned char level); + void setTPBFOuter(unsigned char level); + + void setIFShiftWindow(unsigned char level); + void setTPBFInnerWindow(unsigned char level); + void setTPBFOuterWindow(unsigned char level); void setMicGain(unsigned char); void setCompLevel(unsigned char); void setTxPower(unsigned char); @@ -213,6 +223,13 @@ private slots: void receiveRfGain(unsigned char level); void receiveAfGain(unsigned char level); void receiveSql(unsigned char level); + void receiveIFShift(unsigned char level); + void receiveTBPFInner(unsigned char level); + void receiveTBPFOuter(unsigned char level); + // 'change' from data in transceiver controls window: + void changeIFShift(unsigned char level); + void changeTPBFInner(unsigned char level); + void changeTPBFOuter(unsigned char level); void receiveTxPower(unsigned char power); void receiveMicGain(unsigned char gain); void receiveCompLevel(unsigned char compLevel); @@ -600,13 +617,18 @@ private: unsigned char setModeVal=0; unsigned char setFilterVal=0; - enum cmds {cmdNone, cmdGetRigID, cmdGetRigCIV, cmdGetFreq, cmdSetFreq, cmdGetMode, cmdSetMode, cmdGetDataMode, cmdSetModeFilter, - cmdSetDataModeOn, cmdSetDataModeOff, cmdGetRitEnabled, cmdGetRitValue, + enum cmds {cmdNone, cmdGetRigID, cmdGetRigCIV, cmdGetFreq, cmdSetFreq, cmdGetMode, cmdSetMode, + cmdGetDataMode, cmdSetModeFilter, cmdSetDataModeOn, cmdSetDataModeOff, cmdGetRitEnabled, cmdGetRitValue, cmdSpecOn, cmdSpecOff, cmdDispEnable, cmdDispDisable, cmdGetRxGain, cmdSetRxRfGain, cmdGetAfGain, cmdSetAfGain, - cmdGetSql, cmdSetSql, cmdGetATUStatus, cmdSetATU, cmdStartATU, cmdGetSpectrumMode, cmdGetSpectrumSpan, cmdScopeCenterMode, cmdScopeFixedMode, cmdGetPTT, cmdSetPTT, - cmdGetTxPower, cmdSetTxPower, cmdGetMicGain, cmdSetMicGain, cmdSetModLevel, cmdGetSpectrumRefLevel, cmdGetDuplexMode, cmdGetModInput, cmdGetModDataInput, + cmdGetSql, cmdSetSql, cmdGetIFShift, cmdSetIFShift, cmdGetTPBFInner, cmdSetTPBFInner, + cmdGetTPBFOuter, cmdSetTPBFOuter, cmdGetATUStatus, + cmdSetATU, cmdStartATU, cmdGetSpectrumMode, + cmdGetSpectrumSpan, cmdScopeCenterMode, cmdScopeFixedMode, cmdGetPTT, cmdSetPTT, + cmdGetTxPower, cmdSetTxPower, cmdGetMicGain, cmdSetMicGain, cmdSetModLevel, + cmdGetSpectrumRefLevel, cmdGetDuplexMode, cmdGetModInput, cmdGetModDataInput, cmdGetCurrentModLevel, cmdStartRegularPolling, cmdStopRegularPolling, cmdQueNormalSpeed, - cmdGetVdMeter, cmdGetIdMeter, cmdGetSMeter, cmdGetCenterMeter, cmdGetPowerMeter, cmdGetSWRMeter, cmdGetALCMeter, cmdGetCompMeter, cmdGetTxRxMeter, + cmdGetVdMeter, cmdGetIdMeter, cmdGetSMeter, cmdGetCenterMeter, cmdGetPowerMeter, + cmdGetSWRMeter, cmdGetALCMeter, cmdGetCompMeter, cmdGetTxRxMeter, cmdGetTone, cmdGetTSQL, cmdGetDTCS, cmdGetRptAccessMode, cmdGetPreamp, cmdGetAttenuator, cmdGetAntenna, cmdSetTime, cmdSetDate, cmdSetUTCOffset}; diff --git a/wfmain.ui b/wfmain.ui index f392fd8..0194a6a 100644 --- a/wfmain.ui +++ b/wfmain.ui @@ -6,7 +6,7 @@ 0 0 - 934 + 941 582 @@ -18,7 +18,7 @@ - 3 + 0 @@ -2814,8 +2814,8 @@ 0 0 - 934 - 21 + 941 + 22