fix crash when unicable matrix is selected, cleanup code
[vuplus_dvbapp] / lib / python / Components / NimManager.py
index 0290ff6..553de9c 100644 (file)
@@ -1,4 +1,5 @@
 from Tools.HardwareInfo import HardwareInfo
+from Tools.BoundFunction import boundFunction
 
 from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, \
        ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, ConfigNothing, \
@@ -13,8 +14,10 @@ from enigma import eDVBSatelliteEquipmentControl as secClass, \
 
 from time import localtime, mktime
 from datetime import datetime
+from Tools.BoundFunction import boundFunction
 
-from sets import Set
+from Tools import Directories
+import xml.etree.cElementTree
 
 def getConfigSatlist(orbpos, satlist):
        default_orbpos = None
@@ -39,7 +42,7 @@ class SecConfigure:
                sec.addSatellite(orbpos)
                self.configuredSatellites.add(orbpos)
 
-       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, useInputPower=True, inputPowerDelta=50, fastDiSEqC = False, setVoltageTone = True):
+       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, useInputPower=True, inputPowerDelta=50, fastDiSEqC = False, setVoltageTone = True, diseqc13V = False):
                if orbpos is None or orbpos == 3601:
                        return
                #simple defaults
@@ -48,9 +51,11 @@ class SecConfigure:
                if self.equal.has_key(slotid):
                        for slot in self.equal[slotid]:
                                tunermask |= (1 << slot)
-               elif self.linked.has_key(slotid):
+               if self.linked.has_key(slotid):
                        for slot in self.linked[slotid]:
                                tunermask |= (1 << slot)
+               sec.setLNBSatCR(-1)
+               sec.setLNBNum(1)
                sec.setLNBLOFL(9750000)
                sec.setLNBLOFH(10600000)
                sec.setLNBThreshold(11700000)
@@ -58,14 +63,6 @@ class SecConfigure:
                sec.setRepeats(0)
                sec.setFastDiSEqC(fastDiSEqC)
                sec.setSeqRepeat(0)
-
-               if setVoltageTone:
-                       sec.setVoltageMode(switchParam.HV)
-                       sec.setToneMode(switchParam.HILO)
-               else:
-                       sec.setVoltageMode(switchParam._14V)
-                       sec.setToneMode(switchParam.OFF)
-
                sec.setCommandOrder(0)
 
                #user values
@@ -77,6 +74,15 @@ class SecConfigure:
 
                if 0 <= diseqcmode < 3:
                        self.addSatellite(sec, orbpos)
+                       if setVoltageTone:
+                               if diseqc13V:
+                                       sec.setVoltageMode(switchParam.HV_13)
+                               else:
+                                       sec.setVoltageMode(switchParam.HV)
+                               sec.setToneMode(switchParam.HILO)
+                       else:
+                               sec.setVoltageMode(switchParam._14V)
+                               sec.setToneMode(switchParam.OFF)
                elif (diseqcmode == 3): # diseqc 1.2
                        if self.satposdepends.has_key(slotid):
                                for slot in self.satposdepends[slotid]:
@@ -92,7 +98,10 @@ class SecConfigure:
                        for x in self.NimManager.satList:
                                print "Add sat " + str(x[0])
                                self.addSatellite(sec, int(x[0]))
-                               sec.setVoltageMode(switchParam.HV)
+                               if diseqc13V:
+                                       sec.setVoltageMode(switchParam.HV_13)
+                               else:
+                                       sec.setVoltageMode(switchParam.HV)
                                sec.setToneMode(switchParam.HILO)
                                sec.setRotorPosNum(0) # USALS
                
@@ -108,7 +117,7 @@ class SecConfigure:
                
        def getRoot(self, slotid, connto):
                visited = []
-               while (self.NimManager.getNimConfig(connto).configMode.value in ["satposdepends", "equal", "loopthrough"]):
+               while (self.NimManager.getNimConfig(connto).configMode.value in ("satposdepends", "equal", "loopthrough")):
                        connto = int(self.NimManager.getNimConfig(connto).connectedTo.value)
                        if connto in visited: # prevent endless loop
                                return slotid
@@ -117,7 +126,7 @@ class SecConfigure:
 
        def update(self):
                sec = secClass.getInstance()
-               self.configuredSatellites = Set()
+               self.configuredSatellites = set()
                sec.clear() ## this do unlinking NIMs too !!
                print "sec config cleared"
 
@@ -164,7 +173,7 @@ class SecConfigure:
                        hw = HardwareInfo()
                        if slot.isCompatible("DVB-S"):
                                print "slot: " + str(x) + " configmode: " + str(nim.configMode.value)
-                               if nim.configMode.value in [ "loopthrough", "satposdepends", "nothing" ]:
+                               if nim.configMode.value in ( "loopthrough", "satposdepends", "nothing" ):
                                        pass
                                else:
                                        sec.setSlotNotLinked(x)
@@ -174,24 +183,24 @@ class SecConfigure:
                                                print "diseqcmode: ", nim.diseqcMode.value
                                                if nim.diseqcMode.value == "single":                    #single
                                                        if nim.simpleSingleSendDiSEqC.value:
-                                                               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.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA, diseqc13V = nim.diseqc13V.value)
                                                        else:
-                                                               self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.NONE, diseqcpos = diseqcParam.SENDNO)
+                                                               self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.NONE, diseqcpos = diseqcParam.SENDNO, diseqc13V = nim.diseqc13V.value)
                                                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)
+                                                       self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.A, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.SENDNO, diseqc13V = nim.diseqc13V.value)
+                                                       self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.B, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.SENDNO, diseqc13V = nim.diseqc13V.value)
                                                elif nim.diseqcMode.value == "diseqc_a_b":              #DiSEqC A/B
                                                        fastDiSEqC = nim.simpleDiSEqCOnlyOnSatChange.value
                                                        setVoltageTone = nim.simpleDiSEqCSetVoltageTone.value
-                                                       self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone)
-                                                       self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone)
+                                                       self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone, diseqc13V = nim.diseqc13V.value)
+                                                       self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone, diseqc13V = nim.diseqc13V.value)
                                                elif nim.diseqcMode.value == "diseqc_a_b_c_d":          #DiSEqC A/B/C/D
                                                        fastDiSEqC = nim.simpleDiSEqCOnlyOnSatChange.value
                                                        setVoltageTone = nim.simpleDiSEqCSetVoltageTone.value
-                                                       self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone)
-                                                       self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone)
-                                                       self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcC.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BA, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone)
-                                                       self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcD.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BB, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone)
+                                                       self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone, diseqc13V = nim.diseqc13V.value)
+                                                       self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone, diseqc13V = nim.diseqc13V.value)
+                                                       self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcC.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BA, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone, diseqc13V = nim.diseqc13V.value)
+                                                       self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcD.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BB, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone, diseqc13V = nim.diseqc13V.value)
                                                elif nim.diseqcMode.value == "positioner":              #Positioner
                                                        if nim.latitudeOrientation.value == "north":
                                                                laValue = rotorParam.NORTH
@@ -221,12 +230,27 @@ class SecConfigure:
                                                                laDirection = laValue,
                                                                turningSpeed = turning_speed,
                                                                useInputPower = useInputPower,
-                                                               inputPowerDelta = inputPowerDelta)
+                                                               inputPowerDelta = inputPowerDelta,
+                                                               diseqc13V = nim.diseqc13V.value)
                                        elif nim.configMode.value == "advanced": #advanced config
                                                self.updateAdvanced(sec, x)
                print "sec config completed"
 
        def updateAdvanced(self, sec, slotid):
+               try:
+                       if config.Nims[slotid].advanced.unicableconnected is not None:
+                               if config.Nims[slotid].advanced.unicableconnected.value == True:
+                                       config.Nims[slotid].advanced.unicableconnectedTo.save_forced = True
+                                       self.linkNIMs(sec, slotid, int(config.Nims[slotid].advanced.unicableconnectedTo.value))
+                                       connto = self.getRoot(slotid, int(config.Nims[slotid].advanced.unicableconnectedTo.value))
+                                       if not self.linked.has_key(connto):
+                                               self.linked[connto] = []
+                                       self.linked[connto].append(slotid)
+                               else:
+                                       config.Nims[slotid].advanced.unicableconnectedTo.save_forced = False
+               except:
+                       pass
+
                lnbSat = {}
                for x in range(1,37):
                        lnbSat[x] = []
@@ -250,18 +274,51 @@ class SecConfigure:
                                currLnb = config.Nims[slotid].advanced.lnb[x]
                                sec.addLNB()
 
+                               if x < 33:
+                                       sec.setLNBNum(x)
+
                                tunermask = 1 << slotid
                                if self.equal.has_key(slotid):
                                        for slot in self.equal[slotid]:
                                                tunermask |= (1 << slot)
-                               elif self.linked.has_key(slotid):
+                               if self.linked.has_key(slotid):
                                        for slot in self.linked[slotid]:
                                                tunermask |= (1 << slot)
 
+                               if currLnb.lof.value != "unicable":
+                                       sec.setLNBSatCR(-1)
+
                                if currLnb.lof.value == "universal_lnb":
                                        sec.setLNBLOFL(9750000)
                                        sec.setLNBLOFH(10600000)
                                        sec.setLNBThreshold(11700000)
+                               elif currLnb.lof.value == "unicable":
+                                       def setupUnicable(configManufacturer, ProductDict):
+                                               manufacturer_name = configManufacturer.value
+                                               manufacturer = ProductDict[manufacturer_name]
+                                               product_name = manufacturer.product.value
+                                               sec.setLNBSatCR(manufacturer.scr[product_name].index)
+                                               sec.setLNBSatCRvco(manufacturer.vco[product_name][manufacturer.scr[product_name].index].value*1000)
+                                               sec.setLNBSatCRpositions(manufacturer.positions[product_name][0].value)
+                                               sec.setLNBLOFL(manufacturer.lofl[product_name][0].value * 1000)
+                                               sec.setLNBLOFH(manufacturer.lofh[product_name][0].value * 1000)
+                                               sec.setLNBThreshold(manufacturer.loft[product_name][0].value * 1000)
+                                               configManufacturer.save_forced = True
+                                               manufacturer.product.save_forced = True
+                                               manufacturer.vco[product_name][manufacturer.scr[product_name].index].save_forced = True
+
+                                       if currLnb.unicable.value == "unicable_user":
+#TODO satpositions for satcruser
+                                               sec.setLNBLOFL(currLnb.lofl.value * 1000)
+                                               sec.setLNBLOFH(currLnb.lofh.value * 1000)
+                                               sec.setLNBThreshold(currLnb.threshold.value * 1000)
+                                               sec.setLNBSatCR(currLnb.satcruser.index)
+                                               sec.setLNBSatCRvco(currLnb.satcrvcouser[currLnb.satcruser.index].value*1000)
+                                               sec.setLNBSatCRpositions(1)     #HACK
+                                       elif currLnb.unicable.value == "unicable_matrix":
+                                               setupUnicable(currLnb.unicableMatrixManufacturer, currLnb.unicableMatrix)
+                                       elif currLnb.unicable.value == "unicable_lnb":
+                                               setupUnicable(currLnb.unicableLnbManufacturer, currLnb.unicableLnb)
                                elif currLnb.lof.value == "c_band":
                                        sec.setLNBLOFL(5150000)
                                        sec.setLNBLOFH(5150000)
@@ -291,9 +348,9 @@ class SecConfigure:
                                elif dm == "1_2":
                                        sec.setDiSEqCMode(diseqcParam.V1_2)
 
-                               if self.satposdepends.has_key(slotid):
-                                       for slot in self.satposdepends[slotid]:
-                                               tunermask |= (1 << slot)
+                                       if self.satposdepends.has_key(slotid):
+                                               for slot in self.satposdepends[slotid]:
+                                                       tunermask |= (1 << slot)
 
                                if dm != "none":
                                        if currLnb.toneburst.value == "none":
@@ -359,23 +416,25 @@ class SecConfigure:
                                        else:
                                                sec.setLoDirection(rotorParam.WEST)
 
-                               if currLnb.powerMeasurement.value:
-                                       sec.setUseInputpower(True)
-                                       sec.setInputpowerDelta(currLnb.powerThreshold.value)
-                                       turn_speed_dict = { "fast": rotorParam.FAST, "slow": rotorParam.SLOW }
-                                       if turn_speed_dict.has_key(currLnb.turningSpeed.value):
-                                               turning_speed = turn_speed_dict[currLnb.turningSpeed.value]
+                                       if currLnb.powerMeasurement.value:
+                                               sec.setUseInputpower(True)
+                                               sec.setInputpowerDelta(currLnb.powerThreshold.value)
+                                               turn_speed_dict = { "fast": rotorParam.FAST, "slow": rotorParam.SLOW }
+                                               if turn_speed_dict.has_key(currLnb.turningSpeed.value):
+                                                       turning_speed = turn_speed_dict[currLnb.turningSpeed.value]
+                                               else:
+                                                       beg_time = localtime(currLnb.fastTurningBegin.value)
+                                                       end_time = localtime(currLnb.fastTurningEnd.value)
+                                                       turning_speed = ((beg_time.tm_hour + 1) * 60 + beg_time.tm_min + 1) << 16
+                                                       turning_speed |= (end_time.tm_hour + 1) * 60 + end_time.tm_min + 1
+                                               sec.setRotorTurningSpeed(turning_speed)
                                        else:
-                                               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)
+                                               sec.setUseInputpower(False)
 
                                sec.setLNBSlotMask(tunermask)
 
+                               sec.setLNBPrio(int(currLnb.prio.value))
+
                                # finally add the orbital positions
                                for y in lnbSat[x]:
                                        self.addSatellite(sec, y)
@@ -385,7 +444,10 @@ class SecConfigure:
                                                satpos = y
                                        currSat = config.Nims[slotid].advanced.sat[satpos]
                                        if currSat.voltage.value == "polarization":
-                                               sec.setVoltageMode(switchParam.HV)
+                                               if config.Nims[slotid].diseqc13V.value:
+                                                       sec.setVoltageMode(switchParam.HV_13)
+                                               else:
+                                                       sec.setVoltageMode(switchParam.HV)
                                        elif currSat.voltage.value == "13V":
                                                sec.setVoltageMode(switchParam._14V)
                                        elif currSat.voltage.value == "18V":
@@ -405,14 +467,14 @@ class SecConfigure:
 
        def __init__(self, nimmgr):
                self.NimManager = nimmgr
-               self.configuredSatellites = Set()
+               self.configuredSatellites = set()
                self.update()
 
 class NIM(object):
-       def __init__(self, slot, type, description, has_outputs = True, internally_connectable = None):
+       def __init__(self, slot, type, description, has_outputs = True, internally_connectable = None, multi_type = {}):
                self.slot = slot
 
-               if type not in ["DVB-S", "DVB-C", "DVB-T", "DVB-S2", None]:
+               if type not in ("DVB-S", "DVB-C", "DVB-T", "DVB-S2", None):
                        print "warning: unknown NIM type %s, not using." % type
                        type = None
 
@@ -420,23 +482,27 @@ class NIM(object):
                self.description = description
                self.has_outputs = has_outputs
                self.internally_connectable = internally_connectable
+               self.multi_type = multi_type
 
        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]
+                               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 getType(self):
+               return self.type
+       
        def connectableTo(self):
                connectable = {
-                               "DVB-S": ["DVB-S", "DVB-S2"],
-                               "DVB-C": ["DVB-C"],
-                               "DVB-T": ["DVB-T"],
-                               "DVB-S2": ["DVB-S", "DVB-S2"]
+                               "DVB-S": ("DVB-S", "DVB-S2"),
+                               "DVB-C": ("DVB-C",),
+                               "DVB-T": ("DVB-T",),
+                               "DVB-S2": ("DVB-S", "DVB-S2")
                        }
                return connectable[self.type]
 
@@ -456,6 +522,13 @@ class NIM(object):
        
        def internallyConnectableTo(self):
                return self.internally_connectable
+       
+       def isMultiType(self):
+               return (len(self.multi_type) > 0)
+       
+       # returns dict {<slotid>: <type>}
+       def getMultiTypeList(self):
+               return self.multi_type
 
        slot_id = property(getSlotID)
 
@@ -519,6 +592,13 @@ class NimManager:
        def getSatDescription(self, pos):
                return self.satellites[pos]
 
+       def sortFunc(self, x):
+               orbpos = x[0]
+               if orbpos > 1800:
+                       return orbpos - 3600
+               else:
+                       return orbpos + 1800
+
        def readTransponders(self):
                # read initial networks from file. we only read files which we are interested in,
                # which means only these where a compatible tuner exists.
@@ -530,9 +610,10 @@ class NimManager:
                if self.hasNimType("DVB-S"):
                        print "Reading satellites.xml"
                        db.readSatellites(self.satList, self.satellites, self.transponders)
-#                      print "SATLIST", self.satList
-#                      print "SATS", self.satellites
-#                      print "TRANSPONDERS", self.transponders
+                       self.satList.sort(key = self.sortFunc) # sort by orbpos
+                       #print "SATLIST", self.satList
+                       #print "SATS", self.satellites
+                       #print "TRANSPONDERS", self.transponders
 
                if self.hasNimType("DVB-C"):
                        print "Reading cables.xml"
@@ -593,7 +674,15 @@ class NimManager:
                                entries[current_slot]["has_outputs"] = (input == "yes")
                        elif line.strip().startswith("Internally_Connectable:"):
                                input = int(line.strip()[len("Internally_Connectable:") + 1:])
-                               entries[current_slot]["internally_connectable"] = input 
+                               entries[current_slot]["internally_connectable"] = input
+                       elif  line.strip().startswith("Mode"):
+                               # "Mode 0: DVB-T" -> ["Mode 0", " DVB-T"]
+                               split = line.strip().split(":")
+                               # "Mode 0" -> ["Mode, "0"]
+                               split2 = split[0].split(" ")
+                               modes = entries[current_slot].get("multi_type", {})
+                               modes[split2[1]] = split[1].strip()
+                               entries[current_slot]["multi_type"] = modes
                        elif line.strip().startswith("empty"):
                                entries[current_slot]["type"] = None
                                entries[current_slot]["name"] = _("N/A")
@@ -607,12 +696,17 @@ class NimManager:
                                entry["has_outputs"] = True
                        if not (entry.has_key("internally_connectable")):
                                entry["internally_connectable"] = None
-                       self.nim_slots.append(NIM(slot = id, description = entry["name"], type = entry["type"], has_outputs = entry["has_outputs"], internally_connectable = entry["internally_connectable"]))
+                       if not (entry.has_key("multi_type")):
+                               entry["multi_type"] = {}
+                       self.nim_slots.append(NIM(slot = id, description = entry["name"], type = entry["type"], has_outputs = entry["has_outputs"], internally_connectable = entry["internally_connectable"], multi_type = entry["multi_type"]))
 
        def hasNimType(self, chktype):
                for slot in self.nim_slots:
                        if slot.isCompatible(chktype):
                                return True
+                       for type in slot.getMultiTypeList().values():
+                               if chktype == type:
+                                       return True
                return False
        
        def getNimType(self, slotid):
@@ -620,6 +714,9 @@ class NimManager:
        
        def getNimDescription(self, slotid):
                return self.nim_slots[slotid].friendly_full_description
+       
+       def getNimName(self, slotid):
+               return self.nim_slots[slotid].description
 
        def getNimListOfType(self, type, exception = -1):
                # returns a list of indexes for NIMs compatible to the given type, except for 'exception'
@@ -724,6 +821,22 @@ class NimManager:
 
        def getSatList(self):
                return self.satList
+       
+       # returns True if something is configured to be connected to this nim
+       # if slotid == -1, returns if something is connected to ANY nim
+       def somethingConnected(self, slotid = -1):
+               if (slotid == -1):
+                       connected = False
+                       for id in range(self.getSlotCount()):
+                               if self.somethingConnected(id):
+                                       connected = True
+                       return connected
+               else:
+                       nim = config.Nims[slotid]
+                       configMode = nim.configMode.value
+               
+                       if self.nim_slots[slotid].isCompatible("DVB-S") or self.nim_slots[slotid].isCompatible("DVB-T") or self.nim_slots[slotid].isCompatible("DVB-C"):
+                               return not (configMode == "nothing")            
 
        def getSatListForNim(self, slotid):
                list = []
@@ -746,10 +859,10 @@ class NimManager:
 
                        if configMode == "simple":
                                dm = nim.diseqcMode.value
-                               if dm in ["single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
+                               if dm in ("single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"):
                                        if nim.diseqcA.orbital_position != 3601:
                                                list.append(self.satList[nim.diseqcA.index-1])
-                               if dm in ["toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
+                               if dm in ("toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"):
                                        if nim.diseqcB.orbital_position != 3601:
                                                list.append(self.satList[nim.diseqcB.index-1])
                                if dm == "diseqc_a_b_c_d":
@@ -800,9 +913,13 @@ class NimManager:
 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=25, limits = (0, 9999))
+       x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_CONT_TONE_DISABLE_BEFORE_DISEQC, configElement.value))
+       config.sec.delay_after_continuous_tone_disable_before_diseqc = x
+
+       x = ConfigInteger(default=10, limits = (0, 9999))
+       x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_FINAL_CONT_TONE_CHANGE, configElement.value))
+       config.sec.delay_after_final_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))
@@ -836,7 +953,7 @@ def InitSecParams():
        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 = ConfigInteger(default=900, 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
 
@@ -860,6 +977,14 @@ def InitSecParams():
        x.addNotifier(lambda configElement: secClass.setParam(secClass.MOTOR_COMMAND_RETRIES, configElement.value))
        config.sec.motor_command_retries = x
 
+       x = ConfigInteger(default=50, limits = (0, 9999))
+       x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_DISEQC_RESET_CMD, configElement.value))
+       config.sec.delay_after_diseqc_reset_cmd = x
+
+       x = ConfigInteger(default=150, limits = (0, 9999))
+       x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_DISEQC_PERIPHERIAL_POWERON_CMD, configElement.value))
+       config.sec.delay_after_diseqc_peripherial_poweron_cmd = 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
@@ -867,147 +992,389 @@ def InitSecParams():
 # the configElement should be only visible when diseqc 1.2 is disabled
 
 def InitNimManager(nimmgr):
-       InitSecParams()
        hw = HardwareInfo()
-
-       config.Nims = ConfigSubList()
-       for x in range(len(nimmgr.nim_slots)):
-               config.Nims.append(ConfigSubsection())
-
+       addNimConfig = False
+       try:
+               config.Nims
+       except:
+               addNimConfig = True
+
+       if addNimConfig:
+               InitSecParams()
+               config.Nims = ConfigSubList()
+               for x in range(len(nimmgr.nim_slots)):
+                       config.Nims.append(ConfigSubsection())
+
+       lnb_choices = {
+               "universal_lnb": _("Universal LNB"),
+#              "unicable": _("Unicable"),
+               "c_band": _("C-Band"),
+               "user_defined": _("User defined")}
+
+       lnb_choices_default = "universal_lnb"
+
+       unicablelnbproducts = {}
+       unicablematrixproducts = {}
+       doc = xml.etree.cElementTree.parse("/usr/share/enigma2/unicable.xml")
+       root = doc.getroot()
+
+       entry = root.find("lnb")
+       for manufacturer in entry.getchildren():
+               m={}
+               for product in manufacturer.getchildren():
+                       scr=[]
+                       lscr=("scr1","scr2","scr3","scr4","scr5","scr6","scr7","scr8")
+                       for i in range(len(lscr)):
+                               scr.append(product.get(lscr[i],"0"))
+                       for i in range(len(lscr)):
+                               if scr[len(lscr)-i-1] == "0":
+                                       scr.pop()
+                               else:
+                                       break;
+                       lof=[]
+                       lof.append(int(product.get("positions",1)))
+                       lof.append(int(product.get("lofl",9750)))
+                       lof.append(int(product.get("lofh",10600)))
+                       lof.append(int(product.get("threshold",11700)))
+                       scr.append(tuple(lof))
+                       m.update({product.get("name"):tuple(scr)})
+               unicablelnbproducts.update({manufacturer.get("name"):m})
+
+       entry = root.find("matrix")
+       for manufacturer in entry.getchildren():
+               m={}
+               for product in manufacturer.getchildren():
+                       scr=[]
+                       lscr=("scr1","scr2","scr3","scr4","scr5","scr6","scr7","scr8")
+                       for i in range(len(lscr)):
+                               scr.append(product.get(lscr[i],"0"))
+                       for i in range(len(lscr)):
+                               if scr[len(lscr)-i-1] == "0":
+                                       scr.pop()
+                               else:
+                                       break;
+                       lof=[]
+                       lof.append(int(product.get("positions",1)))
+                       lof.append(int(product.get("lofl",9750)))
+                       lof.append(int(product.get("lofh",10600)))
+                       lof.append(int(product.get("threshold",11700)))
+                       scr.append(tuple(lof))
+                       m.update({product.get("name"):tuple(scr)})
+               unicablematrixproducts.update({manufacturer.get("name"):m})
+
+       UnicableLnbManufacturers = unicablelnbproducts.keys()
+       UnicableLnbManufacturers.sort()
+       UnicableMatrixManufacturers = unicablematrixproducts.keys()
+       UnicableMatrixManufacturers.sort()
+
+       unicable_choices = {
+               "unicable_lnb": _("Unicable LNB"),
+               "unicable_matrix": _("Unicable Martix"),
+               "unicable_user": "Unicable "+_("User defined")}
+       unicable_choices_default = "unicable_lnb"
+
+       advanced_lnb_satcruser_choices = [ ("1", "SatCR 1"), ("2", "SatCR 2"), ("3", "SatCR 3"), ("4", "SatCR 4"),
+                                       ("5", "SatCR 5"), ("6", "SatCR 6"), ("7", "SatCR 7"), ("8", "SatCR 8")]
+
+       prio_list = [ ("-1", _("Auto")) ]
+       prio_list += [(str(prio), str(prio)) for prio in range(65)+range(14000,14065)+range(19000,19065)]
+
+       advanced_lnb_csw_choices = [("none", _("None")), ("AA", _("AA")), ("AB", _("AB")), ("BA", _("BA")), ("BB", _("BB"))]
+       advanced_lnb_csw_choices += [(str(0xF0|y), "Input " + str(y+1)) for y in range(0, 16)]
+
+       advanced_lnb_ucsw_choices = [("0", _("None"))] + [(str(y), "Input " + str(y)) for y in range(1, 17)]
+
+       diseqc_mode_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"))]
+
+       positioner_mode_choices = [("usals", _("USALS")), ("manual", _("manual"))]
+
+       diseqc_satlist_choices = [(3601, _('nothing connected'), 1)] + nimmgr.satList
+       
+       longitude_orientation_choices = [("east", _("East")), ("west", _("West"))]
+       latitude_orientation_choices = [("north", _("North")), ("south", _("South"))]
+       turning_speed_choices = [("fast", _("Fast")), ("slow", _("Slow")), ("fast epoch", _("Fast epoch"))]
+       
+       advanced_satlist_choices = nimmgr.satList + [
+               (3601, _('All Satellites')+' 1', 1), (3602, _('All Satellites')+' 2', 1),
+               (3603, _('All Satellites')+' 3', 1), (3604, _('All Satellites')+' 4', 1)]
+       advanced_lnb_choices = [("0", "not available")] + [(str(y), "LNB " + str(y)) for y in range(1, 33)]
+       advanced_voltage_choices = [("polarization", _("Polarization")), ("13V", _("13 V")), ("18V", _("18 V"))]
+       advanced_tonemode_choices = [("band", _("Band")), ("on", _("On")), ("off", _("Off"))]
+       advanced_lnb_toneburst_choices = [("none", _("None")), ("A", _("A")), ("B", _("B"))]
+       advanced_lnb_allsat_diseqcmode_choices = [("1_2", _("1.2"))]
+       advanced_lnb_diseqcmode_choices = [("none", _("None")), ("1_0", _("1.0")), ("1_1", _("1.1")), ("1_2", _("1.2"))]
+       advanced_lnb_commandOrder1_0_choices = [("ct", "committed, toneburst"), ("tc", "toneburst, committed")]
+       advanced_lnb_commandOrder_choices = [
+               ("ct", "committed, toneburst"), ("tc", "toneburst, committed"),
+               ("cut", "committed, uncommitted, toneburst"), ("tcu", "toneburst, committed, uncommitted"),
+               ("uct", "uncommitted, committed, toneburst"), ("tuc", "toneburst, uncommitted, commmitted")]
+       advanced_lnb_diseqc_repeat_choices = [("none", _("None")), ("one", _("One")), ("two", _("Two")), ("three", _("Three"))]
+       advanced_lnb_fast_turning_btime = mktime(datetime(1970, 1, 1, 7, 0).timetuple());
+       advanced_lnb_fast_turning_etime = mktime(datetime(1970, 1, 1, 19, 0).timetuple());
+
+       def configLOFChanged(configElement):
+               if configElement.value == "unicable":
+                       x = configElement.slot_id
+                       lnb = configElement.lnb_id
+                       nim = config.Nims[x]
+                       lnbs = nim.advanced.lnb
+                       section = lnbs[lnb]
+                       if isinstance(section.unicable, ConfigNothing):
+                               if lnb == 1:
+                                       section.unicable = ConfigSelection(unicable_choices, unicable_choices_default)
+                               elif lnb == 2:
+                                       section.unicable = ConfigSelection(choices = {"unicable_matrix": _("Unicable Martix"),"unicable_user": "Unicable "+_("User defined")}, default = "unicable_matrix")
+                               else:
+                                       section.unicable = ConfigSelection(choices = {"unicable_user": _("User defined")}, default = "unicable_user")
+
+                               def fillUnicableConf(sectionDict, unicableproducts, vco_null_check):
+                                       for y in unicableproducts:
+                                               products = unicableproducts[y].keys()
+                                               products.sort()
+                                               tmp = ConfigSubsection()
+                                               tmp.product = ConfigSelection(choices = products, default = products[0])
+                                               tmp.scr = ConfigSubDict()
+                                               tmp.vco = ConfigSubDict()
+                                               tmp.lofl = ConfigSubDict()
+                                               tmp.lofh = ConfigSubDict()
+                                               tmp.loft = ConfigSubDict()
+                                               tmp.positions = ConfigSubDict()
+                                               for z in products:
+                                                       scrlist = []
+                                                       vcolist = unicableproducts[y][z]
+                                                       tmp.vco[z] = ConfigSubList()
+                                                       for cnt in range(1,1+len(vcolist)-1):
+                                                               vcofreq = int(vcolist[cnt-1])
+                                                               if vcofreq == 0 and vco_null_check:
+                                                                       scrlist.append(("%d" %cnt,"SCR %d " %cnt +_("not used")))
+                                                               else:
+                                                                       scrlist.append(("%d" %cnt,"SCR %d" %cnt))
+                                                               tmp.vco[z].append(ConfigInteger(default=vcofreq, limits = (vcofreq, vcofreq)))
+                                                               tmp.scr[z] = ConfigSelection(choices = scrlist, default = scrlist[0][0])
+
+                                                               positions = int(vcolist[len(vcolist)-1][0])
+                                                               tmp.positions[z] = ConfigSubList()
+                                                               tmp.positions[z].append(ConfigInteger(default=positions, limits = (positions, positions)))
+
+                                                               lofl = vcolist[len(vcolist)-1][1]
+                                                               tmp.lofl[z] = ConfigSubList()
+                                                               tmp.lofl[z].append(ConfigInteger(default=lofl, limits = (lofl, lofl)))
+
+                                                               lofh = int(vcolist[len(vcolist)-1][2])
+                                                               tmp.lofh[z] = ConfigSubList()
+                                                               tmp.lofh[z].append(ConfigInteger(default=lofh, limits = (lofh, lofh)))
+
+                                                               loft = int(vcolist[len(vcolist)-1][3])
+                                                               tmp.loft[z] = ConfigSubList()
+                                                               tmp.loft[z].append(ConfigInteger(default=loft, limits = (loft, loft)))
+                                               sectionDict[y] = tmp
+
+                               if lnb < 3:
+                                       print "MATRIX"
+                                       section.unicableMatrix = ConfigSubDict()
+                                       section.unicableMatrixManufacturer = ConfigSelection(UnicableMatrixManufacturers, UnicableMatrixManufacturers[0])
+                                       fillUnicableConf(section.unicableMatrix, unicablematrixproducts, True)
+
+                               if lnb < 2:
+                                       print "LNB"
+                                       section.unicableLnb = ConfigSubDict()
+                                       section.unicableLnbManufacturer = ConfigSelection(UnicableLnbManufacturers, UnicableLnbManufacturers[0])
+                                       fillUnicableConf(section.unicableLnb, unicablelnbproducts, False)
+
+#TODO satpositions for satcruser
+                               section.satcruser = ConfigSelection(advanced_lnb_satcruser_choices, default="1")
+                               tmp = ConfigSubList()
+                               tmp.append(ConfigInteger(default=1284, limits = (950, 2150)))
+                               tmp.append(ConfigInteger(default=1400, limits = (950, 2150)))
+                               tmp.append(ConfigInteger(default=1516, limits = (950, 2150)))
+                               tmp.append(ConfigInteger(default=1632, limits = (950, 2150)))
+                               tmp.append(ConfigInteger(default=1748, limits = (950, 2150)))
+                               tmp.append(ConfigInteger(default=1864, limits = (950, 2150)))
+                               tmp.append(ConfigInteger(default=1980, limits = (950, 2150)))
+                               tmp.append(ConfigInteger(default=2096, limits = (950, 2150)))
+                               section.satcrvcouser = tmp 
+
+                               nim.advanced.unicableconnected = ConfigYesNo(default=False)
+                               nim.advanced.unicableconnectedTo = ConfigSelection([(str(id), nimmgr.getNimDescription(id)) for id in nimmgr.getNimListOfType("DVB-S") if id != x])
+       
+       def configDiSEqCModeChanged(configElement):
+               section = configElement.section
+               if configElement.value == "1_2" and isinstance(section.longitude, ConfigNothing):
+                       section.longitude = ConfigFloat(default = [5,100], limits = [(0,359),(0,999)])
+                       section.longitudeOrientation = ConfigSelection(longitude_orientation_choices, "east")
+                       section.latitude = ConfigFloat(default = [50,767], limits = [(0,359),(0,999)])
+                       section.latitudeOrientation = ConfigSelection(latitude_orientation_choices, "north")
+                       section.powerMeasurement = ConfigYesNo(default=True)
+                       section.powerThreshold = ConfigInteger(default=hw.get_device_name() == "dm8000" and 15 or 50, limits=(0, 100))
+                       section.turningSpeed = ConfigSelection(turning_speed_choices, "fast")
+                       section.fastTurningBegin = ConfigDateTime(default=advanced_lnb_fast_turning_btime, formatstring = _("%H:%M"), increment = 600)
+                       section.fastTurningEnd = ConfigDateTime(default=advanced_lnb_fast_turning_etime, formatstring = _("%H:%M"), increment = 600)
+
+       def configLNBChanged(configElement):
+               x = configElement.slot_id
+               nim = config.Nims[x]
+               if isinstance(configElement.value, tuple):
+                       lnb = int(configElement.value[0])
+               else:
+                       lnb = int(configElement.value)
+               lnbs = nim.advanced.lnb
+               if lnb and lnb not in lnbs:
+                       section = lnbs[lnb] = ConfigSubsection()
+                       section.lofl = ConfigInteger(default=9750, limits = (0, 99999))
+                       section.lofh = ConfigInteger(default=10600, limits = (0, 99999))
+                       section.threshold = ConfigInteger(default=11700, limits = (0, 99999))
+#                      section.output_12v = ConfigSelection(choices = [("0V", _("0 V")), ("12V", _("12 V"))], default="0V")
+                       section.increased_voltage = ConfigYesNo(False)
+                       section.toneburst = ConfigSelection(advanced_lnb_toneburst_choices, "none")
+                       section.longitude = ConfigNothing()
+                       if lnb > 32:
+                               tmp = ConfigSelection(advanced_lnb_allsat_diseqcmode_choices, "1_2")
+                               tmp.section = section
+                               configDiSEqCModeChanged(tmp)
+                       else:
+                               tmp = ConfigSelection(advanced_lnb_diseqcmode_choices, "none")
+                               tmp.section = section
+                               tmp.addNotifier(configDiSEqCModeChanged)
+                       section.diseqcMode = tmp
+                       section.commitedDiseqcCommand = ConfigSelection(advanced_lnb_csw_choices)
+                       section.fastDiseqc = ConfigYesNo(False)
+                       section.sequenceRepeat = ConfigYesNo(False)
+                       section.commandOrder1_0 = ConfigSelection(advanced_lnb_commandOrder1_0_choices, "ct")
+                       section.commandOrder = ConfigSelection(advanced_lnb_commandOrder_choices, "ct")
+                       section.uncommittedDiseqcCommand = ConfigSelection(advanced_lnb_ucsw_choices)
+                       section.diseqcRepeats = ConfigSelection(advanced_lnb_diseqc_repeat_choices, "none")
+                       section.prio = ConfigSelection(prio_list, "-1")
+                       section.unicable = ConfigNothing()
+                       tmp = ConfigSelection(lnb_choices, lnb_choices_default)
+                       tmp.slot_id = x
+                       tmp.lnb_id = lnb
+                       tmp.addNotifier(configLOFChanged, initial_call = False)
+                       section.lof = tmp
+
+       def configModeChanged(configMode):
+               slot_id = configMode.slot_id
+               nim = config.Nims[slot_id]
+               if configMode.value == "advanced" and isinstance(nim.advanced, ConfigNothing):
+                       # advanced config:
+                       nim.advanced = ConfigSubsection()
+                       nim.advanced.sat = ConfigSubDict()
+                       nim.advanced.sats = getConfigSatlist(192, advanced_satlist_choices)
+                       nim.advanced.lnb = ConfigSubDict()
+                       nim.advanced.lnb[0] = ConfigNothing()
+                       for x in nimmgr.satList:
+                               tmp = ConfigSubsection()
+                               tmp.voltage = ConfigSelection(advanced_voltage_choices, "polarization")
+                               tmp.tonemode = ConfigSelection(advanced_tonemode_choices, "band")
+                               tmp.usals = ConfigYesNo(True)
+                               tmp.rotorposition = ConfigInteger(default=1, limits=(1, 255))
+                               lnb = ConfigSelection(advanced_lnb_choices, "0")
+                               lnb.slot_id = slot_id
+                               lnb.addNotifier(configLNBChanged, initial_call = False)
+                               tmp.lnb = lnb
+                               nim.advanced.sat[x[0]] = tmp
+                       for x in range(3601, 3605):
+                               tmp = ConfigSubsection()
+                               tmp.voltage = ConfigSelection(advanced_voltage_choices, "polarization")
+                               tmp.tonemode = ConfigSelection(advanced_tonemode_choices, "band")
+                               tmp.usals = ConfigYesNo(default=True)
+                               tmp.rotorposition = ConfigInteger(default=1, limits=(1, 255))
+                               lnbnum = 33+x-3601
+                               lnb = ConfigSelection([("0", "not available"), (str(lnbnum), "LNB %d"%(lnbnum))], "0")
+                               lnb.slot_id = slot_id
+                               lnb.addNotifier(configLNBChanged, initial_call = False)
+                               tmp.lnb = lnb
+                               nim.advanced.sat[x] = tmp
+
+       def toneAmplitudeChanged(configElement):
+               fe_id = configElement.fe_id
+               slot_id = configElement.slot_id
+               if nimmgr.nim_slots[slot_id].description == 'Alps BSBE2':
+                       open("/proc/stb/frontend/%d/tone_amplitude" %(fe_id), "w").write(configElement.value)
+                       
+       def tunerTypeChanged(nimmgr, configElement):
+               fe_id = configElement.fe_id
+               print "tunerTypeChanged feid %d to mode %s" % (fe_id, configElement.value)
+               try:
+                       oldvalue = open("/sys/module/dvb_core/parameters/dvb_shutdown_timeout", "r").readline()
+                       open("/sys/module/dvb_core/parameters/dvb_shutdown_timeout", "w").write("0")
+               except:
+                       print "[info] no /sys/module/dvb_core/parameters/dvb_shutdown_timeout available"
+               frontend = eDVBResourceManager.getInstance().allocateRawChannel(fe_id).getFrontend()
+               frontend.closeFrontend()
+               open("/proc/stb/frontend/%d/mode" % (fe_id), "w").write(configElement.value)
+               frontend.reopenFrontend()
+               try:
+                       open("/sys/module/dvb_core/parameters/dvb_shutdown_timeout", "w").write(oldvalue)
+               except:
+                       print "[info] no /sys/module/dvb_core/parameters/dvb_shutdown_timeout available"
+               nimmgr.enumerateNIMs()
+       
+       empty_slots = 0
        for slot in nimmgr.nim_slots:
                x = slot.slot
                nim = config.Nims[x]
+               addMultiType = False
+               try:
+                       nim.multiType
+               except:
+                       addMultiType = True
+               if slot.isMultiType() and addMultiType:
+                       typeList = []
+                       for id in slot.getMultiTypeList().keys():
+                               type = slot.getMultiTypeList()[id]
+                               typeList.append((id, type))
+                       nim.multiType = ConfigSelection(typeList, "0")
+                       
+                       nim.multiType.fe_id = x - empty_slots
+                       nim.multiType.addNotifier(boundFunction(tunerTypeChanged, nimmgr))
                
+       empty_slots = 0
+       for slot in nimmgr.nim_slots:
+               x = slot.slot
+               nim = config.Nims[x]
+
                if slot.isCompatible("DVB-S"):
-                       choices = { "nothing": _("nothing connected"),
-                                       "simple": _("simple"),
-                                       "advanced": _("advanced")}
-                       if len(nimmgr.getNimListOfType(slot.type, exception = x)) > 0:
-                               choices["equal"] = _("equal to")
-                               choices["satposdepends"] = _("second cable of motorized LNB")
-                       if len(nimmgr.canConnectTo(x)) > 0:
-                               choices["loopthrough"] = _("loopthrough to")
-                       nim.configMode = ConfigSelection(choices = choices, default = "nothing")
-
-#                      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.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")
-
-                       choices = []
-                       for id in nimmgr.getNimListOfType("DVB-S"):
-                               if id != x:
-                                       choices.append((str(id), nimmgr.getNimDescription(id)))
-                       nim.connectedTo = ConfigSelection(choices = choices)
-                       nim.simpleSingleSendDiSEqC = ConfigYesNo(default=False)
-                       nim.simpleDiSEqCSetVoltageTone = ConfigYesNo(default=True)
-                       nim.simpleDiSEqCOnlyOnSatChange = ConfigYesNo(default=False)
-                       nim.diseqcA = getConfigSatlist(192, [(3601, _('nothing connected'), 1)] + nimmgr.satList)
-                       nim.diseqcB = getConfigSatlist(130, [(3601, _('nothing connected'), 1)] + nimmgr.satList)
-                       nim.diseqcC = ConfigSatlist(list = [(3601, _('nothing connected'), 1)] + nimmgr.satList)
-                       nim.diseqcD = ConfigSatlist(list = [(3601, _('nothing connected'), 1)] + nimmgr.satList)
-                       nim.positionerMode = ConfigSelection(
-                               choices = [
-                                       ("usals", _("USALS")),
-                                       ("manual", _("manual"))],
-                               default = "usals")
+                       nim.toneAmplitude = ConfigSelection([("9", "600mV"), ("8", "700mV"), ("7", "800mV"), ("6", "900mV"), ("5", "1100mV")], "7")
+                       nim.toneAmplitude.fe_id = x - empty_slots
+                       nim.toneAmplitude.slot_id = x
+                       nim.toneAmplitude.addNotifier(toneAmplitudeChanged)
+                       nim.diseqc13V = ConfigYesNo(False)
+                       nim.diseqcMode = ConfigSelection(diseqc_mode_choices, "diseqc_a_b")
+                       nim.connectedTo = ConfigSelection([(str(id), nimmgr.getNimDescription(id)) for id in nimmgr.getNimListOfType("DVB-S") if id != x])
+                       nim.simpleSingleSendDiSEqC = ConfigYesNo(False)
+                       nim.simpleDiSEqCSetVoltageTone = ConfigYesNo(True)
+                       nim.simpleDiSEqCOnlyOnSatChange = ConfigYesNo(False)
+                       nim.diseqcA = getConfigSatlist(192, diseqc_satlist_choices)
+                       nim.diseqcB = getConfigSatlist(130, diseqc_satlist_choices)
+                       nim.diseqcC = ConfigSatlist(list = diseqc_satlist_choices)
+                       nim.diseqcD = ConfigSatlist(list = diseqc_satlist_choices)
+                       nim.positionerMode = ConfigSelection(positioner_mode_choices, "usals")
                        nim.longitude = ConfigFloat(default=[5,100], limits=[(0,359),(0,999)])
-                       nim.longitudeOrientation = ConfigSelection(choices={"east": _("East"), "west": _("West")}, default = "east")
+                       nim.longitudeOrientation = ConfigSelection(longitude_orientation_choices, "east")
                        nim.latitude = ConfigFloat(default=[50,767], limits=[(0,359),(0,999)])
-                       nim.latitudeOrientation = ConfigSelection(choices={"north": _("North"), "south": _("South")}, default="north")
-                       nim.powerMeasurement = ConfigYesNo(default=True)
+                       nim.latitudeOrientation = ConfigSelection(latitude_orientation_choices, "north")
+                       nim.powerMeasurement = ConfigYesNo(True)
                        nim.powerThreshold = ConfigInteger(default=hw.get_device_name() == "dm8000" and 15 or 50, limits=(0, 100))
-                       nim.turningSpeed = ConfigSelection(choices = [("fast", _("Fast")), ("slow", _("Slow")), ("fast epoch", _("Fast epoch")) ], default = "fast")
+                       nim.turningSpeed = ConfigSelection(turning_speed_choices, "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)
-
-                       # advanced config:
-                       nim.advanced = ConfigSubsection()
-                       tmp = [(3601, _('All Satellites')+' 1', 1), (3602, _('All Satellites')+' 2', 1), (3603, _('All Satellites')+' 3', 1), (3604, _('All Satellites')+' 4', 1)]
-                       nim.advanced.sats = getConfigSatlist(192,nimmgr.satList+tmp)
-                       nim.advanced.sat = ConfigSubDict()
-                       lnbs = [("0", "not available")]
-                       for y in range(1, 33):
-                               lnbs.append((str(y), "LNB " + str(y)))
-
-                       for x in nimmgr.satList:
-                               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)
-
-                       for x in range(3601, 3605):
-                               nim.advanced.sat[x] = ConfigSubsection()
-                               nim.advanced.sat[x].voltage = ConfigSelection(choices={"polarization": _("Polarization"), "13V": _("13 V"), "18V": _("18 V")}, default = "polarization")
-                               nim.advanced.sat[x].tonemode = ConfigSelection(choices={"band": _("Band"), "on": _("On"), "off": _("Off")}, default = "band")
-                               nim.advanced.sat[x].usals = ConfigYesNo(default=True)
-                               nim.advanced.sat[x].rotorposition = ConfigInteger(default=1, limits=(1, 255))
-                               lnbnum = 33+x-3601
-                               nim.advanced.sat[x].lnb = ConfigSelection(choices = [("0", "not available"), (str(lnbnum), "LNB %d"%(lnbnum))], default="0")
-
-                       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 = [("0", _("None"))]
-                       for y in range(1, 17):
-                               ucsw.append((str(y), "Input " + str(y)))
-
-                       nim.advanced.lnb = ConfigSubList()
-                       nim.advanced.lnb.append(ConfigNothing())
-                       for x in range(1, 37):
-                               nim.advanced.lnb.append(ConfigSubsection())
-                               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")
-                               if x > 32:
-                                       nim.advanced.lnb[x].diseqcMode = ConfigSelection(choices = [("1_2", _("1.2"))], default = "1_2")
-                               else:
-                                       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=hw.get_device_name() == "dm8000" and 15 or 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)
+                       config_mode_choices = [ ("nothing", _("nothing connected")),
+                               ("simple", _("simple")), ("advanced", _("advanced"))]
+                       if len(nimmgr.getNimListOfType(slot.type, exception = x)) > 0:
+                               config_mode_choices.append(("equal", _("equal to")))
+                               config_mode_choices.append(("satposdepends", _("second cable of motorized LNB")))
+                       if len(nimmgr.canConnectTo(x)) > 0:
+                               config_mode_choices.append(("loopthrough", _("loopthrough to")))
+                       nim.advanced = ConfigNothing()
+                       tmp = ConfigSelection(config_mode_choices, "nothing")
+                       tmp.slot_id = x
+                       tmp.addNotifier(configModeChanged, initial_call = False)
+                       nim.configMode = tmp
                elif slot.isCompatible("DVB-C"):
                        nim.configMode = ConfigSelection(
                                choices = {
@@ -1063,6 +1430,7 @@ def InitNimManager(nimmgr):
                        nim.terrestrial = ConfigSelection(choices = list)
                        nim.terrestrial_5V = ConfigOnOff()
                else:
+                       empty_slots += 1
                        nim.configMode = ConfigSelection(choices = { "nothing": _("disabled") }, default="nothing");
                        if slot.type is not None:
                                print "pls add support for this frontend type!", slot.type