{
if (!str)
return;
- len = strlen(str);
- if (len > MAX_DISEQC_LENGTH)
- len = MAX_DISEQC_LENGTH;
- memcpy(data, str, len);
+ len=0;
+ int slen = strlen(str);
+ if (slen % 2)
+ {
+ eDebug("invalid diseqc command string length (not 2 byte aligned)");
+ return;
+ }
+ if (slen > MAX_DISEQC_LENGTH*2)
+ {
+ eDebug("invalid diseqc command string length (string is to long)");
+ return;
+ }
+ unsigned char val=0;
+ for (int i=0; i < slen; ++i)
+ {
+ unsigned char c = str[i];
+ switch(c)
+ {
+ case '0' ... '9': c-=48; break;
+ case 'a' ... 'f': c-=87; break;
+ case 'A' ... 'F': c-=55; break;
+ default:
+ eDebug("invalid character in hex string..ignore complete diseqc command !");
+ return;
+ }
+ if ( i % 2 )
+ {
+ val |= c;
+ data[i/2] = val;
+ }
+ else
+ val = c << 4;
+ }
+ len = slen/2;
}
void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescriptor &descriptor)
return 0;
}
-RESULT eDVBFrontendParameters::setDVBS(const eDVBFrontendParametersSatellite &p)
+RESULT eDVBFrontendParameters::setDVBS(const eDVBFrontendParametersSatellite &p, bool no_rotor_command_on_tune)
{
sat = p;
+ sat.no_rotor_command_on_tune = no_rotor_command_on_tune;
m_type = iDVBFrontend::feSatellite;
return 0;
}
return 0;
}
case iDVBFrontend::feCable:
+ hash = 0xFFFF0000;
+ return 0;
case iDVBFrontend::feTerrestrial:
+ hash = 0xEEEE0000;
+ return 0;
default:
return -1;
}
if (m_fd >= 0)
{
eDebug("close frontend %d", m_fe);
+ m_tuneTimer->stop();
setTone(iDVBFrontend::toneOff);
setVoltage(iDVBFrontend::voltageOff);
+ if (m_sec)
+ m_sec->setRotorMoving(false);
::close(m_fd);
m_fd=-1;
m_data[0] = m_data[1] = m_data[2] = -1;
PutToDict(dict, "guard_interval", tmp);
switch (parm_u_ofdm_hierarchy_information)
{
+ case HIERARCHY_NONE:
+ tmp = "HIERARCHY_NONE";
+ break;
case HIERARCHY_1:
tmp = "HIERARCHY_1";
break;
}
switch (feparm.hierarchy)
{
+ case eDVBFrontendParametersTerrestrial::Hierarchy::HNone:
+ parm_u_ofdm_hierarchy_information = HIERARCHY_NONE;
+ break;
case eDVBFrontendParametersTerrestrial::Hierarchy::H1:
parm_u_ofdm_hierarchy_information = HIERARCHY_1;
break;
parm_u_ofdm_hierarchy_information = HIERARCHY_AUTO;
break;
}
+ switch (feparm.inversion)
+ {
+ case eDVBFrontendParametersTerrestrial::Inversion::On:
+ parm_inversion = INVERSION_ON;
+ break;
+ case eDVBFrontendParametersTerrestrial::Inversion::Off:
+ parm_inversion = INVERSION_OFF;
+ break;
+ default:
+ case eDVBFrontendParametersTerrestrial::Inversion::Unknown:
+ parm_inversion = INVERSION_AUTO;
+ break;
+ }
return 0;
}
return -EINVAL;
}
res=prepare_sat(feparm);
+ m_sec->setRotorMoving(false);
break;
}
case feCable: