From: ghost <andreas.monzner@multimedia-labs.de>
Date: Tue, 29 Dec 2009 12:16:59 +0000 (+0100)
Subject: Merge branch 'bug_167_bsbe2_tone_amplitude'
X-Git-Tag: 2.7.0~24
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/a913fcf03e60167b0cb05a47bbfb98d623337682?hp=3bc4feea6206761d48e7ead73dfd32721bf8e259

Merge branch 'bug_167_bsbe2_tone_amplitude'
---

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)