mirror
/
wfview
kopia lustrzana https://gitlab.com/eliggett/wfview
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Improvements to power on/off handling

creator-widgets
Phil Taylor 2024-04-30 09:42:54 +01:00
rodzic 4cfcf94e37
commit 7bd35772dc
8 zmienionych plików z 43 dodań i 157 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
cachingqueue.cpp
Wyświetl plik

@ -98,6 +98,9 @@ void cachingQueue::run()
while (!items.isEmpty()) {
emit sendValue(items.dequeue());
}
while (!messages.isEmpty()) {
emit sendMessage(messages.dequeue());
}
}
}
}
@ -259,6 +262,8 @@ void cachingQueue::clear()
}
void cachingQueue::message(QString msg)
{
QMutexLocker locker(&mutex);
messages.append(msg);
qInfo() << "Received:" << msg;
waiting.wakeOne();
}

3
cachingqueue.h
Wyświetl plik

@ -58,6 +58,7 @@ class cachingQueue : public QThread
signals:
void haveCommand(funcs func, QVariant param, uchar receiver);
void sendValue(cacheItem item);
void sendMessage(QString msg);
void cacheUpdated(cacheItem item);
void rigCapsUpdated(rigCapabilities* caps);
@ -75,6 +76,7 @@ private:
QMultiMap <queuePriority,queueItem> queue;
QMultiMap<funcs,cacheItem> cache;
QQueue<cacheItem> items;
QQueue<QString> messages;
// Command to set cache value
void setCache(funcs func, QVariant val, uchar receiver=0);
@ -110,6 +112,7 @@ public:
void del(funcs func, uchar receiver=0);
void clear();
void interval(quint64 val);
quint64 interval() {return queueInterval;}
void updateCache(bool reply, queueItem item);
void updateCache(bool reply, funcs func, QVariant value=QVariant(), uchar receiver=0);

9
commhandler.cpp
Wyświetl plik

@ -104,19 +104,20 @@ void commHandler::sendDataOut(const QByteArray &writeData)
}
// Recycle port to attempt reconnection.
if (lastDataReceived.msecsTo(QTime::currentTime()) > 2000) {
if (lastDataReceived.msecsTo(QTime::currentTime()) > 10000) {
qDebug(logSerial()) << "Serial port error? Attempting reconnect...";
lastDataReceived = QTime::currentTime();
QTimer::singleShot(500, this, SLOT(init()));
QTimer::singleShot(100, this, SLOT(init()));
QTimer::singleShot(500, this, [=]() { sendDataOut(writeData); });
return;
}
mutex.lock();
qint64 bytesWritten;
previousSent = writeData;
qint64 bytesWritten;
if(PTTviaRTS)
{
// Size: 1 2 3 4 5 6 7 8

2
commhandler.h
Wyświetl plik

@ -91,7 +91,7 @@ private:
quint8 spectrumCenterOrFixed;
quint8 spectrumInformation;
quint8 lastSpectrum = 0;
QTime lastDataReceived;
QTime lastDataReceived = QTime::currentTime();
};
#endif // COMMHANDLER_H

2
rigcommander.cpp
Wyświetl plik

@ -667,6 +667,8 @@ void rigCommander::parseData(QByteArray dataInput)
// The data are "to 00" and "from E1"
// Don't use it!
qDebug(logRig()) << "Echo caught:" << data.toHex(' ');
queue->message("Radio is available but may be powered-off");
} else {
payloadIn = data.right(data.length() - 4); // Removes FE FE E0 94 part
if(payloadIn.contains("\xFE"))

4
spectrumscope.cpp
Wyświetl plik

@ -1140,10 +1140,10 @@ void spectrumScope::scopeClick(QMouseEvent* me)
else if (clickDragTuning)
{
showStatusBarText(QString("Selected %1 MHz").arg(this->mousePressFreq));
emit showStatusBarText(QString("Selected %1 MHz").arg(this->mousePressFreq));
}
else {
showStatusBarText(QString("Selected %1 MHz").arg(this->mousePressFreq));
emit showStatusBarText(QString("Selected %1 MHz").arg(this->mousePressFreq));
}
}

168
wfmain.cpp
Wyświetl plik

@ -144,6 +144,7 @@ wfmain::wfmain(const QString settingsFile, const QString logFile, bool debugMode
queue = cachingQueue::getInstance(this);
connect(queue,SIGNAL(sendValue(cacheItem)),this,SLOT(receiveValue(cacheItem)));
connect(queue,SIGNAL(sendMessage(QString)),this,SLOT(showStatusBarText(QString)));
// We need to populate the list of rigs as early as possible so do it now
#ifndef Q_OS_LINUX
@ -704,11 +705,7 @@ void wfmain::receiveCommReady()
// qInfo(logSystem()) << "Beginning search from wfview for rigCIV (auto-detection broadcast)";
ui->statusBar->showMessage(QString("Searching CI-V bus for connected radios."), 1000);
//emit getRigCIV();
//queue->add(priorityImmediate,funcTransceiverId,false);
queue->addUnique(priorityHighest,funcTransceiverId,true);
//issueDelayedCommand(cmdGetRigCIV);
//delayedCommand->start();
} else {
// don't bother, they told us the CIV they want, stick with it.
// We still query the rigID to find the model, but at least we know the CIV.
@ -721,12 +718,8 @@ void wfmain::receiveCommReady()
emit setRigID(prefs.radioCIVAddr);
} else {
emit setCIVAddr(prefs.radioCIVAddr);
//emit getRigCIV();
//queue->add(priorityImmediate,funcTransceiverId,false);
queue->addUnique(priorityHighest,funcTransceiverId,true);
//emit getRigID();
//issueDelayedCommand(cmdGetRigID);
//delayedCommand->start();
}
}
}
@ -848,22 +841,6 @@ void wfmain::setupMainUI()
[=](const int &newValue) { statusFromSliderPercent("Squelch", newValue);}
);
/*
connect(this->cw, &cwSender::sendCW,
[=](const QString &cwMessage) { issueCmd(cmdSendCW, cwMessage);});
connect(this->cw, &cwSender::stopCW,
[=]() { issueDelayedCommand(cmdStopCW);});
connect(this->cw, &cwSender::setBreakInMode,
[=](const unsigned char &bmode) { issueCmd(cmdSetBreakMode, bmode);});
connect(this->cw, &cwSender::setKeySpeed,
[=](const unsigned char& wpm) { issueCmd(cmdSetKeySpeed, wpm); });
connect(this->cw, &cwSender::setPitch,
[=](const unsigned char& pitch) { issueCmd(cmdSetCwPitch, pitch); });
connect(this->cw, &cwSender::getCWSettings,
[=]() { issueDelayedCommand(cmdGetKeySpeed);
issueDelayedCommand(cmdGetBreakMode);});
*/
}
void wfmain::connectSettingsWidget()
@ -939,7 +916,6 @@ void wfmain::setInitialTiming()
delayedCmdIntervalLAN_ms = 70; // interval for regular delayed commands, including initial rig/UI state queries
delayedCmdIntervalSerial_ms = 100; // interval for regular delayed commands, including initial rig/UI state queries
delayedCmdStartupInterval_ms = 250; // interval for rigID polling
delayedCommand = new QTimer(this);
queue->interval(delayedCmdStartupInterval_ms);
pttTimer = new QTimer(this);
@ -3507,38 +3483,6 @@ void wfmain:: getInitialRigState()
queue->del(funcTransceiverId); // This command is no longer required
/*
queue->add(priorityImmediate,(rigCaps->commands.contains(funcMainFreq)?funcMainFreq:funcFreqGet),false);
queue->add(priorityImmediate,(rigCaps->commands.contains(funcSubMode)?funcSubMode:funcModeGet),false);
queue->add(priorityImmediate,(rigCaps->commands.contains(funcSubFreq)?funcSubFreq:funcNone),false,true);
queue->add(priorityImmediate,(rigCaps->commands.contains(funcSubMode)?funcSubMode:funcNone),false,true);
// From left to right in the UI:
if (rigCaps->hasTransmit)
{
queue->add(priorityImmediate,funcDataModeWithFilter);
queue->add(priorityImmediate,(rigCaps->commands.contains(funcDATAOffMod)?funcDATAOffMod:funcNone),false);
queue->add(priorityImmediate,(rigCaps->commands.contains(funcDATA1Mod)?funcDATA1Mod:funcNone),false);
queue->add(priorityImmediate,(rigCaps->commands.contains(funcDATA2Mod)?funcDATA2Mod:funcNone),false);
queue->add(priorityImmediate,(rigCaps->commands.contains(funcDATA3Mod)?funcDATA3Mod:funcNone),false);
queue->add(priorityImmediate,(rigCaps->commands.contains(funcRFPower)?funcRFPower:funcNone),false);
queue->add(priorityImmediate,getInputTypeCommand(currentModDataOffSrc.type),false);
queue->add(priorityImmediate,getInputTypeCommand(currentModData1Src.type),false);
if (rigCaps->commands.contains(funcDATA2Mod))
queue->add(priorityImmediate,getInputTypeCommand(currentModData2Src.type),false);
if (rigCaps->commands.contains(funcDATA3Mod))
queue->add(priorityImmediate,getInputTypeCommand(currentModData3Src.type),false);
}
queue->add(priorityImmediate,funcRfGain,false,false);
if (!usingLAN)
queue->add(priorityImmediate,funcAfGain,false);
queue->add(priorityImmediate,funcMonitor,false);
queue->add(priorityImmediate,funcMonitorGain,false);
*/
if(rigCaps->hasSpectrum)
{
queue->add(priorityImmediate,queueItem(funcScopeOnOff,QVariant::fromValue(quint8(1)),false));
@ -3584,59 +3528,6 @@ void wfmain:: getInitialRigState()
receiver->displaySettings(0, start, end, 1,(FctlUnit)prefs.frequencyUnits,&rigCaps->bands);
}
/*
if (rigCaps->commands.contains(funcFilterWidth))
queue->add(priorityHigh,funcFilterWidth,false);
if (rigCaps->commands.contains(funcSplitStatus))
queue->add(priorityHigh,funcSplitStatus,false);
if(rigCaps->commands.contains(funcTuningStep))
queue->add(priorityImmediate,funcTuningStep,false);
if(rigCaps->commands.contains(funcRepeaterTone))
{
queue->add(priorityImmediate,funcRepeaterTone,false);
queue->add(priorityImmediate,funcRepeaterTSQL,false);
}
if(rigCaps->commands.contains(funcRepeaterDTCS))
queue->add(priorityImmediate,funcRepeaterDTCS,false);
if(rigCaps->commands.contains(funcToneSquelchType))
queue->add(priorityImmediate,funcToneSquelchType,false);
if(rigCaps->commands.contains(funcAntenna))
queue->add(priorityImmediate,funcAntenna,false);
if(rigCaps->commands.contains(funcAttenuator))
queue->add(priorityImmediate,funcAttenuator,false);
if(rigCaps->commands.contains(funcPreamp))
queue->add(priorityImmediate,funcPreamp,false);
if (rigCaps->commands.contains(funcRitStatus))
{
queue->add(priorityImmediate,funcRITFreq,false);
queue->add(priorityImmediate,funcRitStatus,false);
}
if(rigCaps->commands.contains(funcIFShift))
queue->add(priorityImmediate,funcIFShift,false);
if(rigCaps->commands.contains(funcPBTInner) && rigCaps->commands.contains(funcPBTOuter))
{
queue->add(priorityImmediate,funcPBTInner,false);
queue->add(priorityImmediate,funcPBTOuter,false);
}
if(rigCaps->commands.contains(funcTunerStatus))
queue->add(priorityImmediate,funcTunerStatus,false);
*/
}
void wfmain::showStatusBarText(QString text)
@ -4034,9 +3925,6 @@ void wfmain::gotoMemoryPreset(int presetNumber)
//m.filter = ui->modeFilterCombo->currentIndex()+1;
m.reg =(unsigned char) m.mk; // fallback, works only for some modes
memFreq.Hz = temp.frequency * 1E6;
//issueCmd(cmdSetFreq, memFreq);
//issueDelayedCommand(cmdSetModeFilter); // goes to setModeVal
//issueCmd(cmdSetMode, m);
memFreq.MHzDouble = memFreq.Hz / 1.0E6;
if (receivers.size())
receivers[0]->setFrequency(memFreq);
@ -4171,8 +4059,7 @@ void wfmain::handlePttLimit()
{
// transmission time exceeded!
showStatusBarText("Transmit timeout at 3 minutes. Sending PTT OFF command now.");
//queue->add(priorityImmediate,queueItem(funcTransceiverStatus,QVariant::fromValue<bool>(false),false));
//issueDelayedCommand(cmdGetPTT);
queue->add(priorityImmediate,queueItem(funcTransceiverStatus,QVariant::fromValue<bool>(false),false));
}
void wfmain::on_saveSettingsBtn_clicked()
@ -4679,21 +4566,19 @@ void wfmain::calculateTimingParameters()
if(rigCaps != Q_NULLPTR && rigCaps->hasFDcomms)
{
delayedCommand->setInterval( msMinTiming); // 20 byte message
queue->interval(msMinTiming);
} else {
delayedCommand->setInterval( msMinTiming * 4); // Multiply by 4 to allow rigMemories to be received.
queue->interval(msMinTiming * 4);
}
qInfo(logSystem()) << "Delay command interval timing: " << delayedCommand->interval() << "ms";
qInfo(logSystem()) << "Delay command interval timing: " << queue->interval() << "ms";
// Normal:
delayedCmdIntervalLAN_ms = delayedCommand->interval();
delayedCmdIntervalSerial_ms = delayedCommand->interval();
delayedCmdIntervalLAN_ms = queue->interval();
delayedCmdIntervalSerial_ms = queue->interval();
// startup initial state:
delayedCmdStartupInterval_ms = delayedCommand->interval() * 3;
delayedCmdStartupInterval_ms = queue->interval() * 3;
}
void wfmain::receiveBaudRate(quint32 baud)
@ -4747,32 +4632,23 @@ void wfmain::on_rigPowerOffBtn_clicked()
void wfmain::powerRigOn()
{
// Bypass the queue
emit sendPowerOn();
delayedCommand->setInterval(3000); // 3 seconds
//if(ui->scopeEnableWFBtn->checkState() != Qt::Unchecked)
//{
//issueDelayedCommand(cmdDispEnable);
//issueDelayedCommand(cmdQueNormalSpeed);
//issueDelayedCommand(cmdSpecOn);
//issueDelayedCommand(cmdStartRegularPolling); // s-meter, etc
//} else {
//issueDelayedCommand(cmdQueNormalSpeed);
//issueDelayedCommand(cmdSpecOff);
//issueDelayedCommand(cmdStartRegularPolling); // s-meter, etc
//}
delayedCommand->start();
calculateTimingParameters(); // Set queue interval
// Need to allow time for the rig to power-on.
// If we have no rigCaps then usual rig detection should occur.
if (rigCaps != Q_NULLPTR) {
calculateTimingParameters(); // Set queue interval
QTimer::singleShot(5000, this, SLOT(initPeriodicCommands()));
QTimer::singleShot(6500, this, SLOT(getInitialRigState()));
}
}
void wfmain::powerRigOff()
{
delayedCommand->stop();
queue->interval(0);
// Clear the queue to stop sending lots of data.
queue->clear();
emit sendPowerOff();
queue->interval(0);
}
void wfmain::on_ritTuneDial_valueChanged(int value)
@ -4879,7 +4755,6 @@ void wfmain::changeMeterType(meter_t m, int meterNum)
funcs newCmd = meter_tToMeterCommand(newMeterType);
funcs oldCmd = meter_tToMeterCommand(oldMeterType);
//removePeriodicCommand(oldCmd);
if (oldCmd != funcSMeter && oldCmd != funcNone)
queue->del(oldCmd);
@ -4909,10 +4784,6 @@ void wfmain::enableRigCtl(bool enabled)
// Start rigctld
rigCtl = new rigCtlD(this);
rigCtl->startServer(prefs.rigCtlPort);
//if (rig != Q_NULLPTR) {
// // We are already connected to a rig.
// emit sendRigCaps(rigCaps);
//}
}
}
@ -6055,7 +5926,8 @@ void wfmain::radioInUse(quint8 radio, bool admin, quint8 busy, QString user, QSt
{
Q_UNUSED(busy)
Q_UNUSED(radio)
qDebug(logSystem()) << "Is this user an admin?" << user << admin;
Q_UNUSED(user)
qDebug(logSystem()) << "Is this user an admin? " << ((admin)?"yes":"no");
isRadioAdmin = admin;
}

7
wfmain.h
Wyświetl plik

@ -502,6 +502,11 @@ private slots:
void receiveRigCaps(rigCapabilities* caps);
void radioInUse(quint8 radio, bool admin, quint8 busy, QString user, QString ip);
// Moved to slots to allow them to be delayed.
void getInitialRigState();
void initPeriodicCommands();
private:
Ui::wfmain *ui; // Main UI
QVector<spectrumScope*>receivers; // Spectrum Scope items.
@ -529,7 +534,6 @@ private:
QCPItemText* ovfIndicator;
void setAppTheme(bool isCustom);
void getInitialRigState();
void showButton(QPushButton *btn);
void hideButton(QPushButton *btn);
@ -681,7 +685,6 @@ private:
void setTuningSteps();
void calculateTimingParameters();
void initPeriodicCommands();
void changePollTiming(int timing_ms, bool setUI=false);
quint64 roundFrequency(quint64 frequency, unsigned int tsHz);