kopia lustrzana https://gitlab.com/eliggett/wfview
Fixed broken implementation of "set_level RFPOWER" in rigctld
rodzic
440429be9f
commit
72663310c5
|
@ -1407,7 +1407,7 @@ void rigCommander::parseLevels()
|
|||
case '\x0A':
|
||||
// TX RF level
|
||||
emit haveTxPower(level);
|
||||
state.set(TXPOWER, level, false);
|
||||
state.set(RFPOWER, level, false);
|
||||
break;
|
||||
case '\x0B':
|
||||
// Mic Gain
|
||||
|
@ -4397,9 +4397,9 @@ void rigCommander::stateUpdated()
|
|||
}
|
||||
getSql();
|
||||
break;
|
||||
case TXPOWER:
|
||||
case RFPOWER:
|
||||
if (i.value()._valid) {
|
||||
setTxPower(state.getChar(TXPOWER));
|
||||
setTxPower(state.getChar(RFPOWER));
|
||||
}
|
||||
getTxLevel();
|
||||
break;
|
||||
|
|
|
@ -710,7 +710,7 @@ void rigCtlClient::socketReadyRead()
|
|||
resp.append(QString("%1").arg((float)rigState->getChar(ANTIVOXGAIN) / 255.0));
|
||||
}
|
||||
else if (command[1] == "RFPOWER") {
|
||||
resp.append(QString("%1").arg((float)rigState->getChar(TXPOWER) / 255.0));
|
||||
resp.append(QString("%1").arg((float)rigState->getChar(RFPOWER) / 255.0));
|
||||
}
|
||||
else if (command[1] == "PREAMP") {
|
||||
resp.append(QString("%1").arg(rigState->getChar(PREAMP)*10));
|
||||
|
@ -736,6 +736,10 @@ void rigCtlClient::socketReadyRead()
|
|||
value = command[2].toFloat() * 255;
|
||||
rigState->set(RFGAIN, value, true);
|
||||
}
|
||||
else if (command[1] == "RFPOWER") {
|
||||
value = command[2].toFloat() * 255;
|
||||
rigState->set(RFPOWER, value, true);
|
||||
}
|
||||
else if (command[1] == "SQL") {
|
||||
value = command[2].toFloat() * 255;
|
||||
rigState->set(SQUELCH, value, true);
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
// Meters at the end as they are ALWAYS updated from the rig!
|
||||
enum stateTypes { VFOAFREQ, VFOBFREQ, CURRENTVFO, PTT, MODE, FILTER, DUPLEX, DATAMODE, ANTENNA, RXANTENNA, CTCSS, TSQL, DTCS, CSQL,
|
||||
PREAMP, AGC, ATTENUATOR, MODINPUT, AFGAIN, RFGAIN, SQUELCH, TXPOWER, MICGAIN, COMPLEVEL, MONITORLEVEL, VOXGAIN, ANTIVOXGAIN,
|
||||
PREAMP, AGC, ATTENUATOR, MODINPUT, AFGAIN, RFGAIN, SQUELCH, RFPOWER, MICGAIN, COMPLEVEL, MONITORLEVEL, VOXGAIN, ANTIVOXGAIN,
|
||||
FAGCFUNC, NBFUNC, COMPFUNC, VOXFUNC, TONEFUNC, TSQLFUNC, SBKINFUNC, FBKINFUNC, ANFFUNC, NRFUNC, AIPFUNC, APFFUNC, MONFUNC, MNFUNC,RFFUNC,
|
||||
AROFUNC, MUTEFUNC, VSCFUNC, REVFUNC, SQLFUNC, ABMFUNC, BCFUNC, MBCFUNC, RITFUNC, AFCFUNC, SATMODEFUNC, SCOPEFUNC,
|
||||
NBLEVEL, NBDEPTH, NBWIDTH, NRLEVEL, RIGINPUT, POWERONOFF, RITVALUE,
|
||||
|
|
Ładowanie…
Reference in New Issue