"finished" message also when skipping configuration backup

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

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index a63a9c83e5f095ac99cf6b335b39ceb64280c6d1..168962e97e395585b0005989a6fbe7a5f4b79e3d 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


@@ -37,25 +39,25 @@ 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()
                tunermask = 1 << slotid
                if self.equal.has_key(slotid):
                        return
                #simple defaults
                sec.addLNB()
                tunermask = 1 << slotid
                if self.equal.has_key(slotid):

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

                elif self.linked.has_key(slotid):
                elif self.linked.has_key(slotid):

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

                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


@@ -67,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)


@@ -81,10 +93,13 @@ 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.setRotorPosNum(0) # USALS

-
+               

                sec.setLNBSlotMask(tunermask)
 
        def setSatposDepends(self, sec, nim1, nim2):
                sec.setLNBSlotMask(tunermask)
 
        def setSatposDepends(self, sec, nim1, nim2):


@@ -94,6 +109,15 @@ class SecConfigure:
        def linkNIMs(self, sec, nim1, nim2):
                print "link tuner", nim1, "to tuner", nim2
                sec.setTunerLinked(nim1, nim2)
        def linkNIMs(self, sec, nim1, nim2):
                print "link tuner", nim1, "to tuner", nim2
                sec.setTunerLinked(nim1, nim2)

+               
+       def getRoot(self, slotid, connto):
+               visited = []
+               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
+                       visited.append(connto)
+               return connto

 
        def update(self):
                sec = secClass.getInstance()
 
        def update(self):
                sec = secClass.getInstance()


@@ -111,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:


@@ -121,20 +145,29 @@ class SecConfigure:
                                # save what nim we link to/are equal to/satposdepends to.
                                # this is stored in the *value* (not index!) of the config list
                                if nim.configMode.value == "equal":
                                # save what nim we link to/are equal to/satposdepends to.
                                # this is stored in the *value* (not index!) of the config list
                                if nim.configMode.value == "equal":

-                                       self.equal[int(nim.equalTo.value)]=x
+                                       connto = self.getRoot(x, int(nim.connectedTo.value))
+                                       if not self.equal.has_key(connto):
+                                               self.equal[connto] = []
+                                       self.equal[connto].append(x)

                                elif nim.configMode.value == "loopthrough":
                                elif nim.configMode.value == "loopthrough":

-                                       self.linkNIMs(sec, x, int(nim.linkedTo.value))
-                                       self.linked[int(nim.linkedTo.value)]=x
+                                       self.linkNIMs(sec, x, int(nim.connectedTo.value))
+                                       connto = self.getRoot(x, int(nim.connectedTo.value))
+                                       if not self.linked.has_key(connto):
+                                               self.linked[connto] = []
+                                       self.linked[connto].append(x)

                                elif nim.configMode.value == "satposdepends":
                                elif nim.configMode.value == "satposdepends":

-                                       self.setSatposDepends(sec, x, int(nim.satposDependsTo.value))
-                                       self.satposdepends[int(nim.satposDependsTo.value)]=x
+                                       self.setSatposDepends(sec, x, int(nim.connectedTo.value))
+                                       connto = self.getRoot(x, int(nim.connectedTo.value))
+                                       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.configMode.value

                                if nim.configMode.value in [ "loopthrough", "satposdepends", "nothing" ]:
                                        pass
                                else:
                                if nim.configMode.value in [ "loopthrough", "satposdepends", "nothing" ]:
                                        pass
                                else:


@@ -142,19 +175,27 @@ class SecConfigure:
                                        if nim.configMode.value == "equal":
                                                pass
                                        elif nim.configMode.value == "simple":          #simple config
                                        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


@@ -164,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]


@@ -185,30 +225,43 @@ 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()
 
                                tunermask = 1 << slotid
                                if self.equal.has_key(slotid):
                        if len(lnbSat[x]) > 0:
                                currLnb = config.Nims[slotid].advanced.lnb[x]
                                sec.addLNB()
 
                                tunermask = 1 << slotid
                                if self.equal.has_key(slotid):

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

                                elif self.linked.has_key(slotid):
                                elif self.linked.has_key(slotid):

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

 
                                if currLnb.lof.value == "universal_lnb":
                                        sec.setLNBLOFL(9750000)
 
                                if currLnb.lof.value == "universal_lnb":
                                        sec.setLNBLOFL(9750000)


@@ -243,8 +296,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":


@@ -327,26 +381,34 @@ class SecConfigure:
 
                                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
                                                sec.setRotorPosNum(currSat.rotorposition.value)
                                        else:
                                                sec.setRotorPosNum(0) #USALS


@@ -357,7 +419,7 @@ class SecConfigure:
                self.update()
 
 class NIM(object):
                self.update()
 
 class NIM(object):

-       def __init__(self, slot, type, description, has_outputs = True):
+       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]:
                self.slot = slot
 
                if type not in ["DVB-S", "DVB-C", "DVB-T", "DVB-S2", None]:


@@ -367,6 +429,7 @@ class NIM(object):
                self.type = type
                self.description = description
                self.has_outputs = has_outputs
                self.type = type
                self.description = description
                self.has_outputs = has_outputs

+               self.internally_connectable = internally_connectable

 
        def isCompatible(self, what):
                compatible = {
 
        def isCompatible(self, what):
                compatible = {


@@ -377,6 +440,15 @@ class NIM(object):
                                "DVB-S2": ["DVB-S", "DVB-S2", None]
                        }
                return what in compatible[self.type]
                                "DVB-S2": ["DVB-S", "DVB-S2", None]
                        }
                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"]
+                       }
+               return connectable[self.type]

 
        def getSlotName(self):
                # get a friendly description for a slot name.
 
        def getSlotName(self):
                # get a friendly description for a slot name.


@@ -391,6 +463,9 @@ class NIM(object):
        
        def hasOutputs(self):
                return self.has_outputs
        
        def hasOutputs(self):
                return self.has_outputs

+       
+       def internallyConnectableTo(self):
+               return self.internally_connectable

 
        slot_id = property(getSlotID)
 
 
        slot_id = property(getSlotID)
 


@@ -524,8 +599,11 @@ class NimManager:
                        elif line.strip().startswith("Name:"):
                                entries[current_slot]["name"] = str(line.strip()[6:])
                        elif line.strip().startswith("Has_Outputs:"):
                        elif line.strip().startswith("Name:"):
                                entries[current_slot]["name"] = str(line.strip()[6:])
                        elif line.strip().startswith("Has_Outputs:"):

-                               input = str(line.strip()[6:])
-                               entries[current_slot]["has_outputs"] = (input == "yes") 
+                               input = str(line.strip()[len("Has_Outputs:") + 1:])
+                               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 

                        elif line.strip().startswith("empty"):
                                entries[current_slot]["type"] = None
                                entries[current_slot]["name"] = _("N/A")
                        elif line.strip().startswith("empty"):
                                entries[current_slot]["type"] = None
                                entries[current_slot]["name"] = _("N/A")


@@ -537,13 +615,21 @@ class NimManager:
                                entry["type"] = None
                        if not (entry.has_key("has_outputs")):
                                entry["has_outputs"] = True
                                entry["type"] = None
                        if not (entry.has_key("has_outputs")):
                                entry["has_outputs"] = True

-                       self.nim_slots.append(NIM(slot = id, description = entry["name"], type = entry["type"], has_outputs = entry["has_outputs"]))
+                       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"]))

 
        def hasNimType(self, chktype):
                for slot in self.nim_slots:
                        if slot.isCompatible(chktype):
                                return True
                return False
 
        def hasNimType(self, chktype):
                for slot in self.nim_slots:
                        if slot.isCompatible(chktype):
                                return True
                return False

+       
+       def getNimType(self, slotid):
+               return self.nim_slots[slotid].type
+       
+       def getNimDescription(self, slotid):
+               return self.nim_slots[slotid].friendly_full_description

 
        def getNimListOfType(self, type, exception = -1):
                # returns a list of indexes for NIMs compatible to the given type, except for 'exception'
 
        def getNimListOfType(self, type, exception = -1):
                # returns a list of indexes for NIMs compatible to the given type, except for 'exception'


@@ -568,11 +654,83 @@ class NimManager:
                        list.append(slot.friendly_full_description)
                return list
        
                        list.append(slot.friendly_full_description)
                return list
        

+       def getSlotCount(self):
+               return len(self.nim_slots)
+       

        def hasOutputs(self, slotid):
                return self.nim_slots[slotid].hasOutputs()
        
        def hasOutputs(self, slotid):
                return self.nim_slots[slotid].hasOutputs()
        

+       def canConnectTo(self, slotid):
+               slots = []
+               if self.nim_slots[slotid].internallyConnectableTo() is not None:
+                       slots.append(self.nim_slots[slotid].internallyConnectableTo())
+               for type in self.nim_slots[slotid].connectableTo(): 
+                       for slot in self.getNimListOfType(type, exception = slotid):
+                               if self.hasOutputs(slot):
+                                       slots.append(slot)
+               # remove nims, that have a conntectedTo reference on
+               for testnim in slots[:]:
+                       for nim in self.getNimListOfType("DVB-S", slotid):
+                               nimConfig = self.getNimConfig(nim)
+                               if nimConfig.content.items.has_key("configMode") and nimConfig.configMode.value == "loopthrough" and int(nimConfig.connectedTo.value) == testnim:
+                                       slots.remove(testnim)
+                                       break 
+               slots.sort()
+               
+               return slots
+       
+       def canEqualTo(self, slotid):
+               type = self.getNimType(slotid)
+               if type == "DVB-S2":
+                       type = "DVB-S"
+               nimList = self.getNimListOfType(type, slotid)
+               for nim in nimList[:]:
+                       mode = self.getNimConfig(nim)
+                       if mode.configMode.value == "loopthrough" or mode.configMode.value == "satposdepends":
+                               nimList.remove(nim)
+               return nimList
+
+       def canDependOn(self, slotid):
+               type = self.getNimType(slotid)
+               if type == "DVB-S2":
+                       type = "DVB-S"
+               nimList = self.getNimListOfType(type, slotid)
+               positionerList = []
+               for nim in nimList[:]:
+                       mode = self.getNimConfig(nim)
+                       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)
+                                       if testmode.configMode.value == "satposdepends" and int(testmode.connectedTo.value) == int(nim):
+                                               alreadyConnected = True
+                                               break
+                               if not alreadyConnected:
+                                       positionerList.append(nim)
+               return positionerList
+       

        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


@@ -580,40 +738,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
+                               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"]:

-                                       list.append(self.satList[config.Nims[slotid].diseqcA.index])
+                                       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"]:

-                                       list.append(self.satList[config.Nims[slotid].diseqcB.index])
+                                       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


@@ -622,13 +793,18 @@ 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():
                return list
 
 def InitSecParams():


@@ -654,6 +830,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


@@ -662,7 +842,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
 


@@ -670,15 +850,19 @@ 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=120, limits = (0, 9999))
+       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.addNotifier(lambda configElement: secClass.setParam(secClass.MOTOR_RUNNING_TIMEOUT, configElement.value))
        config.sec.motor_running_timeout = x
 


@@ -686,9 +870,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


@@ -698,6 +886,7 @@ 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 = ConfigSubList()
        for x in range(len(nimmgr.nim_slots)):


@@ -707,43 +896,25 @@ def InitNimManager(nimmgr):
                x = slot.slot
                nim = config.Nims[x]
                
                x = slot.slot
                nim = config.Nims[x]
                

-               # HACK: currently, we can only looptrough to socket A
-

                if slot.isCompatible("DVB-S"):
                if slot.isCompatible("DVB-S"):

-                       if slot.slot == 0:
-                               nim.configMode = ConfigSelection(
-                                       choices = {
-                                               "simple": _("simple"),
-                                               "advanced": _("advanced"),
-                                               "nothing": _("nothing connected"),
-                                               },
-                                       default = "simple")
-                       else:
-                               nim.configMode = ConfigSelection(
-                                       choices = {
-                                               "equal": _("equal to Socket A"),
-                                               "loopthrough": _("loopthrough to socket A"),
-                                               "nothing": _("nothing connected"),
-                                               "satposdepends": _("second cable of motorized LNB"),
-                                               "simple": _("simple"),
-                                               "advanced": _("advanced")},
-                                       default = "loopthrough")
-
-                       #important - check if just the 2nd one is LT only and the first one is DVB-S
-                       # 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()
+                       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.diseqc13V = ConfigYesNo(default = False)

 
                        nim.diseqcMode = ConfigSelection(
                                choices = [
 
                        nim.diseqcMode = ConfigSelection(
                                choices = [


@@ -754,10 +925,18 @@ def InitNimManager(nimmgr):
                                        ("positioner", _("Positioner"))],
                                default = "diseqc_a_b")
 
                                        ("positioner", _("Positioner"))],
                                default = "diseqc_a_b")
 

-                       nim.diseqcA = getConfigSatlist(192, nimmgr.satList)
-                       nim.diseqcB = getConfigSatlist(130, nimmgr.satList)
-                       nim.diseqcC = ConfigSatlist(list = nimmgr.satList)
-                       nim.diseqcD = ConfigSatlist(list = nimmgr.satList)
+                       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")),
                        nim.positionerMode = ConfigSelection(
                                choices = [
                                        ("usals", _("USALS")),


@@ -768,29 +947,17 @@ def InitNimManager(nimmgr):
                        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.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.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")
                        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)
                        nim.turningSpeed = ConfigSelection(choices = [("fast", _("Fast")), ("slow", _("Slow")), ("fast epoch", _("Fast epoch")) ], default = "fast")
                        btime = datetime(1970, 1, 1, 7, 0);
                        nim.fastTurningBegin = ConfigDateTime(default = mktime(btime.timetuple()), formatstring = _("%H:%M"), increment = 900)
                        etime = datetime(1970, 1, 1, 19, 0);
                        nim.fastTurningEnd = ConfigDateTime(default = mktime(etime.timetuple()), formatstring = _("%H:%M"), increment = 900)

-                       # get other frontends of the same type
-
-                       satNimList = nimmgr.getNimListOfType("DVB-S", slot.slot)
-                       satNimListNames = {}
-
-                       for x in satNimList:
-                               n = nimmgr.nim_slots[x]
-                               satNimListNames["%d" % n.slot] = n.friendly_full_description
-
-                       if len(satNimListNames):
-                               nim.equalTo = ConfigSelection(choices = satNimListNames)
-                               nim.linkedTo = ConfigSelection(choices = satNimListNames)
-                               nim.satposDependsTo = ConfigSelection(choices = satNimListNames)

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

-                       nim.advanced.sats = getConfigSatlist(192,nimmgr.satList)
+                       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):
                        nim.advanced.sat = ConfigSubDict()
                        lnbs = [("0", "not available")]
                        for y in range(1, 33):


@@ -804,6 +971,15 @@ def InitNimManager(nimmgr):
                                nim.advanced.sat[x[0]].rotorposition = ConfigInteger(default=1, limits=(1, 255))
                                nim.advanced.sat[x[0]].lnb = ConfigSelection(choices = lnbs)
 
                                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)))
                        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)))


@@ -814,7 +990,7 @@ def InitNimManager(nimmgr):
 
                        nim.advanced.lnb = ConfigSubList()
                        nim.advanced.lnb.append(ConfigNothing())
 
                        nim.advanced.lnb = ConfigSubList()
                        nim.advanced.lnb.append(ConfigNothing())

-                       for x in range(1, 33):
+                       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.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))


@@ -823,7 +999,10 @@ def InitNimManager(nimmgr):
 #                              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].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")
+                               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].commitedDiseqcCommand = ConfigSelection(choices = csw)
                                nim.advanced.lnb[x].fastDiseqc = ConfigYesNo(default=False)
                                nim.advanced.lnb[x].sequenceRepeat = ConfigYesNo(default=False)


@@ -843,12 +1022,20 @@ def InitNimManager(nimmgr):
                                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].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].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)
                                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)

+                               prio_list = [ ("-1", _("Auto")) ]
+                               for prio in range(65):
+                                       prio_list.append((str(prio), str(prio)))
+                               for prio in range(14000,14065):
+                                       prio_list.append((str(prio), str(prio)))
+                               for prio in range(19000,19065):
+                                       prio_list.append((str(prio), str(prio)))
+                               nim.advanced.lnb[x].prio = ConfigSelection(default="-1", choices=prio_list)

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


@@ -905,7 +1092,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)