ServiceName converter now can handle iPlayableService's and

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

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 1d70580f615180784ecd8d5fb22e0bf933859cd3..22c99520a8b5c669c6aa04483e07ba55e2327725 100644 (file)
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -1,39 +1,35 @@
-from config import config       #global config instance
-
-from config import configElement
-from config import ConfigSubsection
-from config import configSelection
-from config import currentConfigSelectionElement
-from config import getConfigSelectionElement
-from config import configSequence
-from config import configsequencearg
-from config import configSatlist
-
-from enigma import eDVBSatelliteEquipmentControl, \
+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, \
        eDVBSatelliteLNBParameters as lnbParam, \
        eDVBSatelliteDiseqcParameters as diseqcParam, \
        eDVBSatelliteSwitchParameters as switchParam, \

-       eDVBSatelliteRotorParameters as rotorParam
-
-import xml.dom.minidom
-from xml.dom import EMPTY_NAMESPACE
-from skin import elementsWithTag
-from Tools import XMLTools
+       eDVBSatelliteRotorParameters as rotorParam, \
+       eDVBResourceManager

 
 from xml.sax import make_parser
 from xml.sax.handler import ContentHandler
 
 
 from xml.sax import make_parser
 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
+       for x in satlist:
+               if x[0] == orbpos:
+                       default_orbpos = orbpos
+                       break
+       return ConfigSatlist(satlist, default_orbpos)

 
 def tryOpen(filename):
        try:
                procFile = open(filename)
        except IOError:
 
 def tryOpen(filename):
        try:
                procFile = open(filename)
        except IOError:

-               return ""
+               return None

        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


@@ -41,7 +37,6 @@ class SecConfigure:
                        tunermask |= (1 << self.equal[slotid])
                elif self.linked.has_key(slotid):
                        tunermask |= (1 << self.linked[slotid])
                        tunermask |= (1 << self.equal[slotid])
                elif self.linked.has_key(slotid):
                        tunermask |= (1 << self.linked[slotid])

-               sec.setLNBTunerMask(tunermask)

                sec.setLNBLOFL(9750000)
                sec.setLNBLOFH(10600000)
                sec.setLNBThreshold(11700000)
                sec.setLNBLOFL(9750000)
                sec.setLNBLOFH(10600000)
                sec.setLNBThreshold(11700000)


@@ -57,29 +52,32 @@ 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)
 
                #print "set orbpos to:" + str(orbpos)
 

-               if (0 <= diseqcmode < 3):
+               if 0 <= diseqcmode < 3:

                        sec.addSatellite(orbpos)
                        self.satList.append(orbpos)
                elif (diseqcmode == 3): # diseqc 1.2
                        if self.satposdepends.has_key(slotid):
                                tunermask |= (1 << self.satposdepends[slotid])
                        sec.addSatellite(orbpos)
                        self.satList.append(orbpos)
                elif (diseqcmode == 3): # diseqc 1.2
                        if self.satposdepends.has_key(slotid):
                                tunermask |= (1 << self.satposdepends[slotid])

-                               sec.setLNBTunerMask(tunermask)

                        sec.setLatitude(latitude)
                        sec.setLaDirection(laDirection)
                        sec.setLongitude(longitude)
                        sec.setLoDirection(loDirection)
                        sec.setUseInputpower(True)
                        sec.setInputpowerDelta(50)
                        sec.setLatitude(latitude)
                        sec.setLaDirection(laDirection)
                        sec.setLongitude(longitude)
                        sec.setLoDirection(loDirection)
                        sec.setUseInputpower(True)
                        sec.setInputpowerDelta(50)

+                       sec.setRotorTurningSpeed(turningSpeed)

 
                        for x in self.NimManager.satList:
 
                        for x in self.NimManager.satList:

-                               print "Add sat " + str(x[1])
-                               sec.addSatellite(int(x[1]))
+                               print "Add sat " + str(x[0])
+                               sec.addSatellite(int(x[0]))

                                sec.setVoltageMode(0)
                                sec.setToneMode(0)
                                sec.setRotorPosNum(0) # USALS
                                sec.setVoltageMode(0)
                                sec.setToneMode(0)
                                sec.setRotorPosNum(0) # USALS

-                               self.satList.append(int(x[1]))
+                               self.satList.append(int(x[0]))
+
+               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


@@ -93,7 +91,7 @@ class SecConfigure:
                return self.satList
 
        def update(self):
                return self.satList
 
        def update(self):

-               sec = eDVBSatelliteEquipmentControl.getInstance()
+               sec = secClass.getInstance()

                sec.clear() ## this do unlinking NIMs too !!
                print "sec config cleared"
                self.satList = []
                sec.clear() ## this do unlinking NIMs too !!
                print "sec config cleared"
                self.satList = []


@@ -101,56 +99,82 @@ class SecConfigure:
                self.linked = { }
                self.satposdepends = { }
                self.equal = { }
                self.linked = { }
                self.satposdepends = { }
                self.equal = { }

-               for slot in self.NimManager.nimslots:
-                       x = slot.slotid
-                       nim = config.Nims[x]
-                       if slot.nimType == self.NimManager.nimType["DVB-S"]:
-                               if currentConfigSelectionElement(nim.configMode) == "equal":
-                                       self.equal[nim.equalTo.value]=x
-                               if currentConfigSelectionElement(nim.configMode) == "loopthrough":
-                                       self.linkNIMs(sec, x, nim.linkedTo.value)
-                                       self.linked[nim.linkedTo.value]=x
-                               elif currentConfigSelectionElement(nim.configMode) == "satposdepends":
-                                       self.setSatposDepends(sec, x, nim.satposDependsTo.value)
-                                       self.satposdepends[nim.satposDependsTo.value]=x
-
-               for slot in self.NimManager.nimslots:
-                       x = slot.slotid
-                       nim = config.Nims[x]
-                       if slot.nimType == self.NimManager.nimType["DVB-S"]:
+
+               nim_slots = self.NimManager.nim_slots
+
+               used_nim_slots = [ ]
+
+               for slot in nim_slots:
+                       x = slot.slot
+                       nim = slot.config
+                       if slot.isCompatible("DVB-S"):
+                               # save what nim we link to/are equal to/satposdepends to.
+                               # this is stored in the *value* (not index!) of the config list
+                               if nim.configMode.value == "equal":
+                                       self.equal[int(nim.equalTo.value)]=x
+                               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
+
+                       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 "slot: " + str(x) + " configmode: " + str(nim.configMode.value)

-                               if currentConfigSelectionElement(nim.configMode) in [ "loopthrough", "satposdepends", "equal", "nothing" ]:
+                               print "diseqcmode: ", nim.configMode.value
+                               if nim.configMode.value in [ "loopthrough", "satposdepends", "nothing" ]:

                                        pass
                                        pass

-                               elif currentConfigSelectionElement(nim.configMode) == "simple":         #simple config
-                                       if currentConfigSelectionElement(nim.diseqcMode) == "single":                   #single
-                                               self.addLNBSimple(sec, slotid = x, orbpos = int(nim.diseqcA.vals[nim.diseqcA.value][1]), toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.NONE, diseqcpos = diseqcParam.SENDNO)
-                                       elif currentConfigSelectionElement(nim.diseqcMode) == "toneburst_a_b":          #Toneburst A/B
-                                               self.addLNBSimple(sec, slotid = x, orbpos = int(nim.diseqcA.vals[nim.diseqcA.value][1]), toneburstmode = diseqcParam.A, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.SENDNO)
-                                               self.addLNBSimple(sec, slotid = x, orbpos = int(nim.diseqcB.vals[nim.diseqcB.value][1]), toneburstmode = diseqcParam.B, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.SENDNO)
-                                       elif currentConfigSelectionElement(nim.diseqcMode) == "diseqc_a_b":             #DiSEqC A/B
-                                               self.addLNBSimple(sec, slotid = x, orbpos = int(nim.diseqcA.vals[nim.diseqcA.value][1]), toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA)
-                                               self.addLNBSimple(sec, slotid = x, orbpos = int(nim.diseqcB.vals[nim.diseqcB.value][1]), toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB)
-                                       elif currentConfigSelectionElement(nim.diseqcMode) == "diseqc_a_b_c_d":         #DiSEqC A/B/C/D
-                                               self.addLNBSimple(sec, slotid = x, orbpos = int(nim.diseqcA.vals[nim.diseqcA.value][1]), toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA)
-                                               self.addLNBSimple(sec, slotid = x, orbpos = int(nim.diseqcB.vals[nim.diseqcB.value][1]), toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB)
-                                               self.addLNBSimple(sec, slotid = x, orbpos = int(nim.diseqcC.vals[nim.diseqcC.value][1]), toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BA)
-                                               self.addLNBSimple(sec, slotid = x, orbpos = int(nim.diseqcD.vals[nim.diseqcD.value][1]), toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BB)
-                                       elif currentConfigSelectionElement(nim.diseqcMode) == "positioner":             #Positioner
-                                               if currentConfigSelectionElement(nim.latitudeOrientation) == "north":
-                                                       laValue = rotorParam.NORTH
-                                               else:
-                                                       laValue = rotorParam.SOUTH
-                                               if currentConfigSelectionElement(nim.longitudeOrientation) == "east":
-                                                       loValue = rotorParam.EAST
-                                               else:
-                                                       loValue = rotorParam.WEST
-                                               self.addLNBSimple(sec, slotid = x, diseqcmode = 3,
-                                                       longitude = configsequencearg.getFloat(nim.longitude),
-                                                       loDirection = loValue,
-                                                       latitude = configsequencearg.getFloat(nim.latitude),
-                                                       laDirection = laValue)
-                               elif currentConfigSelectionElement(nim.configMode) == "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):


@@ -158,10 +182,10 @@ class SecConfigure:
                for x in range(1,33):
                        lnbSat[x] = []
                for x in self.NimManager.satList:
                for x in range(1,33):
                        lnbSat[x] = []
                for x in self.NimManager.satList:

-                       lnb = config.Nims[slotid].advanced.sat[x[1]].lnb.value
+                       lnb = int(config.Nims[slotid].advanced.sat[x[0]].lnb.value)

                        if lnb != 0:
                        if lnb != 0:

-                               print "add", x[1], "to", lnb
-                               lnbSat[lnb].append(x[1])
+                               print "add", x[0], "to", lnb
+                               lnbSat[lnb].append(x[0])

                for x in range(1,33):
                        if len(lnbSat[x]) > 0:
                                currLnb = config.Nims[slotid].advanced.lnb[x]
                for x in range(1,33):
                        if len(lnbSat[x]) > 0:
                                currLnb = config.Nims[slotid].advanced.lnb[x]


@@ -173,149 +197,144 @@ class SecConfigure:
                                elif self.linked.has_key(slotid):
                                        tunermask |= (1 << self.linked[slotid])
 
                                elif self.linked.has_key(slotid):
                                        tunermask |= (1 << self.linked[slotid])
 

-                               if currentConfigSelectionElement(currLnb.lof) == "universal_lnb":
+                               if currLnb.lof.value == "universal_lnb":

                                        sec.setLNBLOFL(9750000)
                                        sec.setLNBLOFH(10600000)
                                        sec.setLNBThreshold(11700000)
                                        sec.setLNBLOFL(9750000)
                                        sec.setLNBLOFH(10600000)
                                        sec.setLNBThreshold(11700000)

-                               elif currentConfigSelectionElement(currLnb.lof) == "c_band":
+                               elif currLnb.lof.value == "c_band":

                                        sec.setLNBLOFL(5150000)
                                        sec.setLNBLOFH(5150000)
                                        sec.setLNBThreshold(5150000)
                                        sec.setLNBLOFL(5150000)
                                        sec.setLNBLOFH(5150000)
                                        sec.setLNBThreshold(5150000)

-                               elif currentConfigSelectionElement(currLnb.lof) == "user_defined":
-                                       sec.setLNBLOFL(currLnb.lofl.value[0] * 1000)
-                                       sec.setLNBLOFH(currLnb.lofh.value[0] * 1000)
-                                       sec.setLNBThreshold(currLnb.threshold.value[0] * 1000)
-                                       
-                               if currentConfigSelectionElement(currLnb.output_12v) == "0V":
-                                       pass # nyi in drivers
-                               elif currentConfigSelectionElement(currLnb.output_12v) == "12V":
-                                       pass # nyi in drivers
-                                       
-                               if currentConfigSelectionElement(currLnb.increased_voltage) == "yes":
+                               elif currLnb.lof.value == "user_defined":
+                                       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.increased_voltage.value:

                                        sec.setLNBIncreasedVoltage(lnbParam.ON)
                                else:
                                        sec.setLNBIncreasedVoltage(lnbParam.OFF)
                                        sec.setLNBIncreasedVoltage(lnbParam.ON)
                                else:
                                        sec.setLNBIncreasedVoltage(lnbParam.OFF)

-                                       
-                               if currentConfigSelectionElement(currLnb.diseqcMode) == "none":
+
+                               dm = currLnb.diseqcMode.value
+                               if dm == "none":

                                        sec.setDiSEqCMode(diseqcParam.NONE)
                                        sec.setDiSEqCMode(diseqcParam.NONE)

-                               elif currentConfigSelectionElement(currLnb.diseqcMode) == "1_0":
+                               elif dm == "1_0":

                                        sec.setDiSEqCMode(diseqcParam.V1_0)
                                        sec.setDiSEqCMode(diseqcParam.V1_0)

-                               elif currentConfigSelectionElement(currLnb.diseqcMode) == "1_1":
+                               elif dm == "1_1":

                                        sec.setDiSEqCMode(diseqcParam.V1_1)
                                        sec.setDiSEqCMode(diseqcParam.V1_1)

-                               elif currentConfigSelectionElement(currLnb.diseqcMode) == "1_2":
+                               elif dm == "1_2":

                                        sec.setDiSEqCMode(diseqcParam.V1_2)
 
                                        if self.satposdepends.has_key(slotid):  # only useable with rotors
                                                tunermask |= (1 << self.satposdepends[slotid])
 
                                        sec.setDiSEqCMode(diseqcParam.V1_2)
 
                                        if self.satposdepends.has_key(slotid):  # only useable with rotors
                                                tunermask |= (1 << self.satposdepends[slotid])
 

-                               if currentConfigSelectionElement(currLnb.diseqcMode) != "none":
-                                       if currentConfigSelectionElement(currLnb.toneburst) == "none":
+                               if dm != "none":
+                                       if currLnb.toneburst.value == "none":

                                                sec.setToneburst(diseqcParam.NO)
                                                sec.setToneburst(diseqcParam.NO)

-                                       elif currentConfigSelectionElement(currLnb.toneburst) == "A":
+                                       elif currLnb.toneburst.value == "A":

                                                sec.setToneburst(diseqcParam.A)
                                                sec.setToneburst(diseqcParam.A)

-                                       elif currentConfigSelectionElement(currLnb.toneburst) == "B":
+                                       elif currLnb.toneburst.value == "B":

                                                sec.setToneburst(diseqcParam.B)
                                                sec.setToneburst(diseqcParam.B)

-                                               
-                                       if currentConfigSelectionElement(currLnb.commitedDiseqcCommand) == "none":
-                                               sec.setCommittedCommand(diseqcParam.SENDNO)
-                                       elif currentConfigSelectionElement(currLnb.commitedDiseqcCommand) == "AA":
-                                               sec.setCommittedCommand(diseqcParam.AA)
-                                       elif currentConfigSelectionElement(currLnb.commitedDiseqcCommand) == "AB":
-                                               sec.setCommittedCommand(diseqcParam.AB)
-                                       elif currentConfigSelectionElement(currLnb.commitedDiseqcCommand) == "BA":
-                                               sec.setCommittedCommand(diseqcParam.BA)
-                                       elif currentConfigSelectionElement(currLnb.commitedDiseqcCommand) == "BB":
-                                               sec.setCommittedCommand(diseqcParam.BB)
-                                       else:
-                                               sec.setCommittedCommand(long(currentConfigSelectionElement(currLnb.commitedDiseqcCommand)))

 
 

-                                       if currentConfigSelectionElement(currLnb.fastDiseqc) == "yes":
-                                               sec.setFastDiSEqC(True)
-                                       else:
-                                               sec.setFastDiSEqC(False)
-                                               
-                                       if currentConfigSelectionElement(currLnb.sequenceRepeat) == "yes":
-                                               sec.setSeqRepeat(True)
+                                       # Committed Diseqc Command
+                                       cdc = currLnb.commitedDiseqcCommand.value
+
+                                       c = { "none": diseqcParam.SENDNO,
+                                               "AA": diseqcParam.AA,
+                                               "AB": diseqcParam.AB,
+                                               "BA": diseqcParam.BA,
+                                               "BB": diseqcParam.BB }
+
+                                       if c.has_key(cdc):
+                                               sec.setCommittedCommand(c[cdc])

                                        else:
                                        else:

-                                               sec.setSeqRepeat(False)
-                                               
-                                       if currentConfigSelectionElement(currLnb.diseqcMode) == "1_0":
+                                               sec.setCommittedCommand(long(cdc))
+
+                                       sec.setFastDiSEqC(currLnb.fastDiseqc.value)
+
+                                       sec.setSeqRepeat(currLnb.sequenceRepeat.value)
+
+                                       if currLnb.diseqcMode.value == "1_0":

                                                currCO = currLnb.commandOrder1_0.value
                                        else:
                                                currCO = currLnb.commandOrder.value
                                                currCO = currLnb.commandOrder1_0.value
                                        else:
                                                currCO = currLnb.commandOrder.value

-                                               
-                                               if currLnb.uncommittedDiseqcCommand.value > 0:
-                                                       sec.setUncommittedCommand(0xF0|(currLnb.uncommittedDiseqcCommand.value-1))
+
+                                               udc = int(currLnb.uncommittedDiseqcCommand.value)
+                                               if udc > 0:
+                                                       sec.setUncommittedCommand(0xF0|(udc-1))

                                                else:
                                                        sec.setUncommittedCommand(0) # SENDNO
                                                else:
                                                        sec.setUncommittedCommand(0) # SENDNO

-                                               
-                                               if currentConfigSelectionElement(currLnb.diseqcRepeats) == "none":
-                                                       sec.setRepeats(0)
-                                               elif currentConfigSelectionElement(currLnb.diseqcRepeats) == "One":
-                                                       sec.setRepeats(1)
-                                               elif currentConfigSelectionElement(currLnb.diseqcRepeats) == "Two":
-                                                       sec.setRepeats(2)
-                                               elif currentConfigSelectionElement(currLnb.diseqcRepeats) == "Three":
-                                                       sec.setRepeats(3)
-                                               
-                                       setCommandOrder=False
-                                       if currCO == 0: # committed, toneburst
-                                               setCommandOrder=True
-                                       elif currCO == 1: # toneburst, committed
-                                               setCommandOrder=True
-                                       elif currCO == 2: # committed, uncommitted, toneburst
-                                               setCommandOrder=True
-                                       elif currCO == 3: # toneburst, committed, uncommitted
-                                               setCommandOrder=True
-                                       elif currCO == 4: # uncommitted, committed, toneburst
-                                               setCommandOrder=True
-                                       elif currCO == 5: # toneburst, uncommitted, commmitted
-                                               setCommandOrder=True
-                                       if setCommandOrder:
-                                               sec.setCommandOrder(currCO)
-                                               
-                               if currentConfigSelectionElement(currLnb.diseqcMode) == "1_2":
-                                       latitude = configsequencearg.getFloat(currLnb.latitude)
+
+                                               sec.setRepeats({"none": 0, "one": 1, "two": 2, "three": 3}[currLnb.diseqcRepeats.value])
+
+                                       setCommandOrder = False
+
+                                       # 0 "committed, toneburst",
+                                       # 1 "toneburst, committed",
+                                       # 2 "committed, uncommitted, toneburst",
+                                       # 3 "toneburst, committed, uncommitted",
+                                       # 4 "uncommitted, committed, toneburst"
+                                       # 5 "toneburst, uncommitted, commmitted"
+                                       order_map = {"ct": 0, "tc": 1, "cut": 2, "tcu": 3, "uct": 4, "tuc": 5}
+                                       sec.setCommandOrder(order_map[currCO])
+
+                               if dm == "1_2":
+                                       latitude = currLnb.latitude.float

                                        sec.setLatitude(latitude)
                                        sec.setLatitude(latitude)

-                                       longitude = configsequencearg.getFloat(currLnb.longitude)
+                                       longitude = currLnb.longitude.float

                                        sec.setLongitude(longitude)
                                        sec.setLongitude(longitude)

-                                       if currentConfigSelectionElement(currLnb.latitudeOrientation) == "north":
+                                       if currLnb.latitudeOrientation.value == "north":

                                                sec.setLaDirection(rotorParam.NORTH)
                                        else:
                                                sec.setLaDirection(rotorParam.SOUTH)
                                                sec.setLaDirection(rotorParam.NORTH)
                                        else:
                                                sec.setLaDirection(rotorParam.SOUTH)

-                                       if currentConfigSelectionElement(currLnb.longitudeOrientation) == "east":
+                                       if currLnb.longitudeOrientation.value == "east":

                                                sec.setLoDirection(rotorParam.EAST)
                                        else:
                                                sec.setLoDirection(rotorParam.WEST)
                                                sec.setLoDirection(rotorParam.EAST)
                                        else:
                                                sec.setLoDirection(rotorParam.WEST)

-                                               
-                               if currentConfigSelectionElement(currLnb.powerMeasurement) == "yes":
+
+                               if currLnb.powerMeasurement.value:

                                        sec.setUseInputpower(True)
                                        sec.setUseInputpower(True)

-                                       sec.setInputpowerDelta(currLnb.powerThreshold.value[0])
+                                       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]:
                                        sec.addSatellite(y)
                                        currSat = config.Nims[slotid].advanced.sat[y]
 
                                # finally add the orbital positions
                                for y in lnbSat[x]:
                                        sec.addSatellite(y)
                                        currSat = config.Nims[slotid].advanced.sat[y]

-                                       if currentConfigSelectionElement(currSat.voltage) == "polarization":
+
+                                       if currSat.voltage.value == "polarization":

                                                sec.setVoltageMode(switchParam.HV)
                                                sec.setVoltageMode(switchParam.HV)

-                                       elif currentConfigSelectionElement(currSat.voltage) == "13V":
+                                       elif currSat.voltage.value == "13V":

                                                sec.setVoltageMode(switchParam._14V)
                                                sec.setVoltageMode(switchParam._14V)

-                                       elif currentConfigSelectionElement(currSat.voltage) == "18V":
+                                       elif currSat.voltage.value == "18V":

                                                sec.setVoltageMode(switchParam._18V)
                                                
                                                sec.setVoltageMode(switchParam._18V)
                                                

-                                       if currentConfigSelectionElement(currSat.tonemode) == "band":
+                                       if currSat.tonemode == "band":

                                                sec.setToneMode(switchParam.HILO)
                                                sec.setToneMode(switchParam.HILO)

-                                       elif currentConfigSelectionElement(currSat.tonemode) == "on":
+                                       elif currSat.tonemode == "on":

                                                sec.setToneMode(switchParam.ON)
                                                sec.setToneMode(switchParam.ON)

-                                       elif currentConfigSelectionElement(currSat.tonemode) == "off":
+                                       elif currSat.tonemode == "off":

                                                sec.setToneMode(switchParam.OFF)
                                                
                                                sec.setToneMode(switchParam.OFF)
                                                

-                                       if  currentConfigSelectionElement(currSat.usals) == "no":
-                                               sec.setRotorPosNum(currSat.rotorposition.value[0])
+                                       if not currSat.usals.value:
+                                               sec.setRotorPosNum(currSat.rotorposition.value)

                                        else:
                                                sec.setRotorPosNum(0) #USALS
 
                                        else:
                                                sec.setRotorPosNum(0) #USALS
 


@@ -323,11 +342,65 @@ class SecConfigure:
                self.NimManager = nimmgr
                self.update()
 
                self.NimManager = nimmgr
                self.update()
 

-class nimSlot:
-       def __init__(self, slotid, nimtype, name):
-               self.slotid = slotid
-               self.nimType = nimtype
-               self.name = name
+class NIM(object):
+       def __init__(self, slot, type, description):
+               self.slot = slot
+
+               if type not in ["DVB-S", "DVB-C", "DVB-T", "DVB-S2", None]:
+                       print "warning: unknown NIM type %s, not using." % type
+                       type = None
+
+               self.type = type
+               self.description = description
+
+       def isCompatible(self, what):
+               compatible = {
+                               None: [None],
+                               "DVB-S": ["DVB-S", None],
+                               "DVB-C": ["DVB-C", None],
+                               "DVB-T": ["DVB-T", None],
+                               "DVB-S2": ["DVB-S", "DVB-S2", None]
+                       }
+               return what in compatible[self.type]
+
+       def getSlotName(self):
+               # get a friendly description for a slot name.
+               # we name them "Tuner A/B/C/...", because that's what's usually written on the back
+               # of the device.
+               return _("Tuner ") + chr(ord('A') + self.slot)
+
+       slot_name = property(getSlotName)
+
+       def getSlotID(self):
+               return chr(ord('A') + self.slot)
+
+       slot_id = property(getSlotID)
+
+       def getFriendlyType(self):
+               return {
+                       "DVB-S": "DVB-S", 
+                       "DVB-T": "DVB-T",
+                       "DVB-S2": "DVB-S2",
+                       "DVB-C": "DVB-C",
+                       None: _("empty")
+                       }[self.type]
+
+       friendly_type = property(getFriendlyType)
+
+       def getFriendlyFullDescription(self):
+               nim_text = self.slot_name + ": "
+                       
+               if self.empty:
+                       nim_text += _("(empty)")
+               else:
+                       nim_text += self.description + " (" + self.friendly_type + ")"
+               
+               return nim_text
+
+       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)

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


@@ -343,39 +416,46 @@ class NimManager:
                                tpos = int(attrs.get('position',""))
                                if tpos < 0:
                                        tpos = 3600 + tpos
                                tpos = int(attrs.get('position',""))
                                if tpos < 0:
                                        tpos = 3600 + tpos

-                               tname = attrs.get('name',"")
+                               tname = attrs.get('name',"").encode("UTF-8")

                                self.satellites[tpos] = tname
                                self.satellites[tpos] = tname

-                               self.satList.append( (tname, tpos) )
+                               self.satList.append( (tpos, tname) )

                                self.parsedSat = int(tpos)
                        elif (name == "transponder"):
                                self.parsedSat = int(tpos)
                        elif (name == "transponder"):

+                               modulation = int(attrs.get('modulation',"1")) # QPSK default
+                               system = int(attrs.get('system',"0")) # DVB-S default

                                freq = int(attrs.get('frequency',""))
                                sr = int(attrs.get('symbol_rate',""))
                                pol = int(attrs.get('polarization',""))
                                freq = int(attrs.get('frequency',""))
                                sr = int(attrs.get('symbol_rate',""))
                                pol = int(attrs.get('polarization',""))

-                               fec = int(attrs.get('fec_inner',""))
+                               fec = int(attrs.get('fec_inner',"0")) # AUTO default

                                if self.parsedSat in self.transponders:
                                        pass
                                else:
                                        self.transponders[self.parsedSat] = [ ]
 
                                if self.parsedSat in self.transponders:
                                        pass
                                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, modulation))

 
        class parseCables(ContentHandler):
                def __init__(self, cablesList, transponders):
                        self.isPointsElement, self.isReboundsElement = 0, 0
                        self.cablesList = cablesList
 
        class parseCables(ContentHandler):
                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',""))
                        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',"")
-                               self.cablesList.append(str(tname))
-                               self.parsedCab = str(tname)
+                               tname = attrs.get('name',"").encode("UTF-8")
+                               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',""))
-                               fec = int(attrs.get('fec_inner',""))
+                               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:
                                if self.parsedCab in self.transponders:
                                        pass
                                else:


@@ -398,14 +478,18 @@ class NimManager:
                        elif (name == "transponder"):
                                # TODO finish this!
                                freq = int(attrs.get('centre_frequency',""))
                        elif (name == "transponder"):
                                # TODO finish this!
                                freq = int(attrs.get('centre_frequency',""))

-                               bw = int(attrs.get('bandwidth',""))
-                               const = int(attrs.get('constellation',""))
-                               crh = int(attrs.get('code_rate_hp',""))
-                               crl = int(attrs.get('code_rate_lp',""))
-                               guard = int(attrs.get('guard_interval',""))
-                               transm = int(attrs.get('transmission_mode',""))
-                               hierarchy = int(attrs.get('hierarchy_information',""))
-                               inv = int(attrs.get('inversion',""))
+                               bw = int(attrs.get('bandwidth',"3")) # AUTO
+                               const = int(attrs.get('constellation',"1")) # AUTO
+                               crh = int(attrs.get('code_rate_hp',"5")) # AUTO
+                               if crh > 5: # our terrestrial.xml is buggy... 6 for AUTO
+                                       crh = 5
+                               crl = int(attrs.get('code_rate_lp',"5")) # AUTO
+                               if crl > 5: # our terrestrial.xml is buggy... 6 for AUTO
+                                       crl = 5
+                               guard = int(attrs.get('guard_interval',"4")) # AUTO
+                               transm = int(attrs.get('transmission_mode',"2")) # AUTO
+                               hierarchy = int(attrs.get('hierarchy_information',"4")) # AUTO
+                               inv = int(attrs.get('inversion',"2")) # AUTO

                                if self.parsedTer in self.transponders:
                                        pass
                                else:
                                if self.parsedTer in self.transponders:
                                        pass
                                else:


@@ -419,20 +503,26 @@ 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[config.Nims[nim].cable.value]
+               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):
 
        def getTerrestrialDescription(self, nim):

-               return self.terrestrialsList[config.Nims[nim].terrestrial.value][0]
+               return self.terrestrialsList[config.Nims[nim].terrestrial.index][0]

 
        def getTerrestrialFlags(self, nim):
 
        def getTerrestrialFlags(self, nim):

-               return self.terrestrialsList[config.Nims[nim].terrestrial.value][1]
+               return self.terrestrialsList[config.Nims[nim].terrestrial.index][1]

 
        def getConfiguredSats(self):
                return self.sec.getSatList()
 
        def getConfiguredSats(self):
                return self.sec.getSatList()


@@ -441,334 +531,447 @@ class NimManager:
                return self.satellites[pos]
 
        def readSatsfromFile(self):
                return self.satellites[pos]
 
        def readSatsfromFile(self):

+               # read initial networks from file. we only read files which we are interested in,
+               # which means only these where a compatible tuner exists.

                self.satellites = { }
                self.transponders = { }
                self.transponderscable = { }
                self.transpondersterrestrial = { }              
                self.satellites = { }
                self.transponders = { }
                self.transponderscable = { }
                self.transpondersterrestrial = { }              

-               
+

                parser = make_parser()
                parser = make_parser()

-               if (self.hasNimType(self.nimType["DVB-S"])):
+               
+               if self.hasNimType("DVB-S"):

                        print "Reading satellites.xml"
                        satHandler = self.parseSats(self.satList, self.satellites, self.transponders)
                        parser.setContentHandler(satHandler)
                        parser.parse('/etc/tuxbox/satellites.xml')
                        print "Reading satellites.xml"
                        satHandler = self.parseSats(self.satList, self.satellites, self.transponders)
                        parser.setContentHandler(satHandler)
                        parser.parse('/etc/tuxbox/satellites.xml')

-               if (self.hasNimType(self.nimType["DVB-C"])):
+
+               if self.hasNimType("DVB-C"):

                        print "Reading cables.xml"
                        cabHandler = self.parseCables(self.cablesList, self.transponderscable)
                        parser.setContentHandler(cabHandler)
                        parser.parse('/etc/tuxbox/cables.xml')
 
                        print "Reading cables.xml"
                        cabHandler = self.parseCables(self.cablesList, self.transponderscable)
                        parser.setContentHandler(cabHandler)
                        parser.parse('/etc/tuxbox/cables.xml')
 

-               if (self.hasNimType(self.nimType["DVB-T"])):
+               if self.hasNimType("DVB-T"):

                        print "Reading terrestrial.xml"
                        terHandler = self.parseTerrestrials(self.terrestrialsList, self.transpondersterrestrial)
                        parser.setContentHandler(terHandler)
                        parser.parse('/etc/tuxbox/terrestrial.xml')
                        print "Reading terrestrial.xml"
                        terHandler = self.parseTerrestrials(self.terrestrialsList, self.transpondersterrestrial)
                        parser.setContentHandler(terHandler)
                        parser.parse('/etc/tuxbox/terrestrial.xml')

+
+       def enumerateNIMs(self):
+               # enum available NIMs. This is currently very dreambox-centric and uses the /proc/bus/nim_sockets interface.
+               # the result will be stored into nim_slots.
+               # the content of /proc/bus/nim_sockets looks like:
+               # NIM Socket 0:
+               #          Type: DVB-S
+               #          Name: BCM4501 DVB-S2 NIM (internal)
+               # NIM Socket 1:
+               #          Type: DVB-S
+               #          Name: BCM4501 DVB-S2 NIM (internal)
+               # NIM Socket 2:
+               #          Type: DVB-T
+               #          Name: Philips TU1216
+               # NIM Socket 3:
+               #          Type: DVB-S
+               #          Name: Alps BSBE1 702A

                
                

-       def parseProc(self):
-               self.nimTypes = {}
-               self.nimNames = {}              
-               self.nimSocketCount = 0
+               #
+               # Type will be either "DVB-S", "DVB-S2", "DVB-T", "DVB-C" or None.
+

                nimfile = tryOpen("/proc/bus/nim_sockets")
 
                nimfile = tryOpen("/proc/bus/nim_sockets")
 

-               if nimfile == "":
-                               return self.nimType["empty/unknown"]
-                       
-               lastsocket = -1
+               if nimfile is None:
+                       return
+
+               current_slot = None

 
 

-               while 1:                
-                       line = nimfile.readline()
+               entries = {}
+               for line in nimfile.readlines():

                        if line == "":
                                break
                        if line.strip().startswith("NIM Socket"):
                                parts = line.strip().split(" ")
                        if line == "":
                                break
                        if line.strip().startswith("NIM Socket"):
                                parts = line.strip().split(" ")

-                               id = int(parts[2][:1])
-                               lastsocket = int(id)
-                               self.nimSocketCount += 1
+                               current_slot = int(parts[2][:-1])
+                               entries[current_slot] = {}

                        elif line.strip().startswith("Type:"):
                        elif line.strip().startswith("Type:"):

-                               self.nimTypes[lastsocket] = str(line.strip()[6:])
-                               #self.nimTypes[lastsocket] = str("DVB-T")
+                               entries[current_slot]["type"] = str(line.strip()[6:])

                        elif line.strip().startswith("Name:"):
                        elif line.strip().startswith("Name:"):

-                               self.nimNames[lastsocket] = str(line.strip()[6:])
+                               entries[current_slot]["name"] = str(line.strip()[6:])

                        elif line.strip().startswith("empty"):
                        elif line.strip().startswith("empty"):

-                               self.nimNames[lastsocket] = _("N/A")
-                               self.nimTypes[lastsocket] = "empty/unknown"
-
+                               entries[current_slot]["type"] = None
+                               entries[current_slot]["name"] = _("N/A")

                nimfile.close()
                nimfile.close()

-
-       def getNimType(self, slotID):
-               if slotID >= self.nimCount:
-                       return self.nimType["empty/unknown"]
-               else:   
-                       return self.nimType[self.nimTypes[slotID]]
-                       
-       def getNimTypeName(self, slotID):
-               if slotID >= self.nimCount:
-                       return "empty/unknown"
-               else:   
-                       return self.nimTypes[slotID]

                
                

-       def getNimName(self, slotID):
-               return self.nimNames[slotID]
+               # nim_slots is an array which has exactly one entry for each slot, even for empty ones.
+               self.nim_slots = [ ]
+
+               for id, entry in entries.items():
+                       if not (entry.has_key("name") and entry.has_key("type")):
+                               entry["name"] =  _("N/A")
+                               entry["type"] = None
+                       self.nim_slots.append(NIM(slot = id, description = entry["name"], type = entry["type"]))

 
 

-       def getNimSocketCount(self):
-               return self.nimSocketCount
-       

        def hasNimType(self, chktype):
        def hasNimType(self, chktype):

-               for id, type in self.nimTypes.items():
-                       if (chktype == self.nimType[str(type)]):
+               for slot in self.nim_slots:
+                       if slot.isCompatible(chktype):

                                return True
                return False
                                return True
                return False

-       
+

        def getNimListOfType(self, type, exception = -1):
        def getNimListOfType(self, type, exception = -1):

+               # returns a list of indexes for NIMs compatible to the given type, except for 'exception'

                list = []
                list = []

-               for x in self.nimslots:
-                       if ((x.nimType == type) and (x.slotid != exception)):
-                               list.append(x.slotid)
+               for x in self.nim_slots:
+                       if x.isCompatible(type) and x.slot != exception:
+                               list.append(x.slot)

                return list
 
                return list
 

-       def getConfigPrefix(self, slotid):
-               return "config.Nim" + ("A","B","C","D")[slotid] + "."
-                       

        def __init__(self):
        def __init__(self):

-               #use as enum
-               self.nimType = {                "empty/unknown": -1,
-                                                                                               "DVB-S": 0,
-                                                                                               "DVB-C": 1,
-                                                                                               "DVB-T": 2}

                self.satList = [ ]
                self.cablesList = []
                self.terrestrialsList = []
                self.satList = [ ]
                self.cablesList = []
                self.terrestrialsList = []

-                                                                                               
-               self.parseProc()
+               self.enumerateNIMs()
+               self.readSatsfromFile()

 
 

-               self.readSatsfromFile()                                                 
-               
-               self.nimCount = self.getNimSocketCount()
-               
-               self.nimslots = [ ]
-               x = 0
-               while x < self.nimCount:
-                       tType = self.getNimType(x)
-                       tName = self.getNimName(x)
-                       tNim = nimSlot(x, tType, tName)
-                       self.nimslots.append(tNim)
-                       x += 1
-               

                InitNimManager(self)    #init config stuff
 
                InitNimManager(self)    #init config stuff
 

+       # get a list with the friendly full description

        def nimList(self):
                list = [ ]
        def nimList(self):
                list = [ ]

-               for slot in self.nimslots:
-                       nimText = _("Socket ") + ("A", "B", "C", "D")[slot.slotid] + ": "
-                       if slot.nimType == -1:
-                               nimText += _("empty/unknown")
-                       else:
-                               nimText += slot.name + " ("     
-                               nimText += ("DVB-S", "DVB-C", "DVB-T")[slot.nimType] + ")"
-                       list.append((nimText, slot))
+               for slot in self.nim_slots:
+                       list.append(slot.friendly_full_description)

                return list
 
                return list
 

-       def getNimConfigMode(self, slotid):
-               return currentConfigSelectionElement(config.Nims[slotid].configMode)
-       

        def getSatList(self):
                return self.satList
 
        def getSatListForNim(self, slotid):
                list = []
        def getSatList(self):
                return self.satList
 
        def getSatListForNim(self, slotid):
                list = []

-               if (self.getNimType(slotid) == self.nimType["DVB-S"]):
+               if self.nim_slots[slotid].isCompatible("DVB-S"):

                        #print "slotid:", slotid
                        #print "slotid:", slotid

-                       
-                       #print "self.satellites:", self.satList[config.Nims[slotid].diseqcA.value]
+
+                       #print "self.satellites:", self.satList[config.Nims[slotid].diseqcA.index]

                        #print "diseqcA:", config.Nims[slotid].diseqcA.value
                        #print "diseqcA:", config.Nims[slotid].diseqcA.value

-                       configMode = currentConfigSelectionElement(config.Nims[slotid].configMode)
+                       configMode = config.Nims[slotid].configMode.value
+
+                       if configMode == "equal":
+                               slotid=0 #FIXME add handling for more than two tuners !!!
+                               configMode = config.Nims[slotid].configMode.value
+

                        if configMode == "simple":
                        if configMode == "simple":

-                               if (config.Nims[slotid].diseqcMode.value <= 3):
-                                       list.append(self.satList[config.Nims[slotid].diseqcA.value])
-                               if (0 < config.Nims[slotid].diseqcMode.value <= 3):
-                                       list.append(self.satList[config.Nims[slotid].diseqcB.value])
-                               if (config.Nims[slotid].diseqcMode.value == 3):
-                                       list.append(self.satList[config.Nims[slotid].diseqcC.value])
-                                       list.append(self.satList[config.Nims[slotid].diseqcD.value])
-                               if (config.Nims[slotid].diseqcMode.value == 4):
+                               dm = config.Nims[slotid].diseqcMode.value
+                               if dm in ["single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
+                                       list.append(self.satList[config.Nims[slotid].diseqcA.index])
+                               if dm in ["toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
+                                       list.append(self.satList[config.Nims[slotid].diseqcB.index])
+                               if dm == "diseqc_a_b_c_d":
+                                       list.append(self.satList[config.Nims[slotid].diseqcC.index])
+                                       list.append(self.satList[config.Nims[slotid].diseqcD.index])
+                               if dm == "positioner":

                                        for x in self.satList:
                                                list.append(x)
                        elif configMode == "advanced":
                                for x in self.satList:
                                        for x in self.satList:
                                                list.append(x)
                        elif configMode == "advanced":
                                for x in self.satList:

-                                       if config.Nims[slotid].advanced.sat[x[1]].lnb.value != 0:
+                                       if int(config.Nims[slotid].advanced.sat[x[0]].lnb.value) != 0:

                                                list.append(x)
                                                list.append(x)

+               

                return list
 
        def getRotorSatListForNim(self, slotid):
                list = []
                return list
 
        def getRotorSatListForNim(self, slotid):
                list = []

-               if (self.getNimType(slotid) == self.nimType["DVB-S"]):
+               if self.nim_slots[slotid].isCompatible("DVB-S"):

                        #print "slotid:", slotid
 
                        #print "self.satellites:", self.satList[config.Nims[slotid].diseqcA.value]
                        #print "diseqcA:", config.Nims[slotid].diseqcA.value
                        #print "slotid:", slotid
 
                        #print "self.satellites:", self.satList[config.Nims[slotid].diseqcA.value]
                        #print "diseqcA:", config.Nims[slotid].diseqcA.value

-                       configMode = currentConfigSelectionElement(config.Nims[slotid].configMode)
+                       configMode = config.Nims[slotid].configMode.value

                        if configMode == "simple":
                        if configMode == "simple":

-                               if (config.Nims[slotid].diseqcMode.value == 4):
+                               if config.Nims[slotid].diseqcMode.value == "positioner":

                                        for x in self.satList:
                                                list.append(x)
                        elif configMode == "advanced":
                                for x in self.satList:
                                        nim = config.Nims[slotid]
                                        for x in self.satList:
                                                list.append(x)
                        elif configMode == "advanced":
                                for x in self.satList:
                                        nim = config.Nims[slotid]

-                                       lnbnum = nim.advanced.sat[x[1]].lnb.value
+                                       lnbnum = int(nim.advanced.sat[x[0]].lnb.value)

                                        if lnbnum != 0:
                                                lnb = nim.advanced.lnb[lnbnum]
                                        if lnbnum != 0:
                                                lnb = nim.advanced.lnb[lnbnum]

-                                               if lnb.diseqcMode.value == 3: # diseqc 1.2
+                                               if lnb.diseqcMode.value == "1_2":

                                                        list.append(x)
                return list
 
                                                        list.append(x)
                return list
 

-       def nimDiseqcModeChanged(self, slotid, mode):
-               #print "nimDiseqcModeChanged set to " + str(mode)
-               pass
-       def nimPortAChanged(self, slotid, val):
-               #print "nimDiseqcA set to " + str(slotid) + " val:" + str(val)
-               pass
-       def nimPortBChanged(self, slotid, val):
-               #print "nimDiseqcA set to " + str(slotid) + " val:" + str(val)
-               #print "nimDiseqcB set to " + str(val)
-               pass
-       def nimPortCChanged(self, slotid, val):
-               #print "nimDiseqcC set to " + str(val)
-               pass
-       def nimPortDChanged(self, slotid, val):
-               #print "nimDiseqcD set to " + str(val)
-               pass
+def InitSecParams():
+       config.sec = ConfigSubsection()
+
+       x = ConfigInteger(default=15, limits = (0, 9999))
+       x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_CONT_TONE, configElement.value))
+       config.sec.delay_after_continuous_tone_change = x
+
+       x = ConfigInteger(default=10, limits = (0, 9999))
+       x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_FINAL_VOLTAGE_CHANGE, configElement.value))
+       config.sec.delay_after_final_voltage_change = x
+
+       x = ConfigInteger(default=120, limits = (0, 9999))
+       x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_BETWEEN_DISEQC_REPEATS, configElement.value))
+       config.sec.delay_between_diseqc_repeats = x
+
+       x = ConfigInteger(default=50, limits = (0, 9999))
+       x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_LAST_DISEQC_CMD, configElement.value))
+       config.sec.delay_after_last_diseqc_command = x
+
+       x = ConfigInteger(default=50, limits = (0, 9999))
+       x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_TONEBURST, configElement.value))
+       config.sec.delay_after_toneburst = x
+
+       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 = ConfigInteger(default=700, limits = (0, 9999))
+       x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_BETWEEN_SWITCH_AND_MOTOR_CMD, configElement.value))
+       config.sec.delay_between_switch_and_motor_command = x
+
+       x = ConfigInteger(default=150, limits = (0, 9999))
+       x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MEASURE_IDLE_INPUTPOWER, configElement.value))
+       config.sec.delay_after_voltage_change_before_measure_idle_inputpower = x
+
+       x = ConfigInteger(default=750, limits = (0, 9999))
+       x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_MOTOR_CMD, configElement.value))
+       config.sec.delay_after_enable_voltage_before_motor_command = x
+
+       x = ConfigInteger(default=150, limits = (0, 9999))
+       x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_MOTOR_STOP_CMD, configElement.value))
+       config.sec.delay_after_motor_stop_command = x
+
+       x = ConfigInteger(default=150, limits = (0, 9999))
+       x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MOTOR_CMD, configElement.value))
+       config.sec.delay_after_voltage_change_before_motor_command = x
+
+       x = ConfigInteger(default=120, limits = (0, 9999))
+       x.addNotifier(lambda configElement: secClass.setParam(secClass.MOTOR_RUNNING_TIMEOUT, configElement.value))
+       config.sec.motor_running_timeout = x
+
+       x = ConfigInteger(default=1, limits = (0, 5))
+       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):
 
 def InitNimManager(nimmgr):

-       config.Nims = []
-       for x in range(nimmgr.nimCount):
+       InitSecParams()
+
+       config.Nims = ConfigSubList()
+       for x in range(len(nimmgr.nim_slots)):

                config.Nims.append(ConfigSubsection())
                config.Nims.append(ConfigSubsection())

-               
-#      def nimConfigModeChanged(slotid, configElement):
-#              nimmgr.nimConfigModeChanged(slotid, configElement.value)
-       def nimDiseqcModeChanged(slotid, configElement):
-               nimmgr.nimDiseqcModeChanged(slotid, configElement.value)
-               
-       def nimPortAChanged(slotid, configElement):
-               nimmgr.nimPortAChanged(slotid, configElement.vals[configElement.value][1])
-       def nimPortBChanged(slotid, configElement):
-               nimmgr.nimPortBChanged(slotid, configElement.vals[configElement.value][1])
-       def nimPortCChanged(slotid, configElement):
-               nimmgr.nimPortCChanged(slotid, configElement.vals[configElement.value][1])
-       def nimPortDChanged(slotid, configElement):
-               nimmgr.nimPortDChanged(slotid, configElement.vals[configElement.value][1])
-
-       for slot in nimmgr.nimslots:
-               x = slot.slotid
-               cname = nimmgr.getConfigPrefix(x)
+
+       for slot in nimmgr.nim_slots:
+               x = slot.slot

                nim = config.Nims[x]
                
                nim = config.Nims[x]
                

-               if slot.nimType == nimmgr.nimType["DVB-S"]:
-                       if slot.slotid == 0:
-                               nim.configMode = configElement(cname + "configMode", configSelection, 0, (
-                               ("simple", _("Simple")), ("advanced", _("Advanced"))), False)
+               # HACK: currently, we can only looptrough to socket A
+
+               if slot.isCompatible("DVB-S"):
+                       if slot.slot == 0:
+                               nim.configMode = ConfigSelection(
+                                       choices = {
+                                               "simple": _("simple"),
+                                               "advanced": _("advanced"),
+                                               "nothing": _("nothing connected"),
+                                               },
+                                       default = "simple")

                        else:
                        else:

-                               nim.configMode = configElement(cname + "configMode", configSelection, 0, (
-                               ("equal", _("Equal to Socket A")),
-                               ("loopthrough", _("Loopthrough to Socket A")),
-                               ("nothing", _("Nothing connected")),
-                               ("satposdepends", _("Secondary cable from motorized LNB")),
-                               ("simple", _("Simple")),
-                               ("advanced", _("Advanced"))), False)
+                               nim.configMode = ConfigSelection(
+                                       choices = {
+                                               "equal": _("equal to Socket A"),
+                                               "loopthrough": _("loopthrough to socket A"),
+                                               "nothing": _("nothing connected"),
+                                               "satposdepends": _("second cable of motorized LNB"),
+                                               "simple": _("simple"),
+                                               "advanced": _("advanced")},
+                                       default = "loopthrough")
+

                        #important - check if just the 2nd one is LT only and the first one is DVB-S
                        #important - check if just the 2nd one is LT only and the first one is DVB-S

-                       if currentConfigSelectionElement(nim.configMode) in ["loopthrough", "satposdepends", "equal"]:
-                               if x == 0:                                                                              #first one can never be linked to anything
-                                       nim.configMode.value = getConfigSelectionElement(nim.configMode, "simple")              #reset to simple
+                       # CHECKME: is this logic correct for >2 slots?
+                       if nim.configMode.value in ["loopthrough", "satposdepends", "equal"]:
+                               if x == 0: # first one can never be linked to anything
+                                       # reset to simple
+                                       nim.configMode.value = "simple"

                                        nim.configMode.save()
                                else:
                                        #FIXME: make it better
                                        nim.configMode.save()
                                else:
                                        #FIXME: make it better

-                                       for y in nimmgr.nimslots:
-                                               if y.slotid == 0:
-                                                       if y.nimType != nimmgr.nimType["DVB-S"]:
-                                                               nim.configMode.value = getConfigSelectionElement(nim.configMode, "simple")              #reset to simple
+                                       for y in nimmgr.nim_slots:
+                                               if y.slot == 0:
+                                                       if not y.isCompatible("DVB-S"):
+                                                               # reset to simple
+                                                               nim.configMode.value = "simple"

                                                                nim.configMode.save()
 
                                                                nim.configMode.save()
 

-                       nim.diseqcMode = configElement(cname + "diseqcMode", configSelection, 2, (("single", _("Single")), ("toneburst_a_b", _("Toneburst A/B")), ("diseqc_a_b", _("DiSEqC A/B")), ("diseqc_a_b_c_d", _("DiSEqC A/B/C/D")), ("positioner", _("Positioner"))), False);
-                       nim.diseqcA = configElement(cname + "diseqcA", configSatlist, 192, nimmgr.satList, False);
-                       nim.diseqcB = configElement(cname + "diseqcB", configSatlist, 130, nimmgr.satList, False);
-                       nim.diseqcC = configElement(cname + "diseqcC", configSatlist, 0, nimmgr.satList, False);
-                       nim.diseqcD = configElement(cname + "diseqcD", configSatlist, 0, nimmgr.satList, False);
-                       nim.positionerMode = configElement(cname + "positionerMode", configSelection, 0, (("usals", _("USALS")), ("manual", _("manual"))), False);
-                       nim.longitude = configElement(cname + "longitude", configSequence, [5,100], configsequencearg.get("FLOAT", [(0,90),(0,999)]), False);
-                       nim.longitudeOrientation = configElement(cname + "longitudeOrientation", configSelection, 0, (("east", _("East")), ("west", _("West"))), False)
-                       nim.latitude = configElement(cname + "latitude", configSequence, [50,767], configsequencearg.get("FLOAT", [(0,90),(0,999)]), False);
-                       nim.latitudeOrientation = configElement(cname + "latitudeOrientation", configSelection, 0, (("north", _("North")), ("south", _("South"))), False)
-                       satNimList = nimmgr.getNimListOfType(nimmgr.nimType["DVB-S"], slot.slotid)
-                       satNimListNames = []
+                       nim.diseqcMode = ConfigSelection(
+                               choices = [
+                                       ("single", _("Single")),
+                                       ("toneburst_a_b", _("Toneburst A/B")),
+                                       ("diseqc_a_b", _("DiSEqC A/B")),
+                                       ("diseqc_a_b_c_d", _("DiSEqC A/B/C/D")),
+                                       ("positioner", _("Positioner"))],
+                               default = "diseqc_a_b")
+
+                       nim.diseqcA = getConfigSatlist(192, nimmgr.satList)
+                       nim.diseqcB = getConfigSatlist(130, nimmgr.satList)
+                       nim.diseqcC = ConfigSatlist(list = nimmgr.satList)
+                       nim.diseqcD = ConfigSatlist(list = nimmgr.satList)
+                       nim.positionerMode = ConfigSelection(
+                               choices = [
+                                       ("usals", _("USALS")),
+                                       ("manual", _("manual"))],
+                               default = "usals")
+                       nim.longitude = ConfigFloat(default=[5,100], limits=[(0,359),(0,999)])
+                       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
+
+                       satNimList = nimmgr.getNimListOfType("DVB-S", slot.slot)
+                       satNimListNames = {}
+

                        for x in satNimList:
                        for x in satNimList:

-                               satNimListNames.append((("Slot_" + ("A", "B", "C", "D")[x] + "_" + nimmgr.getNimName(x)), _("Slot ") + ("A", "B", "C", "D")[x] + ": " + nimmgr.getNimName(x)))
-                       nim.equalTo = configElement(cname + "equalTo", configSelection, 0, satNimListNames, False);
-                       nim.linkedTo = configElement(cname + "linkedTo", configSelection, 0, satNimListNames, False);
-                       nim.satposDependsTo = configElement(cname + "satposDependsTo", configSelection, 0, satNimListNames, False);
-                       
-                       #perhaps the instance of the slot is more useful?
-#                      nim.configMode.addNotifier(boundFunction(nimConfigModeChanged,x))
-                       nim.diseqcMode.addNotifier(boundFunction(nimDiseqcModeChanged,x))
-                       nim.diseqcA.addNotifier(boundFunction(nimPortAChanged,int(x)))
-                       nim.diseqcB.addNotifier(boundFunction(nimPortBChanged,x))
-                       nim.diseqcC.addNotifier(boundFunction(nimPortCChanged,x))
-                       nim.diseqcD.addNotifier(boundFunction(nimPortDChanged,x))
-                       
+                               n = nimmgr.nim_slots[x]
+                               satNimListNames["%d" % n.slot] = n.friendly_full_description
+
+                       if len(satNimListNames):
+                               nim.equalTo = ConfigSelection(choices = satNimListNames)
+                               nim.linkedTo = ConfigSelection(choices = satNimListNames)
+                               nim.satposDependsTo = ConfigSelection(choices = satNimListNames)
+

                        # advanced config:
                        nim.advanced = ConfigSubsection()
                        # advanced config:
                        nim.advanced = ConfigSubsection()

-                       nim.advanced.sats = configElement(cname + "advanced.sats", configSatlist, 192, nimmgr.satList, False);
-                       nim.advanced.sat = {}
-                       lnbs = ["not available"]
+                       nim.advanced.sats = getConfigSatlist(192,nimmgr.satList)
+                       nim.advanced.sat = ConfigSubDict()
+                       lnbs = [("0", "not available")]

                        for y in range(1, 33):
                        for y in range(1, 33):

-                               lnbs.append("LNB " + str(y))
+                               lnbs.append((str(y), "LNB " + str(y)))
+

                        for x in nimmgr.satList:
                        for x in nimmgr.satList:

-                               nim.advanced.sat[x[1]] = ConfigSubsection()
-                               nim.advanced.sat[x[1]].voltage = configElement(cname + "advanced.sat" + str(x[1]) + ".voltage", configSelection, 0, (("polarization", _("Polarization")), ("13V", _("13 V")), ("18V", _("18 V"))), False)
-                               nim.advanced.sat[x[1]].tonemode = configElement(cname + "advanced.sat" + str(x[1]) + ".tonemode", configSelection, 0, (("band", _("Band")), ("on", _("On")), ("off", _("Off"))), False)
-                               nim.advanced.sat[x[1]].usals = configElement(cname + "advanced.sat" + str(x[1]) + ".usals", configSelection, 0, (("yes", _("Yes")), ("no", _("No"))), False)
-                               nim.advanced.sat[x[1]].rotorposition = configElement(cname + "advanced.sat" + str(x[1]) + ".rotorposition", configSequence, [1], configsequencearg.get("INTEGER", (1, 255)), False)
-                               nim.advanced.sat[x[1]].lnb = configElement(cname + "advanced.sat" + str(x[1]) + ".lnb", configSelection, 0, lnbs, False)
+                               nim.advanced.sat[x[0]] = ConfigSubsection()
+                               nim.advanced.sat[x[0]].voltage = ConfigSelection(choices={"polarization": _("Polarization"), "13V": _("13 V"), "18V": _("18 V")}, default = "polarization")
+                               nim.advanced.sat[x[0]].tonemode = ConfigSelection(choices={"band": _("Band"), "on": _("On"), "off": _("Off")}, default = "band")
+                               nim.advanced.sat[x[0]].usals = ConfigYesNo(default=True)
+                               nim.advanced.sat[x[0]].rotorposition = ConfigInteger(default=1, limits=(1, 255))
+                               nim.advanced.sat[x[0]].lnb = ConfigSelection(choices = lnbs)

 
                        csw = [("none", _("None")), ("AA", _("AA")), ("AB", _("AB")), ("BA", _("BA")), ("BB", _("BB"))]
                        for y in range(0, 16):
                                csw.append((str(0xF0|y), "Input " + str(y+1)))
 
 
                        csw = [("none", _("None")), ("AA", _("AA")), ("AB", _("AB")), ("BA", _("BA")), ("BB", _("BB"))]
                        for y in range(0, 16):
                                csw.append((str(0xF0|y), "Input " + str(y+1)))
 

-                       ucsw = [("none", _("None"))]
+                       ucsw = [("0", _("None"))]

                        for y in range(1, 17):
                        for y in range(1, 17):

-                               ucsw.append("Input " + str(y))
+                               ucsw.append((str(y), "Input " + str(y)))

 
 

-                       nim.advanced.lnb = [0]
+                       nim.advanced.lnb = ConfigSubList()
+                       nim.advanced.lnb.append(ConfigNothing())

                        for x in range(1, 33):
                                nim.advanced.lnb.append(ConfigSubsection())
                        for x in range(1, 33):
                                nim.advanced.lnb.append(ConfigSubsection())

-                               nim.advanced.lnb[x].lof = configElement(cname + "advanced.lnb" + str(x) + ".lof", configSelection, 0, (("universal_lnb", _("Universal LNB")), ("c_band", _("C-Band")), ("user_defined", _("User defined"))), False)
-                               nim.advanced.lnb[x].lofl = configElement(cname + "advanced.lnb" + str(x) + ".lofl", configSequence, [9750], configsequencearg.get("INTEGER", (0, 99999)), False)
-                               nim.advanced.lnb[x].lofh = configElement(cname + "advanced.lnb" + str(x) + ".lofh", configSequence, [10600], configsequencearg.get("INTEGER", (0, 99999)), False)
-                               nim.advanced.lnb[x].threshold = configElement(cname + "advanced.lnb" + str(x) + ".threshold", configSequence, [11700], configsequencearg.get("INTEGER", (0, 99999)), False)
-                               nim.advanced.lnb[x].output_12v = configElement(cname + "advanced.lnb" + str(x) + ".output_12v", configSelection, 0, (("0V", _("0 V")), ("12V", _("12 V"))), False)
-                               nim.advanced.lnb[x].increased_voltage = configElement(cname + "advanced.lnb" + str(x) + ".increased_voltage", configSelection, 0, (("no", _("No")), ("yes", _("Yes"))), False)
-                               nim.advanced.lnb[x].toneburst = configElement(cname + "advanced.lnb" + str(x) + ".toneburst", configSelection, 0, (("none", _("None")), ("A", _("A")), ("B", _("B"))), False)
-                               nim.advanced.lnb[x].diseqcMode = configElement(cname + "advanced.lnb" + str(x) + ".diseqcMode", configSelection, 0, (("none", _("None")), ("1_0", _("1.0")), ("1_1", _("1.1")), ("1_2", _("1.2"))), False)
-                               nim.advanced.lnb[x].commitedDiseqcCommand = configElement(cname + "advanced.lnb" + str(x) + ".commitedDiseqcCommand", configSelection, 0, csw, False)
-                               nim.advanced.lnb[x].fastDiseqc = configElement(cname + "advanced.lnb" + str(x) + ".fastDiseqc", configSelection, 0, (("no", _("No")), ("yes", _("Yes"))), False)
-                               nim.advanced.lnb[x].sequenceRepeat = configElement(cname + "advanced.lnb" + str(x) + ".sequenceRepeat", configSelection, 0, (("no", _("No")), ("yes", _("Yes"))), False)
-                               nim.advanced.lnb[x].commandOrder1_0 = configElement(cname + "advanced.lnb" + str(x) + ".commandOrder1_0", configSelection, 0, ("committed, toneburst", "toneburst, committed"), False)
-                               nim.advanced.lnb[x].commandOrder = configElement(cname + "advanced.lnb" + str(x) + ".commandOrder", configSelection, 0, ("committed, toneburst", "toneburst, committed", "committed, uncommitted, toneburst", "toneburst, committed, uncommitted", "uncommitted, committed, toneburst", "toneburst, uncommitted, commmitted"), False)
-                               nim.advanced.lnb[x].uncommittedDiseqcCommand = configElement(cname + "advanced.lnb" + str(x) + ".uncommittedDiseqcCommand", configSelection, 0, ucsw, False)
-                               nim.advanced.lnb[x].diseqcRepeats = configElement(cname + "advanced.lnb" + str(x) + ".diseqcRepeats", configSelection, 0, (("none", _("None")), ("one", _("One")), ("two", _("Two")), ("three", _("Three"))), False)
-                               nim.advanced.lnb[x].longitude = configElement(cname + "advanced.lnb" + str(x) + ".longitude", configSequence, [5,100], configsequencearg.get("FLOAT", [(0,90),(0,999)]), False)
-                               nim.advanced.lnb[x].longitudeOrientation = configElement(cname + "advanced.lnb" + str(x) + ".longitudeOrientation", configSelection, 0, (("east", _("East")), ("west", _("West"))), False)
-                               nim.advanced.lnb[x].latitude = configElement(cname + "advanced.lnb" + str(x) + ".latitude", configSequence, [50,767], configsequencearg.get("FLOAT", [(0,90),(0,999)]), False)
-                               nim.advanced.lnb[x].latitudeOrientation = configElement(cname + "advanced.lnb" + str(x) + ".latitudeOrientation", configSelection, 0, (("north", _("North")), ("south", _("South"))), False)
-                               nim.advanced.lnb[x].powerMeasurement = configElement(cname + "advanced.lnb" + str(x) + ".powerMeasurement", configSelection, 0, (("yes", _("Yes")), ("no", _("No"))), False)
-                               nim.advanced.lnb[x].powerThreshold = configElement(cname + "advanced.lnb" + str(x) + ".powerThreshold", configSequence, [50], configsequencearg.get("INTEGER", (0, 100)), False)
-               elif slot.nimType == nimmgr.nimType["DVB-C"]:
-                       nim.cable = configElement(cname + "cable", configSelection, 0, nimmgr.cablesList, False);
-               elif slot.nimType == nimmgr.nimType["DVB-T"]:
+                               nim.advanced.lnb[x].lof = ConfigSelection(choices={"universal_lnb": _("Universal LNB"), "c_band": _("C-Band"), "user_defined": _("User defined")}, default="universal_lnb")
+                               nim.advanced.lnb[x].lofl = ConfigInteger(default=9750, limits = (0, 99999))
+                               nim.advanced.lnb[x].lofh = ConfigInteger(default=10600, limits = (0, 99999))
+                               nim.advanced.lnb[x].threshold = ConfigInteger(default=11700, limits = (0, 99999))
+#                              nim.advanced.lnb[x].output_12v = ConfigSelection(choices = [("0V", _("0 V")), ("12V", _("12 V"))], default="0V")
+                               nim.advanced.lnb[x].increased_voltage = ConfigYesNo(default=False)
+                               nim.advanced.lnb[x].toneburst = ConfigSelection(choices = [("none", _("None")), ("A", _("A")), ("B", _("B"))], default = "none")
+                               nim.advanced.lnb[x].diseqcMode = ConfigSelection(choices = [("none", _("None")), ("1_0", _("1.0")), ("1_1", _("1.1")), ("1_2", _("1.2"))], default = "none")
+                               nim.advanced.lnb[x].commitedDiseqcCommand = ConfigSelection(choices = csw)
+                               nim.advanced.lnb[x].fastDiseqc = ConfigYesNo(default=False)
+                               nim.advanced.lnb[x].sequenceRepeat = ConfigYesNo(default=False)
+                               nim.advanced.lnb[x].commandOrder1_0 = ConfigSelection(choices = [("ct", "committed, toneburst"), ("tc", "toneburst, committed")], default = "ct")
+                               nim.advanced.lnb[x].commandOrder = ConfigSelection(choices = [
+                                               ("ct", "committed, toneburst"),
+                                               ("tc", "toneburst, committed"),
+                                               ("cut", "committed, uncommitted, toneburst"),
+                                               ("tcu", "toneburst, committed, uncommitted"),
+                                               ("uct", "uncommitted, committed, toneburst"),
+                                               ("tuc", "toneburst, uncommitted, commmitted")],
+                                               default="ct")
+                               nim.advanced.lnb[x].uncommittedDiseqcCommand = ConfigSelection(choices = ucsw)
+                               nim.advanced.lnb[x].diseqcRepeats = ConfigSelection(choices = [("none", _("None")), ("one", _("One")), ("two", _("Two")), ("three", _("Three"))], default = "none")
+                               nim.advanced.lnb[x].longitude = ConfigFloat(default = [5,100], limits = [(0,359),(0,999)])
+                               nim.advanced.lnb[x].longitudeOrientation = ConfigSelection(choices = [("east", _("East")), ("west", _("West"))], default = "east")
+                               nim.advanced.lnb[x].latitude = ConfigFloat(default = [50,767], limits = [(0,359),(0,999)])
+                               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"):
+                       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 = {
+                                       "enabled": _("enabled"),
+                                       "nothing": _("nothing connected"),
+                                       },
+                               default = "enabled")

                        list = []
                        list = []

+                       n = 0

                        for x in nimmgr.terrestrialsList:
                        for x in nimmgr.terrestrialsList:

-                               list.append(x[0])
-                       nim.terrestrial = configElement(cname + "terrestrial", configSelection, 0, list, False);
+                               list.append((str(n), x[0]))
+                               n += 1
+                       nim.terrestrial = ConfigSelection(choices = list)
+                       nim.terrestrial_5V = ConfigOnOff()

                else:
                else:

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

                        print "pls add support for this frontend type!"         
                        print "pls add support for this frontend type!"         

+#                      assert False

 
        nimmgr.sec = SecConfigure(nimmgr)
 
 
        nimmgr.sec = SecConfigure(nimmgr)