From 2aa5cf5a1bfe64fbb1ef6b082920c82ff927007a Mon Sep 17 00:00:00 2001 From: ghost Date: Sat, 8 Nov 2008 00:23:39 +0100 Subject: fix rotor input current measurement default value for dm8000 --- lib/python/Components/NimManager.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/python/Components/NimManager.py') diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 3c7a147e..434ab4aa 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 @@ -153,6 +155,7 @@ class SecConfigure: 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 nim.configMode.value in [ "loopthrough", "satposdepends", "nothing" ]: @@ -185,7 +188,7 @@ class SecConfigure: loValue = rotorParam.EAST else: loValue = rotorParam.WEST - inputPowerDelta=50 + inputPowerDelta=hw.get_device_name() == "dm8000" and 50 or 15 useInputPower=False turning_speed=0 if nim.powerMeasurement.value: @@ -842,6 +845,7 @@ def InitSecParams(): def InitNimManager(nimmgr): InitSecParams() + hw = HardwareInfo() config.Nims = ConfigSubList() for x in range(len(nimmgr.nim_slots)): @@ -972,7 +976,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) -- cgit v1.2.3 From cb725de8216cb61d0a889b3a6a7651619161ef08 Mon Sep 17 00:00:00 2001 From: ghost Date: Sat, 8 Nov 2008 00:28:33 +0100 Subject: 15 <-> 50 --- lib/python/Components/NimManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/python/Components/NimManager.py') diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 434ab4aa..1ee8dddd 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -188,7 +188,7 @@ class SecConfigure: loValue = rotorParam.EAST else: loValue = rotorParam.WEST - inputPowerDelta=hw.get_device_name() == "dm8000" and 50 or 15 + inputPowerDelta=hw.get_device_name() == "dm8000" and 15 or 50 useInputPower=False turning_speed=0 if nim.powerMeasurement.value: -- cgit v1.2.3 From d3a03446578d5cf77ea3f2128aa3aeee434a23b8 Mon Sep 17 00:00:00 2001 From: ghost Date: Sat, 8 Nov 2008 00:52:00 +0100 Subject: fix typos --- lib/python/Components/NimManager.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/python/Components/NimManager.py') diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 1ee8dddd..3c1fe455 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -659,7 +659,7 @@ class NimManager: 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[:]: @@ -667,10 +667,10 @@ 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 = [] -- cgit v1.2.3 From ae5651346d0b371a89287365003466fef729b72a Mon Sep 17 00:00:00 2001 From: ghost Date: Sat, 8 Nov 2008 01:01:18 +0100 Subject: add possibility to select "second cable of motorized LNB" also when the rotor is configured in advanced mode --- lib/python/Components/NimManager.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib/python/Components/NimManager.py') diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 3c1fe455..32fca47f 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -683,6 +683,13 @@ class NimManager: 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: -- cgit v1.2.3 From b0e31efd2aca2cb7774f031e2d23e0e4d0668dbc Mon Sep 17 00:00:00 2001 From: ghost Date: Tue, 11 Nov 2008 19:12:46 +0100 Subject: change default input power current for dm8000 (for rotor turning) --- lib/python/Components/NimManager.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lib/python/Components/NimManager.py') diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 32fca47f..e1d3b068 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -188,12 +188,11 @@ class SecConfigure: loValue = rotorParam.EAST else: loValue = rotorParam.WEST - inputPowerDelta=hw.get_device_name() == "dm8000" and 15 or 50 + inputPowerDelta=nim.powerThreshold.value 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] @@ -908,7 +907,7 @@ 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.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) -- cgit v1.2.3 From 4eb0a9517110f531d15184ea155ccf3176f7d854 Mon Sep 17 00:00:00 2001 From: ghost Date: Wed, 12 Nov 2008 15:02:53 +0100 Subject: add possibility to set diseqc inputs to "nothing connected" --- lib/python/Components/NimManager.py | 10 +++++----- lib/python/Screens/Satconfig.py | 13 +++++++++---- 2 files changed, 14 insertions(+), 9 deletions(-) (limited to 'lib/python/Components/NimManager.py') diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index e1d3b068..41925aeb 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -40,7 +40,7 @@ class SecConfigure: 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: + if orbpos is None or orbpos == 3601: return #simple defaults sec.addLNB() @@ -893,10 +893,10 @@ def InitNimManager(nimmgr): if id != x: choices.append((str(id), nimmgr.getNimDescription(id))) nim.connectedTo = ConfigSelection(choices = choices) - nim.diseqcA = getConfigSatlist(192, nimmgr.satList) - nim.diseqcB = getConfigSatlist(130, nimmgr.satList) - nim.diseqcC = ConfigSatlist(list = nimmgr.satList) - nim.diseqcD = ConfigSatlist(list = nimmgr.satList) + nim.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")), diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py index ccb776ea..6dc9f416 100644 --- a/lib/python/Screens/Satconfig.py +++ b/lib/python/Screens/Satconfig.py @@ -407,12 +407,17 @@ class NimSelection(Screen): text = _("nothing connected") elif nimConfig.configMode.value == "simple": if nimConfig.diseqcMode.value in ["single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]: - text = _("Sats") + ": " + nimmanager.getSatName(int(nimConfig.diseqcA.value)) + text = _("Sats") + ": " + if nimConfig.diseqcA.orbital_position != 3601: + text += nimmanager.getSatName(int(nimConfig.diseqcA.value)) if nimConfig.diseqcMode.value in ["toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]: - text += "," + nimmanager.getSatName(int(nimConfig.diseqcB.value)) + if nimConfig.diseqcB.orbital_position != 3601: + text += "," + nimmanager.getSatName(int(nimConfig.diseqcB.value)) if nimConfig.diseqcMode.value == "diseqc_a_b_c_d": - text += "," + nimmanager.getSatName(int(nimConfig.diseqcC.value)) - text += "," + nimmanager.getSatName(int(nimConfig.diseqcD.value)) + if nimConfig.diseqcC.orbital_position != 3601: + text += "," + nimmanager.getSatName(int(nimConfig.diseqcC.value)) + if nimConfig.diseqcD.orbital_position != 3601: + text += "," + nimmanager.getSatName(int(nimConfig.diseqcD.value)) elif nimConfig.diseqcMode.value == "positioner": text = _("Positioner") + ":" if nimConfig.positionerMode.value == "usals": -- cgit v1.2.3 From 47c0f019cb4e1a0c70e497b17c214f1dc851c7ce Mon Sep 17 00:00:00 2001 From: ghost Date: Wed, 12 Nov 2008 16:34:46 +0100 Subject: more flexible diseqc / sat config --- lib/python/Components/NimManager.py | 38 ++++++++++++++++++++++++++----------- lib/python/Screens/Satconfig.py | 17 +++++++++++------ po/ar.po | 2 +- po/ca.po | 4 ++-- po/cs.po | 4 ++-- po/da.po | 4 ++-- po/de.po | 4 ++-- po/el.po | 4 ++-- po/en.po | 2 +- po/enigma2.pot | 2 +- po/es.po | 4 ++-- po/fi.po | 4 ++-- po/fr.po | 4 ++-- po/hr.po | 4 ++-- po/hu.po | 4 ++-- po/is.po | 4 ++-- po/it.po | 4 ++-- po/lt.po | 4 ++-- po/nl.po | 4 ++-- po/no.po | 4 ++-- po/pl.po | 4 ++-- po/pt.po | 4 ++-- po/ru.po | 4 ++-- po/sv.po | 4 ++-- po/tr.po | 4 ++-- 25 files changed, 81 insertions(+), 60 deletions(-) (limited to 'lib/python/Components/NimManager.py') diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 41925aeb..17297e67 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -39,7 +39,7 @@ class SecConfigure: sec.addSatellite(orbpos) self.configuredSatellites.add(orbpos) - def addLNBSimple(self, sec, slotid, diseqcmode, toneburstmode = diseqcParam.NO, diseqcpos = diseqcParam.SENDNO, orbpos = 0, longitude = 0, latitude = 0, loDirection = 0, laDirection = 0, turningSpeed = rotorParam.FAST, useInputPower=True, inputPowerDelta=50): + 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): if orbpos is None or orbpos == 3601: return #simple defaults @@ -56,10 +56,16 @@ class SecConfigure: sec.setLNBThreshold(11700000) sec.setLNBIncreasedVoltage(lnbParam.OFF) sec.setRepeats(0) - sec.setFastDiSEqC(0) + sec.setFastDiSEqC(fastDiSEqC) sec.setSeqRepeat(0) - sec.setVoltageMode(switchParam.HV) - sec.setToneMode(switchParam.HILO) + + if setVoltageTone: + sec.setVoltageMode(switchParam.HV) + sec.setToneMode(switchParam.HILO) + else: + sec.setVoltageMode(switchParam._14V) + sec.setToneMode(switchParam.OFF) + sec.setCommandOrder(0) #user values @@ -167,18 +173,25 @@ class SecConfigure: 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) + if nim.simpleSingleSendDiSEqC.value: + self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA) + else: + 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 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) 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) + self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone) 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) + self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone) + self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcC.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BA, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone) + self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcD.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BB, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone) elif nim.diseqcMode.value == "positioner": #Positioner if nim.latitudeOrientation.value == "north": laValue = rotorParam.NORTH @@ -893,6 +906,9 @@ def InitNimManager(nimmgr): 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) diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py index 6dc9f416..6489f28f 100644 --- a/lib/python/Screens/Satconfig.py +++ b/lib/python/Screens/Satconfig.py @@ -14,16 +14,21 @@ from datetime import datetime class NimSetup(Screen, ConfigListScreen): def createSimpleSetup(self, list, mode): + nim = self.nimConfig if mode == "single": - list.append(getConfigListEntry(_("Satellite"), self.nimConfig.diseqcA)) + list.append(getConfigListEntry(_("Satellite"), nim.diseqcA)) + list.append(getConfigListEntry(_("Send DiSEqC"), nim.simpleSingleSendDiSEqC)) else: - list.append(getConfigListEntry(_("Port A"), self.nimConfig.diseqcA)) + list.append(getConfigListEntry(_("Port A"), nim.diseqcA)) if mode in ["toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]: - list.append(getConfigListEntry(_("Port B"), self.nimConfig.diseqcB)) + list.append(getConfigListEntry(_("Port B"), nim.diseqcB)) if mode == "diseqc_a_b_c_d": - list.append(getConfigListEntry(_("Port C"), self.nimConfig.diseqcC)) - list.append(getConfigListEntry(_("Port D"), self.nimConfig.diseqcD)) + list.append(getConfigListEntry(_("Port C"), nim.diseqcC)) + list.append(getConfigListEntry(_("Port D"), nim.diseqcD)) + if mode != "toneburst_a_b": + list.append(getConfigListEntry(_("Set Voltage and 22KHz"), nim.simpleDiSEqCSetVoltageTone)) + list.append(getConfigListEntry(_("Send DiSEqC only on satellite change"), nim.simpleDiSEqCOnlyOnSatChange)) def createPositionerSetup(self, list): nim = self.nimConfig @@ -88,7 +93,7 @@ class NimSetup(Screen, ConfigListScreen): self.list.append(self.configMode) if self.nimConfig.configMode.value == "simple": #simple setup - self.diseqcModeEntry = getConfigListEntry(_("DiSEqC Mode"), self.nimConfig.diseqcMode) + self.diseqcModeEntry = getConfigListEntry(_("Mode"), self.nimConfig.diseqcMode) self.list.append(self.diseqcModeEntry) if self.nimConfig.diseqcMode.value in ["single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]: self.createSimpleSetup(self.list, self.nimConfig.diseqcMode.value) diff --git a/po/ar.po b/po/ar.po index 0c9f0248..7ff6583e 100755 --- a/po/ar.po +++ b/po/ar.po @@ -820,7 +820,7 @@ msgstr "دايزك Ø£/ب" msgid "DiSEqC A/B/C/D" msgstr "دايزك Ø£/ب/ج/د" -msgid "DiSEqC Mode" +msgid "Mode" msgstr "وضع الدايزك" msgid "DiSEqC mode" diff --git a/po/ca.po b/po/ca.po index 331ebe3c..7935a925 100755 --- a/po/ca.po +++ b/po/ca.po @@ -851,8 +851,8 @@ msgstr "DiSEqC A/B" msgid "DiSEqC A/B/C/D" msgstr "DiSEqC A/B/C/D" -msgid "DiSEqC Mode" -msgstr "Mode DiSEqC" +msgid "Mode" +msgstr "Mode" msgid "DiSEqC mode" msgstr "mode DiSEqC" diff --git a/po/cs.po b/po/cs.po index 1638798b..711b8204 100755 --- a/po/cs.po +++ b/po/cs.po @@ -840,8 +840,8 @@ msgstr "DiSEqC A/B" msgid "DiSEqC A/B/C/D" msgstr "DiSEqC A/B/C/D" -msgid "DiSEqC Mode" -msgstr "DiSEqC Mód" +msgid "Mode" +msgstr "Mód" msgid "DiSEqC mode" msgstr "DiSEqC Mód" diff --git a/po/da.po b/po/da.po index 55016cd8..c4d8a941 100755 --- a/po/da.po +++ b/po/da.po @@ -849,8 +849,8 @@ msgstr "DiSEqC A/B" msgid "DiSEqC A/B/C/D" msgstr "DiSEqC A/B/C/D" -msgid "DiSEqC Mode" -msgstr "DiSEqC Type" +msgid "Mode" +msgstr "Type" msgid "DiSEqC mode" msgstr "DiSEqC type" diff --git a/po/de.po b/po/de.po index e5f33eec..e506fd97 100755 --- a/po/de.po +++ b/po/de.po @@ -879,8 +879,8 @@ msgstr "DiSEqC A/B" msgid "DiSEqC A/B/C/D" msgstr "DiSEqC A/B/C/D" -msgid "DiSEqC Mode" -msgstr "DiSEqC-Modus" +msgid "Mode" +msgstr "Modus" msgid "DiSEqC mode" msgstr "DiSEqC-Modus" diff --git a/po/el.po b/po/el.po index 3053587f..322659a8 100755 --- a/po/el.po +++ b/po/el.po @@ -841,8 +841,8 @@ msgstr "DiSEqC A/B" msgid "DiSEqC A/B/C/D" msgstr "DiSEqC A/B/C/D" -msgid "DiSEqC Mode" -msgstr "DiSEqC Mode" +msgid "Mode" +msgstr "Mode" msgid "DiSEqC mode" msgstr "DiSEqC mode" diff --git a/po/en.po b/po/en.po index daff3168..a6b3fd61 100644 --- a/po/en.po +++ b/po/en.po @@ -815,7 +815,7 @@ msgstr "" msgid "DiSEqC A/B/C/D" msgstr "" -msgid "DiSEqC Mode" +msgid "Mode" msgstr "" msgid "DiSEqC mode" diff --git a/po/enigma2.pot b/po/enigma2.pot index 375931bd..9c131a79 100644 --- a/po/enigma2.pot +++ b/po/enigma2.pot @@ -783,7 +783,7 @@ msgid "DiSEqC A/B/C/D" msgstr "" #: ../lib/python/Screens/Satconfig.py:74 -msgid "DiSEqC Mode" +msgid "Mode" msgstr "" #: ../lib/python/Screens/Satconfig.py:180 diff --git a/po/es.po b/po/es.po index 59a83032..1e42b605 100644 --- a/po/es.po +++ b/po/es.po @@ -856,8 +856,8 @@ msgstr "DiSEqC A/B" msgid "DiSEqC A/B/C/D" msgstr "DiSEqC A/B/C/D" -msgid "DiSEqC Mode" -msgstr "Modo DiSEqC" +msgid "Mode" +msgstr "Modo" msgid "DiSEqC mode" msgstr "Modo DiSEqC" diff --git a/po/fi.po b/po/fi.po index 19a3ddd9..4f9e0234 100755 --- a/po/fi.po +++ b/po/fi.po @@ -854,8 +854,8 @@ msgstr "DiSEqC A/B" msgid "DiSEqC A/B/C/D" msgstr "DiSEqC A/B/C/D" -msgid "DiSEqC Mode" -msgstr "DiSEqC-tila" +msgid "Mode" +msgstr "Tila" msgid "DiSEqC mode" msgstr "DiSEqC-tila" diff --git a/po/fr.po b/po/fr.po index b71e1ce1..885e305a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -854,8 +854,8 @@ msgstr "" msgid "DiSEqC A/B/C/D" msgstr "" -msgid "DiSEqC Mode" -msgstr "Mode DiSEqC" +msgid "Mode" +msgstr "Mode" msgid "DiSEqC mode" msgstr "Mode DiSEqC" diff --git a/po/hr.po b/po/hr.po index 26b554f3..e051eea6 100755 --- a/po/hr.po +++ b/po/hr.po @@ -840,8 +840,8 @@ msgstr "DiSEqC A/B" msgid "DiSEqC A/B/C/D" msgstr "DiSEqC A/B/C/D" -msgid "DiSEqC Mode" -msgstr "DiSEqC Mod" +msgid "Mode" +msgstr "Mod" msgid "DiSEqC mode" msgstr "DiSEqC mod" diff --git a/po/hu.po b/po/hu.po index 345f90b4..098761c1 100755 --- a/po/hu.po +++ b/po/hu.po @@ -852,8 +852,8 @@ msgstr "DiSEqC A/B" msgid "DiSEqC A/B/C/D" msgstr "DiSEqC A/B/C/D" -msgid "DiSEqC Mode" -msgstr "DiSEqC mód" +msgid "Mode" +msgstr "Mód" msgid "DiSEqC mode" msgstr "DiSEqC mód" diff --git a/po/is.po b/po/is.po index 71e0d6d3..facb2468 100755 --- a/po/is.po +++ b/po/is.po @@ -848,8 +848,8 @@ msgstr "DiSEqC A/B" msgid "DiSEqC A/B/C/D" msgstr "DiSEqC A/B/C/D" -msgid "DiSEqC Mode" -msgstr "DiSEqC Gerð" +msgid "Mode" +msgstr "Gerð" msgid "DiSEqC mode" msgstr "DiSEqC gerð" diff --git a/po/it.po b/po/it.po index 0b1bde29..b81e982c 100755 --- a/po/it.po +++ b/po/it.po @@ -847,8 +847,8 @@ msgstr "DiSEqC A/B" msgid "DiSEqC A/B/C/D" msgstr "DiSEqC A/B/C/D" -msgid "DiSEqC Mode" -msgstr "Modalità DiSEqc" +msgid "Mode" +msgstr "ModalitÃ" msgid "DiSEqC mode" msgstr "Modalità DiSEqC" diff --git a/po/lt.po b/po/lt.po index 2cdc4f79..61714a9a 100755 --- a/po/lt.po +++ b/po/lt.po @@ -856,8 +856,8 @@ msgstr "DiSEqC A/B" msgid "DiSEqC A/B/C/D" msgstr "DiSEqC A/B/C/D" -msgid "DiSEqC Mode" -msgstr "DiSEqC pasirinkimas" +msgid "Mode" +msgstr "Pasirinkimas" msgid "DiSEqC mode" msgstr "DiSEqC pasirinkimas" diff --git a/po/nl.po b/po/nl.po index e63e24b5..8627e0f0 100644 --- a/po/nl.po +++ b/po/nl.po @@ -861,8 +861,8 @@ msgstr "DiSEqC A/B" msgid "DiSEqC A/B/C/D" msgstr "DiSEqC A/B/C/D" -msgid "DiSEqC Mode" -msgstr "DiSEqC-modus" +msgid "Mode" +msgstr "Modus" msgid "DiSEqC mode" msgstr "DiSEqC-modus" diff --git a/po/no.po b/po/no.po index a16e0884..520816f4 100755 --- a/po/no.po +++ b/po/no.po @@ -844,8 +844,8 @@ msgstr "DiSEqC A/B" msgid "DiSEqC A/B/C/D" msgstr "DiSEqC A/B/C/D" -msgid "DiSEqC Mode" -msgstr "DiSEqC-Modus" +msgid "Mode" +msgstr "Modus" msgid "DiSEqC mode" msgstr "DiSEqC-Modus" diff --git a/po/pl.po b/po/pl.po index eef53bc4..b3332c12 100755 --- a/po/pl.po +++ b/po/pl.po @@ -851,8 +851,8 @@ msgstr "DiSEqC A/B" msgid "DiSEqC A/B/C/D" msgstr "DiSEqC A/B/C/D" -msgid "DiSEqC Mode" -msgstr "Tryb DiSEqC" +msgid "Mode" +msgstr "Tryb" msgid "DiSEqC mode" msgstr "Tryb DiSEqC" diff --git a/po/pt.po b/po/pt.po index d37a8e87..72df8b21 100755 --- a/po/pt.po +++ b/po/pt.po @@ -847,8 +847,8 @@ msgstr "DiSEqC A/B" msgid "DiSEqC A/B/C/D" msgstr "DiSEqC A/B/C/D" -msgid "DiSEqC Mode" -msgstr "Modo DiSEqC" +msgid "Mode" +msgstr "Modo" msgid "DiSEqC mode" msgstr "Modo DiSEqC" diff --git a/po/ru.po b/po/ru.po index d5c8fff9..2407e7dc 100755 --- a/po/ru.po +++ b/po/ru.po @@ -823,8 +823,8 @@ msgstr "DiSEqC A/B" msgid "DiSEqC A/B/C/D" msgstr "DiSEqC A/B/C/D" -msgid "DiSEqC Mode" -msgstr "DiSEqC-режим" +msgid "Mode" +msgstr "режим" msgid "DiSEqC mode" msgstr "DiSEqC-режим" diff --git a/po/sv.po b/po/sv.po index 8f8cb010..1474d7f0 100644 --- a/po/sv.po +++ b/po/sv.po @@ -868,8 +868,8 @@ msgstr "DiSEqC A/B" msgid "DiSEqC A/B/C/D" msgstr "DiSEqC A/B/C/D" -msgid "DiSEqC Mode" -msgstr "DiSEqC Läge" +msgid "Mode" +msgstr "Läge" msgid "DiSEqC mode" msgstr "DiSEqC läge" diff --git a/po/tr.po b/po/tr.po index aa9ffc7d..720e17ba 100644 --- a/po/tr.po +++ b/po/tr.po @@ -866,8 +866,8 @@ msgstr "DiSEqC A/B" msgid "DiSEqC A/B/C/D" msgstr "DiSEqC A/B/C/D" -msgid "DiSEqC Mode" -msgstr "DiSEqC Modu" +msgid "Mode" +msgstr "Modu" msgid "DiSEqC mode" msgstr "DiSEqC modu" -- cgit v1.2.3 From 47c5768da94377e1cea40a3d45a2e6f0cc9dafb6 Mon Sep 17 00:00:00 2001 From: ghost Date: Wed, 12 Nov 2008 22:48:04 +0100 Subject: NimManager.py: fix service searching with simple config --- lib/python/Components/NimManager.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'lib/python/Components/NimManager.py') diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 17297e67..0290ff6d 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -747,12 +747,16 @@ class NimManager: if configMode == "simple": dm = nim.diseqcMode.value if dm in ["single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]: - list.append(self.satList[nim.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"]: - list.append(self.satList[nim.diseqcB.index]) + if nim.diseqcB.orbital_position != 3601: + list.append(self.satList[nim.diseqcB.index-1]) if dm == "diseqc_a_b_c_d": - list.append(self.satList[nim.diseqcC.index]) - list.append(self.satList[nim.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) -- cgit v1.2.3 From 549ebaf137cabfbe9b9c3c346011c7d6241e7655 Mon Sep 17 00:00:00 2001 From: ghost Date: Thu, 13 Nov 2008 11:50:50 +0100 Subject: NimManager.py: fix non working option "Set Voltage and 22KHz" --- lib/python/Components/NimManager.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'lib/python/Components/NimManager.py') diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 0290ff6d..7060168e 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -58,14 +58,6 @@ class SecConfigure: sec.setRepeats(0) sec.setFastDiSEqC(fastDiSEqC) sec.setSeqRepeat(0) - - if setVoltageTone: - sec.setVoltageMode(switchParam.HV) - sec.setToneMode(switchParam.HILO) - else: - sec.setVoltageMode(switchParam._14V) - sec.setToneMode(switchParam.OFF) - sec.setCommandOrder(0) #user values @@ -77,6 +69,12 @@ class SecConfigure: if 0 <= diseqcmode < 3: self.addSatellite(sec, orbpos) + if setVoltageTone: + sec.setVoltageMode(switchParam.HV) + sec.setToneMode(switchParam.HILO) + else: + sec.setVoltageMode(switchParam._14V) + sec.setToneMode(switchParam.OFF) elif (diseqcmode == 3): # diseqc 1.2 if self.satposdepends.has_key(slotid): for slot in self.satposdepends[slotid]: -- cgit v1.2.3 From 58163e18dce8d07d32500c8b24e616518e40710b Mon Sep 17 00:00:00 2001 From: ghost Date: Thu, 13 Nov 2008 13:32:15 +0100 Subject: add possibility to change delay after diseqc reset command and delay after diseqc peripherial poweron command via satellite equipment control plugin --- lib/dvb/sec.cpp | 4 ++-- lib/dvb/sec.h | 2 ++ lib/python/Components/NimManager.py | 8 ++++++++ .../Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py | 2 ++ 4 files changed, 14 insertions(+), 2 deletions(-) (limited to 'lib/python/Components/NimManager.py') diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp index 2a6016e0..2b7f717b 100644 --- a/lib/dvb/sec.cpp +++ b/lib/dvb/sec.cpp @@ -637,11 +637,11 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA diseqc.data[2] = 0; // diseqc reset sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) ); - sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) ); + sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_DISEQC_RESET_CMD]) ); diseqc.data[2] = 3; // diseqc peripherial powersupply on sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) ); - sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 150) ); + sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_DISEQC_PERIPHERIAL_POWERON_CMD]) ); } for (int seq_repeat = 0; seq_repeat < (di_param.m_seq_repeat?2:1); ++seq_repeat) diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h index 42e53ebe..e68ed167 100644 --- a/lib/dvb/sec.h +++ b/lib/dvb/sec.h @@ -267,6 +267,8 @@ public: MOTOR_COMMAND_RETRIES, // max transmit tries of rotor command when the rotor dont start turning (with power measurement) MOTOR_RUNNING_TIMEOUT, // max motor running time before timeout DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_SWITCH_CMDS, // delay after change voltage before transmit toneburst/diseqc + DELAY_AFTER_DISEQC_RESET_CMD, + DELAY_AFTER_DISEQC_PERIPHERIAL_POWERON_CMD, MAX_PARAMS }; private: diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 7060168e..f4e91083 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -858,6 +858,14 @@ def InitSecParams(): x.addNotifier(lambda configElement: secClass.setParam(secClass.MOTOR_COMMAND_RETRIES, configElement.value)) config.sec.motor_command_retries = x + x = ConfigInteger(default=50, limits = (0, 9999)) + x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_DISEQC_RESET_CMD, configElement.value)) + config.sec.delay_after_diseqc_reset_cmd = x + + x = ConfigInteger(default=150, limits = (0, 9999)) + x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_DISEQC_PERIPHERIAL_POWERON_CMD, configElement.value)) + config.sec.delay_after_diseqc_peripherial_poweron_cmd = x + # TODO add support for satpos depending nims to advanced nim configuration # so a second/third/fourth cable from a motorized lnb can used behind a # diseqc 1.0 / diseqc 1.1 / toneburst switch diff --git a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py index 7b3d08f6..ec223d3e 100644 --- a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py +++ b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py @@ -23,6 +23,8 @@ class SecParameterSetup(Screen, ConfigListScreen): Screen.__init__(self, session) list = [ + ("Delay after diseqc reset command", config.sec.delay_after_diseqc_reset_cmd), + ("Delay after diseqc peripherial poweron command", config.sec.delay_after_diseqc_peripherial_poweron_cmd), ("Delay after continuous tone change", config.sec.delay_after_continuous_tone_change), ("Delay after last voltage change", config.sec.delay_after_final_voltage_change), ("Delay between diseqc commands", config.sec.delay_between_diseqc_repeats), -- cgit v1.2.3