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') 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 4f3fcdfda1657e35deb3759173024e3b478a4b15 Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Wed, 12 Nov 2008 23:39:25 +0100 Subject: when passing a broken utf-8 string, ignore characters. fixes #55. --- lib/python/Components/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/python/Components') diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py index 4ddcabec..4d57bbb9 100755 --- a/lib/python/Components/config.py +++ b/lib/python/Components/config.py @@ -782,12 +782,12 @@ class ConfigText(ConfigElement, NumericalTextInput): def getValue(self): return self.text.encode("utf-8") - + def setValue(self, val): try: self.text = val.decode("utf-8") except UnicodeDecodeError: - self.text = val + self.text = val.decode("utf-8", "ignore") print "Broken UTF8!" value = property(getValue, setValue) -- 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') 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