diff = 1<<29;
else if (sat.polarisation != osat.polarisation)
diff = 1<<28;
- else
+ else
+ {
diff = abs(sat.frequency - osat.frequency);
+ diff += abs(sat.symbol_rate - osat.symbol_rate);
+ }
return 0;
}
case iDVBFrontend::feCable:
struct FEC
{
enum {
- fNone, f1_2, f2_3, f3_4, f5_6, f7_8, fAuto
+ fAuto, f1_2, f2_3, f3_4, f5_6, f7_8, fNone
};
};
unsigned int frequency, symbol_rate;
else:
self.transponders[self.parsedCab] = [ ]
- self.transponders[self.parsedCab].append((0, freq, sr, mod, fec))
+ self.transponders[self.parsedCab].append((1, freq, sr, mod, fec))
class parseTerrestrials(ContentHandler):
def __init__(self, terrestrialsList, transponders):
else:
self.transponders[self.parsedTer] = [ ]
- self.transponders[self.parsedTer].append((0, freq, bw, const, crh, crl, guard, transm, hierarchy, inv))
+ self.transponders[self.parsedTer].append((2, freq, bw, const, crh, crl, guard, transm, hierarchy, inv))
def getTransponders(self, pos):
return self.transponders[pos]
parm.frequency = x[1]
parm.symbol_rate = x[2]
parm.polarisation = x[3] # eDVBFrontendParametersSatellite.Polarisation.Vertical
- #parm.fec = x[4] # eDVBFrontendParametersSatellite.FEC.f3_4;
- parm.fec = 6 # AUTO
+ parm.fec = x[4] # eDVBFrontendParametersSatellite.FEC.f3_4;
+ #parm.fec = 6 # AUTO
#parm.inversion = 1 #eDVBFrontendParametersSatellite.Inversion.Off;
parm.inversion = 2 #AUTO
parm.orbital_position = pos
config.scan.sat.inversion = configElement_nonSave("config.scan.sat.inversion", configSelection, 2, (_("off"), _("on"), _("Auto")))
config.scan.sat.symbolrate = configElement_nonSave("config.scan.sat.symbolrate", configSequence, [27500], configsequencearg.get("INTEGER", (1, 99999)))
config.scan.sat.polarization = configElement_nonSave("config.scan.sat.polarization", configSelection, 0, (_("horizontal"), _("vertical"), _("circular left"), _("circular right")))
- config.scan.sat.fec = configElement_nonSave("config.scan.sat.fec", configSelection, 7, ("None", "1/2", "2/3", "3/4", "5/6", "7/8", "auto"))
+ config.scan.sat.fec = configElement_nonSave("config.scan.sat.fec", configSelection, 7, (_("Auto"), "1/2", "2/3", "3/4", "5/6", "7/8", _("None")))
# cable
config.scan.cab.frequency = configElement_nonSave("config.scan.cab.frequency", configSequence, [466], configsequencearg.get("INTEGER", (50, 9999)))