kopia lustrzana https://gitlab.com/eliggett/wfview
Cleaned up repeater-related debug code.
rodzic
eea17e5e09
commit
a5f3750988
|
@ -316,7 +316,6 @@ void repeaterSetup::handleRptAccessMode(rptAccessTxRx tmode)
|
||||||
// ratrXY
|
// ratrXY
|
||||||
// X = Transmit (T)one or (N)one or (D)CS
|
// X = Transmit (T)one or (N)one or (D)CS
|
||||||
// Y = Receive (T)sql or (N)one or (D)CS
|
// Y = Receive (T)sql or (N)one or (D)CS
|
||||||
qDebug() << "In repeater setup, have received mode: " << tmode;
|
|
||||||
switch(tmode)
|
switch(tmode)
|
||||||
{
|
{
|
||||||
case ratrNN:
|
case ratrNN:
|
||||||
|
@ -350,7 +349,6 @@ void repeaterSetup::handleRptAccessMode(rptAccessTxRx tmode)
|
||||||
if( !ui->toneTSQL->isChecked() && !ui->toneTone->isChecked() && !ui->toneDTCS->isChecked())
|
if( !ui->toneTSQL->isChecked() && !ui->toneTone->isChecked() && !ui->toneDTCS->isChecked())
|
||||||
{
|
{
|
||||||
ui->toneNone->setChecked(true);
|
ui->toneNone->setChecked(true);
|
||||||
qDebug() << "Assuming tone None is correct";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1228,11 +1228,6 @@ void rigCommander::setRptAccessMode(rptrAccessData_t rd)
|
||||||
{
|
{
|
||||||
case ratrNN:
|
case ratrNN:
|
||||||
// No tone at all
|
// No tone at all
|
||||||
qDebug(logRig()) << "Tone off requested. state_TONE_enabled: " << state_TONE_Main_Enabled << ", state_TSQL_enabled: " << state_TSQL_Main_Enabled;
|
|
||||||
qDebug(logRig()) << "state.getBool(TONEFUNC): " << state.getBool(TONEFUNC);
|
|
||||||
qDebug(logRig()) << "state.getBool(TSQLFUNC): " << state.getBool(TSQLFUNC);
|
|
||||||
qDebug(logRig()) << "turn off tone: " << rd.turnOffTone << ", turn off tsql: " << rd.turnOffTSQL;
|
|
||||||
qDebug(logRig()) << "Using sequence? " << rd.usingSequence << ", sequence number: " << rd.sequence;
|
|
||||||
if(rd.turnOffTone)
|
if(rd.turnOffTone)
|
||||||
{
|
{
|
||||||
payload.append("\x16\x42\x00", 3); // TONE off
|
payload.append("\x16\x42\x00", 3); // TONE off
|
||||||
|
@ -1240,19 +1235,6 @@ void rigCommander::setRptAccessMode(rptrAccessData_t rd)
|
||||||
{
|
{
|
||||||
payload.append("\x16\x43\x00", 3); // TSQL off
|
payload.append("\x16\x43\x00", 3); // TSQL off
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
if(state.getBool(TONEFUNC))
|
|
||||||
{
|
|
||||||
payload.append("\x16\x42\x00", 3); // TONE off
|
|
||||||
} else if (state.getBool(TSQLFUNC)) {
|
|
||||||
payload.append("\x16\x43\x00", 3); // TSQL off
|
|
||||||
} else {
|
|
||||||
// ?? turn off TSQL ??
|
|
||||||
payload.append("\x16\x43\x00", 3); // TSQL off
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case ratrTN:
|
case ratrTN:
|
||||||
// TONE on transmit only
|
// TONE on transmit only
|
||||||
|
@ -2975,7 +2957,6 @@ void rigCommander::parseRegister16()
|
||||||
break;
|
break;
|
||||||
case '\x42':
|
case '\x42':
|
||||||
state.set(TONEFUNC, payloadIn.at(2) != 0, false);
|
state.set(TONEFUNC, payloadIn.at(2) != 0, false);
|
||||||
state_TONE_Main_Enabled = (bool)payloadIn.at(2);
|
|
||||||
if(payloadIn.at(2)==1)
|
if(payloadIn.at(2)==1)
|
||||||
{
|
{
|
||||||
ra = ratrTONEon;
|
ra = ratrTONEon;
|
||||||
|
@ -2986,7 +2967,6 @@ void rigCommander::parseRegister16()
|
||||||
break;
|
break;
|
||||||
case '\x43':
|
case '\x43':
|
||||||
state.set(TSQLFUNC, payloadIn.at(2) != 0, false);
|
state.set(TSQLFUNC, payloadIn.at(2) != 0, false);
|
||||||
state_TSQL_Main_Enabled = (bool)payloadIn.at(2);
|
|
||||||
if(payloadIn.at(2)==1)
|
if(payloadIn.at(2)==1)
|
||||||
{
|
{
|
||||||
ra = ratrTSQLon;
|
ra = ratrTSQLon;
|
||||||
|
|
|
@ -451,11 +451,6 @@ private:
|
||||||
struct rigCapabilities rigCaps;
|
struct rigCapabilities rigCaps;
|
||||||
|
|
||||||
rigstate state;
|
rigstate state;
|
||||||
// These are temporary measurements for debugging:
|
|
||||||
bool state_TONE_Main_Enabled = false;
|
|
||||||
bool state_TSQL_Main_Enabled = false;
|
|
||||||
bool state_TONE_Sub_Enabled = false;
|
|
||||||
bool state_TSQL_Sub_Enabled = false;
|
|
||||||
|
|
||||||
bool haveRigCaps;
|
bool haveRigCaps;
|
||||||
model_kind model;
|
model_kind model;
|
||||||
|
|
|
@ -3476,10 +3476,11 @@ void wfmain:: getInitialRigState()
|
||||||
{
|
{
|
||||||
issueDelayedCommand(cmdGetDTCS);
|
issueDelayedCommand(cmdGetDTCS);
|
||||||
}
|
}
|
||||||
// TODO: decide which one!
|
|
||||||
issueDelayedCommand(cmdGetRptAccessMode);
|
if(rigCaps.hasCTCSS || rigCaps.hasDTCS)
|
||||||
issueDelayedCommand(cmdGetToneEnabled);
|
{
|
||||||
issueDelayedCommand(cmdGetTSQLEnabled);
|
issueDelayedCommand(cmdGetRptAccessMode);
|
||||||
|
}
|
||||||
|
|
||||||
if(rigCaps.hasAntennaSel)
|
if(rigCaps.hasAntennaSel)
|
||||||
{
|
{
|
||||||
|
|
Ładowanie…
Reference in New Issue