self.satList.append( (tname, tpos) )
self.parsedSat = int(tpos)
elif (name == "transponder"):
+ system = int(attrs.get('system',"0"))
freq = int(attrs.get('frequency',""))
sr = int(attrs.get('symbol_rate',""))
pol = int(attrs.get('polarization',""))
else:
self.transponders[self.parsedSat] = [ ]
- self.transponders[self.parsedSat].append((0, freq, sr, pol, fec))
+ self.transponders[self.parsedSat].append((0, freq, sr, pol, fec, system))
class parseCables(ContentHandler):
def __init__(self, cablesList, transponders):
parm.fec = transponder[3]
parm.inversion = transponder[4]
parm.orbital_position = transponder[5]
+ parm.system = 0 # FIXMEE !! HARDCODED DVB-S (add support for DVB-S2)
feparm = eDVBFrontendParameters()
feparm.setDVBS(parm, True)
self.lastparm = feparm
#parm.inversion = 1 #eDVBFrontendParametersSatellite.Inversion.Off;
parm.inversion = 2 #AUTO
parm.orbital_position = pos
+ parm.system = x[5] #DVB-S or DVB-S2
tlist.append(parm)
def getInitialCableTransponderList(tlist, cable):
"3_5": 7,
"4_5": 8,
"9_10": 9,
- "none": 10
+ "none": 15
}
def addSatTransponder(self, tlist, frequency, symbol_rate, polarisation, fec, inversion, orbital_position, system):
config.scan.sat.polarization.value,
fec,
config.scan.sat.inversion.value,
- config.scan.sat.system.value,
- orbpos)
+ orbpos,
+ config.scan.sat.system.value)
elif currentConfigSelectionElement(config.scan.type) == "single_satellite":
sat = self.satList[config.scan.nims.value][config.scan.satselection[config.scan.nims.value].value]
getInitialTransponderList(tlist, int(sat[1]))