git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add new after record timer event behavior "auto".. and use it as default
[enigma2.git]
/
lib
/
dvb
/
frontend.cpp
diff --git
a/lib/dvb/frontend.cpp
b/lib/dvb/frontend.cpp
index 27ea66ec19fd12c4092a1ab76f73e81f6f33d3da..a74e65cab4d9979ec4275e17b3efab0ebd7bbd1d 100644
(file)
--- a/
lib/dvb/frontend.cpp
+++ b/
lib/dvb/frontend.cpp
@@
-728,7
+728,7
@@
int eDVBFrontend::readFrontendData(int type)
eDebug("FE_READ_SNR failed (%m)");
if (!strcmp(m_description, "BCM4501 (internal)"))
{
eDebug("FE_READ_SNR failed (%m)");
if (!strcmp(m_description, "BCM4501 (internal)"))
{
-
unsigned in
t SDS_SNRE = snr << 16;
+
floa
t SDS_SNRE = snr << 16;
float snr_in_db;
if (parm_u_qpsk_fec_inner <= FEC_AUTO) // DVB-S1 / QPSK
float snr_in_db;
if (parm_u_qpsk_fec_inner <= FEC_AUTO) // DVB-S1 / QPSK
@@
-748,7
+748,7
@@
int eDVBFrontend::readFrontendData(int type)
if (fval1 < 10.0)
{
fval2 = SNR_COEFF[0];
if (fval1 < 10.0)
{
fval2 = SNR_COEFF[0];
- for (int i=
0
; i<6; ++i)
+ for (int i=
1
; i<6; ++i)
{
fval2 *= fval1;
fval2 += SNR_COEFF[i];
{
fval2 *= fval1;
fval2 += SNR_COEFF[i];
@@
-1014,22
+1014,19
@@
void fillDictWithSatelliteData(ePyObject dict, const FRONTENDPARAMETERS &parm, e
break;
}
PutToDict(dict, "rolloff", tmp);
break;
}
PutToDict(dict, "rolloff", tmp);
-
if (parm_u_qpsk_fec_inner > FEC_S2_QPSK_9_1
0)
+
switch(parm_inversion & 0x3
0)
{
{
- switch(parm_inversion & 0x30)
- {
- case 0: // pilot off
- tmp = "PILOT_OFF";
- break;
- case 0x10: // pilot on
- tmp = "PILOT_ON";
- break;
- case 0x20: // pilot auto
- tmp = "PILOT_AUTO";
- break;
- }
- PutToDict(dict, "pilot", tmp);
+ case 0: // pilot off
+ tmp = "PILOT_OFF";
+ break;
+ case 0x10: // pilot on
+ tmp = "PILOT_ON";
+ break;
+ case 0x20: // pilot auto
+ tmp = "PILOT_AUTO";
+ break;
}
}
+ PutToDict(dict, "pilot", tmp);
tmp = "DVB-S2";
}
else
tmp = "DVB-S2";
}
else
@@
-1310,7
+1307,7
@@
void eDVBFrontend::getTransponderData(ePyObject dest, bool original)
{
const FRONTENDPARAMETERS &parm = original || m_simulate ? this->parm : front;
const char *tmp = "INVERSION_AUTO";
{
const FRONTENDPARAMETERS &parm = original || m_simulate ? this->parm : front;
const char *tmp = "INVERSION_AUTO";
- switch(parm_inversion)
+ switch(parm_inversion
& 3
)
{
case INVERSION_ON:
tmp = "INVERSION_ON";
{
case INVERSION_ON:
tmp = "INVERSION_ON";
@@
-1916,10
+1913,10
@@
RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm,
return -EINVAL;
}
parm_inversion |= (feparm.rolloff << 2); // Hack.. we use bit 2..3 of inversion param for rolloff
return -EINVAL;
}
parm_inversion |= (feparm.rolloff << 2); // Hack.. we use bit 2..3 of inversion param for rolloff
+ parm_inversion |= (feparm.pilot << 4); // Hack.. we use bit 4..5 of inversion param for pilot
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
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
- parm_inversion |= (feparm.pilot << 4); // Hack.. we use bit 4..5 of inversion param for pilot
}
}
#endif
}
}
#endif