Merge branch 'master' of git.opendreambox.org:/git/enigma2

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

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index c5a294edba797ebbfbc1c7a5287dbe836b04863c..c5b2f8db4aa9b2be37d6a8b0c4d55273f9d14ca3 100644 (file)
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -1,3 +1,5 @@
+from Tools.HardwareInfo import HardwareInfo
+

 from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, \
        ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, ConfigNothing, \
        ConfigSubDict, ConfigOnOff, ConfigDateTime
 from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, \
        ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, ConfigNothing, \
        ConfigSubDict, ConfigOnOff, ConfigDateTime


@@ -12,8 +14,6 @@ from enigma import eDVBSatelliteEquipmentControl as secClass, \
 from time import localtime, mktime
 from datetime import datetime
 
 from time import localtime, mktime
 from datetime import datetime
 

-from sets import Set
-

 def getConfigSatlist(orbpos, satlist):
        default_orbpos = None
        for x in satlist:
 def getConfigSatlist(orbpos, satlist):
        default_orbpos = None
        for x in satlist:


@@ -37,8 +37,8 @@ class SecConfigure:
                sec.addSatellite(orbpos)
                self.configuredSatellites.add(orbpos)
 
                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):
-               if orbpos is None:
+       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
                sec.addLNB()
                        return
                #simple defaults
                sec.addLNB()


@@ -49,15 +49,15 @@ class SecConfigure:
                elif self.linked.has_key(slotid):
                        for slot in self.linked[slotid]:
                                tunermask |= (1 << slot)
                elif 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)
                sec.setLNBIncreasedVoltage(lnbParam.OFF)
                sec.setRepeats(0)
                sec.setLNBLOFL(9750000)
                sec.setLNBLOFH(10600000)
                sec.setLNBThreshold(11700000)
                sec.setLNBIncreasedVoltage(lnbParam.OFF)
                sec.setRepeats(0)

-               sec.setFastDiSEqC(0)
+               sec.setFastDiSEqC(fastDiSEqC)

                sec.setSeqRepeat(0)
                sec.setSeqRepeat(0)

-               sec.setVoltageMode(switchParam.HV)
-               sec.setToneMode(switchParam.HILO)

                sec.setCommandOrder(0)
 
                #user values
                sec.setCommandOrder(0)
 
                #user values


@@ -69,9 +69,19 @@ class SecConfigure:
 
                if 0 <= diseqcmode < 3:
                        self.addSatellite(sec, orbpos)
 
                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):
                elif (diseqcmode == 3): # diseqc 1.2
                        if self.satposdepends.has_key(slotid):

-                               tunermask |= (1 << self.satposdepends[slotid])
+                               for slot in self.satposdepends[slotid]:
+                                       tunermask |= (1 << slot)

                        sec.setLatitude(latitude)
                        sec.setLaDirection(laDirection)
                        sec.setLongitude(longitude)
                        sec.setLatitude(latitude)
                        sec.setLaDirection(laDirection)
                        sec.setLongitude(longitude)


@@ -83,8 +93,11 @@ class SecConfigure:
                        for x in self.NimManager.satList:
                                print "Add sat " + str(x[0])
                                self.addSatellite(sec, int(x[0]))
                        for x in self.NimManager.satList:
                                print "Add sat " + str(x[0])
                                self.addSatellite(sec, int(x[0]))

-                               sec.setVoltageMode(0)
-                               sec.setToneMode(0)
+                               if diseqc13V:
+                                       sec.setVoltageMode(switchParam.HV_13)
+                               else:
+                                       sec.setVoltageMode(switchParam.HV)
+                               sec.setToneMode(switchParam.HILO)

                                sec.setRotorPosNum(0) # USALS
                
                sec.setLNBSlotMask(tunermask)
                                sec.setRotorPosNum(0) # USALS
                
                sec.setLNBSlotMask(tunermask)


@@ -99,7 +112,7 @@ class SecConfigure:
                
        def getRoot(self, slotid, connto):
                visited = []
                
        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
                        connto = int(self.NimManager.getNimConfig(connto).connectedTo.value)
                        if connto in visited: # prevent endless loop
                                return slotid


@@ -108,7 +121,7 @@ class SecConfigure:
 
        def update(self):
                sec = secClass.getInstance()
 
        def update(self):
                sec = secClass.getInstance()

-               self.configuredSatellites = Set()
+               self.configuredSatellites = set()

                sec.clear() ## this do unlinking NIMs too !!
                print "sec config cleared"
 
                sec.clear() ## this do unlinking NIMs too !!
                print "sec config cleared"
 


@@ -122,7 +135,7 @@ class SecConfigure:
 
                for slot in nim_slots:
                        if slot.type is not None:
 
                for slot in nim_slots:
                        if slot.type is not None:

-                               used_nim_slots.append((slot.slot, slot.description, slot.config.configMode.value != "nothing" and True or False))
+                               used_nim_slots.append((slot.slot, slot.description, slot.config.configMode.value != "nothing" and True or False, slot.isCompatible("DVB-S2")))

                eDVBResourceManager.getInstance().setFrontendSlotInformations(used_nim_slots)
 
                for slot in nim_slots:
                eDVBResourceManager.getInstance().setFrontendSlotInformations(used_nim_slots)
 
                for slot in nim_slots:


@@ -148,34 +161,41 @@ class SecConfigure:
                                        if not self.satposdepends.has_key(connto):
                                                self.satposdepends[connto] = []
                                        self.satposdepends[connto].append(x)
                                        if not self.satposdepends.has_key(connto):
                                                self.satposdepends[connto] = []
                                        self.satposdepends[connto].append(x)

-                                       

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

+                       hw = HardwareInfo()

                        if slot.isCompatible("DVB-S"):
                                print "slot: " + str(x) + " configmode: " + str(nim.configMode.value)
                        if slot.isCompatible("DVB-S"):
                                print "slot: " + str(x) + " configmode: " + str(nim.configMode.value)

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

                                        pass
                                else:
                                        sec.setSlotNotLinked(x)
                                        if nim.configMode.value == "equal":
                                                pass
                                        elif nim.configMode.value == "simple":          #simple config
                                        pass
                                else:
                                        sec.setSlotNotLinked(x)
                                        if nim.configMode.value == "equal":
                                                pass
                                        elif nim.configMode.value == "simple":          #simple config

+                                               print "diseqcmode: ", nim.diseqcMode.value

                                                if nim.diseqcMode.value == "single":                    #single
                                                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)
+                                                       if nim.simpleSingleSendDiSEqC.value:
+                                                               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, diseqc13V = nim.diseqc13V.value)

                                                elif nim.diseqcMode.value == "toneburst_a_b":           #Toneburst A/B
                                                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
                                                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)
+                                                       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, 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
                                                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)
+                                                       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, 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
                                                elif nim.diseqcMode.value == "positioner":              #Positioner
                                                        if nim.latitudeOrientation.value == "north":
                                                                laValue = rotorParam.NORTH


@@ -185,12 +205,11 @@ class SecConfigure:
                                                                loValue = rotorParam.EAST
                                                        else:
                                                                loValue = rotorParam.WEST
                                                                loValue = rotorParam.EAST
                                                        else:
                                                                loValue = rotorParam.WEST

-                                                       inputPowerDelta=50
+                                                       inputPowerDelta=nim.powerThreshold.value

                                                        useInputPower=False
                                                        turning_speed=0
                                                        if nim.powerMeasurement.value:
                                                                useInputPower=True
                                                        useInputPower=False
                                                        turning_speed=0
                                                        if nim.powerMeasurement.value:
                                                                useInputPower=True

-                                                               inputPowerDelta=nim.powerThreshold.value

                                                                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]
                                                                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]


@@ -206,25 +225,39 @@ class SecConfigure:
                                                                laDirection = laValue,
                                                                turningSpeed = turning_speed,
                                                                useInputPower = useInputPower,
                                                                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):
                lnbSat = {}
                                        elif nim.configMode.value == "advanced": #advanced config
                                                self.updateAdvanced(sec, x)
                print "sec config completed"
 
        def updateAdvanced(self, sec, slotid):
                lnbSat = {}

-               for x in range(1,33):
+               for x in range(1,37):

                        lnbSat[x] = []
                        lnbSat[x] = []

+
+               #wildcard for all satellites ( for rotor )
+               for x in range(3601, 3605):
+                       lnb = int(config.Nims[slotid].advanced.sat[x].lnb.value)
+                       if lnb != 0:
+                               for x in self.NimManager.satList:
+                                       print "add", x[0], "to", lnb
+                                       lnbSat[lnb].append(x[0])
+

                for x in self.NimManager.satList:
                        lnb = int(config.Nims[slotid].advanced.sat[x[0]].lnb.value)
                        if lnb != 0:
                                print "add", x[0], "to", lnb
                                lnbSat[lnb].append(x[0])
                for x in self.NimManager.satList:
                        lnb = int(config.Nims[slotid].advanced.sat[x[0]].lnb.value)
                        if lnb != 0:
                                print "add", x[0], "to", lnb
                                lnbSat[lnb].append(x[0])

-               for x in range(1,33):
+
+               for x in range(1,37):

                        if len(lnbSat[x]) > 0:
                                currLnb = config.Nims[slotid].advanced.lnb[x]
                                sec.addLNB()
 
                        if len(lnbSat[x]) > 0:
                                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 << slotid
                                if self.equal.has_key(slotid):
                                        for slot in self.equal[slotid]:


@@ -233,10 +266,32 @@ class SecConfigure:
                                        for slot in self.linked[slotid]:
                                                tunermask |= (1 << slot)
 
                                        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)
                                if currLnb.lof.value == "universal_lnb":
                                        sec.setLNBLOFL(9750000)
                                        sec.setLNBLOFH(10600000)
                                        sec.setLNBThreshold(11700000)

+                               elif currLnb.lof.value == "unicable":
+                                       sec.setLNBLOFL(9750000)
+                                       sec.setLNBLOFH(10600000)
+                                       sec.setLNBThreshold(11700000)
+                                       if currLnb.unicable.value == "unicable_user":
+                                               sec.setLNBSatCR(currLnb.satcruser.index)
+                                               sec.setLNBSatCRvco(currLnb.satcrvcouser[currLnb.satcruser.index].value*1000)
+                                       elif currLnb.unicable.value == "unicable_matrix":
+                                               manufacturer_name = currLnb.unicableMatrixManufacturer.value
+                                               manufacturer = currLnb.unicableMatrix[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)
+                                       elif currLnb.unicable.value == "unicable_lnb":
+                                               manufacturer_name = currLnb.unicableLnbManufacturer.value
+                                               manufacturer = currLnb.unicableLnb[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)

                                elif currLnb.lof.value == "c_band":
                                        sec.setLNBLOFL(5150000)
                                        sec.setLNBLOFH(5150000)
                                elif currLnb.lof.value == "c_band":
                                        sec.setLNBLOFL(5150000)
                                        sec.setLNBLOFH(5150000)


@@ -266,8 +321,9 @@ class SecConfigure:
                                elif dm == "1_2":
                                        sec.setDiSEqCMode(diseqcParam.V1_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])
+                                       if self.satposdepends.has_key(slotid):
+                                               for slot in self.satposdepends[slotid]:
+                                                       tunermask |= (1 << slot)

 
                                if dm != "none":
                                        if currLnb.toneburst.value == "none":
 
                                if dm != "none":
                                        if currLnb.toneburst.value == "none":


@@ -333,57 +389,65 @@ class SecConfigure:
                                        else:
                                                sec.setLoDirection(rotorParam.WEST)
 
                                        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:
                                        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.setLNBSlotMask(tunermask)
 

+                               sec.setLNBPrio(int(currLnb.prio.value))
+

                                # finally add the orbital positions
                                for y in lnbSat[x]:
                                        self.addSatellite(sec, y)
                                # finally add the orbital positions
                                for y in lnbSat[x]:
                                        self.addSatellite(sec, y)

-                                       currSat = config.Nims[slotid].advanced.sat[y]
-
+                                       if x > 32:
+                                               satpos = x > 32 and (3604-(36 - x)) or y
+                                       else:
+                                               satpos = y
+                                       currSat = config.Nims[slotid].advanced.sat[satpos]

                                        if currSat.voltage.value == "polarization":
                                        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":
                                                sec.setVoltageMode(switchParam._18V)
                                        elif currSat.voltage.value == "13V":
                                                sec.setVoltageMode(switchParam._14V)
                                        elif currSat.voltage.value == "18V":
                                                sec.setVoltageMode(switchParam._18V)

-                                               
-                                       if currSat.tonemode == "band":
+
+                                       if currSat.tonemode.value == "band":

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

-                                       elif currSat.tonemode == "on":
+                                       elif currSat.tonemode.value == "on":

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

-                                       elif currSat.tonemode == "off":
+                                       elif currSat.tonemode.value == "off":

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

-                                       if not currSat.usals.value:
+                                       if not currSat.usals.value and x < 34:

                                                sec.setRotorPosNum(currSat.rotorposition.value)
                                        else:
                                                sec.setRotorPosNum(0) #USALS
 
        def __init__(self, nimmgr):
                self.NimManager = nimmgr
                                                sec.setRotorPosNum(currSat.rotorposition.value)
                                        else:
                                                sec.setRotorPosNum(0) #USALS
 
        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):
                self.slot = slot
 
                self.update()
 
 class NIM(object):
        def __init__(self, slot, type, description, has_outputs = True, internally_connectable = None):
                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
 
                        print "warning: unknown NIM type %s, not using." % type
                        type = None
 


@@ -394,20 +458,20 @@ class NIM(object):
 
        def isCompatible(self, what):
                compatible = {
 
        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 connectableTo(self):
                connectable = {
                        }
                return what in compatible[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]
 
                        }
                return connectable[self.type]
 


@@ -642,7 +706,7 @@ class NimManager:
        
        def canEqualTo(self, slotid):
                type = self.getNimType(slotid)
        
        def canEqualTo(self, slotid):
                type = self.getNimType(slotid)

-               if self.getNimConfig(slotid) == "DVB-S2":
+               if type == "DVB-S2":

                        type = "DVB-S"
                nimList = self.getNimListOfType(type, slotid)
                for nim in nimList[:]:
                        type = "DVB-S"
                nimList = self.getNimListOfType(type, slotid)
                for nim in nimList[:]:


@@ -650,16 +714,30 @@ class NimManager:
                        if mode.configMode.value == "loopthrough" or mode.configMode.value == "satposdepends":
                                nimList.remove(nim)
                return nimList
                        if mode.configMode.value == "loopthrough" or mode.configMode.value == "satposdepends":
                                nimList.remove(nim)
                return nimList

-       
+

        def canDependOn(self, slotid):
                type = self.getNimType(slotid)
        def canDependOn(self, slotid):
                type = self.getNimType(slotid)

-               if self.getNimConfig(slotid) == "DVB-S2":
+               if type == "DVB-S2":

                        type = "DVB-S"
                nimList = self.getNimListOfType(type, slotid)
                positionerList = []
                for nim in nimList[:]:
                        mode = self.getNimConfig(nim)
                        type = "DVB-S"
                nimList = self.getNimListOfType(type, slotid)
                positionerList = []
                for nim in nimList[:]:
                        mode = self.getNimConfig(nim)

-                       if mode.configMode.value == "simple" and mode.diseqcMode.value == "positioner":
+                       nimHaveRotor = mode.configMode.value == "simple" and mode.diseqcMode.value == "positioner"
+                       if not nimHaveRotor and mode.configMode.value == "advanced":
+                               for x in range(3601, 3605):
+                                       lnb = int(mode.advanced.sat[x].lnb.value)
+                                       if lnb != 0:
+                                               nimHaveRotor = True
+                                               break
+                               if not nimHaveRotor:
+                                       for sat in mode.advanced.sat.values():
+                                               lnb_num = int(sat.lnb.value)
+                                               diseqcmode = lnb_num and mode.advanced.lnb[lnb_num].diseqcMode.value or ""
+                                               if diseqcmode == "1_2":
+                                                       nimHaveRotor = True
+                                                       break
+                       if nimHaveRotor:

                                alreadyConnected = False
                                for testnim in nimList:
                                        testmode = self.getNimConfig(testnim)
                                alreadyConnected = False
                                for testnim in nimList:
                                        testmode = self.getNimConfig(testnim)


@@ -672,6 +750,12 @@ class NimManager:
        
        def getNimConfig(self, slotid):
                return config.Nims[slotid]
        
        def getNimConfig(self, slotid):
                return config.Nims[slotid]

+       
+       def getSatName(self, pos):
+               for sat in self.satList:
+                       if sat[0] == pos:
+                               return sat[1]
+               return _("N/A")

 
        def getSatList(self):
                return self.satList
 
        def getSatList(self):
                return self.satList


@@ -679,40 +763,53 @@ class NimManager:
        def getSatListForNim(self, slotid):
                list = []
                if self.nim_slots[slotid].isCompatible("DVB-S"):
        def getSatListForNim(self, slotid):
                list = []
                if self.nim_slots[slotid].isCompatible("DVB-S"):

+                       nim = config.Nims[slotid]

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

-                       configMode = config.Nims[slotid].configMode.value
+                       configMode = nim.configMode.value

 
                        if configMode == "equal":
 
                        if configMode == "equal":

-                               slotid=0 #FIXME add handling for more than two tuners !!!
-                               configMode = config.Nims[slotid].configMode.value
+                               slotid = int(nim.connectedTo.value)
+                               nim = config.Nims[slotid]
+                               configMode = nim.configMode.value
+                       elif configMode == "loopthrough":
+                               slotid = self.sec.getRoot(slotid, int(nim.connectedTo.value))
+                               nim = config.Nims[slotid]
+                               configMode = nim.configMode.value

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

-                               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])
+                               dm = nim.diseqcMode.value
+                               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 nim.diseqcB.orbital_position != 3601:
+                                               list.append(self.satList[nim.diseqcB.index-1])

                                if dm == "diseqc_a_b_c_d":
                                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 nim.diseqcC.orbital_position != 3601:
+                                               list.append(self.satList[nim.diseqcC.index-1])
+                                       if nim.diseqcD.orbital_position != 3601:
+                                               list.append(self.satList[nim.diseqcD.index-1])

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

-                               for x in self.satList:
-                                       if int(config.Nims[slotid].advanced.sat[x[0]].lnb.value) != 0:
-                                               list.append(x)
-               
+                               for x in range(3601, 3605):
+                                       if int(nim.advanced.sat[x].lnb.value) != 0:
+                                               for x in self.satList:
+                                                       list.append(x)
+                               if not list:
+                                       for x in self.satList:
+                                               if int(nim.advanced.sat[x[0]].lnb.value) != 0:
+                                                       list.append(x)

                return list
 
        def getRotorSatListForNim(self, slotid):
                list = []
                if self.nim_slots[slotid].isCompatible("DVB-S"):
                        #print "slotid:", slotid
                return list
 
        def getRotorSatListForNim(self, slotid):
                list = []
                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
                        configMode = config.Nims[slotid].configMode.value
                        #print "self.satellites:", self.satList[config.Nims[slotid].diseqcA.value]
                        #print "diseqcA:", config.Nims[slotid].diseqcA.value
                        configMode = config.Nims[slotid].configMode.value


@@ -721,21 +818,30 @@ class NimManager:
                                        for x in self.satList:
                                                list.append(x)
                        elif configMode == "advanced":
                                        for x in self.satList:
                                                list.append(x)
                        elif configMode == "advanced":

-                               for x in self.satList:
-                                       nim = config.Nims[slotid]
-                                       lnbnum = int(nim.advanced.sat[x[0]].lnb.value)
-                                       if lnbnum != 0:
-                                               lnb = nim.advanced.lnb[lnbnum]
-                                               if lnb.diseqcMode.value == "1_2":
+                               nim = config.Nims[slotid]
+                               for x in range(3601, 3605):
+                                       if int(nim.advanced.sat[x].lnb.value) != 0:
+                                               for x in self.satList:

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

+                               if not list:
+                                       for x in self.satList:
+                                               lnbnum = int(nim.advanced.sat[x[0]].lnb.value)
+                                               if lnbnum != 0:
+                                                       lnb = nim.advanced.lnb[lnbnum]
+                                                       if lnb.diseqcMode.value == "1_2":
+                                                               list.append(x)

                return list
 
 def InitSecParams():
        config.sec = ConfigSubsection()
 
                return list
 
 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))
 
        x = ConfigInteger(default=10, limits = (0, 9999))
        x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_FINAL_VOLTAGE_CHANGE, configElement.value))


@@ -753,6 +859,10 @@ def InitSecParams():
        x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_TONEBURST, configElement.value))
        config.sec.delay_after_toneburst = x
 
        x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_TONEBURST, configElement.value))
        config.sec.delay_after_toneburst = x
 

+       x = ConfigInteger(default=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
+

        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=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


@@ -761,7 +871,7 @@ def InitSecParams():
        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.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 = ConfigInteger(default=500, 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.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
 


@@ -769,14 +879,18 @@ def InitSecParams():
        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.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 = ConfigInteger(default=500, 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.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 = ConfigInteger(default=500, 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.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=70, limits = (0, 9999))
+       x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_BEFORE_SEQUENCE_REPEAT, configElement.value))
+       config.sec.delay_before_sequence_repeat = x
+

        x = ConfigInteger(default=360, limits = (0, 9999))
        x.addNotifier(lambda configElement: secClass.setParam(secClass.MOTOR_RUNNING_TIMEOUT, configElement.value))
        config.sec.motor_running_timeout = x
        x = ConfigInteger(default=360, limits = (0, 9999))
        x.addNotifier(lambda configElement: secClass.setParam(secClass.MOTOR_RUNNING_TIMEOUT, configElement.value))
        config.sec.motor_running_timeout = x


@@ -785,9 +899,13 @@ def InitSecParams():
        x.addNotifier(lambda configElement: secClass.setParam(secClass.MOTOR_COMMAND_RETRIES, configElement.value))
        config.sec.motor_command_retries = x
 
        x.addNotifier(lambda configElement: secClass.setParam(secClass.MOTOR_COMMAND_RETRIES, configElement.value))
        config.sec.motor_command_retries = x
 

-       x = ConfigInteger(default=20, limits = (0, 9999))
-       x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_SWITCH_CMDS, configElement.value))
-       config.sec.delay_after_change_voltage_before_switch_command = x
+       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
 
 # 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


@@ -797,138 +915,318 @@ def InitSecParams():
 
 def InitNimManager(nimmgr):
        InitSecParams()
 
 def InitNimManager(nimmgr):
        InitSecParams()

+       hw = HardwareInfo()

 
        config.Nims = ConfigSubList()
        for x in range(len(nimmgr.nim_slots)):
                config.Nims.append(ConfigSubsection())
 
 
        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 = {
+               "Humax": {"150 SCR":("1210","1420","1680","2040")},
+               "Inverto": {"IDLP-40UNIQD+S":("1680","1420","2040","1210")},
+               "Kathrein": {"UAS481":("1400","1516","1632","1748")},
+               "Kreiling": {"KR1440":("1680","1420","2040","1210")},
+               "Radix": {"Unicable LNB":("1680","1420","2040","1210")},
+               "Wisi": {"OC 05":("1210","1420","1680","2040")}}
+       UnicableLnbManufacturers = unicablelnbproducts.keys()
+       UnicableLnbManufacturers.sort()
+
+       unicablematrixproducts = {
+               "Ankaro": {
+                       "UCS 51440":("1400","1632","1284","1516"),
+                       "UCS 51820":("1400","1632","1284","1516","1864","2096","1748","1980"),
+                       "UCS 51840":("1400","1632","1284","1516","1864","2096","1748","1980"),
+                       "UCS 52240":("1400","1632"),
+                       "UCS 52420":("1400","1632","1284","1516"),
+                       "UCS 52440":("1400","1632","1284","1516"),
+                       "UCS 91440":("1400","1632","1284","1516"),
+                       "UCS 91820":("1400","1632","1284","1516","1864","2096","1748","1980"),
+                       "UCS 91840":("1400","1632","1284","1516","1864","2096","1748","1980"),
+                       "UCS 92240":("1400","1632"),
+                       "UCS 92420":("1400","1632","1284","1516"),
+                       "UCS 92440":("1400","1632","1284","1516")},
+               "DCT Delta": {
+                       "SUM518":("1284","1400","1516","1632","1748","1864","1980","2096"),
+                       "SUM918":("1284","1400","1516","1632","1748","1864","1980","2096"),
+                       "SUM928":("1284","1400","1516","1632","1748","1864","1980","2096")},
+               "Inverto": {
+                       "IDLP-UST11O-CUO1O-8PP":("1076","1178","1280","1382","1484","1586","1688","1790")},
+               "Kathrein": {
+                       "EXR501":("1400","1516","1632","1748"),
+                       "EXR551":("1400","1516","1632","1748"),
+                       "EXR552":("1400","1516")},
+               "ROTEK": {
+                       "EKL2/1":("1400","1516"),
+                       "EKL2/1E":("0","0","1632","1748")},
+               "Smart": {
+                       "DPA 51":("1284","1400","1516","1632","1748","1864","1980","2096")},
+               "Technisat": {
+                       "TechniRouter 5/1x8 G":("1284","1400","1516","1632","1748","1864","1980","2096"),
+                       "TechniRouter 5/1x8 K":("1284","1400","1516","1632","1748","1864","1980","2096"),
+                       "TechniRouter 5/2x4 G":("1284","1400","1516","1632"),
+                       "TechniRouter 5/2x4 K":("1284","1400","1516","1632")},
+               "Telstar": {
+                       "SCR 5/1x8 G":("1284","1400","1516","1632","1748","1864","1980","2096"),
+                       "SCR 5/1x8 K":("1284","1400","1516","1632","1748","1864","1980","2096"),
+                       "SCR 5/2x4 G":("1284","1400","1516","1632"),
+                       "SCR 5/2x4 K":("1284","1400","1516","1632")}}
+       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")
+
+                               if lnb < 3:
+                                       section.unicableMatrix = ConfigSubDict()
+                                       section.unicableMatrixManufacturer = ConfigSelection(choices = UnicableMatrixManufacturers, default = UnicableMatrixManufacturers[0])
+                                       for y in unicablematrixproducts:
+                                               products = unicablematrixproducts[y].keys()
+                                               products.sort()
+                                               tmp = ConfigSubsection()
+                                               tmp.product = ConfigSelection(choices = products, default = products[0])
+                                               tmp.scr = ConfigSubDict()
+                                               tmp.vco = ConfigSubDict()
+                                               for z in products:
+                                                       scrlist = []
+                                                       vcolist = unicablematrixproducts[y][z]
+                                                       tmp.vco[z] = ConfigSubList()
+                                                       for cnt in range(1,1+len(vcolist)):
+                                                               vcofreq = int(vcolist[cnt-1])
+                                                               if vcofreq == 0:
+                                                                       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])
+                                               section.unicableMatrix[y] = tmp
+
+                               if lnb < 2:
+                                       section.unicableLnb = ConfigSubDict()
+                                       section.unicableLnbManufacturer = ConfigSelection(UnicableLnbManufacturers, UnicableLnbManufacturers[0])
+                                       for y in unicablelnbproducts:
+                                               products = unicablelnbproducts[y].keys()
+                                               products.sort()
+                                               tmp = ConfigSubsection()
+                                               tmp.product = ConfigSelection(choices = products, default = products[0])
+                                               tmp.scr = ConfigSubDict()
+                                               tmp.vco = ConfigSubDict()
+                                               for z in products:
+                                                       scrlist = []
+                                                       vcolist = unicablelnbproducts[y][z]
+                                                       tmp.vco[z] = ConfigSubList()
+                                                       for cnt in range(1,1+len(vcolist)):
+                                                               scrlist.append(("%d" %cnt,"SCR %d" %cnt))
+                                                               vcofreq = int(vcolist[cnt-1])
+                                                               tmp.vco[z].append(ConfigInteger(default=vcofreq, limits = (vcofreq, vcofreq)))
+                                                       tmp.scr[z] = ConfigSelection(choices = scrlist, default = scrlist[0][0])
+                                               section.unicableLnb[y] = tmp
+
+                               section.satcruser = ConfigSelection(advanced_lnb_satcruser_choices, default="1")
+                               tmp = ConfigSubList()
+                               tmp.append(ConfigInteger(default=1284, limits = (0, 9999)))
+                               tmp.append(ConfigInteger(default=1400, limits = (0, 9999)))
+                               tmp.append(ConfigInteger(default=1516, limits = (0, 9999)))
+                               tmp.append(ConfigInteger(default=1632, limits = (0, 9999)))
+                               tmp.append(ConfigInteger(default=1748, limits = (0, 9999)))
+                               tmp.append(ConfigInteger(default=1864, limits = (0, 9999)))
+                               tmp.append(ConfigInteger(default=1980, limits = (0, 9999)))
+                               tmp.append(ConfigInteger(default=2096, limits = (0, 9999)))
+                               section.satcrvcouser = tmp 
+
+       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
+

        for slot in nimmgr.nim_slots:
                x = slot.slot
                nim = config.Nims[x]
        for slot in nimmgr.nim_slots:
                x = slot.slot
                nim = config.Nims[x]

-               

                if slot.isCompatible("DVB-S"):
                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")
-
-                       #important - check if just the 2nd one is LT only and the first one is DVB-S
-                       # 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
-                       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.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.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.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.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.powerThreshold = ConfigInteger(default=50, limits=(0, 100))
-                       nim.turningSpeed = ConfigSelection(choices = [("fast", _("Fast")), ("slow", _("Slow")), ("fast epoch", _("Fast epoch")) ], default = "fast")
+                       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(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)
                        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()
-                       nim.advanced.sats = getConfigSatlist(192,nimmgr.satList)
-                       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)
-
-                       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, 33):
-                               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")
-                               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)
+                       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 = {
                elif slot.isCompatible("DVB-C"):
                        nim.configMode = ConfigSelection(
                                choices = {


@@ -985,7 +1283,8 @@ def InitNimManager(nimmgr):
                        nim.terrestrial_5V = ConfigOnOff()
                else:
                        nim.configMode = ConfigSelection(choices = { "nothing": _("disabled") }, default="nothing");
                        nim.terrestrial_5V = ConfigOnOff()
                else:
                        nim.configMode = ConfigSelection(choices = { "nothing": _("disabled") }, default="nothing");

-                       print "pls add support for this frontend type!"         
+                       if slot.type is not None:
+                               print "pls add support for this frontend type!", slot.type

 #                      assert False
 
        nimmgr.sec = SecConfigure(nimmgr)
 #                      assert False
 
        nimmgr.sec = SecConfigure(nimmgr)