More work on repeater tones.

translations
Elliott Liggett 2024-02-12 13:36:39 -08:00
rodzic d182d59f59
commit 4e8819becb
5 zmienionych plików z 1102 dodań i 1080 usunięć

Wyświetl plik

@ -360,6 +360,9 @@ bool cachingQueue::compare(QVariant a, QVariant b)
} else if (!strcmp(a.typeName(),"duplexMode_t")) { } else if (!strcmp(a.typeName(),"duplexMode_t")) {
if (a.value<duplexMode_t>() != b.value<duplexMode_t>()) if (a.value<duplexMode_t>() != b.value<duplexMode_t>())
changed=true; changed=true;
} else if (!strcmp(a.typeName(),"toneInfo")) {
if (a.value<toneInfo>().tone != b.value<toneInfo>().tone)
changed=true;
} else if (!strcmp(a.typeName(),"spectrumMode_t")) { } else if (!strcmp(a.typeName(),"spectrumMode_t")) {
if (a.value<spectrumMode_t>() != b.value<spectrumMode_t>()) if (a.value<spectrumMode_t>() != b.value<spectrumMode_t>())
changed=true; changed=true;

Wyświetl plik

@ -64,7 +64,7 @@ void loggingWindow::acceptLogText(QPair<QtMsgType,QString> text)
QString colour = "white"; QString colour = "white";
if (text.first == QtDebugMsg) if (text.first == QtDebugMsg)
{ {
colour = "#ffbc11"; colour = "#ffbc11"; // orange
} else if (text.first == QtWarningMsg) } else if (text.first == QtWarningMsg)
{ {
colour = "yellow"; colour = "yellow";

Wyświetl plik

@ -368,6 +368,7 @@ void repeaterSetup::handleRptAccessMode(rptAccessTxRx_t tmode)
void repeaterSetup::handleTone(quint16 tone) void repeaterSetup::handleTone(quint16 tone)
{ {
qDebug(logRptr()) << "Handling incoming tone request of tone = " << tone;
int tindex = ui->rptToneCombo->findData(tone); int tindex = ui->rptToneCombo->findData(tone);
ui->rptToneCombo->setCurrentIndex(tindex); ui->rptToneCombo->setCurrentIndex(tindex);
} }
@ -375,12 +376,14 @@ void repeaterSetup::handleTone(quint16 tone)
void repeaterSetup::handleTSQL(quint16 tsql) void repeaterSetup::handleTSQL(quint16 tsql)
{ {
// TODO: Consider a second combo box for the TSQL // TODO: Consider a second combo box for the TSQL
qDebug(logRptr()) << "Handling incoming TSQL request of tone = " << tsql;
int tindex = ui->rptToneCombo->findData(tsql); int tindex = ui->rptToneCombo->findData(tsql);
ui->rptToneCombo->setCurrentIndex(tindex); ui->rptToneCombo->setCurrentIndex(tindex);
} }
void repeaterSetup::handleDTCS(quint16 dcode, bool tinv, bool rinv) void repeaterSetup::handleDTCS(quint16 dcode, bool tinv, bool rinv)
{ {
qDebug(logRptr()) << "Handling incoming DTCS request of dcode = " << dcode;
int dindex = ui->rptDTCSCombo->findData(dcode); int dindex = ui->rptDTCSCombo->findData(dcode);
ui->rptDTCSCombo->setCurrentIndex(dindex); ui->rptDTCSCombo->setCurrentIndex(dindex);
ui->rptDTCSInvertTx->setChecked(tinv); ui->rptDTCSInvertTx->setChecked(tinv);

Plik diff jest za duży Load Diff

Wyświetl plik

@ -479,22 +479,28 @@ void wfmain::makeRig()
connect(this->rpt, &repeaterSetup::setTone, this->rig, connect(this->rpt, &repeaterSetup::setTone, this->rig,
[=](const toneInfo& t) { [=](const toneInfo& t) {
qDebug(logSystem()) << "Setting TONE for VFO [" << t.useSecondaryVFO << "]"; qDebug(logSystem()) << "Setting TONE for VFO, useInactiveVFO= [" << t.useSecondaryVFO << "], tone=" << t.tone;
queue->add(priorityImmediate,queueItem(funcToneFreq,QVariant::fromValue<toneInfo>(t),false, t.useSecondaryVFO));}); queue->add(priorityImmediate,queueItem(funcToneFreq,QVariant::fromValue<toneInfo>(t),false, t.useSecondaryVFO));});
connect(this->rpt, &repeaterSetup::setTSQL, this->rig, connect(this->rpt, &repeaterSetup::setTSQL, this->rig,
[=](const toneInfo& t) { [=](const toneInfo& t) {
qDebug(logSystem()) << "Setting TSQL for VFO [" << t.useSecondaryVFO << "]"; qDebug(logSystem()) << "Setting TSQL for VFO, useInactiveVFO= [" << t.useSecondaryVFO << "], tone=" << t.tone;
queue->add(priorityImmediate,queueItem(funcTSQLFreq,QVariant::fromValue<toneInfo>(t),false, t.useSecondaryVFO));}); queue->add(priorityImmediate,queueItem(funcTSQLFreq,QVariant::fromValue<toneInfo>(t),false, t.useSecondaryVFO));});
connect(this->rpt, &repeaterSetup::getTSQL, this->rig, connect(this->rpt, &repeaterSetup::getTSQL, this->rig,
[=]() { queue->add(priorityImmediate,funcRepeaterTSQL,false,false);}); [=]() {
qDebug(logSystem()) << "Asking for TSQL";
queue->add(priorityImmediate,funcRepeaterTSQL,false,false);});
connect(this->rpt, &repeaterSetup::setDTCS, this->rig, connect(this->rpt, &repeaterSetup::setDTCS, this->rig,
[=](const toneInfo& t) { queue->add(priorityImmediate,queueItem(funcRepeaterDTCS,QVariant::fromValue<toneInfo>(t),false));}); [=](const toneInfo& t) {
qDebug(logSystem()) << "Setting DCS, code =" << t.tone;
queue->add(priorityImmediate,queueItem(funcRepeaterDTCS,QVariant::fromValue<toneInfo>(t),false));});
connect(this->rpt, &repeaterSetup::getDTCS, this->rig, connect(this->rpt, &repeaterSetup::getDTCS, this->rig,
[=]() { queue->add(priorityImmediate,funcRepeaterDTCS,false,false);}); [=]() {
qDebug(logSystem()) << "Asking for DCS";
queue->add(priorityImmediate,funcRepeaterDTCS,false,false);});
connect(this->rpt, &repeaterSetup::getRptAccessMode, this->rig, connect(this->rpt, &repeaterSetup::getRptAccessMode, this->rig,