#include <lib/dvb/dvb.h>
#include <lib/base/eerror.h>
+#include <lib/base/nconfig.h> // access to python config
#include <errno.h>
#include <unistd.h>
#include <fcntl.h>
#ifdef FEC_9_10
#warning "FEC_9_10 already exist in dvb api ... it seems it is now ready for DVB-S2"
#else
- #define FEC_9_10 (fe_code_rate_t)(FEC_AUTO+1)
+ #define FEC_S2_QPSK_1_2 (fe_code_rate_t)(FEC_AUTO+1)
+ #define FEC_S2_QPSK_2_3 (fe_code_rate_t)(FEC_S2_QPSK_1_2+1)
+ #define FEC_S2_QPSK_3_4 (fe_code_rate_t)(FEC_S2_QPSK_2_3+1)
+ #define FEC_S2_QPSK_5_6 (fe_code_rate_t)(FEC_S2_QPSK_3_4+1)
+ #define FEC_S2_QPSK_7_8 (fe_code_rate_t)(FEC_S2_QPSK_5_6+1)
+ #define FEC_S2_QPSK_8_9 (fe_code_rate_t)(FEC_S2_QPSK_7_8+1)
+ #define FEC_S2_QPSK_3_5 (fe_code_rate_t)(FEC_S2_QPSK_8_9+1)
+ #define FEC_S2_QPSK_4_5 (fe_code_rate_t)(FEC_S2_QPSK_3_5+1)
+ #define FEC_S2_QPSK_9_10 (fe_code_rate_t)(FEC_S2_QPSK_4_5+1)
+ #define FEC_S2_8PSK_1_2 (fe_code_rate_t)(FEC_S2_QPSK_9_10+1)
+ #define FEC_S2_8PSK_2_3 (fe_code_rate_t)(FEC_S2_8PSK_1_2+1)
+ #define FEC_S2_8PSK_3_4 (fe_code_rate_t)(FEC_S2_8PSK_2_3+1)
+ #define FEC_S2_8PSK_5_6 (fe_code_rate_t)(FEC_S2_8PSK_3_4+1)
+ #define FEC_S2_8PSK_7_8 (fe_code_rate_t)(FEC_S2_8PSK_5_6+1)
+ #define FEC_S2_8PSK_8_9 (fe_code_rate_t)(FEC_S2_8PSK_7_8+1)
+ #define FEC_S2_8PSK_3_5 (fe_code_rate_t)(FEC_S2_8PSK_8_9+1)
+ #define FEC_S2_8PSK_4_5 (fe_code_rate_t)(FEC_S2_8PSK_3_5+1)
+ #define FEC_S2_8PSK_9_10 (fe_code_rate_t)(FEC_S2_8PSK_4_5+1)
#endif
#endif
return 0;
}
-RESULT eDVBFrontendParameters::calculateDifference(const iDVBFrontendParameters *parm, int &diff) const
+RESULT eDVBFrontendParameters::calculateDifference(const iDVBFrontendParameters *parm, int &diff, bool exact) const
{
if (!parm)
return -1;
diff = 1<<30; // big difference
return 0;
}
-
+
switch (type)
{
case iDVBFrontend::feSatellite:
eDVBFrontendParametersSatellite osat;
if (parm->getDVBS(osat))
return -2;
-
+
if (sat.orbital_position != osat.orbital_position)
diff = 1<<29;
else if (sat.polarisation != osat.polarisation)
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);
eDVBFrontendParametersCable ocable;
if (parm->getDVBC(ocable))
return -2;
-
- if (cable.modulation != ocable.modulation && cable.modulation != eDVBFrontendParametersCable::Modulation::Auto && ocable.modulation != eDVBFrontendParametersCable::Modulation::Auto)
+
+ if (exact && cable.modulation != ocable.modulation
+ && cable.modulation != eDVBFrontendParametersCable::Modulation::Auto
+ && ocable.modulation != eDVBFrontendParametersCable::Modulation::Auto)
diff = 1 << 29;
- else if (cable.inversion != ocable.inversion && cable.inversion != eDVBFrontendParametersCable::Inversion::Unknown && ocable.inversion != eDVBFrontendParametersCable::Inversion::Unknown)
- diff = 1 << 28;
+ else if (exact && cable.fec_inner != ocable.fec_inner && cable.fec_inner != eDVBFrontendParametersCable::FEC::fAuto && ocable.fec_inner != eDVBFrontendParametersCable::FEC::fAuto)
+ diff = 1 << 27;
else
{
diff = abs(cable.frequency - ocable.frequency);
diff += abs(cable.symbol_rate - ocable.symbol_rate);
}
-
return 0;
case iDVBFrontend::feTerrestrial:
eDVBFrontendParametersTerrestrial oterrestrial;
if (parm->getDVBT(oterrestrial))
return -2;
-
- diff = abs(terrestrial.frequency - oterrestrial.frequency);
+
+ if (exact && oterrestrial.bandwidth != terrestrial.bandwidth &&
+ oterrestrial.bandwidth != eDVBFrontendParametersTerrestrial::Bandwidth::BwAuto &&
+ terrestrial.bandwidth != eDVBFrontendParametersTerrestrial::Bandwidth::BwAuto)
+ diff = 1 << 30;
+ else if (exact && oterrestrial.modulation != terrestrial.modulation &&
+ oterrestrial.modulation != eDVBFrontendParametersTerrestrial::Modulation::Auto &&
+ terrestrial.modulation != eDVBFrontendParametersTerrestrial::Modulation::Auto)
+ diff = 1 << 30;
+ else if (exact && oterrestrial.transmission_mode != terrestrial.transmission_mode &&
+ oterrestrial.transmission_mode != eDVBFrontendParametersTerrestrial::TransmissionMode::TMAuto &&
+ terrestrial.transmission_mode != eDVBFrontendParametersTerrestrial::TransmissionMode::TMAuto)
+ diff = 1 << 30;
+ else if (exact && oterrestrial.guard_interval != terrestrial.guard_interval &&
+ oterrestrial.guard_interval != eDVBFrontendParametersTerrestrial::GuardInterval::GI_Auto &&
+ terrestrial.guard_interval != eDVBFrontendParametersTerrestrial::GuardInterval::GI_Auto)
+ diff = 1 << 30;
+ else if (exact && oterrestrial.hierarchy != terrestrial.hierarchy &&
+ oterrestrial.hierarchy != eDVBFrontendParametersTerrestrial::Hierarchy::HAuto &&
+ terrestrial.hierarchy != eDVBFrontendParametersTerrestrial::Hierarchy::HAuto)
+ diff = 1 << 30;
+ else if (exact && oterrestrial.code_rate_LP != terrestrial.code_rate_LP &&
+ oterrestrial.code_rate_LP != eDVBFrontendParametersTerrestrial::FEC::fAuto &&
+ terrestrial.code_rate_LP != eDVBFrontendParametersTerrestrial::FEC::fAuto)
+ diff = 1 << 30;
+ else if (exact && oterrestrial.code_rate_HP != terrestrial.code_rate_HP &&
+ oterrestrial.code_rate_HP != eDVBFrontendParametersTerrestrial::FEC::fAuto &&
+ terrestrial.code_rate_HP != eDVBFrontendParametersTerrestrial::FEC::fAuto)
+ diff = 1 << 30;
+ else
+ diff = abs(terrestrial.frequency - oterrestrial.frequency);
return 0;
default:
return -1;
m_tuneTimer = new eTimer(eApp);
CONNECT(m_tuneTimer->timeout, eDVBFrontend::tuneLoop);
- int entries = sizeof(m_data) / sizeof(int);
- for (int i=0; i<entries; ++i)
+ for (int i=0; i<eDVBFrontend::NUM_DATA_ENTRIES; ++i)
m_data[i] = -1;
m_idleInputpower[0]=m_idleInputpower[1]=0;
int eDVBFrontend::closeFrontend()
{
- if (!m_fe && m_data[7] != -1)
+ eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*)m_data[LINKED_NEXT_PTR];
+ while (linked_fe != (eDVBRegisteredFrontend*)-1)
{
- // try to close the first frontend.. but the second is linked to the first
- eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*)m_data[7];
if (linked_fe->m_inuse)
{
eDebug("dont close frontend %d until the linked frontend %d is still in use",
m_fe, linked_fe->m_frontend->getID());
return -1;
}
+ linked_fe->m_frontend->getData(LINKED_NEXT_PTR, (int&)linked_fe);
}
if (m_fd >= 0)
{
m_fd=-1;
else
eWarning("couldnt close frontend %d", m_fe);
- m_data[0] = m_data[1] = m_data[2] = -1;
+ m_data[CSW] = m_data[UCSW] = m_data[TONEBURST] = -1;
}
#if HAVE_DVB_API_VERSION < 3
if (m_secfd >= 0)
int res;
int state;
res = ::ioctl(m_fd, FE_GET_EVENT, &event);
-
+
if (res && (errno == EAGAIN))
break;
eWarning("FE_GET_EVENT failed! %m");
return;
}
-
+
if (w < 0)
continue;
state = stateTuning;
else
{
+ eDebug("stateLostLock");
state = stateLostLock;
- m_data[0] = m_data[1] = m_data[2] = -1; // reset diseqc
+ m_data[CSW] = m_data[UCSW] = m_data[TONEBURST] = -1; // reset diseqc
}
}
if (m_state != state)
eDebug("FE_READ_SIGNAL_STRENGTH failed (%m)");
return strength;
}
- case Locked:
+ case locked:
{
#if HAVE_DVB_API_VERSION < 3
FrontendStatus status=0;
eDebug("FE_READ_STATUS failed (%m)");
return !!(status&FE_HAS_LOCK);
}
- case Synced:
+ case synced:
{
#if HAVE_DVB_API_VERSION < 3
FrontendStatus status=0;
eDebug("FE_READ_STATUS failed (%m)");
return !!(status&FE_HAS_SYNC);
}
+ case frontendNumber:
+ return m_fe;
}
return 0;
}
-void PutToDict(PyObject *dict, const char*key, long value)
+void PutToDict(ePyObject &dict, const char*key, long value)
{
- PyObject *item = PyInt_FromLong(value);
+ ePyObject item = PyInt_FromLong(value);
if (item)
{
if (PyDict_SetItemString(dict, key, item))
eDebug("could not create PyObject for %s", key);
}
-void PutToDict(PyObject *dict, const char*key, const char *value)
+void PutToDict(ePyObject &dict, const char*key, const char *value)
{
- PyObject *item = PyString_FromString(value);
+ ePyObject item = PyString_FromString(value);
if (item)
{
if (PyDict_SetItemString(dict, key, item))
eDebug("could not create PyObject for %s", key);
}
-void fillDictWithSatelliteData(PyObject *dict, const FRONTENDPARAMETERS &parm, eDVBFrontend *fe)
+void fillDictWithSatelliteData(ePyObject dict, const FRONTENDPARAMETERS &parm, eDVBFrontend *fe)
{
int freq_offset=0;
int csw=0;
- const char *fec=0;
- fe->getData(0, csw);
- fe->getData(9, freq_offset);
+ const char *tmp=0;
+ fe->getData(eDVBFrontend::CSW, csw);
+ fe->getData(eDVBFrontend::FREQ_OFFSET, freq_offset);
int frequency = parm_frequency + freq_offset;
PutToDict(dict, "frequency", frequency);
PutToDict(dict, "symbol_rate", parm_u_qpsk_symbol_rate);
-
switch(parm_u_qpsk_fec_inner)
{
case FEC_1_2:
- fec = "FEC_1_2";
+ tmp = "FEC_1_2";
break;
case FEC_2_3:
- fec = "FEC_2_3";
+ tmp = "FEC_2_3";
break;
case FEC_3_4:
- fec = "FEC_3_4";
+ tmp = "FEC_3_4";
break;
case FEC_5_6:
- fec = "FEC_5_6";
+ tmp = "FEC_5_6";
break;
case FEC_7_8:
- fec = "FEC_7_8";
+ tmp = "FEC_7_8";
break;
+ case FEC_NONE:
+ tmp = "FEC_NONE";
default:
case FEC_AUTO:
- fec = "FEC_AUTO";
+ tmp = "FEC_AUTO";
break;
+#if HAVE_DVB_API_VERSION >=3
+ case FEC_S2_8PSK_1_2:
+ case FEC_S2_QPSK_1_2:
+ tmp = "FEC_1_2";
+ break;
+ case FEC_S2_8PSK_2_3:
+ case FEC_S2_QPSK_2_3:
+ tmp = "FEC_2_3";
+ break;
+ case FEC_S2_8PSK_3_4:
+ case FEC_S2_QPSK_3_4:
+ tmp = "FEC_3_4";
+ break;
+ case FEC_S2_8PSK_5_6:
+ case FEC_S2_QPSK_5_6:
+ tmp = "FEC_5_6";
+ break;
+ case FEC_S2_8PSK_7_8:
+ case FEC_S2_QPSK_7_8:
+ tmp = "FEC_7_8";
+ break;
+ case FEC_S2_8PSK_8_9:
+ case FEC_S2_QPSK_8_9:
+ tmp = "FEC_8_9";
+ break;
+ case FEC_S2_8PSK_3_5:
+ case FEC_S2_QPSK_3_5:
+ tmp = "FEC_3_5";
+ break;
+ case FEC_S2_8PSK_4_5:
+ case FEC_S2_QPSK_4_5:
+ tmp = "FEC_4_5";
+ break;
+ case FEC_S2_8PSK_9_10:
+ case FEC_S2_QPSK_9_10:
+ tmp = "FEC_9_10";
+ break;
+#endif
}
- PutToDict(dict, "fec_inner", fec);
+#if HAVE_DVB_API_VERSION >=3
+ PutToDict(dict, "modulation",
+ parm_u_qpsk_fec_inner > FEC_S2_QPSK_9_10 ? "8PSK": "QPSK" );
+#else
+ PutToDict(dict, "modulation", "QPSK" );
+#endif
+ PutToDict(dict, "fec_inner", tmp);
+ tmp = parm_u_qpsk_fec_inner > FEC_AUTO ?
+ "DVB-S2" : "DVB-S";
+ PutToDict(dict, "system", tmp);
}
-void fillDictWithCableData(PyObject *dict, const FRONTENDPARAMETERS &parm)
+void fillDictWithCableData(ePyObject dict, const FRONTENDPARAMETERS &parm)
{
const char *tmp=0;
PutToDict(dict, "frequency", parm_frequency/1000);
PutToDict(dict, "modulation", tmp);
}
-void fillDictWithTerrestrialData(PyObject *dict, const FRONTENDPARAMETERS &parm)
+void fillDictWithTerrestrialData(ePyObject dict, const FRONTENDPARAMETERS &parm)
{
const char *tmp=0;
PutToDict(dict, "frequency", parm_frequency);
PyObject *eDVBFrontend::readTransponderData(bool original)
{
- PyObject *ret=PyDict_New();
+ ePyObject ret=PyDict_New();
if (ret)
{
}
PutToDict(ret, "tuner_state", tmp);
- PutToDict(ret, "tuner_locked", readFrontendData(Locked));
- PutToDict(ret, "tuner_synced", readFrontendData(Synced));
+ PutToDict(ret, "tuner_locked", readFrontendData(locked));
+ PutToDict(ret, "tuner_synced", readFrontendData(synced));
PutToDict(ret, "tuner_bit_error_rate", readFrontendData(bitErrorRate));
PutToDict(ret, "tuner_signal_power", readFrontendData(signalPower));
PutToDict(ret, "tuner_signal_quality", readFrontendData(signalQuality));
eDebug("FE_GET_FRONTEND (%m)");
else
{
+ const FRONTENDPARAMETERS &parm = original ? this->parm : front;
tmp = "INVERSION_AUTO";
switch(parm_inversion)
{
case eSecCommand::IF_TUNER_LOCKED_GOTO:
{
eSecCommand::rotor &cmd = m_sec_sequence.current()->measure;
- if (readFrontendData(Locked))
+ if (readFrontendData(locked))
{
eDebug("[SEC] locked step %d ok", cmd.okcount);
++cmd.okcount;
break;
}
case eSecCommand::IF_ROTORPOS_VALID_GOTO:
- if (m_data[5] != -1 && m_data[6] != -1)
+ if (m_data[ROTOR_CMD] != -1 && m_data[ROTOR_POS] != -1)
setSecSequencePos(m_sec_sequence.current()->steps);
else
++m_sec_sequence.current();
break;
case eSecCommand::INVALIDATE_CURRENT_ROTORPARMS:
- m_data[5] = m_data[6] = -1;
+ m_data[ROTOR_CMD] = m_data[ROTOR_POS] = -1;
eDebug("[SEC] invalidate current rotorparams");
++m_sec_sequence.current();
break;
case eSecCommand::UPDATE_CURRENT_ROTORPARAMS:
- m_data[5] = m_data[3];
- m_data[6] = m_data[4];
+ m_data[ROTOR_CMD] = m_data[NEW_ROTOR_CMD];
+ m_data[ROTOR_POS] = m_data[NEW_ROTOR_POS];
eDebug("[SEC] update current rotorparams %d %04x %d", m_timeoutCount, m_data[5], m_data[6]);
++m_sec_sequence.current();
break;
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 orbpos %d",
+ feparm.system,
+ feparm.frequency,
+ feparm.polarisation,
+ feparm.symbol_rate,
+ feparm.inversion,
+ feparm.fec,
+ feparm.orbital_position);
parm_u_qpsk_symbol_rate = feparm.symbol_rate;
switch (feparm.inversion)
{
parm_inversion = INVERSION_AUTO;
break;
}
- switch (feparm.fec)
- {
- default:
- eDebug("no valid fec set.. assume auto");
- case eDVBFrontendParametersSatellite::FEC::fAuto:
- parm_u_qpsk_fec_inner = FEC_AUTO;
- break;
- case eDVBFrontendParametersSatellite::FEC::fNone:
- parm_u_qpsk_fec_inner = FEC_NONE;
- case eDVBFrontendParametersSatellite::FEC::f1_2:
- parm_u_qpsk_fec_inner = FEC_1_2;
- break;
- case eDVBFrontendParametersSatellite::FEC::f2_3:
- parm_u_qpsk_fec_inner = FEC_2_3;
- break;
- case eDVBFrontendParametersSatellite::FEC::f3_4:
- parm_u_qpsk_fec_inner = FEC_3_4;
- break;
- case eDVBFrontendParametersSatellite::FEC::f5_6:
- parm_u_qpsk_fec_inner = FEC_5_6;
- break;
- case eDVBFrontendParametersSatellite::FEC::f7_8:
- parm_u_qpsk_fec_inner = FEC_7_8;
- break;
+ if (feparm.system == eDVBFrontendParametersSatellite::System::DVB_S)
+ switch (feparm.fec)
+ {
+ case eDVBFrontendParametersSatellite::FEC::fNone:
+ parm_u_qpsk_fec_inner = FEC_NONE;
+ break;
+ case eDVBFrontendParametersSatellite::FEC::f1_2:
+ parm_u_qpsk_fec_inner = FEC_1_2;
+ break;
+ case eDVBFrontendParametersSatellite::FEC::f2_3:
+ parm_u_qpsk_fec_inner = FEC_2_3;
+ break;
+ case eDVBFrontendParametersSatellite::FEC::f3_4:
+ parm_u_qpsk_fec_inner = FEC_3_4;
+ break;
+ case eDVBFrontendParametersSatellite::FEC::f5_6:
+ parm_u_qpsk_fec_inner = FEC_5_6;
+ break;
+ case eDVBFrontendParametersSatellite::FEC::f7_8:
+ parm_u_qpsk_fec_inner = FEC_7_8;
+ break;
+ default:
+ eDebug("no valid fec for DVB-S set.. assume auto");
+ case eDVBFrontendParametersSatellite::FEC::fAuto:
+ parm_u_qpsk_fec_inner = FEC_AUTO;
+ break;
+ }
#if HAVE_DVB_API_VERSION >= 3
- case eDVBFrontendParametersSatellite::FEC::f9_10:
- parm_u_qpsk_fec_inner = FEC_9_10;
- break;
-#endif
+ else // DVB_S2
+ {
+ switch (feparm.fec)
+ {
+ case eDVBFrontendParametersSatellite::FEC::f1_2:
+ parm_u_qpsk_fec_inner = FEC_S2_QPSK_1_2;
+ break;
+ case eDVBFrontendParametersSatellite::FEC::f2_3:
+ parm_u_qpsk_fec_inner = FEC_S2_QPSK_2_3;
+ break;
+ case eDVBFrontendParametersSatellite::FEC::f3_4:
+ parm_u_qpsk_fec_inner = FEC_S2_QPSK_3_4;
+ break;
+ case eDVBFrontendParametersSatellite::FEC::f3_5:
+ parm_u_qpsk_fec_inner = FEC_S2_QPSK_3_5;
+ break;
+ case eDVBFrontendParametersSatellite::FEC::f4_5:
+ parm_u_qpsk_fec_inner = FEC_S2_QPSK_4_5;
+ break;
+ case eDVBFrontendParametersSatellite::FEC::f5_6:
+ parm_u_qpsk_fec_inner = FEC_S2_QPSK_5_6;
+ break;
+ case eDVBFrontendParametersSatellite::FEC::f7_8:
+ parm_u_qpsk_fec_inner = FEC_S2_QPSK_7_8;
+ break;
+ case eDVBFrontendParametersSatellite::FEC::f8_9:
+ parm_u_qpsk_fec_inner = FEC_S2_QPSK_8_9;
+ break;
+ case eDVBFrontendParametersSatellite::FEC::f9_10:
+ parm_u_qpsk_fec_inner = FEC_S2_QPSK_9_10;
+ break;
+ default:
+ eDebug("no valid fec for DVB-S2 set.. abort !!");
+ return -EINVAL;
+ }
+ if (feparm.modulation == eDVBFrontendParametersSatellite::Modulation::M8PSK)
+ parm_u_qpsk_fec_inner = (fe_code_rate_t)((int)parm_u_qpsk_fec_inner+9);
+ // 8PSK fec driver values are decimal 9 bigger
}
+#endif
// FIXME !!! get frequency range from tuner
if ( parm_frequency < 900000 || parm_frequency > 2200000 )
{
parm_u_qam_fec_inner = FEC_AUTO;
break;
}
+ eDebug("tuning to %d khz, sr %d, fec %d, modulation %d, inversion %d",
+ parm_frequency/1000,
+ parm_u_qam_symbol_rate,
+ parm_u_qam_fec_inner,
+ parm_u_qam_modulation,
+ parm_inversion);
return 0;
}
int res=0;
+ if (!m_sn)
+ {
+ eDebug("no frontend device opened... do not try to tune !!!");
+ 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)
- {
- m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
- 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)
RESULT eDVBFrontend::setVoltage(int voltage)
{
- if (m_type != feSatellite)
+ if (m_type == feCable)
return -1;
#if HAVE_DVB_API_VERSION < 3
secVoltage vlt;
#if HAVE_DVB_API_VERSION < 3
return ::ioctl(m_secfd, SEC_SET_VOLTAGE, vlt);
#else
- if (::ioctl(m_fd, FE_ENABLE_HIGH_LNB_VOLTAGE, increased) < 0)
+ if (m_type == feSatellite && ::ioctl(m_fd, FE_ENABLE_HIGH_LNB_VOLTAGE, increased) < 0)
perror("FE_ENABLE_HIGH_LNB_VOLTAGE");
return ::ioctl(m_fd, FE_SET_VOLTAGE, vlt);
#endif
RESULT eDVBFrontend::getData(int num, int &data)
{
- if ( num < (int)(sizeof(m_data)/sizeof(int)) )
+ if ( num < NUM_DATA_ENTRIES )
{
data = m_data[num];
return 0;
RESULT eDVBFrontend::setData(int num, int val)
{
- if ( num < (int)(sizeof(m_data)/sizeof(int)) )
+ if ( num < NUM_DATA_ENTRIES )
{
m_data[num] = val;
return 0;
ASSERT(!feparm->getDVBS(sat_parm));
return m_sec->canTune(sat_parm, this, 1 << m_fe);
}
+ else if (m_type == eDVBFrontend::feCable)
+ return 2; // more prio for cable frontends
return 1;
}
projects / vuplus_dvbapp / blobdiff