Merge branch 'master' into rigctl-enhancement

merge-requests/8/head
Phil Taylor 2021-12-01 10:22:29 +00:00
commit d71fb9ef4a
2 zmienionych plików z 23 dodań i 9 usunięć

Wyświetl plik

@ -47,7 +47,7 @@ void transceiverAdjustments::on_IFShiftSlider_valueChanged(int value)
unsigned char outer = ui->TPBFOuterSlider->value(); unsigned char outer = ui->TPBFOuterSlider->value();
int shift = value - previousIFShift; int shift = value - previousIFShift;
inner = qMax( 0, qMin(255,int (inner + shift)) ); inner = qMax( 0, qMin(255,int (inner + shift)) );
outer =qMax( 0, qMin(255,int (outer + shift)) ); outer = qMax( 0, qMin(255,int (outer + shift)) );
ui->TPBFInnerSlider->setValue(inner); ui->TPBFInnerSlider->setValue(inner);
ui->TPBFOuterSlider->setValue(outer); ui->TPBFOuterSlider->setValue(outer);

Wyświetl plik

@ -2234,14 +2234,22 @@ void wfmain:: getInitialRigState()
issueDelayedCommand(cmdGetMode); issueDelayedCommand(cmdGetMode);
// From left to right in the UI: // From left to right in the UI:
issueDelayedCommand(cmdGetDataMode); if (rigCaps.hasTransmit)
issueDelayedCommand(cmdGetModInput); {
issueDelayedCommand(cmdGetModDataInput); issueDelayedCommand(cmdGetDataMode);
issueDelayedCommand(cmdGetModInput);
issueDelayedCommand(cmdGetModDataInput);
}
issueDelayedCommand(cmdGetRxGain); issueDelayedCommand(cmdGetRxGain);
issueDelayedCommand(cmdGetAfGain); issueDelayedCommand(cmdGetAfGain);
issueDelayedCommand(cmdGetSql); issueDelayedCommand(cmdGetSql);
issueDelayedCommand(cmdGetTxPower);
issueDelayedCommand(cmdGetCurrentModLevel); // level for currently selected mod sources if (rigCaps.hasTransmit)
{
issueDelayedCommand(cmdGetTxPower);
issueDelayedCommand(cmdGetCurrentModLevel); // level for currently selected mod sources
}
issueDelayedCommand(cmdGetSpectrumRefLevel); issueDelayedCommand(cmdGetSpectrumRefLevel);
issueDelayedCommand(cmdGetDuplexMode); issueDelayedCommand(cmdGetDuplexMode);
@ -2250,8 +2258,12 @@ void wfmain:: getInitialRigState()
issueDelayedCommand(cmdDispEnable); issueDelayedCommand(cmdDispEnable);
issueDelayedCommand(cmdSpecOn); issueDelayedCommand(cmdSpecOn);
} }
issueDelayedCommand(cmdGetModInput);
issueDelayedCommand(cmdGetModDataInput); if (rigCaps.hasTransmit)
{
issueDelayedCommand(cmdGetModInput);
issueDelayedCommand(cmdGetModDataInput);
}
if(rigCaps.hasCTCSS) if(rigCaps.hasCTCSS)
{ {
@ -3524,8 +3536,10 @@ void wfmain::receiveMode(unsigned char mode, unsigned char filter)
// Note: we need to know if the DATA mode is active to reach mode-D // Note: we need to know if the DATA mode is active to reach mode-D
// some kind of queued query: // some kind of queued query:
if(rigCaps.hasDataModes) if (rigCaps.hasDataModes && rigCaps.hasTransmit)
{
issueDelayedCommand(cmdGetDataMode); issueDelayedCommand(cmdGetDataMode);
}
} }
void wfmain::receiveDataModeStatus(bool dataEnabled) void wfmain::receiveDataModeStatus(bool dataEnabled)