small cleanup

[enigma2.git] / lib / python / Components / NimManager.py

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index d54ebb3766efb155785239c607a6d0f3efe3ec9f..70ce4dbe6b576947e5b9a380bdec198d0d87d17a 100644 (file)
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -1,10 +1,11 @@
-from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, ConfigNothing, ConfigSubDict, ConfigOnOff
+from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, ConfigNothing, ConfigSubDict, ConfigOnOff, ConfigDateTime

 
 from enigma import eDVBSatelliteEquipmentControl as secClass, \
        eDVBSatelliteLNBParameters as lnbParam, \
        eDVBSatelliteDiseqcParameters as diseqcParam, \
        eDVBSatelliteSwitchParameters as switchParam, \
 
 from enigma import eDVBSatelliteEquipmentControl as secClass, \
        eDVBSatelliteLNBParameters as lnbParam, \
        eDVBSatelliteDiseqcParameters as diseqcParam, \
        eDVBSatelliteSwitchParameters as switchParam, \

-       eDVBSatelliteRotorParameters as rotorParam
+       eDVBSatelliteRotorParameters as rotorParam, \
+       eDVBResourceManager

 
 import xml.dom.minidom
 from xml.dom import EMPTY_NAMESPACE
 
 import xml.dom.minidom
 from xml.dom import EMPTY_NAMESPACE


@@ -15,6 +16,8 @@ from xml.sax import make_parser
 from xml.sax.handler import ContentHandler
 
 from Tools.BoundFunction import boundFunction
 from xml.sax.handler import ContentHandler
 
 from Tools.BoundFunction import boundFunction

+from time import localtime, mktime
+from datetime import datetime

 
 def getConfigSatlist(orbpos, satlist):
        default_orbpos = None
 
 def getConfigSatlist(orbpos, satlist):
        default_orbpos = None


@@ -32,7 +35,7 @@ def tryOpen(filename):
        return procFile
 
 class SecConfigure:
        return procFile
 
 class SecConfigure:

-       def addLNBSimple(self, sec, slotid, diseqcmode, toneburstmode = 0, diseqcpos = 0, orbpos = 0, longitude = 0, latitude = 0, loDirection = 0, laDirection = 0):
+       def addLNBSimple(self, sec, slotid, diseqcmode, toneburstmode = diseqcParam.NO, diseqcpos = diseqcParam.SENDNO, orbpos = 0, longitude = 0, latitude = 0, loDirection = 0, laDirection = 0, turningSpeed = rotorParam.FAST):

                #simple defaults
                sec.addLNB()
                tunermask = 1 << slotid
                #simple defaults
                sec.addLNB()
                tunermask = 1 << slotid


@@ -55,6 +58,7 @@ class SecConfigure:
                sec.setDiSEqCMode(diseqcmode)
                sec.setToneburst(toneburstmode)
                sec.setCommittedCommand(diseqcpos)
                sec.setDiSEqCMode(diseqcmode)
                sec.setToneburst(toneburstmode)
                sec.setCommittedCommand(diseqcpos)

+               sec.setUncommittedCommand(0) # SENDNO

                #print "set orbpos to:" + str(orbpos)
 
                if 0 <= diseqcmode < 3:
                #print "set orbpos to:" + str(orbpos)
 
                if 0 <= diseqcmode < 3:


@@ -69,6 +73,7 @@ class SecConfigure:
                        sec.setLoDirection(loDirection)
                        sec.setUseInputpower(True)
                        sec.setInputpowerDelta(50)
                        sec.setLoDirection(loDirection)
                        sec.setUseInputpower(True)
                        sec.setInputpowerDelta(50)

+                       sec.setRotorTurningSpeed(turningSpeed)

 
                        for x in self.NimManager.satList:
                                print "Add sat " + str(x[0])
 
                        for x in self.NimManager.satList:
                                print "Add sat " + str(x[0])


@@ -78,7 +83,7 @@ class SecConfigure:
                                sec.setRotorPosNum(0) # USALS
                                self.satList.append(int(x[0]))
 
                                sec.setRotorPosNum(0) # USALS
                                self.satList.append(int(x[0]))
 

-               sec.setLNBTunerMask(tunermask)
+               sec.setLNBSlotMask(tunermask)

 
        def setSatposDepends(self, sec, nim1, nim2):
                print "tuner", nim1, "depends on satpos of", nim2
 
        def setSatposDepends(self, sec, nim1, nim2):
                print "tuner", nim1, "depends on satpos of", nim2


@@ -100,9 +105,11 @@ class SecConfigure:
                self.linked = { }
                self.satposdepends = { }
                self.equal = { }
                self.linked = { }
                self.satposdepends = { }
                self.equal = { }

-               
+

                nim_slots = self.NimManager.nim_slots
                nim_slots = self.NimManager.nim_slots

-               
+
+               used_nim_slots = [ ]
+

                for slot in nim_slots:
                        x = slot.slot
                        nim = slot.config
                for slot in nim_slots:
                        x = slot.slot
                        nim = slot.config


@@ -111,51 +118,69 @@ class SecConfigure:
                                # this is stored in the *value* (not index!) of the config list
                                if nim.configMode.value == "equal":
                                        self.equal[int(nim.equalTo.value)]=x
                                # this is stored in the *value* (not index!) of the config list
                                if nim.configMode.value == "equal":
                                        self.equal[int(nim.equalTo.value)]=x

-                               if nim.configMode.value == "loopthrough":
+                               elif nim.configMode.value == "loopthrough":

                                        self.linkNIMs(sec, x, int(nim.linkedTo.value))
                                        self.linked[int(nim.linkedTo.value)]=x
                                elif nim.configMode.value == "satposdepends":
                                        self.setSatposDepends(sec, x, int(nim.satposDependsTo.value))
                                        self.satposdepends[int(nim.satposDependsTo.value)]=x
 
                                        self.linkNIMs(sec, x, int(nim.linkedTo.value))
                                        self.linked[int(nim.linkedTo.value)]=x
                                elif nim.configMode.value == "satposdepends":
                                        self.setSatposDepends(sec, x, int(nim.satposDependsTo.value))
                                        self.satposdepends[int(nim.satposDependsTo.value)]=x
 

+                       if slot.type is not None:
+                               used_nim_slots.append((slot.slot, slot.description, nim.configMode.value != "nothing" and True or False))
+
+               eDVBResourceManager.getInstance().setFrontendSlotInformations(used_nim_slots)
+

                for slot in nim_slots:
                        x = slot.slot
                        nim = slot.config
                        if slot.isCompatible("DVB-S"):
                                print "slot: " + str(x) + " configmode: " + str(nim.configMode.value)
                                print "diseqcmode: ", nim.configMode.value
                for slot in nim_slots:
                        x = slot.slot
                        nim = slot.config
                        if slot.isCompatible("DVB-S"):
                                print "slot: " + str(x) + " configmode: " + str(nim.configMode.value)
                                print "diseqcmode: ", nim.configMode.value

-                               if nim.configMode.value in [ "loopthrough", "satposdepends", "equal", "nothing" ]:
+                               if nim.configMode.value in [ "loopthrough", "satposdepends", "nothing" ]:

                                        pass
                                        pass

-                               elif nim.configMode.value == "simple":          #simple config
-                                       if nim.diseqcMode.value == "single":                    #single
-                                               self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.NONE, diseqcpos = diseqcParam.SENDNO)
-                                       elif nim.diseqcMode.value == "toneburst_a_b":           #Toneburst A/B
-                                               self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.A, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.SENDNO)
-                                               self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.B, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.SENDNO)
-                                       elif nim.diseqcMode.value == "diseqc_a_b":              #DiSEqC A/B
-                                               self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA)
-                                               self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB)
-                                       elif nim.diseqcMode.value == "diseqc_a_b_c_d":          #DiSEqC A/B/C/D
-                                               self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA)
-                                               self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB)
-                                               self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcC.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BA)
-                                               self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcD.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BB)
-                                       elif nim.diseqcMode.value == "positioner":              #Positioner
-                                               if nim.latitudeOrientation.value == "north":
-                                                       laValue = rotorParam.NORTH
-                                               else:
-                                                       laValue = rotorParam.SOUTH
-                                               if nim.longitudeOrientation.value == "east":
-                                                       loValue = rotorParam.EAST
-                                               else:
-                                                       loValue = rotorParam.WEST
-                                               self.addLNBSimple(sec, slotid = x, diseqcmode = 3,
-                                                       longitude = nim.longitude.float,
-                                                       loDirection = loValue,
-                                                       latitude = nim.latitude.float,
-                                                       laDirection = laValue)
-                               elif nim.configMode.value == "advanced": #advanced config
-                                       self.updateAdvanced(sec, x)
+                               else:
+                                       sec.setSlotNotLinked(x)
+                                       if nim.configMode.value == "equal":
+                                               pass
+                                       elif nim.configMode.value == "simple":          #simple config
+                                               if nim.diseqcMode.value == "single":                    #single
+                                                       self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.NONE, diseqcpos = diseqcParam.SENDNO)
+                                               elif nim.diseqcMode.value == "toneburst_a_b":           #Toneburst A/B
+                                                       self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.A, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.SENDNO)
+                                                       self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.B, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.SENDNO)
+                                               elif nim.diseqcMode.value == "diseqc_a_b":              #DiSEqC A/B
+                                                       self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA)
+                                                       self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB)
+                                               elif nim.diseqcMode.value == "diseqc_a_b_c_d":          #DiSEqC A/B/C/D
+                                                       self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA)
+                                                       self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB)
+                                                       self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcC.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BA)
+                                                       self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcD.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BB)
+                                               elif nim.diseqcMode.value == "positioner":              #Positioner
+                                                       if nim.latitudeOrientation.value == "north":
+                                                               laValue = rotorParam.NORTH
+                                                       else:
+                                                               laValue = rotorParam.SOUTH
+                                                       if nim.longitudeOrientation.value == "east":
+                                                               loValue = rotorParam.EAST
+                                                       else:
+                                                               loValue = rotorParam.WEST
+                                                       turn_speed_dict = { "fast": rotorParam.FAST, "slow": rotorParam.SLOW }
+                                                       if turn_speed_dict.has_key(nim.turningSpeed.value):
+                                                               turning_speed = turn_speed_dict[nim.turningSpeed.value]
+                                                       else:
+                                                               beg_time = localtime(nim.fastTurningBegin.value)
+                                                               end_time = localtime(nim.fastTurningEnd.value)
+                                                               turning_speed = ((beg_time.tm_hour+1) * 60 + beg_time.tm_min + 1) << 16
+                                                               turning_speed |= (end_time.tm_hour+1) * 60 + end_time.tm_min + 1
+                                                       self.addLNBSimple(sec, slotid = x, diseqcmode = 3,
+                                                               longitude = nim.longitude.float,
+                                                               loDirection = loValue,
+                                                               latitude = nim.latitude.float,
+                                                               laDirection = laValue,
+                                                               turningSpeed = turning_speed)
+                                       elif nim.configMode.value == "advanced": #advanced config
+                                               self.updateAdvanced(sec, x)

                print "sec config completed"
 
        def updateAdvanced(self, sec, slotid):
                print "sec config completed"
 
        def updateAdvanced(self, sec, slotid):


@@ -190,18 +215,18 @@ class SecConfigure:
                                        sec.setLNBLOFL(currLnb.lofl.value * 1000)
                                        sec.setLNBLOFH(currLnb.lofh.value * 1000)
                                        sec.setLNBThreshold(currLnb.threshold.value * 1000)
                                        sec.setLNBLOFL(currLnb.lofl.value * 1000)
                                        sec.setLNBLOFH(currLnb.lofh.value * 1000)
                                        sec.setLNBThreshold(currLnb.threshold.value * 1000)

-                                       
+

 #                              if currLnb.output_12v.value == "0V":
 #                                      pass # nyi in drivers
 #                              elif currLnb.output_12v.value == "12V":
 #                                      pass # nyi in drivers
 #                              if currLnb.output_12v.value == "0V":
 #                                      pass # nyi in drivers
 #                              elif currLnb.output_12v.value == "12V":
 #                                      pass # nyi in drivers

-                                       
+

                                if currLnb.increased_voltage.value:
                                        sec.setLNBIncreasedVoltage(lnbParam.ON)
                                else:
                                        sec.setLNBIncreasedVoltage(lnbParam.OFF)
                                if currLnb.increased_voltage.value:
                                        sec.setLNBIncreasedVoltage(lnbParam.ON)
                                else:
                                        sec.setLNBIncreasedVoltage(lnbParam.OFF)

-                               
-                               dm = currLnb.diseqcMode.value 
+
+                               dm = currLnb.diseqcMode.value

                                if dm == "none":
                                        sec.setDiSEqCMode(diseqcParam.NONE)
                                elif dm == "1_0":
                                if dm == "none":
                                        sec.setDiSEqCMode(diseqcParam.NONE)
                                elif dm == "1_0":


@@ -221,10 +246,10 @@ class SecConfigure:
                                                sec.setToneburst(diseqcParam.A)
                                        elif currLnb.toneburst.value == "B":
                                                sec.setToneburst(diseqcParam.B)
                                                sec.setToneburst(diseqcParam.A)
                                        elif currLnb.toneburst.value == "B":
                                                sec.setToneburst(diseqcParam.B)

-                                       
+

                                        # Committed Diseqc Command
                                        cdc = currLnb.commitedDiseqcCommand.value
                                        # Committed Diseqc Command
                                        cdc = currLnb.commitedDiseqcCommand.value

-                                       
+

                                        c = { "none": diseqcParam.SENDNO,
                                                "AA": diseqcParam.AA,
                                                "AB": diseqcParam.AB,
                                        c = { "none": diseqcParam.SENDNO,
                                                "AA": diseqcParam.AA,
                                                "AB": diseqcParam.AB,


@@ -237,9 +262,9 @@ class SecConfigure:
                                                sec.setCommittedCommand(long(cdc))
 
                                        sec.setFastDiSEqC(currLnb.fastDiseqc.value)
                                                sec.setCommittedCommand(long(cdc))
 
                                        sec.setFastDiSEqC(currLnb.fastDiseqc.value)

-                                               
+

                                        sec.setSeqRepeat(currLnb.sequenceRepeat.value)
                                        sec.setSeqRepeat(currLnb.sequenceRepeat.value)

-                                               
+

                                        if currLnb.diseqcMode.value == "1_0":
                                                currCO = currLnb.commandOrder1_0.value
                                        else:
                                        if currLnb.diseqcMode.value == "1_0":
                                                currCO = currLnb.commandOrder1_0.value
                                        else:


@@ -254,9 +279,9 @@ class SecConfigure:
                                                sec.setRepeats({"none": 0, "one": 1, "two": 2, "three": 3}[currLnb.diseqcRepeats.value])
 
                                        setCommandOrder = False
                                                sec.setRepeats({"none": 0, "one": 1, "two": 2, "three": 3}[currLnb.diseqcRepeats.value])
 
                                        setCommandOrder = False

-                                       
-                                       # 0 "committed, toneburst", 
-                                       # 1 "toneburst, committed", 
+
+                                       # 0 "committed, toneburst",
+                                       # 1 "toneburst, committed",

                                        # 2 "committed, uncommitted, toneburst",
                                        # 3 "toneburst, committed, uncommitted",
                                        # 4 "uncommitted, committed, toneburst"
                                        # 2 "committed, uncommitted, toneburst",
                                        # 3 "toneburst, committed, uncommitted",
                                        # 4 "uncommitted, committed, toneburst"


@@ -277,14 +302,23 @@ class SecConfigure:
                                                sec.setLoDirection(rotorParam.EAST)
                                        else:
                                                sec.setLoDirection(rotorParam.WEST)
                                                sec.setLoDirection(rotorParam.EAST)
                                        else:
                                                sec.setLoDirection(rotorParam.WEST)

-                                               
+

                                if currLnb.powerMeasurement.value:
                                        sec.setUseInputpower(True)
                                        sec.setInputpowerDelta(currLnb.powerThreshold.value)
                                if currLnb.powerMeasurement.value:
                                        sec.setUseInputpower(True)
                                        sec.setInputpowerDelta(currLnb.powerThreshold.value)

+                                       turn_speed_dict = { "fast": rotorParam.FAST, "slow": rotorParam.SLOW }
+                                       if turn_speed_dict.has_key(currLnb.turningSpeed.value):
+                                               turning_speed = turn_speed_dict[currLnb.turningSpeed.value]
+                                       else:
+                                               beg_time = localtime(currLnb.fastTurningBegin.value)
+                                               end_time = localtime(currLnb.fastTurningEnd.value)
+                                               turning_speed = ((beg_time.tm_hour + 1) * 60 + beg_time.tm_min + 1) << 16
+                                               turning_speed |= (end_time.tm_hour + 1) * 60 + end_time.tm_min + 1
+                                       sec.setRotorTurningSpeed(turning_speed)

                                else:
                                        sec.setUseInputpower(False)
 
                                else:
                                        sec.setUseInputpower(False)
 

-                               sec.setLNBTunerMask(tunermask)
+                               sec.setLNBSlotMask(tunermask)

 
                                # finally add the orbital positions
                                for y in lnbSat[x]:
 
                                # finally add the orbital positions
                                for y in lnbSat[x]:


@@ -372,10 +406,7 @@ class NIM(object):
        friendly_full_description = property(getFriendlyFullDescription)
        config_mode = property(lambda self: config.Nims[self.slot].configMode.value)
        config = property(lambda self: config.Nims[self.slot])
        friendly_full_description = property(getFriendlyFullDescription)
        config_mode = property(lambda self: config.Nims[self.slot].configMode.value)
        config = property(lambda self: config.Nims[self.slot])

-       

        empty = property(lambda self: self.type is None)
        empty = property(lambda self: self.type is None)

-       
-       cable_trust_nit = property(lambda self: self.config.cabletype.value == "quick")

 
 class NimManager:
        class parseSats(ContentHandler):
 
 class NimManager:
        class parseSats(ContentHandler):


@@ -413,24 +444,29 @@ class NimManager:
                def __init__(self, cablesList, transponders):
                        self.isPointsElement, self.isReboundsElement = 0, 0
                        self.cablesList = cablesList
                def __init__(self, cablesList, transponders):
                        self.isPointsElement, self.isReboundsElement = 0, 0
                        self.cablesList = cablesList

+                       for x in self.cablesList:
+                               self.cablesList.remove(x)

                        self.transponders = transponders
        
                def startElement(self, name, attrs):
                        if (name == "cable"):
                                #print "found sat " + attrs.get('name',"") + " " + str(attrs.get('position',""))
                                tname = attrs.get('name',"").encode("UTF-8")
                        self.transponders = transponders
        
                def startElement(self, name, attrs):
                        if (name == "cable"):
                                #print "found sat " + attrs.get('name',"") + " " + str(attrs.get('position',""))
                                tname = attrs.get('name',"").encode("UTF-8")

-                               self.cablesList.append(str(tname))
-                               self.parsedCab = str(tname)
+                               tflags = int(attrs.get('flags',"0"))
+                               self.cablesList.append((tname, tflags))
+                               self.parsedCab = tname

                        elif (name == "transponder"):
                                freq = int(attrs.get('frequency',""))
                        elif (name == "transponder"):
                                freq = int(attrs.get('frequency',""))

-                               #sr = int(attrs.get('symbol_rate',""))
-                               #mod = int(attrs.get('modulation',"3")) # QAM64 default
-                               #fec = int(attrs.get('fec_inner',"0")) # AUTO default
+                               while freq > 999999:
+                                       freq /= 10
+                               sr = int(attrs.get('symbol_rate',"0"))
+                               mod = int(attrs.get('modulation',"3")) # QAM64 default
+                               fec = int(attrs.get('fec_inner',"0")) # AUTO default

                                if self.parsedCab in self.transponders:
                                        pass
                                else:
                                        self.transponders[self.parsedCab] = [ ]
                                if self.parsedCab in self.transponders:
                                        pass
                                else:
                                        self.transponders[self.parsedCab] = [ ]

-                               self.transponders[self.parsedCab].append((1, freq))
+                               self.transponders[self.parsedCab].append((1, freq, sr, mod, fec))

 
        class parseTerrestrials(ContentHandler):
                def __init__(self, terrestrialsList, transponders):
 
        class parseTerrestrials(ContentHandler):
                def __init__(self, terrestrialsList, transponders):


@@ -473,15 +509,21 @@ class NimManager:
                else:
                        return []
 
                else:
                        return []
 

-       def getTranspondersCable(self, cable):
-               return self.transponderscable[cable]
+       def getTranspondersCable(self, nim):
+               nimConfig = config.Nims[nim]
+               if nimConfig.configMode.value != "nothing" and nimConfig.cable.scan_type.value == "provider":
+                       return self.transponderscable[self.cablesList[nimConfig.cable.scan_provider.index][0]]
+               return [ ]

 
        def getTranspondersTerrestrial(self, region):
                return self.transpondersterrestrial[region]
        
        def getCableDescription(self, nim):
 
        def getTranspondersTerrestrial(self, region):
                return self.transpondersterrestrial[region]
        
        def getCableDescription(self, nim):

-               return self.cablesList[0]
-       
+               return self.cablesList[config.Nims[nim].scan_provider.index][0]
+
+       def getCableFlags(self, nim):
+               return self.cablesList[config.Nims[nim].scan_provider.index][1]
+

        def getTerrestrialDescription(self, nim):
                return self.terrestrialsList[config.Nims[nim].terrestrial.index][0]
 
        def getTerrestrialDescription(self, nim):
                return self.terrestrialsList[config.Nims[nim].terrestrial.index][0]
 


@@ -685,7 +727,7 @@ def InitSecParams():
        x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_TONEBURST, configElement.value))
        config.sec.delay_after_toneburst = x
 
        x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_TONEBURST, configElement.value))
        config.sec.delay_after_toneburst = x
 

-       x = ConfigInteger(default=750, limits = (0, 9999))
+       x = ConfigInteger(default=200, limits = (0, 9999))

        x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_SWITCH_CMDS, configElement.value))
        config.sec.delay_after_enable_voltage_before_switch_command = x
 
        x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_SWITCH_CMDS, configElement.value))
        config.sec.delay_after_enable_voltage_before_switch_command = x
 


@@ -717,6 +759,15 @@ def InitSecParams():
        x.addNotifier(lambda configElement: secClass.setParam(secClass.MOTOR_COMMAND_RETRIES, configElement.value))
        config.sec.motor_command_retries = x
 
        x.addNotifier(lambda configElement: secClass.setParam(secClass.MOTOR_COMMAND_RETRIES, configElement.value))
        config.sec.motor_command_retries = x
 

+       x = ConfigInteger(default=20, limits = (0, 9999))
+       x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_SWITCH_CMDS, configElement.value))
+       config.sec.delay_after_change_voltage_before_switch_command = x
+
+# TODO add support for satpos depending nims to advanced nim configuration
+# so a second/third/fourth cable from a motorized lnb can used behind a
+# diseqc 1.0 / diseqc 1.1 / toneburst switch
+# the C(++) part should can handle this
+# the configElement should be only visible when diseqc 1.2 is disabled

 
 def InitNimManager(nimmgr):
        InitSecParams()
 
 def InitNimManager(nimmgr):
        InitSecParams()


@@ -789,9 +840,14 @@ def InitNimManager(nimmgr):
                        nim.longitudeOrientation = ConfigSelection(choices={"east": _("East"), "west": _("West")}, default = "east")
                        nim.latitude = ConfigFloat(default=[50,767], limits=[(0,359),(0,999)])
                        nim.latitudeOrientation = ConfigSelection(choices={"north": _("North"), "south": _("South")}, default="north")
                        nim.longitudeOrientation = ConfigSelection(choices={"east": _("East"), "west": _("West")}, default = "east")
                        nim.latitude = ConfigFloat(default=[50,767], limits=[(0,359),(0,999)])
                        nim.latitudeOrientation = ConfigSelection(choices={"north": _("North"), "south": _("South")}, default="north")

-                       
+                       nim.turningSpeed = ConfigSelection(choices = [("fast", _("Fast")), ("slow", _("Slow")), ("fast epoch", _("Fast epoch")) ], default = "fast")
+                       btime = datetime(1970, 1, 1, 7, 0);
+                       nim.fastTurningBegin = ConfigDateTime(default = mktime(btime.timetuple()), formatstring = _("%H:%M"), increment = 900)
+                       etime = datetime(1970, 1, 1, 19, 0);
+                       nim.fastTurningEnd = ConfigDateTime(default = mktime(etime.timetuple()), formatstring = _("%H:%M"), increment = 900)

                        # get other frontends of the same type
                        # get other frontends of the same type

-                       satNimList = nimmgr.getNimListOfType(slot.type, slot.slot)
+
+                       satNimList = nimmgr.getNimListOfType("DVB-S", slot.slot)

                        satNimListNames = {}
 
                        for x in satNimList:
                        satNimListNames = {}
 
                        for x in satNimList:


@@ -859,15 +915,51 @@ def InitNimManager(nimmgr):
                                nim.advanced.lnb[x].latitudeOrientation = ConfigSelection(choices = [("north", _("North")), ("south", _("South"))], default = "north")
                                nim.advanced.lnb[x].powerMeasurement = ConfigYesNo(default=True)
                                nim.advanced.lnb[x].powerThreshold = ConfigInteger(default=50, limits=(0, 100))
                                nim.advanced.lnb[x].latitudeOrientation = ConfigSelection(choices = [("north", _("North")), ("south", _("South"))], default = "north")
                                nim.advanced.lnb[x].powerMeasurement = ConfigYesNo(default=True)
                                nim.advanced.lnb[x].powerThreshold = ConfigInteger(default=50, limits=(0, 100))

-
+                               nim.advanced.lnb[x].turningSpeed = ConfigSelection(choices = [("fast", _("Fast")), ("slow", _("Slow")), ("fast epoch", _("Fast epoch"))], default = "fast")
+                               btime = datetime(1970, 1, 1, 7, 0);
+                               nim.advanced.lnb[x].fastTurningBegin = ConfigDateTime(default=mktime(btime.timetuple()), formatstring = _("%H:%M"), increment = 600)
+                               etime = datetime(1970, 1, 1, 19, 0);
+                               nim.advanced.lnb[x].fastTurningEnd = ConfigDateTime(default=mktime(etime.timetuple()), formatstring = _("%H:%M"), increment = 600)

                elif slot.isCompatible("DVB-C"):
                elif slot.isCompatible("DVB-C"):

-                       nim.cabletype = ConfigSelection(choices = [("quick", _("Quick")), ("complete", _("Complete"))], default = "complete")

                        nim.configMode = ConfigSelection(
                                choices = {
                                        "enabled": _("enabled"),
                                        "nothing": _("nothing connected"),
                                        },
                                default = "enabled")
                        nim.configMode = ConfigSelection(
                                choices = {
                                        "enabled": _("enabled"),
                                        "nothing": _("nothing connected"),
                                        },
                                default = "enabled")

+                       list = [ ]
+                       n = 0
+                       for x in nimmgr.cablesList:
+                               list.append((str(n), x[0]))
+                               n += 1
+                       nim.cable = ConfigSubsection()
+                       possible_scan_types = [("bands", _("Frequency bands")), ("steps", _("Frequency steps"))]
+                       if n:
+                               possible_scan_types.append(("provider", _("Provider")))
+                       nim.cable.scan_type = ConfigSelection(default = "bands", choices = possible_scan_types)
+                       nim.cable.scan_provider = ConfigSelection(default = "0", choices = list)
+                       nim.cable.scan_band_EU_VHF_I = ConfigYesNo(default = True)
+                       nim.cable.scan_band_EU_MID = ConfigYesNo(default = True)
+                       nim.cable.scan_band_EU_VHF_III = ConfigYesNo(default = True)
+                       nim.cable.scan_band_EU_UHF_IV = ConfigYesNo(default = True)
+                       nim.cable.scan_band_EU_UHF_V = ConfigYesNo(default = True)
+                       nim.cable.scan_band_EU_SUPER = ConfigYesNo(default = True)
+                       nim.cable.scan_band_EU_HYPER = ConfigYesNo(default = True)
+                       nim.cable.scan_band_US_LOW = ConfigYesNo(default = False)
+                       nim.cable.scan_band_US_MID = ConfigYesNo(default = False)
+                       nim.cable.scan_band_US_HIGH = ConfigYesNo(default = False)
+                       nim.cable.scan_band_US_SUPER = ConfigYesNo(default = False)
+                       nim.cable.scan_band_US_HYPER = ConfigYesNo(default = False)
+                       nim.cable.scan_frequency_steps = ConfigInteger(default = 1000, limits = (1000, 10000))
+                       nim.cable.scan_mod_qam16 = ConfigYesNo(default = False)
+                       nim.cable.scan_mod_qam32 = ConfigYesNo(default = False)
+                       nim.cable.scan_mod_qam64 = ConfigYesNo(default = True)
+                       nim.cable.scan_mod_qam128 = ConfigYesNo(default = False)
+                       nim.cable.scan_mod_qam256 = ConfigYesNo(default = True)
+                       nim.cable.scan_sr_6900 = ConfigYesNo(default = True)
+                       nim.cable.scan_sr_6875 = ConfigYesNo(default = True)
+                       nim.cable.scan_sr_ext1 = ConfigInteger(default = 0, limits = (0, 7230))
+                       nim.cable.scan_sr_ext2 = ConfigInteger(default = 0, limits = (0, 7230))

                elif slot.isCompatible("DVB-T"):
                        nim.configMode = ConfigSelection(
                                choices = {
                elif slot.isCompatible("DVB-T"):
                        nim.configMode = ConfigSelection(
                                choices = {


@@ -883,6 +975,7 @@ def InitNimManager(nimmgr):
                        nim.terrestrial = ConfigSelection(choices = list)
                        nim.terrestrial_5V = ConfigOnOff()
                else:
                        nim.terrestrial = ConfigSelection(choices = list)
                        nim.terrestrial_5V = ConfigOnOff()
                else:

+                       nim.configMode = ConfigSelection(choices = { "nothing": _("disabled") }, default="nothing");

                        print "pls add support for this frontend type!"         
 #                      assert False
 
                        print "pls add support for this frontend type!"         
 #                      assert False