diff = 1<<28;
else if (exact && sat.fec != osat.fec && sat.fec != eDVBFrontendParametersSatellite::FEC::fAuto && osat.fec != eDVBFrontendParametersSatellite::FEC::fAuto)
diff = 1<<27;
+ else if (exact && sat.modulation != osat.modulation && sat.modulation != eDVBFrontendParametersSatellite::Modulation::Auto && osat.modulation != eDVBFrontendParametersSatellite::Modulation::Auto)
+ diff = 1<<27;
else
{
diff = abs(sat.frequency - osat.frequency);
break;
}
default:
+ eDebug("[SEC] unhandled sec command %d",
+ ++m_sec_sequence.current()->cmd);
++m_sec_sequence.current();
- eDebug("[SEC] unhandled sec command");
}
m_tuneTimer->start(delay,true);
}
res = m_sec->prepare(*this, parm, feparm, 1 << m_fe);
if (!res)
{
- eDebug("prepare_sat System %d Freq %d Pol %d SR %d INV %d FEC %d",
+ eDebug("prepare_sat System %d Freq %d Pol %d SR %d INV %d FEC %d orbpos %d",
feparm.system,
feparm.frequency,
feparm.polarisation,
feparm.symbol_rate,
feparm.inversion,
- feparm.fec);
+ feparm.fec,
+ feparm.orbital_position);
parm_u_qpsk_symbol_rate = feparm.symbol_rate;
switch (feparm.inversion)
{
if (!m_sn)
{
eDebug("no frontend device opened... do not try to tune !!!");
- return -ENODEV;
+ res = -ENODEV;
+ goto tune_error;
}
if (m_type == -1)
- return -ENODEV;
+ {
+ res = -ENODEV;
+ goto tune_error;
+ }
m_sn->stop();
m_sec_sequence.clear();
if (where.getDVBS(feparm))
{
eDebug("no dvbs data!");
- return -EINVAL;
+ res = -EINVAL;
+ goto tune_error;
}
- res=prepare_sat(feparm);
m_sec->setRotorMoving(false);
+ res=prepare_sat(feparm);
+ if (res)
+ goto tune_error;
+
break;
}
case feCable:
{
eDVBFrontendParametersCable feparm;
if (where.getDVBC(feparm))
- return -EINVAL;
- res=prepare_cable(feparm);
- if (!res)
{
- m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
- m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+ res = -EINVAL;
+ goto tune_error;
}
+ res=prepare_cable(feparm);
+ if (res)
+ goto tune_error;
+
+ m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
+ m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
break;
}
case feTerrestrial:
if (where.getDVBT(feparm))
{
eDebug("no -T data");
- return -EINVAL;
+ res = -EINVAL;
+ goto tune_error;
}
res=prepare_terrestrial(feparm);
- if (!res)
- {
- std::string enable_5V;
- char configStr[255];
- snprintf(configStr, 255, "config.Nim%c.terrestrial_5V", 'A'+m_fe);
- m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
- ePythonConfigQuery::getConfigValue(configStr, enable_5V);
- if (enable_5V == "on")
- m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) );
- else
- m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltageOff) );
- m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
- }
+ if (res)
+ goto tune_error;
+
+ std::string enable_5V;
+ char configStr[255];
+ snprintf(configStr, 255, "config.Nims.%d.terrestrial_5V", m_fe);
+ m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
+ ePythonConfigQuery::getConfigValue(configStr, enable_5V);
+ if (enable_5V == "True")
+ m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) );
+ else
+ m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltageOff) );
+ m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+
break;
}
}
- if (!res) // prepare ok
- {
- m_tuneTimer->start(0,true);
- m_sec_sequence.current() = m_sec_sequence.begin();
+ m_tuneTimer->start(0,true);
+ m_sec_sequence.current() = m_sec_sequence.begin();
- if (m_state != stateTuning)
- {
- m_tuning = 1;
- m_state = stateTuning;
- m_stateChanged(this);
- }
+ if (m_state != stateTuning)
+ {
+ m_tuning = 1;
+ m_state = stateTuning;
+ m_stateChanged(this);
}
return res;
+
+tune_error:
+ m_tuneTimer->stop();
+ return res;
}
RESULT eDVBFrontend::connectStateChange(const Slot1<void,iDVBFrontend*> &stateChange, ePtr<eConnection> &connection)