From 37aab042c94eefbd6352ce013df258bc02bdcef5 Mon Sep 17 00:00:00 2001 From: Phil Taylor Date: Tue, 26 Sep 2023 12:58:37 +0100 Subject: [PATCH] Start changing bw to min/max values --- cachingqueue.cpp | 2 +- rigcommander.cpp | 895 +--------------------------------------------- rigcommander.h | 2 +- rigcreator.cpp | 34 +- rigcreator.ui | 7 +- spectrumscope.cpp | 2 +- wfviewtypes.h | 7 +- 7 files changed, 16 insertions(+), 933 deletions(-) diff --git a/cachingqueue.cpp b/cachingqueue.cpp index 60ed89c7..5dd13c0c 100644 --- a/cachingqueue.cpp +++ b/cachingqueue.cpp @@ -343,7 +343,7 @@ bool cachingQueue::compare(QVariant a, QVariant b) changed=true; } else if (!strcmp(a.typeName(),"modeInfo")) { if (a.value().mk != b.value().mk || a.value().reg != b.value().reg - || a.value().bw != b.value().bw || a.value().filter != b.value().filter) { + || a.value().filter != b.value().filter) { changed=true; } } else if(!strcmp(a.typeName(),"freqt")) { diff --git a/rigcommander.cpp b/rigcommander.cpp index 77f0f803..f21b94b2 100644 --- a/rigcommander.cpp +++ b/rigcommander.cpp @@ -3949,17 +3949,6 @@ void rigCommander::parseWFData() { } - -modeInfo rigCommander::createMode(rigMode_t m, unsigned char reg, QString name, bool bw) -{ - modeInfo mode; - mode.mk = m; - mode.reg = reg; - mode.name = name; - mode.bw = bw; - return mode; -} - centerSpanData rigCommander::createScopeCenter(centerSpansType s, QString name) { centerSpanData csd; @@ -4075,7 +4064,7 @@ void rigCommander::determineRigCaps() { settings->setArrayIndex(c); rigCaps.modes.push_back(modeInfo(rigMode_t(settings->value("Num", 0).toUInt()), - settings->value("Reg", 0).toString().toUInt(nullptr,16), settings->value("Name", "").toString(), settings->value("BW", 0).toBool())); + settings->value("Reg", 0).toString().toUInt(nullptr,16), settings->value("Name", "").toString(), settings->value("Min", 0).toInt(), settings->value("Max", 0).toInt())); } settings->endArray(); } @@ -4228,886 +4217,6 @@ void rigCommander::determineRigCaps() #endif } - - /* - switch(model){ - case model7300: - rigCaps.modelName = QString("IC-7300"); - rigCaps.rigctlModel = 3073; - rigCaps.hasSpectrum = true; - rigCaps.spectSeqMax = 11; - rigCaps.spectAmpMax = 160; - rigCaps.spectLenMax = 475; - rigCaps.inputs.append(inputUSB); - rigCaps.inputs.append(inputACC); - rigCaps.hasLan = false; - rigCaps.hasEthernet = false; - 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'); - // rigCaps.bands = standardHF; - // rigCaps.bands.insert(rigCaps.bands.end(), { bandDef4m, bandDef630m, bandDef2200m, bandDefGen }); - rigCaps.transceiveCommand = QByteArrayLiteral("\x1a\x05\x00\x71"); - rigCaps.hasVFOMS = false; - rigCaps.hasVFOAB = true; - rigCaps.hasQuickSplitCommand = true; - rigCaps.quickSplitCommand = QByteArrayLiteral("\x1a\x05\x00\x30"); - // new functions - //rigCaps.commands.insert(funcTransceive,QByteArrayLiteral("\x1a\x05\x00\x71")); - //rigCaps.commands.insert(funcQuickSplit,QByteArrayLiteral("\x1a\x05\x00\x30")); - //rigCaps.commands.insert(funcDashRatio,QByteArrayLiteral("\x1a\x05\x01\x61")); - break; - case modelR8600: - rigCaps.modelName = QString("IC-R8600"); - rigCaps.rigctlModel = 3079; - rigCaps.hasSpectrum = true; - rigCaps.spectSeqMax = 11; - rigCaps.spectAmpMax = 160; - rigCaps.spectLenMax = 475; - rigCaps.inputs.clear(); - rigCaps.hasLan = true; - rigCaps.hasEthernet = true; - rigCaps.hasWiFi = false; - rigCaps.hasTransmit = false; - rigCaps.hasPTTCommand = false; - 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'); - rigCaps.preamps.push_back('\x01'); - rigCaps.preamps.push_back('\x02'); - rigCaps.hasAntennaSel = true; - rigCaps.antennas = {0x00, 0x01, 0x02}; - // rigCaps.bands = standardHF; - // rigCaps.bands.insert(rigCaps.bands.end(), standardVU.begin(), standardVU.end()); - // rigCaps.bands.insert(rigCaps.bands.end(), { bandDef23cm, bandDef4m, bandDef630m, bandDef2200m, bandDefGen }); - // rigCaps.modes = commonModes; - rigCaps.modes.insert(rigCaps.modes.end(), { - createMode(modeWFM, 0x06, "WFM"), createMode(modeS_AMD, 0x11, "S-AM (D)"), - createMode(modeS_AML, 0x14, "S-AM(L)"), createMode(modeS_AMU, 0x15, "S-AM(U)"), - createMode(modeP25, 0x16, "P25"), createMode(modedPMR, 0x18, "dPMR"), - createMode(modeNXDN_VN, 0x19, "NXDN-VN"), createMode(modeNXDN_N, 0x20, "NXDN-N"), - createMode(modeDCR, 0x21, "DCR")}); - rigCaps.scopeCenterSpans.insert(rigCaps.scopeCenterSpans.end(), {createScopeCenter(cs1M, "±1M"), createScopeCenter(cs2p5M, "±2.5M")}); - rigCaps.transceiveCommand = QByteArrayLiteral("\x1a\x05\x00\x92"); - rigCaps.hasVFOMS = true; // not documented very well - rigCaps.hasVFOAB = true; // so we just do both... - // new functions - //rigCaps.commands.insert(funcTransceive,QByteArrayLiteral("\x1a\x05\x00\x92")); - break; - case model9700: - rigCaps.modelName = QString("IC-9700"); - rigCaps.rigctlModel = 3081; - rigCaps.hasSpectrum = true; - rigCaps.spectSeqMax = 11; - rigCaps.spectAmpMax = 160; - rigCaps.spectLenMax = 475; - rigCaps.inputs.append(inputLAN); - rigCaps.inputs.append(inputUSB); - rigCaps.inputs.append(inputACC); - rigCaps.hasLan = true; - rigCaps.hasEthernet = true; - rigCaps.hasWiFi = false; - rigCaps.hasDD = true; - rigCaps.hasDV = true; - rigCaps.hasCTCSS = true; - rigCaps.hasDTCS = true; - rigCaps.hasRepeaterModes = true; - rigCaps.hasTBPF = true; - rigCaps.attenuators.push_back('\x10'); - rigCaps.preamps.push_back('\x01'); - //rigCaps.bands = standardVU; - //rigCaps.bands.push_back(bandDef23cm); - rigCaps.bsr[band23cm] = 0x03; - rigCaps.bsr[band70cm] = 0x02; - rigCaps.bsr[band2m] = 0x01; - //rigCaps.modes = commonModes; - rigCaps.modes.insert(rigCaps.modes.end(), {createMode(modeDV, 0x17, "DV"), - createMode(modeDD, 0x22, "DD")}); - rigCaps.transceiveCommand = QByteArrayLiteral("\x1a\x05\x01\x27"); - rigCaps.hasVFOMS = true; - rigCaps.hasVFOAB = true; - rigCaps.hasAdvancedRptrToneCmds = true; - rigCaps.hasQuickSplitCommand = true; - rigCaps.quickSplitCommand = QByteArrayLiteral("\x1a\x05\x00\x43"); - // new functions - //rigCaps.commands.insert(funcTransceive,QByteArrayLiteral("\x1a\x05\x01\x27")); - //rigCaps.commands.insert(funcQuickSplit,QByteArrayLiteral("\x1a\x05\x00\x43")); - //rigCaps.commands.insert(funcDashRatio,QByteArrayLiteral("\x1a\x05\x02\x24")); - break; - case model905: - rigCaps.modelName = QString("IC-905"); - rigCaps.rigctlModel = 0; - rigCaps.hasSpectrum = true; - rigCaps.spectSeqMax = 11; - rigCaps.spectAmpMax = 160; - rigCaps.spectLenMax = 475; - rigCaps.inputs.append(inputLAN); - rigCaps.inputs.append(inputUSB); - rigCaps.hasLan = true; - rigCaps.hasEthernet = true; - rigCaps.hasWiFi = false; - rigCaps.hasDD = true; - rigCaps.hasDV = true; - rigCaps.hasCTCSS = true; - rigCaps.hasDTCS = true; - rigCaps.hasRepeaterModes = true; - rigCaps.hasTBPF = true; - rigCaps.attenuators.push_back('\x10'); - rigCaps.preamps.push_back('\x01'); - //rigCaps.bands = standardVU; - //rigCaps.bands.push_back(bandDef23cm); - //rigCaps.bands.push_back(bandDef13cm); - //rigCaps.bands.push_back(bandDef6cm); - // rigCaps.bands.push_back(bandDef3cm); - rigCaps.bsr[band2m] = 0x01; - rigCaps.bsr[band70cm] = 0x02; - rigCaps.bsr[band23cm] = 0x03; - rigCaps.bsr[band13cm] = 0x04; - rigCaps.bsr[band6cm] = 0x05; - rigCaps.bsr[band3cm] = 0x06; - //rigCaps.modes = commonModes; - rigCaps.modes.insert(rigCaps.modes.end(), {createMode(modeDV, 0x17, "DV"), - createMode(modeDD, 0x22, "DD"), - createMode(modeATV, 0x23, "ATV") - }); - - rigCaps.scopeCenterSpans.insert(rigCaps.scopeCenterSpans.end(), {createScopeCenter(cs1M, "±1M"), - createScopeCenter(cs2p5M, "±2.5M"), - createScopeCenter(cs5M, "±5M"), - createScopeCenter(cs10M, "±10M"), - createScopeCenter(cs25M, "±25M")}); - rigCaps.transceiveCommand = QByteArrayLiteral("\x1a\x05\x01\x42"); - rigCaps.hasVFOMS = false; - rigCaps.hasVFOAB = true; - rigCaps.hasAdvancedRptrToneCmds = true; - rigCaps.hasQuickSplitCommand = true; - rigCaps.quickSplitCommand = QByteArrayLiteral("\x1a\x05\x00\x46"); - // new functions - //rigCaps.commands.insert(funcTransceive,QByteArrayLiteral("\x1a\x05\x01\x42")); - //rigCaps.commands.insert(funcQuickSplit,QByteArrayLiteral("\x1a\x05\x00\x46")); - //rigCaps.commands.insert(funcDashRatio,QByteArrayLiteral("\x1a\x05\x02\x36")); - break; - case model910h: - rigCaps.modelName = QString("IC-910H"); - rigCaps.rigctlModel = 3044; - rigCaps.hasSpectrum = false; - rigCaps.hasLan = false; - rigCaps.hasEthernet = false; - rigCaps.hasWiFi = false; - rigCaps.hasFDcomms = false; - rigCaps.hasDD = false; - rigCaps.hasDV = false; - rigCaps.hasCTCSS = true; - rigCaps.hasDTCS = true; - rigCaps.hasRepeaterModes = true; - rigCaps.hasATU = false; - rigCaps.attenuators.insert(rigCaps.attenuators.end(),{ '\x10' , '\x20', '\x30'}); - rigCaps.preamps.push_back('\x01'); - //rigCaps.bands = standardVU; - //rigCaps.bands.push_back(bandDef23cm); - rigCaps.bsr[band23cm] = 0x03; - rigCaps.bsr[band70cm] = 0x02; - rigCaps.bsr[band2m] = 0x01; - //rigCaps.modes = commonModes; - rigCaps.transceiveCommand = QByteArrayLiteral("\x1a\x05\x00\x58"); - rigCaps.hasVFOMS = false; - rigCaps.hasVFOAB = true; - // new functions - //rigCaps.commands.insert(funcTransceive,QByteArrayLiteral("\x1a\x05\x00\x58")); - break; - case model7600: - rigCaps.modelName = QString("IC-7600"); - rigCaps.rigctlModel = 3063; - rigCaps.hasSpectrum = false; - rigCaps.inputs.append(inputACC); - rigCaps.inputs.append(inputUSB); - rigCaps.hasLan = false; - rigCaps.hasEthernet = false; - rigCaps.hasWiFi = false; - rigCaps.hasFDcomms = false; - 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'); - rigCaps.antennas = {0x00, 0x01}; - //rigCaps.bands = standardHF; - //rigCaps.bands.push_back(bandDefGen); - rigCaps.bsr[bandGen] = 0x11; - //rigCaps.modes = commonModes; - rigCaps.modes.insert(rigCaps.modes.end(), { createMode(modePSK, 0x12, "PSK"), - createMode(modePSK_R, 0x13, "PSK-R") }); - rigCaps.transceiveCommand = QByteArrayLiteral("\x1a\x05\x00\x97"); - rigCaps.hasVFOMS = true; - rigCaps.hasVFOAB = false; - rigCaps.hasQuickSplitCommand = true; - rigCaps.quickSplitCommand = QByteArrayLiteral("\x1a\x05\x00\x64"); - // new functions - //rigCaps.commands.insert(funcTransceive,QByteArrayLiteral("\x1a\x05\x00\x97")); - //rigCaps.commands.insert(funcQuickSplit,QByteArrayLiteral("\x1a\x05\x00\x64")); - break; - case model7610: - rigCaps.modelName = QString("IC-7610"); - rigCaps.rigctlModel = 3078; - rigCaps.hasSpectrum = true; - rigCaps.spectSeqMax = 15; - rigCaps.spectAmpMax = 200; - rigCaps.spectLenMax = 689; - rigCaps.inputs.append(inputLAN); - rigCaps.inputs.append(inputUSB); - rigCaps.inputs.append(inputACC); - rigCaps.hasLan = true; - 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',\ - '\x27', '\x30', '\x33', '\x36', - '\x39', '\x42', '\x45'}); - rigCaps.preamps.push_back('\x01'); - rigCaps.preamps.push_back('\x02'); - rigCaps.hasAntennaSel = true; - rigCaps.antennas = {0x00, 0x01}; - rigCaps.hasATU = true; - rigCaps.bands = standardHF; - rigCaps.bands.insert(rigCaps.bands.end(), { bandDef630m, bandDef2200m, bandDefGen }); - //rigCaps.modes = commonModes; - rigCaps.modes.insert(rigCaps.modes.end(), { createMode(modePSK, 0x12, "PSK"), - createMode(modePSK_R, 0x13, "PSK-R") }); - rigCaps.hasRXAntenna = true; - rigCaps.transceiveCommand = QByteArrayLiteral("\x1a\x05\x01\x12"); - rigCaps.hasSpecifyMainSubCmd = true; - rigCaps.hasQuickSplitCommand = true; - rigCaps.quickSplitCommand = QByteArrayLiteral("\x1a\x05\x00\x33"); - rigCaps.hasVFOMS = true; - rigCaps.hasVFOAB = false; - break; - case model7850: - rigCaps.modelName = QString("IC-785x"); - rigCaps.rigctlModel = 3075; - rigCaps.hasSpectrum = true; - rigCaps.spectSeqMax = 15; - rigCaps.spectAmpMax = 136; - rigCaps.spectLenMax = 689; - rigCaps.inputs.append(inputLAN); - rigCaps.inputs.append(inputUSB); - rigCaps.inputs.append(inputACCA); - rigCaps.inputs.append(inputACCB); - rigCaps.hasLan = true; - rigCaps.hasEthernet = true; - 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'}); - rigCaps.preamps.push_back('\x01'); - rigCaps.preamps.push_back('\x02'); - rigCaps.hasAntennaSel = true; - rigCaps.antennas = {0x00, 0x01, 0x02, 0x03}; - //rigCaps.bands = standardHF; - //rigCaps.bands.insert(rigCaps.bands.end(), { bandDef630m, bandDef2200m, bandDefGen }); - //rigCaps.modes = commonModes; - rigCaps.modes.insert(rigCaps.modes.end(), {createMode(modePSK, 0x12, "PSK"), - createMode(modePSK_R, 0x13, "PSK-R")}); - rigCaps.hasRXAntenna = true; - rigCaps.transceiveCommand = QByteArrayLiteral("\x1a\x05\x01\x55"); - rigCaps.hasSpecifyMainSubCmd = true; - rigCaps.hasQuickSplitCommand = true; - rigCaps.quickSplitCommand = QByteArrayLiteral("\x1a\x05\x01\x13"); - rigCaps.hasVFOMS = true; - rigCaps.hasVFOAB = false; - break; - case model705: - rigCaps.modelName = QString("IC-705"); - rigCaps.rigctlModel = 3085; - rigCaps.hasSpectrum = true; - rigCaps.spectSeqMax = 11; - rigCaps.spectAmpMax = 160; - rigCaps.spectLenMax = 475; - rigCaps.inputs.append(inputLAN); - rigCaps.inputs.append(inputUSB); - rigCaps.hasLan = true; - rigCaps.hasEthernet = false; - rigCaps.hasWiFi = true; - rigCaps.hasDD = true; - rigCaps.hasDV = true; - rigCaps.hasATU = true; - rigCaps.hasCTCSS = true; - rigCaps.hasDTCS = true; - rigCaps.hasRepeaterModes = true; - rigCaps.hasTBPF = true; - rigCaps.attenuators.insert(rigCaps.attenuators.end(),{ '\x10' , '\x20'}); - rigCaps.preamps.push_back('\x01'); - rigCaps.preamps.push_back('\x02'); - //rigCaps.bands = standardHF; - //rigCaps.bands.insert(rigCaps.bands.end(), standardVU.begin(), standardVU.end()); - //rigCaps.bands.insert(rigCaps.bands.end(), { bandDefAir, bandDefGen, bandDefWFM, bandDef630m, bandDef2200m }); - rigCaps.bsr[band70cm] = 0x14; - rigCaps.bsr[band2m] = 0x13; - rigCaps.bsr[bandAir] = 0x12; - rigCaps.bsr[bandWFM] = 0x11; - rigCaps.bsr[bandGen] = 0x15; - //rigCaps.modes = commonModes; - rigCaps.modes.insert(rigCaps.modes.end(), {createMode(modeWFM, 0x06, "WFM"), - createMode(modeDV, 0x17, "DV")}); - rigCaps.transceiveCommand = QByteArrayLiteral("\x1a\x05\x01\x31"); - rigCaps.hasVFOMS = false; - rigCaps.hasVFOAB = true; - rigCaps.hasQuickSplitCommand = true; - rigCaps.quickSplitCommand = QByteArrayLiteral("\x1a\x05\x00\x45"); - // new functions - //rigCaps.commands.insert(funcTransceive,QByteArrayLiteral("\x1a\x05\x01\x31")); - //rigCaps.commands.insert(funcQuickSplit,QByteArrayLiteral("\x1a\x05\x00\x45")); - //rigCaps.commands.insert(funcDashRatio,QByteArrayLiteral("\x1A\x05\x02\x52")); - break; - case model7000: - rigCaps.modelName = QString("IC-7000"); - rigCaps.rigctlModel = 3060; - rigCaps.hasSpectrum = false; - rigCaps.inputs.append(inputACC); - rigCaps.hasLan = false; - rigCaps.hasEthernet = false; - rigCaps.hasWiFi = false; - rigCaps.hasFDcomms = false; - 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; - //rigCaps.bands.insert(rigCaps.bands.end(), standardVU.begin(), standardVU.end()); - //rigCaps.bands.push_back(bandDefGen); - rigCaps.bsr[band2m] = 0x11; - rigCaps.bsr[band70cm] = 0x12; - rigCaps.bsr[bandGen] = 0x13; - //rigCaps.modes = commonModes; - rigCaps.transceiveCommand = QByteArrayLiteral("\x1a\x05\x00\x92"); - rigCaps.hasVFOMS = false; - rigCaps.hasVFOAB = true; - rigCaps.hasQuickSplitCommand = true; - rigCaps.quickSplitCommand = QByteArrayLiteral("\x1a\x05\x00\x52"); - // new functions - // rigCaps.commands.insert(funcTransceive,QByteArrayLiteral("\x1a\x05\x00\x92")); - //rigCaps.commands.insert(funcQuickSplit,QByteArrayLiteral("\x1a\x05\x00\x52")); - break; - case model7410: - rigCaps.modelName = QString("IC-7410"); - rigCaps.rigctlModel = 3067; - rigCaps.hasSpectrum = false; - rigCaps.inputs.append(inputACC); - rigCaps.hasLan = false; - rigCaps.hasEthernet = false; - rigCaps.hasWiFi = false; - rigCaps.hasFDcomms = true; - 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'); - rigCaps.antennas = {0x00, 0x01}; - //rigCaps.bands = standardHF; - //rigCaps.bands.push_back(bandDefGen); - rigCaps.bsr[bandGen] = 0x11; - //rigCaps.modes = commonModes; - rigCaps.transceiveCommand = QByteArrayLiteral("\x1a\x05\x00\x40"); - rigCaps.hasVFOMS = false; - rigCaps.hasVFOAB = true; - rigCaps.hasQuickSplitCommand = true; - rigCaps.quickSplitCommand = QByteArrayLiteral("\x1a\x05\x00\x11"); - // new functions - //rigCaps.commands.insert(funcTransceive,QByteArrayLiteral("\x1a\x05\x00\x40")); - //rigCaps.commands.insert(funcQuickSplit,QByteArrayLiteral("\x1a\x05\x00\x11")); - break; - case model7100: - rigCaps.modelName = QString("IC-7100"); - rigCaps.rigctlModel = 3070; - rigCaps.hasSpectrum = false; - rigCaps.inputs.append(inputUSB); - rigCaps.inputs.append(inputACC); - rigCaps.hasLan = false; - rigCaps.hasEthernet = false; - rigCaps.hasWiFi = false; - rigCaps.hasFDcomms = false; - rigCaps.hasATU = true; - rigCaps.hasCTCSS = true; - rigCaps.hasDTCS = true; - rigCaps.hasRepeaterModes = true; - rigCaps.hasTBPF = true; - rigCaps.attenuators.push_back('\x12'); - rigCaps.preamps.push_back('\x01'); - rigCaps.preamps.push_back('\x02'); - //rigCaps.bands = standardHF; - //rigCaps.bands.insert(rigCaps.bands.end(), standardVU.begin(), standardVU.end()); - //rigCaps.bands.insert(rigCaps.bands.end(), { bandDef4m, bandDefGen}); - rigCaps.bsr[band2m] = 0x11; - rigCaps.bsr[band70cm] = 0x12; - rigCaps.bsr[bandGen] = 0x13; - //rigCaps.modes = commonModes; - rigCaps.modes.insert(rigCaps.modes.end(), {createMode(modeWFM, 0x06, "WFM"), - createMode(modeDV, 0x17, "DV")}); - rigCaps.transceiveCommand = QByteArrayLiteral("\x1a\x05\x00\x95"); - rigCaps.hasVFOMS = false; - rigCaps.hasVFOAB = true; - rigCaps.hasQuickSplitCommand = true; - rigCaps.quickSplitCommand = QByteArrayLiteral("\x1a\x05\x00\x15"); - // new functions - // rigCaps.commands.insert(funcTransceive,QByteArrayLiteral("\x1a\x05\x00\x95")); - //rigCaps.commands.insert(funcQuickSplit,QByteArrayLiteral("\x1a\x05\x00\x15")); - //rigCaps.commands.insert(funcDashRatio,QByteArrayLiteral("\x1A\x05\x01\x35")); - - break; - case model7200: - rigCaps.modelName = QString("IC-7200"); - rigCaps.rigctlModel = 3061; - rigCaps.hasSpectrum = false; - rigCaps.inputs.append(inputUSB); - rigCaps.inputs.append(inputACC); - rigCaps.hasLan = false; - rigCaps.hasEthernet = false; - rigCaps.hasWiFi = false; - rigCaps.hasFDcomms = false; - 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; - //rigCaps.bands.push_back(bandDefGen); - rigCaps.bsr[bandGen] = 0x11; - //rigCaps.modes = commonModes; - rigCaps.transceiveCommand = QByteArrayLiteral("\x1a\x03\x48"); - rigCaps.hasVFOMS = false; - rigCaps.hasVFOAB = true; - rigCaps.hasQuickSplitCommand = true; - rigCaps.quickSplitCommand = QByteArrayLiteral("\x1a\x03\x18"); - // new functions - //rigCaps.commands.insert(funcTransceive,QByteArrayLiteral("\x1a\x03\x48")); - //rigCaps.commands.insert(funcQuickSplit,QByteArrayLiteral("\x1a\x03\x18")); - break; - case model7700: - rigCaps.modelName = QString("IC-7700"); - rigCaps.rigctlModel = 3062; - rigCaps.hasSpectrum = false; - rigCaps.inputs.append(inputLAN); - //rigCaps.inputs.append(inputSPDIF); - rigCaps.inputs.append(inputACC); - rigCaps.hasLan = true; - 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'); - rigCaps.preamps.push_back('\x02'); - rigCaps.hasAntennaSel = true; - rigCaps.antennas = {0x00, 0x01, 0x02, 0x03}; // not sure if 0x03 works - rigCaps.hasATU = true; - //rigCaps.bands = standardHF; - //rigCaps.bands.insert(rigCaps.bands.end(), { bandDefGen, bandDef630m, bandDef2200m }); - //rigCaps.modes = commonModes; - rigCaps.modes.insert(rigCaps.modes.end(), {createMode(modePSK, 0x12, "PSK"), - createMode(modePSK_R, 0x13, "PSK-R")}); - rigCaps.transceiveCommand = QByteArrayLiteral("\x1a\x05\x00\x95"); - rigCaps.hasVFOMS = false; - rigCaps.hasVFOAB = true; - rigCaps.hasQuickSplitCommand = true; - rigCaps.quickSplitCommand = QByteArrayLiteral("\x1a\x05\x00\x67"); - // new functions - //rigCaps.commands.insert(funcTransceive,QByteArrayLiteral("\x1a\x05\x00\x95")); - //rigCaps.commands.insert(funcQuickSplit,QByteArrayLiteral("\x1a\x05\x00\x67")); - //rigCaps.commands.insert(funcDashRatio,QByteArrayLiteral("\x1A\x05\x01\x34")); - break; - case model703: - rigCaps.modelName = QString("IC-703"); - rigCaps.rigctlModel = 3055; - rigCaps.hasSpectrum = false; - rigCaps.inputs.clear(); - rigCaps.hasLan = false; - rigCaps.hasEthernet = false; - rigCaps.hasWiFi = false; - rigCaps.hasFDcomms = false; - rigCaps.hasATU = true; - rigCaps.hasPTTCommand = false; - rigCaps.useRTSforPTT = true; - rigCaps.hasDataModes = false; - rigCaps.attenuators.push_back('\x20'); - //rigCaps.bands = standardHF; - //rigCaps.bands.insert(rigCaps.bands.end(), standardVU.begin(), standardVU.end()); - //rigCaps.bands.push_back(bandDefGen); - //rigCaps.modes = commonModes; - rigCaps.modes.insert(rigCaps.modes.end(), createMode(modeWFM, 0x06, "WFM")); - rigCaps.transceiveCommand = QByteArrayLiteral("\x1a\x05\x00\x00"); - // new functions - //rigCaps.commands.insert(funcTransceive,QByteArrayLiteral("\x1a\x05\x00\x00")); - //rigCaps.commands.insert(funcFreqGet,QByteArrayLiteral("\x00")); - //rigCaps.commands.insert(funcFreqSet,QByteArrayLiteral("\x03")); - //rigCaps.commands.insert(funcModeGet,QByteArrayLiteral("\x01")); - //rigCaps.commands.insert(funcModeSet,QByteArrayLiteral("\x06")); - - break; - case model706: - rigCaps.modelName = QString("IC-706"); - rigCaps.rigctlModel = 3009; - rigCaps.hasSpectrum = false; - rigCaps.inputs.clear(); - rigCaps.hasLan = false; - rigCaps.hasEthernet = false; - rigCaps.hasWiFi = false; - rigCaps.hasFDcomms = false; - rigCaps.hasATU = true; - rigCaps.hasPTTCommand = false; - rigCaps.useRTSforPTT = true; - rigCaps.hasDataModes = false; - rigCaps.attenuators.push_back('\x20'); - //rigCaps.bands = standardHF; - //rigCaps.bands.insert(rigCaps.bands.end(), standardVU.begin(), standardVU.end()); - //rigCaps.bands.push_back(bandDefGen); - //rigCaps.modes = commonModes; - rigCaps.modes.insert(rigCaps.modes.end(), createMode(modeWFM, 0x06, "WFM")); - rigCaps.transceiveCommand = QByteArrayLiteral("\x1a\x05\x00\x00"); - rigCaps.hasVFOMS = false; - rigCaps.hasVFOAB = true; - // new functions - //rigCaps.commands.insert(funcTransceive,QByteArrayLiteral("\x1a\x05\x00\x00")); - //rigCaps.commands.insert(funcFreqGet,QByteArrayLiteral("\x00")); - //rigCaps.commands.insert(funcFreqSet,QByteArrayLiteral("\x03")); - //rigCaps.commands.insert(funcModeGet,QByteArrayLiteral("\x01")); - //rigCaps.commands.insert(funcModeSet,QByteArrayLiteral("\x06")); - break; - case model718: - rigCaps.modelName = QString("IC-718"); - rigCaps.rigctlModel = 3013; - rigCaps.hasSpectrum = false; - rigCaps.inputs.clear(); - rigCaps.hasLan = false; - rigCaps.hasEthernet = false; - rigCaps.hasWiFi = false; - rigCaps.hasFDcomms = false; - rigCaps.hasATU = false; - rigCaps.hasPTTCommand = false; - rigCaps.useRTSforPTT = true; - rigCaps.hasIFShift = true; - rigCaps.hasDataModes = false; - rigCaps.attenuators.push_back('\x20'); - rigCaps.preamps.push_back('\x01'); - rigCaps.bands = {bandDef10m, bandDef10m, bandDef12m, - bandDef15m, bandDef17m, bandDef20m, bandDef30m, - bandDef40m, bandDef60m, bandDef80m, bandDef160m, bandDefGen}; - rigCaps.modes = { createMode(modeLSB, 0x00, "LSB"), createMode(modeUSB, 0x01, "USB"), - createMode(modeAM, 0x02, "AM"), - createMode(modeCW, 0x03, "CW"), createMode(modeCW_R, 0x07, "CW-R"), - createMode(modeRTTY, 0x04, "RTTY"), createMode(modeRTTY_R, 0x08, "RTTY-R") - }; - rigCaps.transceiveCommand = QByteArrayLiteral("\x1a\x05\x00\x00"); - rigCaps.hasVFOMS = false; - rigCaps.hasVFOAB = true; - // new functions - //rigCaps.commands.insert(funcTransceive,QByteArrayLiteral("\x1a\x05\x00\x00")); - //rigCaps.commands.insert(funcFreqGet,QByteArrayLiteral("\x00")); - //rigCaps.commands.insert(funcFreqSet,QByteArrayLiteral("\x03")); - //rigCaps.commands.insert(funcModeGet,QByteArrayLiteral("\x01")); - //rigCaps.commands.insert(funcModeSet,QByteArrayLiteral("\x06")); - break; - case model736: - rigCaps.modelName = QString("IC-736"); - rigCaps.rigctlModel = 3020; - rigCaps.hasSpectrum = false; - rigCaps.inputs.clear(); - rigCaps.hasLan = false; - rigCaps.hasEthernet = false; - rigCaps.hasWiFi = false; - rigCaps.hasFDcomms = false; - rigCaps.hasATU = false; - rigCaps.hasPTTCommand = false; - rigCaps.useRTSforPTT = true; - rigCaps.hasDataModes = false; - rigCaps.attenuators.push_back('\x20'); - rigCaps.preamps.push_back('\x01'); - rigCaps.bands = standardHF; - rigCaps.modes = { createMode(modeLSB, 0x00, "LSB"), createMode(modeUSB, 0x01, "USB"), - createMode(modeAM, 0x02, "AM"), createMode(modeFM, 0x05, "FM"), - createMode(modeCW, 0x03, "CW"), createMode(modeCW_R, 0x07, "CW-R"), - }; - rigCaps.hasVFOMS = false; - rigCaps.hasVFOAB = true; - //rigCaps.commands.insert(funcFreqGet,QByteArrayLiteral("\x00")); - //rigCaps.commands.insert(funcFreqSet,QByteArrayLiteral("\x03")); - // rigCaps.commands.insert(funcModeGet,QByteArrayLiteral("\x01")); - //rigCaps.commands.insert(funcModeSet,QByteArrayLiteral("\x06")); - break; - case model737: - rigCaps.modelName = QString("IC-737"); - rigCaps.rigctlModel = 3021; - rigCaps.hasSpectrum = false; - rigCaps.inputs.clear(); - rigCaps.hasLan = false; - rigCaps.hasEthernet = false; - rigCaps.hasWiFi = false; - rigCaps.hasFDcomms = false; - rigCaps.hasATU = false; - rigCaps.hasPTTCommand = false; - rigCaps.useRTSforPTT = true; - rigCaps.hasDataModes = false; - rigCaps.attenuators.push_back('\x20'); - rigCaps.preamps.push_back('\x01'); - rigCaps.bands = standardHF; - rigCaps.modes = { createMode(modeLSB, 0x00, "LSB"), createMode(modeUSB, 0x01, "USB"), - createMode(modeAM, 0x02, "AM"), createMode(modeFM, 0x05, "FM"), - createMode(modeCW, 0x03, "CW"), createMode(modeCW_R, 0x07, "CW-R"), - }; - rigCaps.hasVFOMS = false; - rigCaps.hasVFOAB = true; - //rigCaps.commands.insert(funcFreqGet,QByteArrayLiteral("\x00")); - // rigCaps.commands.insert(funcFreqSet,QByteArrayLiteral("\x03")); - // rigCaps.commands.insert(funcModeGet,QByteArrayLiteral("\x01")); - // rigCaps.commands.insert(funcModeSet,QByteArrayLiteral("\x06")); - break; - case model738: - rigCaps.modelName = QString("IC-738"); - rigCaps.rigctlModel = 3022; - rigCaps.hasSpectrum = false; - rigCaps.inputs.clear(); - rigCaps.hasLan = false; - rigCaps.hasEthernet = false; - rigCaps.hasWiFi = false; - rigCaps.hasFDcomms = false; - rigCaps.hasATU = false; - rigCaps.hasPTTCommand = false; - rigCaps.useRTSforPTT = true; - rigCaps.hasDataModes = false; - rigCaps.attenuators.push_back('\x20'); - rigCaps.preamps.push_back('\x01'); - rigCaps.bands = standardHF; - rigCaps.modes = { createMode(modeLSB, 0x00, "LSB"), createMode(modeUSB, 0x01, "USB"), - createMode(modeAM, 0x02, "AM"), createMode(modeFM, 0x05, "FM"), - createMode(modeCW, 0x03, "CW"), createMode(modeCW_R, 0x07, "CW-R"), - }; - rigCaps.hasVFOMS = false; - rigCaps.hasVFOAB = true; - //rigCaps.commands.insert(funcFreqGet,QByteArrayLiteral("\x00")); - //rigCaps.commands.insert(funcFreqSet,QByteArrayLiteral("\x03")); - // rigCaps.commands.insert(funcModeGet,QByteArrayLiteral("\x01")); - // rigCaps.commands.insert(funcModeSet,QByteArrayLiteral("\x06")); - break; - case model746: - rigCaps.modelName = QString("IC-746"); - rigCaps.rigctlModel = 3023; - rigCaps.hasSpectrum = false; - rigCaps.inputs.clear(); - rigCaps.hasLan = false; - rigCaps.hasEthernet = false; - rigCaps.hasWiFi = false; - rigCaps.hasFDcomms = false; - rigCaps.hasATU = true; - rigCaps.hasTBPF = true; - rigCaps.hasIFShift = true; - rigCaps.hasCTCSS = true; - rigCaps.hasDTCS = true; - rigCaps.hasRepeaterModes = true; - rigCaps.hasAntennaSel = true; - rigCaps.preamps.push_back('\x01'); - rigCaps.preamps.push_back('\x02'); - rigCaps.attenuators.insert(rigCaps.attenuators.end(),{ '\x20'}); - // There are two HF and VHF ant, 12-01 adn 12-02 select the HF, the VHF is auto selected - // this incorrectly shows up as 2 and 3 in the drop down. - rigCaps.antennas = {0x01, 0x02}; - rigCaps.bands = standardHF; - rigCaps.bands.push_back(bandDef2m); - rigCaps.bands.push_back(bandDefGen); - //rigCaps.modes = commonModes; - rigCaps.transceiveCommand = QByteArrayLiteral("\x1a\x05\x00\x00"); - rigCaps.hasVFOMS = true; - rigCaps.hasVFOAB = true; - // new functions - //rigCaps.commands.insert(funcTransceive,QByteArrayLiteral("\x1a\x05\x00\x00")); - break; - case model756: - rigCaps.modelName = QString("IC-756"); - rigCaps.rigctlModel = 3026; - rigCaps.hasSpectrum = false; - rigCaps.inputs.clear(); - rigCaps.hasLan = false; - rigCaps.hasEthernet = false; - 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'}); - rigCaps.antennas = {0x00, 0x01}; - rigCaps.bands = standardHF; - rigCaps.bands.push_back(bandDefGen); - rigCaps.bsr[bandGen] = 0x11; - //rigCaps.modes = commonModes; - rigCaps.transceiveCommand = QByteArrayLiteral("\x1a\x05\x00\x00"); - rigCaps.hasVFOMS = true; - rigCaps.hasVFOAB = false; - // new functions - // rigCaps.commands.insert(funcTransceive,QByteArrayLiteral("\x1a\x05\x00\x00")); - break; - case model756pro: - rigCaps.modelName = QString("IC-756 Pro"); - rigCaps.rigctlModel = 3027; - rigCaps.hasSpectrum = false; - rigCaps.inputs.clear(); - rigCaps.hasLan = false; - rigCaps.hasEthernet = false; - 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'}); - rigCaps.antennas = {0x00, 0x01}; - rigCaps.bands = standardHF; - rigCaps.bands.push_back(bandDefGen); - rigCaps.bsr[bandGen] = 0x11; - //rigCaps.modes = commonModes; - rigCaps.transceiveCommand = QByteArrayLiteral("\x1a\x05\x00\x00"); - rigCaps.hasVFOMS = true; - rigCaps.hasVFOAB = false; - // new functions - //rigCaps.commands.insert(funcTransceive,QByteArrayLiteral("\x1a\x05\x00\x00")); - break; - case model756proii: - rigCaps.modelName = QString("IC-756 Pro II"); - rigCaps.rigctlModel = 3027; - rigCaps.hasSpectrum = false; - rigCaps.inputs.clear(); - rigCaps.hasLan = false; - rigCaps.hasEthernet = false; - 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'}); - rigCaps.antennas = {0x00, 0x01}; - rigCaps.bands = standardHF; - rigCaps.bands.push_back(bandDefGen); - rigCaps.bsr[bandGen] = 0x11; - //rigCaps.modes = commonModes; - rigCaps.transceiveCommand = QByteArrayLiteral("\x1a\x05\x00\x00"); - rigCaps.hasVFOMS = true; - rigCaps.hasVFOAB = false; - rigCaps.hasQuickSplitCommand = true; - rigCaps.quickSplitCommand = QByteArrayLiteral("\x1a\x05\x24"); - // new functions - //rigCaps.commands.insert(funcTransceive,QByteArrayLiteral("\x1a\x05\x00\x00")); - // rigCaps.commands.insert(funcQuickSplit,QByteArrayLiteral("\x1a\x05\x24")); - break; - case model756proiii: - rigCaps.modelName = QString("IC-756 Pro III"); - rigCaps.rigctlModel = 3027; - rigCaps.hasSpectrum = false; - rigCaps.inputs.clear(); - rigCaps.hasLan = false; - rigCaps.hasEthernet = false; - 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'}); - rigCaps.antennas = {0x00, 0x01}; - rigCaps.bands = standardHF; - rigCaps.bands.push_back(bandDefGen); - rigCaps.bsr[bandGen] = 0x11; - //rigCaps.modes = commonModes; - rigCaps.transceiveCommand = QByteArrayLiteral("\x1a\x05\x00\x00"); - rigCaps.hasVFOMS = true; - rigCaps.hasVFOAB = false; - rigCaps.hasQuickSplitCommand = true; - rigCaps.quickSplitCommand = QByteArrayLiteral("\x1a\x05\x24"); - // new functions - //rigCaps.commands.insert(funcTransceive,QByteArrayLiteral("\x1a\x05\x00\x00")); - //rigCaps.commands.insert(funcQuickSplit,QByteArrayLiteral("\x1a\x05\x24")); - break; - case model9100: - rigCaps.modelName = QString("IC-9100"); - rigCaps.rigctlModel = 3068; - rigCaps.hasSpectrum = false; - rigCaps.inputs.append(inputUSB); // TODO, add commands for this radio's inputs - rigCaps.inputs.append(inputACC); - rigCaps.hasLan = false; - rigCaps.hasEthernet = false; - rigCaps.hasWiFi = false; - rigCaps.hasFDcomms = false; - rigCaps.hasATU = true; - rigCaps.hasDV = true; - rigCaps.hasTBPF = true; - rigCaps.hasRepeaterModes = true - rigCaps.preamps.push_back('\x01'); - rigCaps.preamps.push_back('\x02'); - rigCaps.attenuators.insert(rigCaps.attenuators.end(),{ '\x20' }); - rigCaps.antennas = {0x00, 0x01}; - rigCaps.bands = standardHF; - rigCaps.bands.insert(rigCaps.bands.end(), standardVU.begin(), standardVU.end()); - rigCaps.bands.push_back(bandDef23cm); - rigCaps.bands.push_back(bandDefGen); - rigCaps.bsr[band2m] = 0x11; - rigCaps.bsr[band70cm] = 0x12; - rigCaps.bsr[band23cm] = 0x13; - rigCaps.bsr[bandGen] = 0x14; - //rigCaps.modes = commonModes; - rigCaps.modes.insert(rigCaps.modes.end(), {createMode(modeDV, 0x17, "DV")}); - rigCaps.hasVFOMS = true; - rigCaps.hasVFOAB = true; - rigCaps.hasQuickSplitCommand = true; - rigCaps.quickSplitCommand = QByteArrayLiteral("\x1a\x05\x00\x14"); - // new functions - //rigCaps.commands.insert(funcQuickSplit,QByteArrayLiteral("\x1a\x05\x00\x14")); - break; - default: - rigCaps.modelName = QString("IC-0x%1").arg(rigCaps.modelID, 2, 16); - rigCaps.hasSpectrum = false; - rigCaps.spectSeqMax = 0; - rigCaps.spectAmpMax = 0; - rigCaps.spectLenMax = 0; - rigCaps.inputs.clear(); - rigCaps.hasLan = false; - rigCaps.hasEthernet = false; - rigCaps.hasWiFi = false; - rigCaps.hasFDcomms = false; - rigCaps.hasPreamp = false; - rigCaps.hasAntennaSel = false; - rigCaps.attenuators.push_back('\x10'); - rigCaps.attenuators.push_back('\x12'); - rigCaps.attenuators.push_back('\x20'); - rigCaps.bands = standardHF; - rigCaps.bands.insert(rigCaps.bands.end(), standardVU.begin(), standardVU.end()); - rigCaps.bands.insert(rigCaps.bands.end(), {bandDef23cm, bandDef4m, bandDef630m, bandDef2200m, bandDefGen}); - //rigCaps.modes = commonModes; - rigCaps.transceiveCommand = QByteArrayLiteral("\x1a\x05\x00\x00"); - rigCaps.hasVFOMS = true; - rigCaps.hasVFOAB = true; - qInfo(logRig()) << "Found unknown rig: 0x" << QString("%1").arg(rigCaps.modelID, 2, 16); - break; - } - */ haveRigCaps = true; @@ -5606,7 +4715,7 @@ modeInfo rigCommander::parseMode(quint8 mode, quint8 filter, bool sub) cacheItem item; // Does the current mode support filterwidth? - if (mi.bw) { + if (mi.bwMin >0 && mi.bwMax > 0) { queue->getCache(funcFilterWidth,sub); } diff --git a/rigcommander.h b/rigcommander.h index 2a90ee45..08facca0 100644 --- a/rigcommander.h +++ b/rigcommander.h @@ -457,7 +457,7 @@ private: void debugMe(); void printHex(const QByteArray &pdata); void printHex(const QByteArray &pdata, bool printVert, bool printHoriz); - modeInfo createMode(rigMode_t m, unsigned char reg, QString name, bool bw); + centerSpanData createScopeCenter(centerSpansType s, QString name); commHandler* comm = Q_NULLPTR; diff --git a/rigcreator.cpp b/rigcreator.cpp index cb9f37f0..1e9e8398 100644 --- a/rigcreator.cpp +++ b/rigcreator.cpp @@ -248,30 +248,9 @@ void rigCreator::loadRigFile(QString file) ui->modes->insertRow(ui->modes->rowCount()); ui->modes->model()->setData(ui->modes->model()->index(c,0),QString::number(settings->value("Num", 0).toUInt()).rightJustified(2,'0')); ui->modes->model()->setData(ui->modes->model()->index(c,1),QString::number(settings->value("Reg", 0).toUInt(),16).rightJustified(2,'0')); - ui->modes->model()->setData(ui->modes->model()->index(c,2),settings->value("BW", 0).toString().toInt()); - /* - if (settings->value("Min", 0).toString().toInt() == 0 && settings->value("Max", 0).toString().toInt() ==0 && settings->value("Name", "").toString() != "FM") { - QString name = settings->value("Name", "").toString(); - if (name == "LSB" || name == "USB" || name == "PSK" || name == "PSK-R" || name == "CW" || name == "CW-R") - { - ui->modes->model()->setData(ui->modes->model()->index(c,3),50,Qt::DisplayRole); - ui->modes->model()->setData(ui->modes->model()->index(c,4),3600,Qt::DisplayRole); - } else if (name == "RTTY" || name == "RTTY-R") - { - ui->modes->model()->setData(ui->modes->model()->index(c,3),50,Qt::DisplayRole); - ui->modes->model()->setData(ui->modes->model()->index(c,4),2700,Qt::DisplayRole); - } else if (name == "AM") - { - ui->modes->model()->setData(ui->modes->model()->index(c,3),200,Qt::DisplayRole); - ui->modes->model()->setData(ui->modes->model()->index(c,4),10000,Qt::DisplayRole); - } - - } else { - */ - ui->modes->model()->setData(ui->modes->model()->index(c,3),settings->value("Min", 0).toString().toInt(),Qt::DisplayRole); - ui->modes->model()->setData(ui->modes->model()->index(c,4),settings->value("Max", 0).toString().toInt(),Qt::DisplayRole); - //} - ui->modes->model()->setData(ui->modes->model()->index(c,5),settings->value("Name", "").toString()); + ui->modes->model()->setData(ui->modes->model()->index(c,2),settings->value("Min", 0).toString().toInt(),Qt::DisplayRole); + ui->modes->model()->setData(ui->modes->model()->index(c,3),settings->value("Max", 0).toString().toInt(),Qt::DisplayRole); + ui->modes->model()->setData(ui->modes->model()->index(c,4),settings->value("Name", "").toString()); } settings->endArray(); } @@ -530,10 +509,9 @@ void rigCreator::saveRigFile(QString file) settings->setArrayIndex(n); settings->setValue("Num", (ui->modes->item(n,0) == NULL) ? 0 : ui->modes->item(n,0)->text().toUInt()); settings->setValue("Reg", (ui->modes->item(n,1) == NULL) ? 0 : ui->modes->item(n,1)->text().toInt(nullptr,16)); - settings->setValue("BW",(ui->modes->item(n,2) == NULL) ? 0 : ui->modes->item(n,2)->text().toInt()); - settings->setValue("Min",(ui->modes->item(n,3) == NULL) ? 0 : ui->modes->item(n,3)->text().toInt()); - settings->setValue("Max",(ui->modes->item(n,4) == NULL) ? 0 : ui->modes->item(n,4)->text().toInt()); - settings->setValue("Name",(ui->modes->item(n,5) == NULL) ? "" : ui->modes->item(n,5)->text()); + settings->setValue("Min",(ui->modes->item(n,2) == NULL) ? 0 : ui->modes->item(n,2)->text().toInt()); + settings->setValue("Max",(ui->modes->item(n,3) == NULL) ? 0 : ui->modes->item(n,3)->text().toInt()); + settings->setValue("Name",(ui->modes->item(n,4) == NULL) ? "" : ui->modes->item(n,4)->text()); } settings->endArray(); diff --git a/rigcreator.ui b/rigcreator.ui index 268132b7..3adb0c4d 100644 --- a/rigcreator.ui +++ b/rigcreator.ui @@ -1050,7 +1050,7 @@ 0 - 80 + 85 true @@ -1074,11 +1074,6 @@ Reg - - - BW - - Min BW diff --git a/spectrumscope.cpp b/spectrumscope.cpp index dd98e7fa..b033c850 100644 --- a/spectrumscope.cpp +++ b/spectrumscope.cpp @@ -1349,7 +1349,7 @@ void spectrumScope::receiveMode(modeInfo m) passbandCenterFrequency = 0.0; // If new mode doesn't allow bandwidth control, disable filterwidth and pbt. - if (m.bw) { + if (m.bwMin > 0 && m.bwMax > 0) { queue->addUnique(priorityHigh,funcPBTInner,true,sub); queue->addUnique(priorityHigh,funcPBTOuter,true,sub); queue->addUnique(priorityHigh,funcFilterWidth,true,sub); diff --git a/wfviewtypes.h b/wfviewtypes.h index 8a977bdd..f5007c83 100644 --- a/wfviewtypes.h +++ b/wfviewtypes.h @@ -115,15 +115,16 @@ struct rptrAccessData { }; struct modeInfo { - modeInfo ():mk(modeUnknown), reg(99), filter(1),VFO(activeVFO), data(0), name(""), bw(false), pass(0) {}; - modeInfo(rigMode_t mk, quint8 reg, QString name, bool bw): mk(mk), reg(reg), data(false), name(name),bw(bw), pass(0) {}; + modeInfo ():mk(modeUnknown), reg(99), filter(1),VFO(activeVFO), data(0), name(""), bwMin(0), bwMax(0), pass(0) {}; + modeInfo(rigMode_t mk, quint8 reg, QString name, int bwMin, int bwMax): mk(mk), reg(reg), data(false), name(name),bwMin(bwMin), bwMax(bwMax), pass(0) {}; rigMode_t mk; unsigned char reg; unsigned char filter; // Default filter is always 1 selVFO_t VFO; unsigned char data; QString name; - bool bw; // Can the bandwidth of the current filter be changed? + int bwMin; + int bwMax; quint16 pass; };