try to add manual scan support for -s2 transponders (not finished)
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>
Tue, 23 May 2006 23:12:31 +0000 (23:12 +0000)
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>
Tue, 23 May 2006 23:12:31 +0000 (23:12 +0000)
lib/python/Screens/ScanSetup.py

index 4983f76..6d51d01 100644 (file)
@@ -301,11 +301,13 @@ class ScanSetup(Screen):
                        config.scan.ber.enabled = False
 
                        # sat
                        config.scan.ber.enabled = False
 
                        # sat
+                       config.scan.sat.system = configElement_nonSave("config.scan.sat.system", configSelection, 0, (("dvb-s", _("DVB-S")), ("dvb-s2", _("DVB-S2"))))
                        config.scan.sat.frequency = configElement_nonSave("config.scan.sat.frequency", configSequence, [11836], configsequencearg.get("INTEGER", (1, 99999)))
                        config.scan.sat.inversion = configElement_nonSave("config.scan.sat.inversion", configSelection, 2, (("off", _("off")), ("on", _("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", _("horizontal")), ("vertical", _("vertical")),  ("circular_left", _("circular left")), ("circular_right", _("circular right"))))
                        config.scan.sat.fec = configElement_nonSave("config.scan.sat.fec", configSelection, 7, (("auto", _("Auto")), ("1_2", "1/2"), ("2_3", "2/3"), ("3_4", "3/4"), ("5_6", "5/6"), ("7_8", "7/8"), ("none", _("None"))))
                        config.scan.sat.frequency = configElement_nonSave("config.scan.sat.frequency", configSequence, [11836], configsequencearg.get("INTEGER", (1, 99999)))
                        config.scan.sat.inversion = configElement_nonSave("config.scan.sat.inversion", configSelection, 2, (("off", _("off")), ("on", _("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", _("horizontal")), ("vertical", _("vertical")),  ("circular_left", _("circular left")), ("circular_right", _("circular right"))))
                        config.scan.sat.fec = configElement_nonSave("config.scan.sat.fec", configSelection, 7, (("auto", _("Auto")), ("1_2", "1/2"), ("2_3", "2/3"), ("3_4", "3/4"), ("5_6", "5/6"), ("7_8", "7/8"), ("none", _("None"))))
+                       config.scan.sat.fec_s2 = configElement_nonSave("config.scan.sat.fec_s2", configSelection, 8, (("1_2", "1/2"), ("2_3", "2/3"), ("3_4", "3/4"), ("3_5", "3/5"), ("4_5", "4/5"), ("5_6", "5/6"), ("7_8", "7/8"), ("8_9", "8/9"), ("9_10", "9/10"))))
 
                        # cable
                        config.scan.cab.frequency = configElement_nonSave("config.scan.cab.frequency", configSequence, [466], configsequencearg.get("INTEGER", (50, 999)))
 
                        # cable
                        config.scan.cab.frequency = configElement_nonSave("config.scan.cab.frequency", configSequence, [466], configsequencearg.get("INTEGER", (50, 999)))
@@ -358,10 +360,11 @@ class ScanSetup(Screen):
                if (self["config"].getCurrent()[1].parent.enabled == True):
                        self["config"].handleKey(config.key[str(number)])
 
                if (self["config"].getCurrent()[1].parent.enabled == True):
                        self["config"].handleKey(config.key[str(number)])
 
-       def addSatTransponder(self, tlist, frequency, symbol_rate, polarisation, fec, inversion, orbital_position):
+       def addSatTransponder(self, tlist, frequency, symbol_rate, polarisation, fec, inversion, orbital_position, system):
                print "Add Sat: frequ: " + str(frequency) + " symbol: " + str(symbol_rate) + " pol: " + str(polarisation) + " fec: " + str(fec) + " inversion: " + str(inversion)
                print "orbpos: " + str(orbital_position)
                parm = eDVBFrontendParametersSatellite()
                print "Add Sat: frequ: " + str(frequency) + " symbol: " + str(symbol_rate) + " pol: " + str(polarisation) + " fec: " + str(fec) + " inversion: " + str(inversion)
                print "orbpos: " + str(orbital_position)
                parm = eDVBFrontendParametersSatellite()
+               parm.system = system
                parm.frequency = frequency * 1000
                parm.symbol_rate = symbol_rate * 1000
                parm.polarisation = polarisation # eDVBFrontendParametersSatellite.Polarisation.Verti
                parm.frequency = frequency * 1000
                parm.symbol_rate = symbol_rate * 1000
                parm.polarisation = polarisation # eDVBFrontendParametersSatellite.Polarisation.Verti
@@ -407,6 +410,7 @@ class ScanSetup(Screen):
                                                                                config.scan.sat.polarization.value,
                                                                                config.scan.sat.fec.value,
                                                                                config.scan.sat.inversion.value,
                                                                                config.scan.sat.polarization.value,
                                                                                config.scan.sat.fec.value,
                                                                                config.scan.sat.inversion.value,
+                                                                               config.scan.sat.system.value,
                                                                                orbpos)
                        elif currentConfigSelectionElement(config.scan.type) == "single_satellite":
                                sat = self.satList[config.scan.nims.value][config.scan.satselection[config.scan.nims.value].value]
                                                                                orbpos)
                        elif currentConfigSelectionElement(config.scan.type) == "single_satellite":
                                sat = self.satList[config.scan.nims.value][config.scan.satselection[config.scan.nims.value].value]