X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9063d6049a81d8945126c66e0a12ce8b5a64b4a1..ae5651346d0b371a89287365003466fef729b72a:/lib/python/Components/NimManager.py diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 650223d9..32fca47f 100644 --- 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 @@ -71,7 +73,8 @@ class SecConfigure: self.addSatellite(sec, orbpos) 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) @@ -83,8 +86,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) @@ -122,7 +125,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: @@ -148,14 +151,13 @@ class SecConfigure: 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 + hw = HardwareInfo() 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 +165,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 @@ -185,7 +188,7 @@ class SecConfigure: loValue = rotorParam.EAST else: loValue = rotorParam.WEST - inputPowerDelta=50 + inputPowerDelta=hw.get_device_name() == "dm8000" and 15 or 50 useInputPower=False turning_speed=0 if nim.powerMeasurement.value: @@ -213,23 +216,35 @@ class SecConfigure: def updateAdvanced(self, sec, slotid): lnbSat = {} - for x in range(1,33): + for x in range(1,37): 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 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): - tunermask |= (1 << self.equal[slotid]) + for slot in self.equal[slotid]: + tunermask |= (1 << slot) 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) @@ -264,8 +279,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": @@ -351,23 +367,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: + if not currSat.usals.value and x < 34: sec.setRotorPosNum(currSat.rotorposition.value) else: sec.setRotorPosNum(0) #USALS @@ -625,17 +644,22 @@ class NimManager: slots.append(self.nim_slots[slotid].internallyConnectableTo()) for type in self.nim_slots[slotid].connectableTo(): for slot in self.getNimListOfType(type, exception = slotid): - # FIXME we restrict loopthrough from dvb-s2 to dvb-s, because the c++ part can't handle it - if not (type == "DVB-S" and self.getNimType(slot)): - if self.hasOutputs(slot): - slots.append(slot) + 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 self.getNimConfig(slotid) == "DVB-S2": + if type == "DVB-S2": type = "DVB-S" nimList = self.getNimListOfType(type, slotid) for nim in nimList[:]: @@ -643,16 +667,30 @@ class NimManager: if mode.configMode.value == "loopthrough" or mode.configMode.value == "satposdepends": nimList.remove(nim) return nimList - + 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) - 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) @@ -665,6 +703,12 @@ class NimManager: 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 @@ -672,40 +716,49 @@ class NimManager: 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 - configMode = config.Nims[slotid].configMode.value + configMode = nim.configMode.value 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": - 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"]: - list.append(self.satList[config.Nims[slotid].diseqcA.index]) + list.append(self.satList[nim.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]) + list.append(self.satList[nim.diseqcB.index]) if dm == "diseqc_a_b_c_d": - list.append(self.satList[config.Nims[slotid].diseqcC.index]) - list.append(self.satList[config.Nims[slotid].diseqcD.index]) + list.append(self.satList[nim.diseqcC.index]) + list.append(self.satList[nim.diseqcD.index]) 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 - #print "self.satellites:", self.satList[config.Nims[slotid].diseqcA.value] #print "diseqcA:", config.Nims[slotid].diseqcA.value configMode = config.Nims[slotid].configMode.value @@ -714,13 +767,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(): @@ -746,6 +804,10 @@ def InitSecParams(): 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 @@ -754,7 +816,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 = 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 @@ -762,14 +824,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 = 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 = 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 = 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 @@ -778,10 +844,6 @@ def InitSecParams(): x.addNotifier(lambda configElement: secClass.setParam(secClass.MOTOR_COMMAND_RETRIES, configElement.value)) config.sec.motor_command_retries = x - x = ConfigInteger(default=20, limits = (0, 9999)) - x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_SWITCH_CMDS, configElement.value)) - config.sec.delay_after_change_voltage_before_switch_command = x - # TODO add support for satpos depending nims to advanced nim configuration # so a second/third/fourth cable from a motorized lnb can used behind a # diseqc 1.0 / diseqc 1.1 / toneburst switch @@ -790,6 +852,7 @@ def InitSecParams(): def InitNimManager(nimmgr): InitSecParams() + hw = HardwareInfo() config.Nims = ConfigSubList() for x in range(len(nimmgr.nim_slots)): @@ -810,21 +873,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 = [ @@ -863,7 +917,8 @@ def InitNimManager(nimmgr): # 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): @@ -877,6 +932,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) + 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))) @@ -887,7 +951,7 @@ def InitNimManager(nimmgr): 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)) @@ -896,7 +960,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].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) @@ -916,7 +983,7 @@ 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].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) @@ -978,7 +1045,8 @@ def InitNimManager(nimmgr): 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)