X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e6c11dc8aed12ed11dcdcba98a14071308e33e0d..79da420aa414522f8b5477053f0b46e6311f1cc1:/lib/python/Components/NimManager.py diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index f8dab123..aae7dabc 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -84,8 +84,8 @@ class SecConfigure: for x in self.NimManager.satList: print "Add sat " + str(x[0]) self.addSatellite(sec, int(x[0])) - sec.setVoltageMode(0) - sec.setToneMode(0) + sec.setVoltageMode(switchParam.HV) + sec.setToneMode(switchParam.HILO) sec.setRotorPosNum(0) # USALS sec.setLNBSlotMask(tunermask) @@ -123,7 +123,7 @@ class SecConfigure: 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: @@ -155,7 +155,6 @@ class SecConfigure: nim = slot.config 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" ]: pass else: @@ -163,6 +162,7 @@ class SecConfigure: if nim.configMode.value == "equal": pass elif nim.configMode.value == "simple": #simple config + print "diseqcmode: ", nim.diseqcMode.value if nim.diseqcMode.value == "single": #single self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.NONE, diseqcpos = diseqcParam.SENDNO) elif nim.diseqcMode.value == "toneburst_a_b": #Toneburst A/B @@ -213,7 +213,7 @@ class SecConfigure: def updateAdvanced(self, sec, slotid): lnbSat = {} - for x in range(1,129): + for x in range(1,37): lnbSat[x] = [] #wildcard for all satellites ( for rotor ) @@ -230,7 +230,7 @@ class SecConfigure: print "add", x[0], "to", lnb lnbSat[lnb].append(x[0]) - for x in range(1,129): + for x in range(1,37): if len(lnbSat[x]) > 0: currLnb = config.Nims[slotid].advanced.lnb[x] sec.addLNB() @@ -276,8 +276,9 @@ class SecConfigure: 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": @@ -363,23 +364,26 @@ class SecConfigure: # 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": sec.setVoltageMode(switchParam.HV) 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) - elif currSat.tonemode == "on": + elif currSat.tonemode.value == "on": sec.setToneMode(switchParam.ON) - elif currSat.tonemode == "off": + elif currSat.tonemode.value == "off": sec.setToneMode(switchParam.OFF) - if not currSat.usals.value and x < 125: + if not currSat.usals.value and x < 34: sec.setRotorPosNum(currSat.rotorposition.value) else: sec.setRotorPosNum(0) #USALS @@ -669,7 +673,14 @@ class NimManager: 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 nimHaveRotor: alreadyConnected = False for testnim in nimList: testmode = self.getNimConfig(testnim) @@ -724,9 +735,14 @@ class NimManager: for x in self.satList: list.append(x) elif configMode == "advanced": - for x in self.satList: - if int(nim.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): @@ -741,13 +757,18 @@ class NimManager: 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) + 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(): @@ -837,21 +858,12 @@ def InitNimManager(nimmgr): 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() +# 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 = [ @@ -890,11 +902,11 @@ def InitNimManager(nimmgr): # advanced config: nim.advanced = ConfigSubsection() - tmp = [(3601, _('All Satellites 1'), 1), (3602, _('All Satellites 2'), 1), (3603, _('All Satellites 3'), 1), (3604, _('All Satellites 4'), 1)] + 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, 125): + for y in range(1, 33): lnbs.append((str(y), "LNB " + str(y))) for x in nimmgr.satList: @@ -911,7 +923,7 @@ def InitNimManager(nimmgr): 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 = 125+x-3601 + 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"))] @@ -924,7 +936,7 @@ def InitNimManager(nimmgr): nim.advanced.lnb = ConfigSubList() nim.advanced.lnb.append(ConfigNothing()) - for x in range(1, 129): + 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)) @@ -933,7 +945,7 @@ 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") - if x > 124: + 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")