diff options
| author | Fraxinas <andreas.frisch@multimedia-labs.de> | 2008-11-13 13:01:54 +0100 |
|---|---|---|
| committer | Fraxinas <andreas.frisch@multimedia-labs.de> | 2008-11-13 13:01:54 +0100 |
| commit | 2c3fe3f9a4eabde0440dbf86fb39ac26062cdc65 (patch) | |
| tree | e5d488296209583186dee04320f1d611bf6a2208 /lib/python/Components | |
| parent | 100681320b09e764b447b00a22cb3ee53d15edf7 (diff) | |
| parent | 549ebaf137cabfbe9b9c3c346011c7d6241e7655 (diff) | |
| download | enigma2-2c3fe3f9a4eabde0440dbf86fb39ac26062cdc65.tar.gz enigma2-2c3fe3f9a4eabde0440dbf86fb39ac26062cdc65.zip | |
Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/python/Components')
| -rw-r--r-- | lib/python/Components/NimManager.py | 26 | ||||
| -rwxr-xr-x | lib/python/Components/config.py | 4 |
2 files changed, 16 insertions, 14 deletions
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 17297e67..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]: @@ -747,12 +745,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) 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) |