diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2009-12-29 13:16:59 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2009-12-29 13:16:59 +0100 |
| commit | a913fcf03e60167b0cb05a47bbfb98d623337682 (patch) | |
| tree | 25baa1864861cf5ed1d1d5806bffb58d1a959970 /lib | |
| parent | 3bc4feea6206761d48e7ead73dfd32721bf8e259 (diff) | |
| parent | 470606978cf70d051eb422acdc5ea093ed395303 (diff) | |
| download | enigma2-a913fcf03e60167b0cb05a47bbfb98d623337682.tar.gz enigma2-a913fcf03e60167b0cb05a47bbfb98d623337682.zip | |
Merge branch 'bug_167_bsbe2_tone_amplitude'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/python/Components/NimManager.py | 12 | ||||
| -rw-r--r-- | lib/python/Screens/Satconfig.py | 2 |
2 files changed, 14 insertions, 0 deletions
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 7d148f3c..00d06095 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -1213,10 +1213,21 @@ def InitNimManager(nimmgr): tmp.lnb = lnb nim.advanced.sat[x] = tmp + def toneAmplitudeChanged(configElement): + fe_id = configElement.fe_id + slot_id = configElement.slot_id + if nimmgr.nim_slots[slot_id].description == 'Alps BSBE2': + open("/proc/stb/frontend/%d/tone_amplitude" %(fe_id), "w").write(configElement.value) + + empty_slots = 0 for slot in nimmgr.nim_slots: x = slot.slot nim = config.Nims[x] if slot.isCompatible("DVB-S"): + nim.toneAmplitude = ConfigSelection([("9", "600mV"), ("8", "700mV"), ("7", "800mV"), ("6", "900mV"), ("5", "1100mV")], "7") + nim.toneAmplitude.fe_id = x - empty_slots + nim.toneAmplitude.slot_id = x + nim.toneAmplitude.addNotifier(toneAmplitudeChanged) nim.diseqc13V = ConfigYesNo(False) nim.diseqcMode = ConfigSelection(diseqc_mode_choices, "diseqc_a_b") nim.connectedTo = ConfigSelection([(str(id), nimmgr.getNimDescription(id)) for id in nimmgr.getNimListOfType("DVB-S") if id != x]) @@ -1306,6 +1317,7 @@ def InitNimManager(nimmgr): nim.terrestrial = ConfigSelection(choices = list) nim.terrestrial_5V = ConfigOnOff() else: + empty_slots += 1 nim.configMode = ConfigSelection(choices = { "nothing": _("disabled") }, default="nothing"); if slot.type is not None: print "pls add support for this frontend type!", slot.type diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py index 93fdcd35..d5249b99 100644 --- a/lib/python/Screens/Satconfig.py +++ b/lib/python/Screens/Satconfig.py @@ -146,6 +146,8 @@ class NimSetup(Screen, ConfigListScreen): currSat = self.nimConfig.advanced.sat[cur_orb_pos] self.fillListWithAdvancedSatEntrys(currSat) self.have_advanced = True + if self.nim.description == "Alps BSBE2" and config.usage.setup_level.index >= 2: # expert + self.list.append(getConfigListEntry(_("Tone Amplitude"), self.nimConfig.toneAmplitude)) elif self.nim.isCompatible("DVB-C"): self.configMode = getConfigListEntry(_("Configuration Mode"), self.nimConfig.configMode) self.list.append(self.configMode) |