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

Fixed broken implementation of "set_level RFPOWER" in rigctld

merge-requests/11/head
Russ Woodman - K5TUX 2022-03-19 14:05:46 -05:00
rodzic 440429be9f
commit 72663310c5
3 zmienionych plików z 10 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
rigcommander.cpp
Wyświetl plik

@ -1407,7 +1407,7 @@ void rigCommander::parseLevels()
case '\x0A': case '\x0A':
// TX RF level // TX RF level
emit haveTxPower(level); emit haveTxPower(level);
state.set(TXPOWER, level, false); state.set(RFPOWER, level, false);
break; break;
case '\x0B': case '\x0B':
// Mic Gain // Mic Gain
@ -4397,9 +4397,9 @@ void rigCommander::stateUpdated()
} }
getSql(); getSql();
break; break;
case TXPOWER: case RFPOWER:
if (i.value()._valid) { if (i.value()._valid) {
setTxPower(state.getChar(TXPOWER)); setTxPower(state.getChar(RFPOWER));
} }
getTxLevel(); getTxLevel();
break; break;

6
rigctld.cpp
Wyświetl plik

@ -710,7 +710,7 @@ void rigCtlClient::socketReadyRead()
resp.append(QString("%1").arg((float)rigState->getChar(ANTIVOXGAIN) / 255.0)); resp.append(QString("%1").arg((float)rigState->getChar(ANTIVOXGAIN) / 255.0));
} }
else if (command[1] == "RFPOWER") { 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") { else if (command[1] == "PREAMP") {
resp.append(QString("%1").arg(rigState->getChar(PREAMP)*10)); resp.append(QString("%1").arg(rigState->getChar(PREAMP)*10));
@ -736,6 +736,10 @@ void rigCtlClient::socketReadyRead()
value = command[2].toFloat() * 255; value = command[2].toFloat() * 255;
rigState->set(RFGAIN, value, true); 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") { else if (command[1] == "SQL") {
value = command[2].toFloat() * 255; value = command[2].toFloat() * 255;
rigState->set(SQUELCH, value, true); rigState->set(SQUELCH, value, true);

4
rigstate.h
Wyświetl plik

@ -13,7 +13,7 @@
// Meters at the end as they are ALWAYS updated from the rig! // 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, 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, 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, AROFUNC, MUTEFUNC, VSCFUNC, REVFUNC, SQLFUNC, ABMFUNC, BCFUNC, MBCFUNC, RITFUNC, AFCFUNC, SATMODEFUNC, SCOPEFUNC,
NBLEVEL, NBDEPTH, NBWIDTH, NRLEVEL, RIGINPUT, POWERONOFF, RITVALUE, NBLEVEL, NBDEPTH, NBWIDTH, NRLEVEL, RIGINPUT, POWERONOFF, RITVALUE,
@ -124,4 +124,4 @@ private:
QMutex _mutex; QMutex _mutex;
}; };
#endif #endif