kopia lustrzana https://gitlab.com/eliggett/wfview
Move some logs from info to debug
rodzic
f088e5b8f9
commit
1c057d98c2
|
@ -82,7 +82,7 @@ void cwSender::handleKeySpeed(unsigned char wpm)
|
|||
{
|
||||
if (wpm != ui->wpmSpin->value() && (wpm >= ui->wpmSpin->minimum()) && (wpm <= ui->wpmSpin->maximum()))
|
||||
{
|
||||
qInfo(logCW()) << "Received new key speed" << wpm;
|
||||
qDebug(logCW()) << "Received new key speed" << wpm;
|
||||
ui->wpmSpin->blockSignals(true);
|
||||
QMetaObject::invokeMethod(ui->wpmSpin, "setValue", Qt::QueuedConnection, Q_ARG(int, wpm));
|
||||
ui->wpmSpin->blockSignals(false);
|
||||
|
|
13
memories.h
13
memories.h
|
@ -34,19 +34,6 @@ public:
|
|||
~memories();
|
||||
void populate();
|
||||
|
||||
signals:
|
||||
void setMemory(memoryType mem);
|
||||
void getMemory(quint32 mem);
|
||||
void setSatelliteMode(bool en);
|
||||
void getSatMemory(quint32 mem);
|
||||
void recallMemory(quint32 mem);
|
||||
void clearMemory(quint32 mem);
|
||||
void clearSatMemory(quint32 mem);
|
||||
void memoryMode();
|
||||
void vfoMode();
|
||||
void setBand(char band);
|
||||
|
||||
|
||||
private slots:
|
||||
void on_table_cellChanged(int row, int col);
|
||||
void on_group_currentIndexChanged(int index);
|
||||
|
|
|
@ -490,8 +490,8 @@ Commands\93\Max=1
|
|||
Commands\93\Command29=false
|
||||
Commands\94\Type=RIT Frequency
|
||||
Commands\94\String=\\x21\\x00
|
||||
Commands\94\Min=0
|
||||
Commands\94\Max=0
|
||||
Commands\94\Min=-999
|
||||
Commands\94\Max=999
|
||||
Commands\94\Command29=false
|
||||
Commands\95\Type=RIT Status
|
||||
Commands\95\String=\\x21\\x01
|
||||
|
|
|
@ -325,8 +325,8 @@ Commands\60\Max=0
|
|||
Commands\60\Command29=false
|
||||
Commands\61\Type=RIT Frequency
|
||||
Commands\61\String=\\x21\\x01
|
||||
Commands\61\Min=0
|
||||
Commands\61\Max=1
|
||||
Commands\61\Min=-999
|
||||
Commands\61\Max=999
|
||||
Commands\61\Command29=false
|
||||
Commands\62\Type=Selected Freq
|
||||
Commands\62\String=\\x25\\x00
|
||||
|
|
|
@ -335,8 +335,8 @@ Commands\62\Max=0
|
|||
Commands\62\Command29=false
|
||||
Commands\63\Type=RIT Frequency
|
||||
Commands\63\String=\\x21\\x01
|
||||
Commands\63\Min=0
|
||||
Commands\63\Max=1
|
||||
Commands\63\Min=-999
|
||||
Commands\63\Max=999
|
||||
Commands\63\Command29=false
|
||||
Commands\64\Type=Selected Freq
|
||||
Commands\64\String=\\x25\\x00
|
||||
|
|
|
@ -550,8 +550,8 @@ Commands\105\Max=1
|
|||
Commands\105\Command29=false
|
||||
Commands\106\Type=RIT Frequency
|
||||
Commands\106\String=\\x21\\x00
|
||||
Commands\106\Min=0
|
||||
Commands\106\Max=0
|
||||
Commands\106\Min=-999
|
||||
Commands\106\Max=999
|
||||
Commands\106\Command29=false
|
||||
Commands\107\Type=RIT Status
|
||||
Commands\107\String=\\x21\\x01
|
||||
|
|
|
@ -560,8 +560,8 @@ Commands\107\Max=1
|
|||
Commands\107\Command29=false
|
||||
Commands\108\Type=RIT Frequency
|
||||
Commands\108\String=\\x21\\x00
|
||||
Commands\108\Min=0
|
||||
Commands\108\Max=0
|
||||
Commands\108\Min=-999
|
||||
Commands\108\Max=999
|
||||
Commands\108\Command29=false
|
||||
Commands\109\Type=RIT Status
|
||||
Commands\109\String=\\x21\\x01
|
||||
|
|
|
@ -515,8 +515,8 @@ Commands\98\Max=1
|
|||
Commands\98\Command29=false
|
||||
Commands\99\Type=RIT Frequency
|
||||
Commands\99\String=\\x21\\x00
|
||||
Commands\99\Min=0
|
||||
Commands\99\Max=0
|
||||
Commands\99\Min=-999
|
||||
Commands\99\Max=999
|
||||
Commands\99\Command29=false
|
||||
Commands\100\Type=RIT Status
|
||||
Commands\100\String=\\x21\\x01
|
||||
|
|
|
@ -1348,7 +1348,7 @@ void spectrumScope::receiveMode(modeInfo m)
|
|||
if (mode.reg != m.reg || m.filter != mode.filter || m.data != mode.data)
|
||||
{
|
||||
|
||||
qInfo(logSystem()) << __func__ << QString("Received new mode for %0: %1 (%2) filter:%3 data:%4")
|
||||
qDebug(logSystem()) << __func__ << QString("Received new mode for %0: %1 (%2) filter:%3 data:%4")
|
||||
.arg((vfo?"Sub":"Main")).arg(QString::number(m.mk,16)).arg(m.name).arg(m.filter).arg(m.data) ;
|
||||
|
||||
if (mode.mk != m.mk) {
|
||||
|
@ -1494,7 +1494,7 @@ void spectrumScope::receiveCwPitch(uchar pitch)
|
|||
if (p != this->cwPitch)
|
||||
{
|
||||
passbandCenterFrequency = p / 2000000.0;
|
||||
qInfo(logSystem()) << QString("%0 Received new CW Pitch %1 Hz was %2 (center freq %3 MHz)").arg((vfo?"Sub":"Main")).arg(p).arg(cwPitch).arg(passbandCenterFrequency);
|
||||
qDebug(logSystem()) << QString("%0 Received new CW Pitch %1 Hz was %2 (center freq %3 MHz)").arg((vfo?"Sub":"Main")).arg(p).arg(cwPitch).arg(passbandCenterFrequency);
|
||||
this->cwPitch = p;
|
||||
}
|
||||
}
|
||||
|
@ -1506,7 +1506,7 @@ void spectrumScope::receivePassband(quint16 pass)
|
|||
if (passbandWidth != pb) {
|
||||
passbandWidth = pb;
|
||||
//trxadj->updatePassband(pass);
|
||||
qInfo(logSystem()) << QString("%0 Received new IF Filter/Passband %1 Hz").arg(vfo?"Sub":"Main").arg(pass);
|
||||
qDebug(logSystem()) << QString("%0 Received new IF Filter/Passband %1 Hz").arg(vfo?"Sub":"Main").arg(pass);
|
||||
emit showStatusBarText(QString("%0 IF filter width %1 Hz (%2 MHz)").arg(vfo?"Sub":"Main").arg(pass).arg(passbandWidth));
|
||||
}
|
||||
}
|
||||
|
|
64
wfmain.cpp
64
wfmain.cpp
|
@ -4053,7 +4053,7 @@ void wfmain::on_rfGainSlider_valueChanged(int value)
|
|||
void wfmain::on_afGainSlider_valueChanged(int value)
|
||||
{
|
||||
|
||||
qInfo(logGui()) << "AF Gain Slider value" << value << "LAN=" << usingLAN;
|
||||
qDebug(logGui()) << "AF Gain Slider value" << value << "LAN=" << usingLAN;
|
||||
if(usingLAN)
|
||||
{
|
||||
prefs.rxSetup.localAFgain = (unsigned char)(value);
|
||||
|
@ -4398,7 +4398,7 @@ void wfmain::receivePassband(quint16 pass)
|
|||
if (vfos.size() && vfos[0]->getPassbandWidth() != pb) {
|
||||
vfos[0]->setPassbandWidth(pb);
|
||||
|
||||
qInfo(logSystem()) << QString("Received new IF Filter/Passband %0 Hz").arg(pass);
|
||||
qDebug(logSystem()) << QString("Received new IF Filter/Passband %0 Hz").arg(pass);
|
||||
showStatusBarText(QString("IF filter width %0 Hz (%1 MHz)").arg(pass).arg(passbandWidth));
|
||||
}
|
||||
}
|
||||
|
@ -4409,7 +4409,7 @@ void wfmain::receiveCwPitch(unsigned char pitch) {
|
|||
if (p != cwPitch)
|
||||
{
|
||||
passbandCenterFrequency = p / 2000000.0;
|
||||
qInfo(logSystem()) << QString("Received new CW Pitch %0 Hz was %1 (center freq %2 MHz)").arg(p).arg(cwPitch).arg(passbandCenterFrequency);
|
||||
qDebug(logSystem()) << QString("Received new CW Pitch %0 Hz was %1 (center freq %2 MHz)").arg(p).arg(cwPitch).arg(passbandCenterFrequency);
|
||||
cwPitch = p;
|
||||
emit sendLevel(funcCwPitch,pitch);
|
||||
}
|
||||
|
@ -4423,7 +4423,7 @@ void wfmain::receiveTuningStep(unsigned char step)
|
|||
for (auto &s: rigCaps->steps)
|
||||
{
|
||||
if (step == s.num && ui->tuningStepCombo->currentData().toUInt() != s.hz) {
|
||||
qInfo(logSystem()) << QString("Received new Tuning Step %0").arg(s.name);
|
||||
qDebug(logSystem()) << QString("Received new Tuning Step %0").arg(s.name);
|
||||
ui->tuningStepCombo->setCurrentIndex(ui->tuningStepCombo->findData(s.hz));
|
||||
foreach (auto vfo, vfos)
|
||||
{
|
||||
|
@ -5155,60 +5155,6 @@ void wfmain::on_memoriesBtn_clicked()
|
|||
memWindow = new memories(false);
|
||||
this->memWindow->connect(this, SIGNAL(haveMemory(memoryType)), memWindow, SLOT(receiveMemory(memoryType)));
|
||||
|
||||
this->memWindow->connect(this->memWindow, &memories::getMemory, rig,[=](const quint32 &mem) {
|
||||
queue->add(priorityImmediate,queueItem(funcMemoryContents,QVariant::fromValue<uint>(mem)));
|
||||
});
|
||||
|
||||
this->memWindow->connect(this->memWindow, &memories::getSatMemory, rig, [=](const quint32 &mem) {
|
||||
queue->add(priorityImmediate,queueItem(funcSatelliteMemory,QVariant::fromValue<ushort>(mem & 0xffff)));
|
||||
});
|
||||
|
||||
this->memWindow->connect(this->memWindow, &memories::setMemory, rig, [=](const memoryType &mem) {
|
||||
queue->add(priorityImmediate,queueItem((mem.sat?funcSatelliteMemory:funcMemoryContents),QVariant::fromValue<memoryType>(mem)));
|
||||
});
|
||||
|
||||
this->memWindow->connect(this->memWindow, &memories::clearMemory, rig, [=](const quint32 &mem) {
|
||||
queue->add(priorityImmediate,queueItem(funcMemoryContents,QVariant::fromValue<uint>(mem)));
|
||||
});
|
||||
|
||||
this->memWindow->connect(this->memWindow, &memories::recallMemory, rig, [=](const quint32 &mem) {
|
||||
queue->add(priorityImmediate,queueItem(funcMemoryMode,QVariant::fromValue<uint>(mem)));
|
||||
});
|
||||
|
||||
this->memWindow->connect(this->memWindow, &memories::setBand, rig, [=](const char &band) {
|
||||
queue->add(priorityImmediate,queueItem(funcBandStackReg,QVariant::fromValue<uchar>(band)));
|
||||
});
|
||||
|
||||
this->memWindow->connect(this->memWindow, &memories::memoryMode, rig, [=]() {
|
||||
queue->add(priorityImmediate,funcMemoryMode);
|
||||
queue->del(funcSelectedFreq,false);
|
||||
queue->del(funcSelectedMode,false);
|
||||
queue->del(funcUnselectedFreq,true);
|
||||
queue->del(funcUnselectedMode,true);
|
||||
});
|
||||
|
||||
this->memWindow->connect(this->memWindow, &memories::vfoMode, rig, [this]() {
|
||||
queue->addUnique(priorityMedium,funcSelectedFreq,true,false);
|
||||
queue->addUnique(priorityMedium,funcSelectedMode,true,false);
|
||||
queue->addUnique(priorityMedium,funcUnselectedFreq,true,true);
|
||||
queue->addUnique(priorityMedium,funcUnselectedMode,true,true);
|
||||
});
|
||||
|
||||
this->memWindow->connect(this->memWindow, &memories::setSatelliteMode, rig, [this](const bool &en) {
|
||||
queue->add(priorityImmediate,queueItem(funcSatelliteMode,QVariant::fromValue<bool>(en)));
|
||||
if (en) {
|
||||
queue->del(funcSelectedFreq,false);
|
||||
queue->del(funcSelectedMode,false);
|
||||
queue->del(funcUnselectedFreq,true);
|
||||
queue->del(funcUnselectedMode,true);
|
||||
} else {
|
||||
queue->addUnique(priorityMedium,funcSelectedFreq,true,false);
|
||||
queue->addUnique(priorityMedium,funcSelectedMode,true,false);
|
||||
queue->addUnique(priorityMedium,funcUnselectedFreq,true,true);
|
||||
queue->addUnique(priorityMedium,funcUnselectedMode,true,true);
|
||||
}
|
||||
});
|
||||
|
||||
memWindow->populate(); // Call populate to get the initial memories
|
||||
}
|
||||
memWindow->show();
|
||||
|
@ -5754,7 +5700,7 @@ void wfmain::dataModeChanged(modeInfo m)
|
|||
{
|
||||
// As the data mode may have changed, we need to make sure that we invalidate the input selection.
|
||||
// Also request the current input from the rig.
|
||||
qInfo(logSystem()) << "*** DATA MODE HAS CHANGED ***";
|
||||
//qInfo(logSystem()) << "*** DATA MODE HAS CHANGED ***";
|
||||
currentModSrc[m.data] = rigInput();
|
||||
|
||||
// Request the current inputSource.
|
||||
|
|
Ładowanie…
Reference in New Issue