kopia lustrzana https://gitlab.com/eliggett/wfview
Merge branch 'creator-widgets' of gitlab.com:eliggett/wfview into creator-widgets
commit
0ad1acc795
|
@ -71,16 +71,22 @@ void cachingQueue::run()
|
||||||
}
|
}
|
||||||
counter++;
|
counter++;
|
||||||
|
|
||||||
|
|
||||||
auto it = queue.find(prio);
|
auto it = queue.find(prio);
|
||||||
if (it != queue.end())
|
if (it != queue.end())
|
||||||
{
|
{
|
||||||
|
while (it != queue.end() && it.key() == prio)
|
||||||
|
{
|
||||||
|
it++;
|
||||||
|
}
|
||||||
|
it--;
|
||||||
auto item = it.value();
|
auto item = it.value();
|
||||||
emit haveCommand(item.command,item.param,item.sub);
|
emit haveCommand(item.command,item.param,item.sub);
|
||||||
|
it=queue.erase(it);
|
||||||
if (item.recurring) {
|
if (item.recurring) {
|
||||||
queue.insert(queue.cend(),prio,item);
|
queue.insert(prio,item);
|
||||||
updateCache(false,item.command,item.param,item.sub);
|
updateCache(false,item.command,item.param,item.sub);
|
||||||
}
|
}
|
||||||
it=queue.erase(it);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QCoreApplication::processEvents();
|
QCoreApplication::processEvents();
|
||||||
|
|
|
@ -1981,6 +1981,10 @@ void rigCommander::parseCommand()
|
||||||
case funcVFODualWatch:
|
case funcVFODualWatch:
|
||||||
// Not currently used, but will report the current dual-watch status
|
// Not currently used, but will report the current dual-watch status
|
||||||
break;
|
break;
|
||||||
|
#if defined __GNUC__
|
||||||
|
#pragma GCC diagnostic push
|
||||||
|
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
|
||||||
|
#endif
|
||||||
case funcUnselectedFreq:
|
case funcUnselectedFreq:
|
||||||
sub = true;
|
sub = true;
|
||||||
case funcSelectedFreq:
|
case funcSelectedFreq:
|
||||||
|
@ -2016,10 +2020,7 @@ void rigCommander::parseCommand()
|
||||||
value.setValue(m);
|
value.setValue(m);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
#if defined __GNUC__
|
|
||||||
#pragma GCC diagnostic push
|
|
||||||
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
|
|
||||||
#endif
|
|
||||||
case funcSatelliteMemory:
|
case funcSatelliteMemory:
|
||||||
memParser=rigCaps.satParser;
|
memParser=rigCaps.satParser;
|
||||||
case funcMemoryContents:
|
case funcMemoryContents:
|
||||||
|
@ -2294,6 +2295,10 @@ void rigCommander::parseCommand()
|
||||||
// This tells us whether we are receiving single or dual scopes
|
// This tells us whether we are receiving single or dual scopes
|
||||||
value.setValue(static_cast<bool>(payloadIn[0]));
|
value.setValue(static_cast<bool>(payloadIn[0]));
|
||||||
break;
|
break;
|
||||||
|
#if defined __GNUC__
|
||||||
|
#pragma GCC diagnostic push
|
||||||
|
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
|
||||||
|
#endif
|
||||||
case funcScopeSubMode:
|
case funcScopeSubMode:
|
||||||
sub=true;
|
sub=true;
|
||||||
case funcScopeMainMode:
|
case funcScopeMainMode:
|
||||||
|
@ -2303,6 +2308,9 @@ void rigCommander::parseCommand()
|
||||||
// [3] 0x00 (center), 0x01 (fixed), 0x02, 0x03
|
// [3] 0x00 (center), 0x01 (fixed), 0x02, 0x03
|
||||||
value.setValue(static_cast<spectrumMode_t>(uchar(payloadIn[0])));
|
value.setValue(static_cast<spectrumMode_t>(uchar(payloadIn[0])));
|
||||||
break;
|
break;
|
||||||
|
#if defined __GNUC__
|
||||||
|
#pragma GCC diagnostic pop
|
||||||
|
#endif
|
||||||
case funcScopeSubSpan:
|
case funcScopeSubSpan:
|
||||||
case funcScopeMainSpan:
|
case funcScopeMainSpan:
|
||||||
{
|
{
|
||||||
|
@ -5204,6 +5212,8 @@ bool rigCommander::parseSpectrum(scopeData& d, bool sub)
|
||||||
// chop off FD.
|
// chop off FD.
|
||||||
if (sequence == 1)
|
if (sequence == 1)
|
||||||
{
|
{
|
||||||
|
// This should work on Qt5, but I need to test, use the switch below instead for now.
|
||||||
|
//d.mode = static_cast<spectrumMode_t>(payloadIn.at(2)); // 0=center, 1=fixed
|
||||||
|
|
||||||
switch (payloadIn[2])
|
switch (payloadIn[2])
|
||||||
{
|
{
|
||||||
|
|
10
wfmain.cpp
10
wfmain.cpp
|
@ -2718,6 +2718,7 @@ void wfmain::extChangedRsPref(prefRsItem i)
|
||||||
break;
|
break;
|
||||||
case rs_setClock:
|
case rs_setClock:
|
||||||
setRadioTimeDatePrep();
|
setRadioTimeDatePrep();
|
||||||
|
break;
|
||||||
case rs_pttOn:
|
case rs_pttOn:
|
||||||
if(!prefs.enablePTT)
|
if(!prefs.enablePTT)
|
||||||
{
|
{
|
||||||
|
@ -5776,6 +5777,10 @@ void wfmain::receiveValue(cacheItem val){
|
||||||
|
|
||||||
switch (val.command)
|
switch (val.command)
|
||||||
{
|
{
|
||||||
|
#if defined __GNUC__
|
||||||
|
#pragma GCC diagnostic push
|
||||||
|
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
|
||||||
|
#endif
|
||||||
case funcUnselectedFreq:
|
case funcUnselectedFreq:
|
||||||
val.sub=true;
|
val.sub=true;
|
||||||
case funcFreqGet:
|
case funcFreqGet:
|
||||||
|
@ -5793,6 +5798,9 @@ void wfmain::receiveValue(cacheItem val){
|
||||||
receiveFreq(f);
|
receiveFreq(f);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
#if defined __GNUC__
|
||||||
|
#pragma GCC diagnostic pop
|
||||||
|
#endif
|
||||||
case funcReadTXFreq:
|
case funcReadTXFreq:
|
||||||
break;
|
break;
|
||||||
case funcVFODualWatch:
|
case funcVFODualWatch:
|
||||||
|
@ -5972,8 +5980,8 @@ void wfmain::receiveValue(cacheItem val){
|
||||||
case funcAutoNotch:
|
case funcAutoNotch:
|
||||||
break;
|
break;
|
||||||
case funcRepeaterTone:
|
case funcRepeaterTone:
|
||||||
break;
|
|
||||||
rpt->handleRptAccessMode(rptAccessTxRx_t((val.value.value<bool>())?ratrTONEon:ratrTONEoff));
|
rpt->handleRptAccessMode(rptAccessTxRx_t((val.value.value<bool>())?ratrTONEon:ratrTONEoff));
|
||||||
|
break;
|
||||||
case funcRepeaterTSQL:
|
case funcRepeaterTSQL:
|
||||||
rpt->handleRptAccessMode(rptAccessTxRx_t((val.value.value<bool>())?ratrTSQLon:ratrTSQLoff));
|
rpt->handleRptAccessMode(rptAccessTxRx_t((val.value.value<bool>())?ratrTSQLon:ratrTSQLoff));
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -116,7 +116,7 @@ struct rptrAccessData {
|
||||||
|
|
||||||
struct modeInfo {
|
struct modeInfo {
|
||||||
modeInfo ():mk(modeUnknown), reg(99), filter(1),VFO(activeVFO), data(0), name(""), bw(false), pass(0) {};
|
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), name(name),bw(bw) {};
|
modeInfo(rigMode_t mk, quint8 reg, QString name, bool bw): mk(mk), reg(reg), data(false), name(name),bw(bw), pass(0) {};
|
||||||
rigMode_t mk;
|
rigMode_t mk;
|
||||||
unsigned char reg;
|
unsigned char reg;
|
||||||
unsigned char filter; // Default filter is always 1
|
unsigned char filter; // Default filter is always 1
|
||||||
|
|
Ładowanie…
Reference in New Issue