From e38c1f0e327a73888cad1b21c4a1e11eac414943 Mon Sep 17 00:00:00 2001 From: Phil Taylor Date: Mon, 15 May 2023 13:47:45 +0100 Subject: [PATCH] Standardize some names --- cwsender.cpp | 2 +- cwsender.h | 4 +- debugwindow.cpp | 4 +- freqmemory.cpp | 2 +- freqmemory.h | 8 +-- meter.cpp | 4 +- meter.h | 6 +- prefs.h | 2 +- repeatersetup.cpp | 22 +++---- repeatersetup.h | 20 +++--- rigcommander.cpp | 82 +++++++++++------------ rigcommander.h | 28 ++++---- rigctld.cpp | 4 +- rigctld.h | 2 +- rigidentities.h | 11 +++- rigstate.h | 6 +- sidebandchooser.h | 2 +- usbcontroller.h | 4 +- wfmain.cpp | 162 +++++++++++++++++++++++----------------------- wfmain.h | 76 ++++++++-------------- wfmain.ui | 2 +- wfviewtypes.h | 43 ++++++++---- 22 files changed, 250 insertions(+), 246 deletions(-) diff --git a/cwsender.cpp b/cwsender.cpp index 8307977..2ff4bad 100644 --- a/cwsender.cpp +++ b/cwsender.cpp @@ -109,7 +109,7 @@ void cwSender::handleBreakInMode(unsigned char b) } } -void cwSender::handleCurrentModeUpdate(mode_kind mode) +void cwSender::handleCurrentModeUpdate(mode_t mode) { this->currentMode = mode; if( (currentMode==modeCW) || (currentMode==modeCW_R) ) diff --git a/cwsender.h b/cwsender.h index 5c4e0ed..717527d 100644 --- a/cwsender.h +++ b/cwsender.h @@ -53,7 +53,7 @@ public slots: void handleDashRatio(unsigned char ratio); void handlePitch(unsigned char pitch); void handleBreakInMode(unsigned char b); - void handleCurrentModeUpdate(mode_kind mode); + void handleCurrentModeUpdate(mode_t mode); private slots: void on_sendBtn_clicked(); @@ -104,7 +104,7 @@ private: QString macroText[11]; int sequenceNumber = 1; int lastSentPos = 0; - mode_kind currentMode; + mode_t currentMode; int sidetoneLevel=0; void processMacroButton(int buttonNumber, QPushButton *btn); void runMacroButton(int buttonNumber); diff --git a/debugwindow.cpp b/debugwindow.cpp index c693e38..c935d89 100644 --- a/debugwindow.cpp +++ b/debugwindow.cpp @@ -117,9 +117,9 @@ QString debugWindow::getValue(QVariant val) { value = QString("Gr: %0 Me: %1").arg(val.value() >> 16 & 0xffff).arg(val.value() & 0xffff); } - else if (!strcmp(val.typeName(),"mode_info")) + else if (!strcmp(val.typeName(),"modeInfo")) { - mode_info mi = val.value(); + modeInfo mi = val.value(); value = QString("%0(V:%1) D:%2 F%3").arg(mi.name).arg(mi.VFO).arg(mi.data).arg(mi.filter); } else if(!strcmp(val.typeName(),"freqt")) diff --git a/freqmemory.cpp b/freqmemory.cpp index 660a8f8..7c6c4fe 100644 --- a/freqmemory.cpp +++ b/freqmemory.cpp @@ -25,7 +25,7 @@ void freqMemory::initializePresets() } } -void freqMemory::setPreset(unsigned int index, double frequency, mode_kind mode) +void freqMemory::setPreset(unsigned int index, double frequency, mode_t mode) { if(index <= maxIndex) { diff --git a/freqmemory.h b/freqmemory.h index e7ccf76..748adf7 100644 --- a/freqmemory.h +++ b/freqmemory.h @@ -9,7 +9,7 @@ struct preset_kind { // QString comment; // unsigned int index; // channel number double frequency; - mode_kind mode; + mode_t mode; bool isSet; }; @@ -17,9 +17,9 @@ class freqMemory { public: freqMemory(); - void setPreset(unsigned int index, double frequency, mode_kind mode); - void setPreset(unsigned int index, double frequency, mode_kind mode, QString name); - void setPreset(unsigned int index, double frequency, mode_kind mode, QString name, QString comment); + void setPreset(unsigned int index, double frequency, mode_t mode); + void setPreset(unsigned int index, double frequency, mode_t mode, QString name); + void setPreset(unsigned int index, double frequency, mode_t mode, QString name, QString comment); void dumpMemory(); unsigned int getNumPresets(); preset_kind getPreset(unsigned int index); diff --git a/meter.cpp b/meter.cpp index 25990e0..c9c1183 100644 --- a/meter.cpp +++ b/meter.cpp @@ -101,7 +101,7 @@ void meter::clearMeter() update(); } -void meter::setMeterType(meterKind type) +void meter::setMeterType(meter_t type) { if(type == meterType) return; @@ -111,7 +111,7 @@ void meter::setMeterType(meterKind type) this->clearMeter(); } -meterKind meter::getMeterType() +meter_t meter::getMeterType() { return meterType; } diff --git a/meter.h b/meter.h index 4e03ced..36c85bf 100644 --- a/meter.h +++ b/meter.h @@ -28,10 +28,10 @@ public slots: void setLevel(int current); void clearMeterOnPTTtoggle(); void clearMeter(); - void setMeterType(meterKind type); + void setMeterType(meter_t type); void setMeterShortString(QString); QString getMeterShortString(); - meterKind getMeterType(); + meter_t getMeterType(); void setColors(QColor current, QColor peakScale, QColor peakLevel, QColor average, QColor lowLine, QColor lowText); @@ -39,7 +39,7 @@ public slots: private: //QPainter painter; - meterKind meterType; + meter_t meterType; QString meterShortString; int fontSize = 10; int length=30; diff --git a/prefs.h b/prefs.h index 35764e3..9a04aaa 100644 --- a/prefs.h +++ b/prefs.h @@ -30,7 +30,7 @@ struct preferences { unsigned int wflength; bool confirmExit; bool confirmPowerOff; - meterKind meter2Type; + meter_t meter2Type; bool clickDragTuningEnable; // Radio: diff --git a/repeatersetup.cpp b/repeatersetup.cpp index e666d74..a49dc05 100644 --- a/repeatersetup.cpp +++ b/repeatersetup.cpp @@ -275,7 +275,7 @@ void repeaterSetup::populateDTCS() ui->rptDTCSCombo->addItem("754", quint16(754)); } -void repeaterSetup::receiveDuplexMode(duplexMode dm) +void repeaterSetup::receiveDuplexMode(duplexMode_t dm) { currentdm = dm; ui->splitEnableChk->blockSignals(true); @@ -314,7 +314,7 @@ void repeaterSetup::receiveDuplexMode(duplexMode dm) ui->splitEnableChk->blockSignals(false); } -void repeaterSetup::handleRptAccessMode(rptAccessTxRx tmode) +void repeaterSetup::handleRptAccessMode(rptAccessTxRx_t tmode) { // ratrXY // X = Transmit (T)one or (N)one or (D)CS @@ -406,7 +406,7 @@ void repeaterSetup::handleUpdateCurrentMainFrequency(freqt mainfreq) this->currentMainFrequency = mainfreq; } -void repeaterSetup::handleUpdateCurrentMainMode(mode_info m) +void repeaterSetup::handleUpdateCurrentMainMode(modeInfo m) { // Used to set the secondary VFO to the same mode // (generally FM) @@ -542,8 +542,8 @@ void repeaterSetup::on_rptDTCSCombo_activated(int index) void repeaterSetup::on_toneNone_clicked() { - rptAccessTxRx rm; - rptrAccessData_t rd; + rptAccessTxRx_t rm; + rptrAccessData rd; rm = ratrNN; rd.accessMode = rm; emit setRptAccessMode(rd); @@ -558,8 +558,8 @@ void repeaterSetup::on_toneNone_clicked() void repeaterSetup::on_toneTone_clicked() { - rptAccessTxRx rm; - rptrAccessData_t rd; + rptAccessTxRx_t rm; + rptrAccessData rd; rm = ratrTN; rd.accessMode = rm; rptrTone_t rt; @@ -580,8 +580,8 @@ void repeaterSetup::on_toneTone_clicked() void repeaterSetup::on_toneTSQL_clicked() { - rptAccessTxRx rm; - rptrAccessData_t rd; + rptAccessTxRx_t rm; + rptrAccessData rd; rm = ratrTT; rptrTone_t rt; rt.tone = (quint16)ui->rptToneCombo->currentData().toUInt(); @@ -601,7 +601,7 @@ void repeaterSetup::on_toneTSQL_clicked() void repeaterSetup::on_toneDTCS_clicked() { - rptrAccessData_t rd; + rptrAccessData rd; quint16 dcode=0; rd.accessMode = ratrDD; @@ -795,7 +795,7 @@ void repeaterSetup::on_setRptrSubVFOBtn_clicked() { // Perhaps not needed // Set the secondary VFO to the selected repeater mode - rptrAccessData_t rd; + rptrAccessData rd; rd.useSecondaryVFO = true; if(ui->toneTone->isChecked()) diff --git a/repeatersetup.h b/repeatersetup.h index 52650e3..792ba24 100644 --- a/repeatersetup.h +++ b/repeatersetup.h @@ -22,14 +22,14 @@ public: signals: void getDuplexMode(); - void setDuplexMode(duplexMode dm); + void setDuplexMode(duplexMode_t dm); void setTone(rptrTone_t tone); void setTSQL(rptrTone_t tsql); void setDTCS(quint16 dcode, bool tinv, bool rinv); void getTone(); void getTSQL(); void getDTCS(); - void setRptAccessMode(rptrAccessData_t rd); + void setRptAccessMode(rptrAccessData rd); void getRptAccessMode(); void setRptDuplexOffset(freqt f); void getRptDuplexOffset(); @@ -37,10 +37,10 @@ signals: void getSplitModeEnabled(); void setQuickSplit(bool qsOn); void getTransmitFrequency(); - // Use the duplexMode to communicate split. + // Use the duplexMode_t to communicate split. // void setSplitModeEnabled(bool splitEnabled); void setTransmitFrequency(freqt transmitFreq); - void setTransmitMode(mode_info m); + void setTransmitMode(modeInfo m); // VFO: void selectVFO(vfo_t v); // A,B,M,S void equalizeVFOsAB(); @@ -48,15 +48,15 @@ signals: void swapVFOs(); public slots: - void receiveDuplexMode(duplexMode dm); - void handleRptAccessMode(rptAccessTxRx tmode); + void receiveDuplexMode(duplexMode_t dm); + void handleRptAccessMode(rptAccessTxRx_t tmode); void handleTone(quint16 tone); void handleTSQL(quint16 tsql); void handleDTCS(quint16 dcscode, bool tinv, bool rinv); // void handleSplitMode(bool splitEnabled); // void handleSplitFrequency(freqt transmitFreq); void handleUpdateCurrentMainFrequency(freqt mainfreq); - void handleUpdateCurrentMainMode(mode_info m); + void handleUpdateCurrentMainMode(modeInfo m); void handleTransmitStatus(bool amTransmitting); void handleRptOffsetFrequency(freqt f); @@ -121,9 +121,9 @@ private: rigCapabilities rig; bool haveRig = false; - duplexMode currentdm; - mode_info currentModeMain; - mode_info modeTransmitVFO; + duplexMode_t currentdm; + modeInfo currentModeMain; + modeInfo modeTransmitVFO; freqt currentOffset; bool usedPlusSplit = false; bool amTransmitting = false; diff --git a/rigcommander.cpp b/rigcommander.cpp index 1458a1f..40e1475 100644 --- a/rigcommander.cpp +++ b/rigcommander.cpp @@ -554,7 +554,7 @@ void rigCommander::setScopeSpan(char span) } } -void rigCommander::setSpectrumMode(spectrumMode spectMode) +void rigCommander::setspectrumMode_t(spectrumMode_t spectMode) { QByteArray payload; unsigned char vfo = '\x00'; @@ -611,7 +611,7 @@ void rigCommander::getSpectrumCenterMode() } } -void rigCommander::getSpectrumMode() +void rigCommander::getspectrumMode_t() { QByteArray payload; if (getCommand(funcScopeCenterFixed,payload)) @@ -786,7 +786,7 @@ void rigCommander::setRitValue(int ritValue) } } -void rigCommander::setMode(mode_info m) +void rigCommander::setMode(modeInfo m) { foreach (auto&& filter, rigCaps.filters) { @@ -831,11 +831,11 @@ void rigCommander::setMode(mode_info m) void rigCommander::setMode(unsigned char mode, unsigned char modeFilter) { - foreach (mode_info m, rigCaps.modes) + foreach (modeInfo m, rigCaps.modes) { if (m.reg == mode) { - mode_info mi = mode_info(m); + modeInfo mi = modeInfo(m); mi.filter = modeFilter; mi.VFO=selVFO_t::activeVFO; setMode(mi); @@ -948,7 +948,7 @@ void rigCommander::setSplit(bool splitEnabled) } } -void rigCommander::setDuplexMode(duplexMode dm) +void rigCommander::setDuplexMode(duplexMode_t dm) { QByteArray payload; if (getCommand(funcDuplexStatus,payload,static_cast(dm))) @@ -1001,7 +1001,7 @@ void rigCommander::setPassband(quint16 pass) // Passband may be fixed? unsigned char mode = state.getChar(MODE); - foreach (mode_info m, rigCaps.modes) + foreach (modeInfo m, rigCaps.modes) { if (m.reg == mode && m.bw) { QByteArray payload; @@ -1046,7 +1046,7 @@ void rigCommander::getPassband() { // Passband may be fixed? unsigned char mode = state.getChar(MODE); - foreach (mode_info m, rigCaps.modes) + foreach (modeInfo m, rigCaps.modes) { if (m.reg == mode && m.bw) { @@ -1287,14 +1287,14 @@ void rigCommander::getRptAccessMode() } } -void rigCommander::setRptAccessMode(rptAccessTxRx ratr) +void rigCommander::setRptAccessMode(rptAccessTxRx_t ratr) { - rptrAccessData_t rd; + rptrAccessData rd; rd.accessMode = ratr; setRptAccessMode(rd); } -void rigCommander::setRptAccessMode(rptrAccessData_t rd) +void rigCommander::setRptAccessMode(rptrAccessData rd) { // NB: This function is the only recommended // function to be used for toggling tone and tone squelch. @@ -2019,7 +2019,7 @@ void rigCommander::parseCommand() case funcModeGet: case funcModeTR: { - mode_info m; + modeInfo m; m = parseMode(payloadIn[1], m.filter); if(payloadIn[2] != '\xFD') { @@ -2033,7 +2033,7 @@ void rigCommander::parseCommand() case funcSelectedMode: case funcUnselectedMode: { - mode_info m; + modeInfo m; // New format payload with mode+datamode+filter m = parseMode(uchar(payloadIn[2]), uchar(payloadIn[4])); m.data = bool(payloadIn[3]); @@ -2162,7 +2162,7 @@ void rigCommander::parseCommand() break; case funcMainSubTracking: case funcToneSquelchType: - emit haveRptAccessMode((rptAccessTxRx)payloadIn.at(2)); + emit haveRptAccessMode((rptAccessTxRx_t)payloadIn.at(2)); break; case funcIPPlus: break; @@ -2198,11 +2198,11 @@ void rigCommander::parseCommand() } case funcDataModeWithFilter: { - mode_info m; + modeInfo m; m.data = static_cast(payloadIn[2]); if (payloadIn[3] != '\xfd') m.filter = static_cast(payloadIn[3]); - value.setValue(static_cast(m)); + value.setValue(static_cast(m)); break; } case funcAFMute: @@ -2294,8 +2294,8 @@ void rigCommander::parseCommand() // [1] 0x14 // [2] 0x00 // [3] 0x00 (center), 0x01 (fixed), 0x02, 0x03 - value.setValue(static_cast(uchar(payloadIn[3]))); - //emit haveSpectrumMode(static_cast((unsigned char)payloadIn[3])); + value.setValue(static_cast(uchar(payloadIn[3]))); + //emit havespectrumMode_t(static_cast((unsigned char)payloadIn[3])); break; case funcScopeCenterSpan: { @@ -2471,11 +2471,11 @@ bool rigCommander::parseMemory(QVector* memParser, memoryType* mem->datamodeB=data[0]; break; case 'j': // combined duplex and tonemode - mem->duplex=duplexMode(quint8(data[0] >> 4 & 0x0f)); + mem->duplex=duplexMode_t(quint8(data[0] >> 4 & 0x0f)); mem->tonemode=quint8(quint8(data[0] & 0x0f)); break; case 'J': // combined duplex and tonemodeB - mem->duplexB=duplexMode((data[0] >> 4 & 0x0f)); + mem->duplexB=duplexMode_t((data[0] >> 4 & 0x0f)); mem->tonemodeB=data[0] & 0x0f; break; case 'k': // combined datamode and tonemode @@ -2760,7 +2760,7 @@ void rigCommander::setPBTInner(unsigned char level) QByteArray payload; // Passband may be fixed? unsigned char mode = state.getChar(MODE); - foreach (mode_info m, rigCaps.modes) + foreach (modeInfo m, rigCaps.modes) { if (m.reg == mode) { @@ -2781,7 +2781,7 @@ void rigCommander::setPBTOuter(unsigned char level) QByteArray payload; // Passband may be fixed? unsigned char mode = state.getChar(MODE); - foreach (mode_info m, rigCaps.modes) + foreach (modeInfo m, rigCaps.modes) { if (m.reg == mode) { @@ -3334,7 +3334,7 @@ void rigCommander::getPBTInner() { // Passband may be fixed? unsigned char mode = state.getChar(MODE); - foreach (mode_info m, rigCaps.modes) + foreach (modeInfo m, rigCaps.modes) { if (m.reg == mode) { if (m.bw) { @@ -3353,7 +3353,7 @@ void rigCommander::getPBTOuter() { // Passband may be fixed? unsigned char mode = state.getChar(MODE); - foreach (mode_info m, rigCaps.modes) + foreach (modeInfo m, rigCaps.modes) { if (m.reg == mode) { if (m.bw) { @@ -3463,7 +3463,7 @@ void rigCommander::getLevels() // getAntiVoxGain(); // 0x17 } -void rigCommander::getMeters(meterKind meter) +void rigCommander::getMeters(meter_t meter) { switch(meter) { @@ -4273,9 +4273,9 @@ void rigCommander::parseWFData() } -mode_info rigCommander::createMode(mode_kind m, unsigned char reg, QString name, bool bw) +modeInfo rigCommander::createMode(mode_t m, unsigned char reg, QString name, bool bw) { - mode_info mode; + modeInfo mode; mode.mk = m; mode.reg = reg; mode.name = name; @@ -4395,7 +4395,7 @@ void rigCommander::determineRigCaps() for (int c = 0; c < numModes; c++) { settings->setArrayIndex(c); - rigCaps.modes.push_back(mode_info(mode_kind(settings->value("Num", 0).toUInt()), + rigCaps.modes.push_back(modeInfo(mode_t(settings->value("Num", 0).toUInt()), settings->value("Reg", 0).toString().toUInt(nullptr,16), settings->value("Name", "").toString(), settings->value("BW", 0).toBool())); } settings->endArray(); @@ -5536,7 +5536,7 @@ bool rigCommander::parseSpectrum(scopeData& d) if ((sequence == 1) && (sequence < rigCaps.spectSeqMax)) { - spectrumMode scopeMode = (spectrumMode)bcdHexToUChar(payloadIn[05]); // 0=center, 1=fixed + spectrumMode_t scopeMode = (spectrumMode_t)bcdHexToUChar(payloadIn[05]); // 0=center, 1=fixed if(scopeMode != oldScopeMode) { @@ -5546,7 +5546,7 @@ bool rigCommander::parseSpectrum(scopeData& d) // 0x01 Fixed // 0x02 Scroll-C // 0x03 Scroll-F - emit haveSpectrumMode(scopeMode); + emit havespectrumMode_t(scopeMode); oldScopeMode = scopeMode; } @@ -5864,15 +5864,15 @@ quint64 rigCommander::parseFreqDataToInt(QByteArray data) } -mode_info rigCommander::parseMode(quint8 mode, quint8 filter) +modeInfo rigCommander::parseMode(quint8 mode, quint8 filter) { - mode_info mi; + modeInfo mi; bool found=false; foreach (auto& m, rigCaps.modes) { if (m.reg == mode) { - mi = mode_info(m); + mi = modeInfo(m); found = true; break; } @@ -6835,7 +6835,7 @@ uchar rigCommander::makeFilterWidth(ushort pass) unsigned char mode = state.getChar(MODE); uchar payload=0; - foreach (mode_info m, rigCaps.modes) + foreach (modeInfo m, rigCaps.modes) { if (m.reg == mode && m.bw) { uchar calc; @@ -6925,18 +6925,18 @@ void rigCommander::receiveCommand(queueItemType type, funcs func, QVariant value } payload.append(bcdEncodeInt(value.value() & 0xffff)); } - else if (!strcmp(value.typeName(),"mode_info")) + else if (!strcmp(value.typeName(),"modeInfo")) { if (func == funcDataModeWithFilter) { - payload.append(value.value().data); - if (value.value().data != 0) - payload.append(value.value().filter); + payload.append(value.value().data); + if (value.value().data != 0) + payload.append(value.value().filter); } else { - payload.append(value.value().reg); + payload.append(value.value().reg); if (func == funcSelectedMode || func == funcUnselectedMode) - payload.append(value.value().data); - payload.append(value.value().filter); + payload.append(value.value().data); + payload.append(value.value().filter); } } else if(!strcmp(value.typeName(),"freqt")) diff --git a/rigcommander.h b/rigcommander.h index 1ec7d85..1482c91 100644 --- a/rigcommander.h +++ b/rigcommander.h @@ -61,9 +61,9 @@ public slots: void enableSpectrumDisplay(); void disableSpectrumDisplay(); void setSpectrumBounds(double startFreq, double endFreq, unsigned char edgeNumber); - void setSpectrumMode(spectrumMode spectMode); + void setspectrumMode_t(spectrumMode_t spectMode); void getSpectrumCenterMode(); - void getSpectrumMode(); + void getspectrumMode_t(); void setSpectrumRefLevel(int level); void getSpectrumRefLevel(); void getSpectrumRefLevel(unsigned char mainSub); @@ -84,7 +84,7 @@ public slots: void equalizeVFOsMS(); void exchangeVFOs(); void setMode(unsigned char mode, unsigned char modeFilter); - void setMode(mode_info); + void setMode(modeInfo); void getMode(); void getMode(unsigned char vfo); void setDataMode(bool dataOn, unsigned char filter); @@ -149,7 +149,7 @@ public slots: void setRttyMark(unsigned char mark); // Repeater: - void setDuplexMode(duplexMode dm); + void setDuplexMode(duplexMode_t dm); void getDuplexMode(); void setQuickSplit(bool qsOn); void getTransmitFrequency(); @@ -161,8 +161,8 @@ public slots: void getTone(); void setDTCS(quint16 dcscode, bool tinv, bool rinv); void getDTCS(); - void setRptAccessMode(rptAccessTxRx ratr); - void setRptAccessMode(rptrAccessData_t ratr); + void setRptAccessMode(rptAccessTxRx_t ratr); + void setRptAccessMode(rptrAccessData ratr); void getRptAccessMode(); void setRptDuplexOffset(freqt f); void getRptDuplexOffset(); @@ -243,7 +243,7 @@ public slots: void getCompReductionMeter(); void getVdMeter(); void getIDMeter(); - void getMeters(meterKind meter); // all supported meters per transmit or receive + void getMeters(meter_t meter); // all supported meters per transmit or receive // Rig ID and CIV: void getRigID(); @@ -312,7 +312,7 @@ signals: void haveSpectrumData(QByteArray spectrum, double startFreq, double endFreq); // pass along data to UI void haveSpectrumBounds(); void haveScopeSpan(freqt span, bool isSub); - void haveSpectrumMode(spectrumMode spectmode); + void havespectrumMode_t(spectrumMode_t spectmode); void haveScopeEdge(char edge); void haveSpectrumRefLevel(int level); void haveScopeOutOfRange(bool outOfRange); @@ -335,8 +335,8 @@ signals: void haveTuningStep(unsigned char step); // Repeater: - void haveDuplexMode(duplexMode); - void haveRptAccessMode(rptAccessTxRx ratr); + void haveDuplexMode(duplexMode_t); + void haveRptAccessMode(rptAccessTxRx_t ratr); void haveTone(quint16 tone); void haveTSQL(quint16 tsql); void haveDTCS(quint16 dcscode, bool tinv, bool rinv); @@ -372,7 +372,7 @@ signals: void haveModSrcGain(inputTypes input, unsigned char gain); // Meters: - void haveMeter(meterKind meter, unsigned char level); + void haveMeter(meter_t meter, unsigned char level); void haveSMeter(unsigned char level); void haveRFMeter(unsigned char level); void haveSWRMeter(unsigned char); @@ -441,7 +441,7 @@ private: unsigned char audioLevelTxMean[50]; unsigned char audioLevelTxPeak[50]; - mode_info parseMode(quint8 mode, quint8 filter); + modeInfo parseMode(quint8 mode, quint8 filter); bool parseSpectrum(scopeData& d); void parseWFData(); void parseSpectrumRefLevel(); @@ -464,7 +464,7 @@ private: void debugMe(); void printHex(const QByteArray &pdata); void printHex(const QByteArray &pdata, bool printVert, bool printHoriz); - mode_info createMode(mode_kind m, unsigned char reg, QString name, bool bw); + modeInfo createMode(mode_t m, unsigned char reg, QString name, bool bw); centerSpanData createScopeCenter(centerSpansType s, QString name); commHandler* comm = Q_NULLPTR; @@ -497,7 +497,7 @@ private: quint8 spectSeqMax; quint16 spectAmpMax; quint16 spectLenMax; - spectrumMode oldScopeMode; + spectrumMode_t oldScopeMode; bool wasOutOfRange = false; bool usingNativeLAN; // indicates using OEM LAN connection (705,7610,9700,7850) diff --git a/rigctld.cpp b/rigctld.cpp index ca44bdf..e795b0d 100644 --- a/rigctld.cpp +++ b/rigctld.cpp @@ -267,7 +267,7 @@ void rigCtlClient::socketReadyRead() if (passband > 0) { - switch ((mode_kind)getMode(mode)) { + switch ((mode_t)getMode(mode)) { case modeAM: if (passband > 6000) { @@ -1204,7 +1204,7 @@ void rigCtlClient::socketReadyRead() } else if (command.length() > 0 && (command[0] == '\xf5' || command[0] == "get_rig_info")) { - duplexMode split = rigState->getDuplex(DUPLEX); + duplexMode_t split = rigState->getDuplex(DUPLEX); quint8 rxa = 1; quint8 txa = split == 0; quint8 rxb = !rxa; diff --git a/rigctld.h b/rigctld.h index b766166..02e6ca7 100644 --- a/rigctld.h +++ b/rigctld.h @@ -344,7 +344,7 @@ signals: void setDataMode(bool dataOn, quint8 modeFilter); void setVFO(quint8 vfo); void setSplit(quint8 split); - void setDuplexMode(duplexMode dm); + void setDuplexMode(duplexMode_t dm); void stateUpdated(); // Power void sendPowerOn(); diff --git a/rigidentities.h b/rigidentities.h index 403e18d..203fe3a 100644 --- a/rigidentities.h +++ b/rigidentities.h @@ -136,7 +136,7 @@ struct bandType { availableBands band; quint64 lowFreq; quint64 highFreq; - mode_kind defaultMode; + mode_t defaultMode; double range; int memGroup; }; @@ -224,7 +224,7 @@ struct rigCapabilities { std::vector steps; unsigned char bsr[24] = {0}; - std::vector modes; + std::vector modes; QByteArray transceiveCommand; quint8 guid[GUIDLEN] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; @@ -239,5 +239,12 @@ struct rigCapabilities { QVector satParser; }; +Q_DECLARE_METATYPE(rigCapabilities) +Q_DECLARE_METATYPE(modeInfo) +Q_DECLARE_METATYPE(rigInput) +Q_DECLARE_METATYPE(filterType) +Q_DECLARE_METATYPE(inputTypes) +Q_DECLARE_METATYPE(genericType) +Q_DECLARE_METATYPE(bandType) #endif // RIGIDENTITIES_H diff --git a/rigstate.h b/rigstate.h index 3e7ffea..3c88e8c 100644 --- a/rigstate.h +++ b/rigstate.h @@ -98,8 +98,8 @@ public: _mutex.unlock(); } } - void set(stateTypes s, duplexMode x, bool u) { - if ((x != (duplexMode)map[s]._value) && ((!u && !map[s]._updated) || (u))) { + void set(stateTypes s, duplexMode_t x, bool u) { + if ((x != (duplexMode_t)map[s]._value) && ((!u && !map[s]._updated) || (u))) { _mutex.lock(); map[s]._value = quint64(x); map[s]._valid = true; @@ -127,7 +127,7 @@ public: qint32 getInt32(stateTypes s) { return qint32(map[s]._value); } quint32 getUInt32(stateTypes s) { return quint32(map[s]._value); } quint64 getInt64(stateTypes s) { return map[s]._value; } - duplexMode getDuplex(stateTypes s) { return duplexMode(map[s]._value); } + duplexMode_t getDuplex(stateTypes s) { return duplexMode_t(map[s]._value); } inputTypes getInput(stateTypes s) { return inputTypes(map[s]._value); } QMap map; diff --git a/sidebandchooser.h b/sidebandchooser.h index 93d6b2a..3e02a11 100644 --- a/sidebandchooser.h +++ b/sidebandchooser.h @@ -8,7 +8,7 @@ class sidebandChooser public: sidebandChooser(); - static inline mode_kind getMode(freqt f, mode_kind currentMode = modeUSB) { + static inline mode_t getMode(freqt f, mode_t currentMode = modeUSB) { if((currentMode == modeLSB) || (currentMode == modeUSB) ) { diff --git a/usbcontroller.h b/usbcontroller.h index 64642bb..b1ba153 100644 --- a/usbcontroller.h +++ b/usbcontroller.h @@ -148,7 +148,7 @@ struct COMMAND { index(index), text(text), cmdType(cmdType), command(command), getCommand(getCommand), suffix(suffix) {} COMMAND(int index, QString text, usbCommandType cmdType, int command, availableBands band) : index(index), text(text), cmdType(cmdType), command(command), band(band) {} - COMMAND(int index, QString text, usbCommandType cmdType, int command, mode_kind mode) : + COMMAND(int index, QString text, usbCommandType cmdType, int command, mode_t mode) : index(index), text(text), cmdType(cmdType), command(command), mode(mode) {} int index=0; @@ -159,7 +159,7 @@ struct COMMAND { unsigned char suffix=0x0; int value=0; availableBands band=bandGen; - mode_kind mode=modeLSB; + mode_t mode=modeLSB; }; struct BUTTON { diff --git a/wfmain.cpp b/wfmain.cpp index 7d00c93..574516e 100644 --- a/wfmain.cpp +++ b/wfmain.cpp @@ -55,18 +55,18 @@ wfmain::wfmain(const QString settingsFile, const QString logFile, bool debugMode qRegisterMetaType(); // Needs to be registered early. qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); qRegisterMetaType(); qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); qRegisterMetaType(); qRegisterMetaType(); qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); qRegisterMetaType(); qRegisterMetaType(); qRegisterMetaType(); @@ -502,8 +502,8 @@ void wfmain::rigConnections() // Repeater, duplex, and split: connect(rpt, SIGNAL(getDuplexMode()), rig, SLOT(getDuplexMode())); - connect(rpt, SIGNAL(setDuplexMode(duplexMode)), rig, SLOT(setDuplexMode(duplexMode))); - connect(rig, SIGNAL(haveDuplexMode(duplexMode)), rpt, SLOT(receiveDuplexMode(duplexMode))); + connect(rpt, SIGNAL(setDuplexMode(duplexMode_t)), rig, SLOT(setDuplexMode(duplexMode_t))); + connect(rig, SIGNAL(haveDuplexMode(duplexMode_t)), rpt, SLOT(receiveDuplexMode(duplexMode_t))); //connect(this, SIGNAL(getRptDuplexOffset()), rig, SLOT(getRptDuplexOffset())); connect(rig, SIGNAL(haveRptOffsetFrequency(freqt)), rpt, SLOT(handleRptOffsetFrequency(freqt))); @@ -543,18 +543,18 @@ void wfmain::rigConnections() }); connect(this->rpt, &repeaterSetup::setRptAccessMode, this->rig, - [=](const rptrAccessData_t &rd) { - queue->add(priorityImmediate,queueItem(funcToneSquelchType,QVariant::fromValue(rd),false)); + [=](const rptrAccessData &rd) { + queue->add(priorityImmediate,queueItem(funcToneSquelchType,QVariant::fromValue(rd),false)); }); connect(rig, SIGNAL(haveTone(quint16)), rpt, SLOT(handleTone(quint16))); connect(rig, SIGNAL(haveTSQL(quint16)), rpt, SLOT(handleTSQL(quint16))); connect(rig, SIGNAL(haveDTCS(quint16,bool,bool)), rpt, SLOT(handleDTCS(quint16,bool,bool))); - connect(rig, SIGNAL(haveRptAccessMode(rptAccessTxRx)), rpt, SLOT(handleRptAccessMode(rptAccessTxRx))); + connect(rig, SIGNAL(haveRptAccessMode(rptAccessTxRx_t)), rpt, SLOT(handleRptAccessMode(rptAccessTxRx_t))); connect(this->rig, &rigCommander::haveDuplexMode, this->rpt, - [=](const duplexMode &dm) { + [=](const duplexMode_t &dm) { if(dm==dmSplitOn) this->splitModeEnabled = true; else @@ -567,7 +567,7 @@ void wfmain::rigConnections() connect(this->rpt, &repeaterSetup::setTransmitFrequency, this->rig, [=](const freqt &transmitFreq) { queue->add(priorityImmediate,queueItem(funcFreqSet,QVariant::fromValue(transmitFreq),false));}); connect(this->rpt, &repeaterSetup::setTransmitMode, this->rig, - [=](const mode_info &transmitMode) { queue->add(priorityImmediate,queueItem(funcModeSet,QVariant::fromValue(transmitMode),false));}); + [=](const modeInfo &transmitMode) { queue->add(priorityImmediate,queueItem(funcModeSet,QVariant::fromValue(transmitMode),false));}); connect(this->rpt, &repeaterSetup::selectVFO, this->rig, [=](const vfo_t &v) { queue->add(priorityImmediate,queueItem(funcSelectVFO,QVariant::fromValue(v),false));}); connect(this->rpt, &repeaterSetup::equalizeVFOsAB, this->rig, @@ -591,9 +591,9 @@ void wfmain::rigConnections() connect(this, SIGNAL(setModInput(inputTypes, bool)), rig, SLOT(setModInput(inputTypes,bool))); connect(rig, SIGNAL(haveSpectrumData(QByteArray, double, double)), this, SLOT(receiveSpectrumData(QByteArray, double, double))); - connect(rig, SIGNAL(haveSpectrumMode(spectrumMode)), this, SLOT(receiveSpectrumMode(spectrumMode))); + connect(rig, SIGNAL(havespectrumMode_t(spectrumMode_t)), this, SLOT(receivespectrumMode_t(spectrumMode_t))); connect(rig, SIGNAL(haveScopeOutOfRange(bool)), this, SLOT(handleScopeOutOfRange(bool))); - connect(this, SIGNAL(setScopeMode(spectrumMode)), rig, SLOT(setSpectrumMode(spectrumMode))); + connect(this, SIGNAL(setScopeMode(spectrumMode_t)), rig, SLOT(setspectrumMode_t(spectrumMode_t))); connect(this, SIGNAL(getScopeMode()), rig, SLOT(getScopeMode())); connect(this, SIGNAL(setFrequency(unsigned char, freqt)), rig, SLOT(setFrequency(unsigned char, freqt))); @@ -606,7 +606,7 @@ void wfmain::rigConnections() connect(this, SIGNAL(setScopeFixedEdge(double,double,unsigned char)), rig, SLOT(setSpectrumBounds(double,double,unsigned char))); connect(this, SIGNAL(setMode(unsigned char, unsigned char)), rig, SLOT(setMode(unsigned char, unsigned char))); - connect(this, SIGNAL(setMode(mode_info)), rig, SLOT(setMode(mode_info))); + connect(this, SIGNAL(setMode(modeInfo)), rig, SLOT(setMode(modeInfo))); connect(this, SIGNAL(setVox(bool)), rig, SLOT(setVox(bool))); connect(this, SIGNAL(setMonitor(bool)), rig, SLOT(setMonitor(bool))); @@ -677,8 +677,8 @@ void wfmain::rigConnections() connect(rig, SIGNAL(haveLANGain(unsigned char)), this, SLOT(receiveLANGain(unsigned char))); //Metering: - connect(this, SIGNAL(getMeters(meterKind)), rig, SLOT(getMeters(meterKind))); - connect(rig, SIGNAL(haveMeter(meterKind,unsigned char)), this, SLOT(receiveMeter(meterKind,unsigned char))); + connect(this, SIGNAL(getMeters(meter_t)), rig, SLOT(getMeters(meter_t))); + connect(rig, SIGNAL(haveMeter(meter_t,unsigned char)), this, SLOT(receiveMeter(meter_t,unsigned char))); // Rig and ATU info: connect(this, SIGNAL(startATU()), rig, SLOT(startATU())); @@ -947,7 +947,7 @@ void wfmain::receiveStatusUpdate(networkStatus status) void wfmain::receiveNetworkAudioLevels(networkAudioLevels l) { /* - meterKind m2mtr = ui->meter2Widget->getMeterType(); + meter_t m2mtr = ui->meter2Widget->getMeterType(); if(m2mtr == meterAudio) { @@ -969,7 +969,7 @@ void wfmain::receiveNetworkAudioLevels(networkAudioLevels l) */ - meterKind m = meterNone; + meter_t m = meterNone; if(l.haveRxLevels) { m = meterRxAudio; @@ -1081,10 +1081,10 @@ void wfmain::setupMainUI() ui->baudRateCombo->insertItem(8, QString("1200"), 1200); ui->baudRateCombo->insertItem(9, QString("300"), 300); - ui->spectrumModeCombo->addItem("Center", (spectrumMode)spectModeCenter); - ui->spectrumModeCombo->addItem("Fixed", (spectrumMode)spectModeFixed); - ui->spectrumModeCombo->addItem("Scroll-C", (spectrumMode)spectModeScrollC); - ui->spectrumModeCombo->addItem("Scroll-F", (spectrumMode)spectModeScrollF); + ui->spectrumMode_tCombo->addItem("Center", (spectrumMode_t)spectModeCenter); + ui->spectrumMode_tCombo->addItem("Fixed", (spectrumMode_t)spectModeFixed); + ui->spectrumMode_tCombo->addItem("Scroll-C", (spectrumMode_t)spectModeScrollC); + ui->spectrumMode_tCombo->addItem("Scroll-F", (spectrumMode_t)spectModeScrollF); ui->modeFilterCombo->addItem("1", 1); ui->modeFilterCombo->addItem("2", 2); @@ -2124,7 +2124,7 @@ void wfmain::loadSettings() setWindowState(Qt::WindowActive); // Works around QT bug to returns window+keyboard focus. prefs.confirmExit = settings->value("ConfirmExit", defPrefs.confirmExit).toBool(); prefs.confirmPowerOff = settings->value("ConfirmPowerOff", defPrefs.confirmPowerOff).toBool(); - prefs.meter2Type = static_cast(settings->value("Meter2Type", defPrefs.meter2Type).toInt()); + prefs.meter2Type = static_cast(settings->value("Meter2Type", defPrefs.meter2Type).toInt()); prefs.clickDragTuningEnable = settings->value("ClickDragTuning", false).toBool(); ui->clickDragTuningEnableChk->setChecked(prefs.clickDragTuningEnable); settings->endGroup(); @@ -2522,7 +2522,7 @@ void wfmain::loadSettings() if (isSet) { - mem.setPreset(chan, freq, (mode_kind)mode); + mem.setPreset(chan, freq, (mode_t)mode); } } @@ -3257,7 +3257,7 @@ void wfmain::showHideSpectrum(bool show) // Controls: ui->spectrumGroupBox->setVisible(show); - ui->spectrumModeCombo->setVisible(show); + ui->spectrumMode_tCombo->setVisible(show); ui->scopeBWCombo->setVisible(show); ui->scopeEdgeCombo->setVisible(show); ui->scopeEnableWFBtn->setVisible(show); @@ -4257,7 +4257,7 @@ void wfmain::receiveRigID(rigCapabilities rigCaps) // Set the second meter here as I suspect we need to be connected for it to work? for (int i = 0; i < ui->meter2selectionCombo->count(); i++) { - if (static_cast(ui->meter2selectionCombo->itemData(i).toInt()) == prefs.meter2Type) + if (static_cast(ui->meter2selectionCombo->itemData(i).toInt()) == prefs.meter2Type) { // I thought that setCurrentIndex() would call the activated() function for the combobox // but it doesn't, so call it manually. @@ -4681,15 +4681,15 @@ void wfmain::computePlasma() plasmaMutex.unlock(); } -void wfmain::receiveSpectrumMode(spectrumMode spectMode) +void wfmain::receivespectrumMode_t(spectrumMode_t spectMode) { - for (int i = 0; i < ui->spectrumModeCombo->count(); i++) + for (int i = 0; i < ui->spectrumMode_tCombo->count(); i++) { - if (static_cast(ui->spectrumModeCombo->itemData(i).toInt()) == spectMode) + if (static_cast(ui->spectrumMode_tCombo->itemData(i).toInt()) == spectMode) { - ui->spectrumModeCombo->blockSignals(true); - ui->spectrumModeCombo->setCurrentIndex(i); - ui->spectrumModeCombo->blockSignals(false); + ui->spectrumMode_tCombo->blockSignals(true); + ui->spectrumMode_tCombo->setCurrentIndex(i); + ui->spectrumMode_tCombo->blockSignals(false); } } setUISpectrumControlsToMode(spectMode); @@ -5079,7 +5079,7 @@ void wfmain::on_scopeEnableWFBtn_stateChanged(int state) -void wfmain::receiveMode(mode_info mode) +void wfmain::receiveMode(modeInfo mode) { // Update mode information if mode/filter has changed if ((mode.VFO == activeVFO) && (currentModeInfo.reg != mode.reg || currentModeInfo.filter != mode.filter || currentModeInfo.data != mode.data)) @@ -5237,17 +5237,17 @@ void wfmain::on_goFreqBtn_clicked() { queue->add(priorityImmediate,queueItem((rigCaps.commands.contains(funcSelectedFreq)?funcSelectedFreq:funcFreqSet),QVariant::fromValue(f),false)); - foreach (mode_info mi, rigCaps.modes) + foreach (modeInfo mi, rigCaps.modes) { if (mi.reg == sidebandChooser::getMode(f, currentModeInfo.mk)) { - mode_info m = mode_info(mi); + modeInfo m = modeInfo(mi); m.filter = ui->modeFilterCombo->currentData().toInt(); m.data = usingDataMode; m.VFO=selVFO_t::activeVFO; if((m.mk != currentModeInfo.mk) && prefs.automaticSidebandSwitching) { - queue->add(priorityImmediate,queueItem((rigCaps.commands.contains(funcSelectedMode)?funcSelectedMode:funcModeGet),QVariant::fromValue(m),false)); + queue->add(priorityImmediate,queueItem((rigCaps.commands.contains(funcSelectedMode)?funcSelectedMode:funcModeGet),QVariant::fromValue(m),false)); } break; } @@ -5343,14 +5343,14 @@ void wfmain::on_fCEbtn_clicked() freqTextSelected = false; } -void wfmain::on_spectrumModeCombo_currentIndexChanged(int index) +void wfmain::on_spectrumMode_tCombo_currentIndexChanged(int index) { - spectrumMode smode = static_cast(ui->spectrumModeCombo->itemData(index).toInt()); + spectrumMode_t smode = static_cast(ui->spectrumMode_tCombo->itemData(index).toInt()); emit setScopeMode(smode); setUISpectrumControlsToMode(smode); } -void wfmain::setUISpectrumControlsToMode(spectrumMode smode) +void wfmain::setUISpectrumControlsToMode(spectrumMode_t smode) { if((smode==spectModeCenter) || (smode==spectModeScrollC)) { @@ -5388,35 +5388,35 @@ void wfmain::on_scopeEdgeCombo_currentIndexChanged(int index) emit setScopeEdge((char)index+1); } -void wfmain::changeMode(mode_kind mode) +void wfmain::changeMode(mode_t mode) { bool dataOn = false; if(((unsigned char) mode >> 4) == 0x08) { dataOn = true; - mode = (mode_kind)((int)mode & 0x0f); + mode = (mode_t)((int)mode & 0x0f); } changeMode(mode, dataOn); } -void wfmain::changeMode(mode_kind mode, unsigned char data) +void wfmain::changeMode(mode_t mode, unsigned char data) { - foreach (mode_info mi, rigCaps.modes) + foreach (modeInfo mi, rigCaps.modes) { if (mi.mk == mode) { - mode_info m; - m = mode_info(mi); + modeInfo m; + m = modeInfo(mi); m.filter = ui->modeFilterCombo->currentData().toInt(); m.data = data; m.VFO=selVFO_t::activeVFO; if((m.mk != currentModeInfo.mk) && prefs.automaticSidebandSwitching) { - queue->add(priorityImmediate,queueItem((rigCaps.commands.contains(funcSelectedMode)?funcSelectedMode:funcModeGet),QVariant::fromValue(m),false)); + queue->add(priorityImmediate,queueItem((rigCaps.commands.contains(funcSelectedMode)?funcSelectedMode:funcModeGet),QVariant::fromValue(m),false)); if (!rigCaps.commands.contains(funcSelectedMode)) - queue->add(priorityImmediate,queueItem(funcDataModeWithFilter,QVariant::fromValue(m),false)); + queue->add(priorityImmediate,queueItem(funcDataModeWithFilter,QVariant::fromValue(m),false)); } break; } @@ -5442,15 +5442,15 @@ void wfmain::on_modeSelectCombo_activated(int index) return; } else { //qInfo(logSystem()) << __func__ << " at index " << index << " has newMode: " << newMode; - foreach (mode_info mi, rigCaps.modes) + foreach (modeInfo mi, rigCaps.modes) { - if (mi.mk == (mode_kind)newMode) + if (mi.mk == (mode_t)newMode) { - mode_info m = mode_info(mi); + modeInfo m = modeInfo(mi); m.filter = filterSelection; m.data = usingDataMode; m.VFO=selVFO_t::activeVFO; - queue->add(priorityImmediate,queueItem((rigCaps.commands.contains(funcSelectedMode)?funcSelectedMode:funcModeSet),QVariant::fromValue(m),false)); + queue->add(priorityImmediate,queueItem((rigCaps.commands.contains(funcSelectedMode)?funcSelectedMode:funcModeSet),QVariant::fromValue(m),false)); queue->add(priorityImmediate,(rigCaps.commands.contains(funcSelectedMode)?funcSelectedMode:funcModeGet),false); break; } @@ -5532,8 +5532,8 @@ void wfmain::receiveBandStackReg(freqt freqGo, char mode, char filter, bool data if (md.reg == mode) { md.filter=filter; md.data=dataOn; - queue->add(priorityImmediate,queueItem((rigCaps.commands.contains(funcSelectedMode)?funcSelectedMode:funcModeSet),QVariant::fromValue(md),false)); - queue->add(priorityImmediate,queueItem((rigCaps.commands.contains(funcSelectedMode)?funcNone:funcDataModeWithFilter),QVariant::fromValue(md),false)); + queue->add(priorityImmediate,queueItem((rigCaps.commands.contains(funcSelectedMode)?funcSelectedMode:funcModeSet),QVariant::fromValue(md),false)); + queue->add(priorityImmediate,queueItem((rigCaps.commands.contains(funcSelectedMode)?funcNone:funcDataModeWithFilter),QVariant::fromValue(md),false)); receiveMode(md); // update UI break; } @@ -5729,7 +5729,7 @@ void wfmain::on_fStoBtn_clicked() if(ok && (preset_number >= 0) && (preset_number < 100)) { // TODO: keep an enum around with the current mode - mem.setPreset(preset_number, freq.MHzDouble, (mode_kind)ui->modeSelectCombo->currentData().toInt() ); + mem.setPreset(preset_number, freq.MHzDouble, (mode_t)ui->modeSelectCombo->currentData().toInt() ); showStatusBarText( QString("Storing frequency %1 to memory location %2").arg( freq.MHzDouble ).arg(preset_number) ); } else { showStatusBarText(QString("Could not store preset to %1. Valid preset numbers are 0 to 99").arg(preset_number)); @@ -6154,16 +6154,16 @@ void wfmain::on_modeFilterCombo_activated(int index) } else { unsigned char newMode = static_cast(ui->modeSelectCombo->currentData().toUInt()); - foreach (mode_info mi, rigCaps.modes) + foreach (modeInfo mi, rigCaps.modes) { - if (mi.mk == (mode_kind)newMode) + if (mi.mk == (mode_t)newMode) { - mode_info m; - m = mode_info(mi); + modeInfo m; + m = modeInfo(mi); m.filter = filterSelection; m.data = usingDataMode; m.VFO=selVFO_t::activeVFO; - queue->add(priorityImmediate, queueItem((rigCaps.commands.contains(funcSelectedMode)?funcSelectedMode:funcModeSet),QVariant::fromValue(m),false)); + queue->add(priorityImmediate, queueItem((rigCaps.commands.contains(funcSelectedMode)?funcSelectedMode:funcModeSet),QVariant::fromValue(m),false)); break; } } @@ -6174,11 +6174,11 @@ void wfmain::on_modeFilterCombo_activated(int index) void wfmain::on_datamodeCombo_activated(int index) { - mode_info m; + modeInfo m; m.filter = ui->modeFilterCombo->currentData().toInt(); m.data = index; - queue->add(priorityImmediate, queueItem(funcDataModeWithFilter,QVariant::fromValue(m))); + queue->add(priorityImmediate, queueItem(funcDataModeWithFilter,QVariant::fromValue(m))); usingDataMode = index; if(usingDataMode == 0) { @@ -6464,7 +6464,7 @@ void wfmain::receiveTuningStep(unsigned char step) } } -void wfmain::receiveMeter(meterKind inMeter, unsigned char level) +void wfmain::receiveMeter(meter_t inMeter, unsigned char level) { switch(inMeter) @@ -7184,7 +7184,7 @@ void wfmain::on_wfInterpolateChk_clicked(bool checked) prefs.wfInterpolate = checked; } -funcs wfmain::meterKindToMeterCommand(meterKind m) +funcs wfmain::meter_tToMeterCommand(meter_t m) { funcs c; switch(m) @@ -7228,15 +7228,15 @@ funcs wfmain::meterKindToMeterCommand(meterKind m) void wfmain::on_meter2selectionCombo_activated(int index) { - meterKind newMeterType; - meterKind oldMeterType; - newMeterType = static_cast(ui->meter2selectionCombo->currentData().toInt()); + meter_t newMeterType; + meter_t oldMeterType; + newMeterType = static_cast(ui->meter2selectionCombo->currentData().toInt()); oldMeterType = ui->meter2Widget->getMeterType(); if(newMeterType == oldMeterType) return; - funcs newCmd = meterKindToMeterCommand(newMeterType); - funcs oldCmd = meterKindToMeterCommand(oldMeterType); + funcs newCmd = meter_tToMeterCommand(newMeterType); + funcs oldCmd = meter_tToMeterCommand(oldMeterType); //removePeriodicCommand(oldCmd); if (oldCmd != funcSMeter && oldCmd != funcNone) @@ -8999,7 +8999,7 @@ void wfmain::receiveValue(cacheItem val){ case funcModeTR: case funcSelectedMode: case funcUnselectedMode: - receiveMode(val.value.value()); + receiveMode(val.value.value()); break; case funcSatelliteMemory: case funcMemoryContents: @@ -9087,32 +9087,32 @@ void wfmain::receiveValue(cacheItem val){ case funcSMeterSqlStatus: break; case funcSMeter: - receiveMeter(meterKind::meterS,val.value.value()); + receiveMeter(meter_t::meterS,val.value.value()); break; case funcVariousSql: break; case funcOverflowStatus: break; case funcCenterMeter: - receiveMeter(meterKind::meterCenter,val.value.value()); + receiveMeter(meter_t::meterCenter,val.value.value()); break; case funcPowerMeter: - receiveMeter(meterKind::meterPower,val.value.value()); + receiveMeter(meter_t::meterPower,val.value.value()); break; case funcSWRMeter: - receiveMeter(meterKind::meterSWR,val.value.value()); + receiveMeter(meter_t::meterSWR,val.value.value()); break; case funcALCMeter: - receiveMeter(meterKind::meterALC,val.value.value()); + receiveMeter(meter_t::meterALC,val.value.value()); break; case funcCompMeter: - receiveMeter(meterKind::meterComp,val.value.value()); + receiveMeter(meter_t::meterComp,val.value.value()); break; case funcVdMeter: - receiveMeter(meterKind::meterVoltage,val.value.value()); + receiveMeter(meter_t::meterVoltage,val.value.value()); break; case funcIdMeter: - receiveMeter(meterKind::meterCurrent,val.value.value()); + receiveMeter(meter_t::meterCurrent,val.value.value()); break; // 0x16 enable/disable functions: case funcPreamp: @@ -9179,7 +9179,7 @@ void wfmain::receiveValue(cacheItem val){ receivePassband(val.value.value()); break; case funcDataModeWithFilter: - receiveDataModeStatus(val.value.value().data,val.value.value().filter); + receiveDataModeStatus(val.value.value().data,val.value.value().filter); break; case funcAFMute: break; diff --git a/wfmain.h b/wfmain.h index bd27f28..94cfbaf 100644 --- a/wfmain.h +++ b/wfmain.h @@ -124,7 +124,7 @@ signals: void setFrequency(unsigned char vfo, freqt freq); void getMode(); void setMode(unsigned char modeIndex, unsigned char modeFilter); - void setMode(mode_info); + void setMode(modeInfo); void selectVFO(vfo_t vfo); void sendVFOSwap(); void sendVFOEqualAB(); @@ -149,7 +149,7 @@ signals: void getTSQL(); void getDTCS(); void getRptAccessMode(); - void setRepeaterAccessMode(rptrAccessData_t rd); + void setRepeaterAccessMode(rptrAccessData rd); void setTone(rptrTone_t t); void setTSQL(rptrTone_t t); void getToneEnabled(); @@ -178,7 +178,7 @@ signals: void getMicGain(); void getSpectrumRefLevel(); void getModInputLevel(inputTypes input); - void getMeters(meterKind meter); + void getMeters(meter_t meter); void getPassband(); void getVoxGain(); void getAntiVoxGain(); @@ -269,7 +269,7 @@ signals: void spectOutputDisable(); void scopeDisplayEnable(); void scopeDisplayDisable(); - void setScopeMode(spectrumMode spectMode); + void setScopeMode(spectrumMode_t spectMode); void setScopeSpan(char span); void setScopeEdge(char edge); void setScopeFixedEdge(double startFreq, double endFreq, unsigned char edgeNumber); @@ -350,9 +350,9 @@ private slots: void receiveCommReady(); void receiveFreq(freqt); - void receiveMode(mode_info mode); + void receiveMode(modeInfo mode); void receiveSpectrumData(QByteArray spectrum, double startFreq, double endFreq); - void receiveSpectrumMode(spectrumMode spectMode); + void receivespectrumMode_t(spectrumMode_t spectMode); void receiveSpectrumSpan(freqt freqspan, bool isSub); void handleScopeOutOfRange(bool outOfRange); void receivePTTstatus(bool pttOn); @@ -361,7 +361,7 @@ private slots: void receiveRITStatus(bool ritEnabled); void receiveRITValue(int ritValHz); void receiveModInput(rigInput input, unsigned char data); - //void receiveDuplexMode(duplexMode dm); + //void receiveDuplexMode(duplexMode_t dm); void receivePassband(quint16 pass); void receiveMonitorGain(unsigned char pass); void receiveNBLevel(unsigned char pass); @@ -394,7 +394,7 @@ private slots: void receiveSpectrumRefLevel(int level); // Meters: - void receiveMeter(meterKind meter, unsigned char level); + void receiveMeter(meter_t meter, unsigned char level); // void receiveSMeter(unsigned char level); // void receivePowerMeter(unsigned char level); // void receiveALCMeter(unsigned char level); @@ -598,7 +598,7 @@ private slots: void on_tuneLockChk_clicked(bool checked); - void on_spectrumModeCombo_currentIndexChanged(int index); + void on_spectrumMode_tCombo_currentIndexChanged(int index); void on_serialEnableBtn_clicked(bool checked); @@ -995,7 +995,7 @@ private: bool onFullscreen; bool freqTextSelected; void checkFreqSel(); - void setUISpectrumControlsToMode(spectrumMode smode); + void setUISpectrumControlsToMode(spectrumMode_t smode); double oldLowerFreq; double oldUpperFreq; @@ -1091,12 +1091,12 @@ private: void changeModLabelAndSlider(rigInput source); - void changeMode(mode_kind mode); - void changeMode(mode_kind mode, unsigned char data); + void changeMode(mode_t mode); + void changeMode(mode_t mode, unsigned char data); void connectionHandler(bool connect); - funcs meterKindToMeterCommand(meterKind m); + funcs meter_tToMeterCommand(meter_t m); void updateUsbButtons(); @@ -1110,8 +1110,8 @@ private: rigInput currentModData2Src = rigInput(inputUnknown); rigInput currentModData3Src = rigInput(inputUnknown); - mode_kind currentMode = modeUnknown; - mode_info currentModeInfo = mode_info(); + mode_t currentMode = modeUnknown; + modeInfo currentModeInfo = modeInfo(); bool haveRigCaps; bool amTransmitting = false; @@ -1201,44 +1201,22 @@ private: QImage lcdImage; }; -Q_DECLARE_METATYPE(struct rigCapabilities) -Q_DECLARE_METATYPE(struct freqt) -Q_DECLARE_METATYPE(struct mode_info) -Q_DECLARE_METATYPE(struct udpPreferences) -Q_DECLARE_METATYPE(struct audioPacket) -Q_DECLARE_METATYPE(struct audioSetup) -Q_DECLARE_METATYPE(struct SERVERCONFIG) -Q_DECLARE_METATYPE(struct timekind) -Q_DECLARE_METATYPE(struct datekind) -Q_DECLARE_METATYPE(struct networkStatus) -Q_DECLARE_METATYPE(struct networkAudioLevels) -Q_DECLARE_METATYPE(struct spotData) -Q_DECLARE_METATYPE(struct rigInput) -Q_DECLARE_METATYPE(enum inputTypes) -Q_DECLARE_METATYPE(enum meterKind) -Q_DECLARE_METATYPE(enum spectrumMode) -Q_DECLARE_METATYPE(enum mode_kind) -Q_DECLARE_METATYPE(enum vfo_t) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(udpPreferences) +Q_DECLARE_METATYPE(audioPacket) +Q_DECLARE_METATYPE(audioSetup) +Q_DECLARE_METATYPE(SERVERCONFIG) +Q_DECLARE_METATYPE(networkStatus) +Q_DECLARE_METATYPE(networkAudioLevels) +Q_DECLARE_METATYPE(spotData) +Q_DECLARE_METATYPE(radio_cap_packet) Q_DECLARE_METATYPE(rigstate*) -Q_DECLARE_METATYPE(QVector