X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/927c65c04c7e538a32fa81ac337f541f35eb477d..b92bc5134f26ded1a6c1de63b0ac6e403c8d7362:/lib/python/Screens/Satconfig.py

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 29219721..9f22013d 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -1,6 +1,6 @@
 from Screen import Screen
 from Components.ActionMap import ActionMap
-from Components.ConfigList import ConfigList, ConfigListScreen
+from Components.ConfigList import ConfigListScreen
 from Components.MenuList import MenuList
 from Components.NimManager import nimmanager
 from Components.config import getConfigListEntry, config, ConfigNothing
@@ -22,22 +22,23 @@ class NimSetup(Screen, ConfigListScreen):
 				list.append(getConfigListEntry(_("Port D"), self.nimConfig.diseqcD))
 
 	def createPositionerSetup(self, list):
-#		list.append(getConfigListEntry(_("Positioner mode"), self.nimConfig.positionerMode))
-#		if self.nimConfig.positionerMode.value == "usals": # USALS
-		list.append(getConfigListEntry(_("Longitude"), self.nimConfig.longitude))
-		list.append(getConfigListEntry(" ", self.nimConfig.longitudeOrientation))
-		list.append(getConfigListEntry(_("Latitude"), self.nimConfig.latitude))
-		list.append(getConfigListEntry(" ", self.nimConfig.latitudeOrientation))
-		self.turningSpeed = getConfigListEntry(_("Rotor turning speed"), self.nimConfig.turningSpeed)
-		self.list.append(self.turningSpeed)
-		if self.nimConfig.turningSpeed.value == "fast epoch":
-			self.turnFastEpochBegin = getConfigListEntry(_("Begin time"), self.nimConfig.fastTurningBegin)
-			self.turnFastEpochEnd = getConfigListEntry(_("End time"), self.nimConfig.fastTurningEnd)
-			self.list.append(self.turnFastEpochBegin)
-			self.list.append(self.turnFastEpochEnd)
+		nim = self.nimConfig
+		list.append(getConfigListEntry(_("Longitude"), nim.longitude))
+		list.append(getConfigListEntry(" ", nim.longitudeOrientation))
+		list.append(getConfigListEntry(_("Latitude"), nim.latitude))
+		list.append(getConfigListEntry(" ", nim.latitudeOrientation))
 
-#		elif self.nimConfig.positionerMode.value == "manual": # manual
-#			pass
+		self.advancedPowerMeasurement = getConfigListEntry(_("Use Power Measurement"), nim.powerMeasurement)
+		list.append(self.advancedPowerMeasurement)
+		if nim.powerMeasurement.value:
+			list.append(getConfigListEntry(_("Power threshold in mA"), nim.powerThreshold))
+			self.turningSpeed = getConfigListEntry(_("Rotor turning speed"), nim.turningSpeed)
+			list.append(self.turningSpeed)
+			if nim.turningSpeed.value == "fast epoch":
+				self.turnFastEpochBegin = getConfigListEntry(_("Begin time"), nim.fastTurningBegin)
+				self.turnFastEpochEnd = getConfigListEntry(_("End time"), nim.fastTurningEnd)
+				list.append(self.turnFastEpochBegin)
+				list.append(self.turnFastEpochEnd)
 
 	def createSetup(self):
 		print "Creating setup"
@@ -117,6 +118,7 @@ class NimSetup(Screen, ConfigListScreen):
 			self.have_advanced = False
 		elif self.nim.isCompatible("DVB-T"):
 			self.configMode = getConfigListEntry(_("Configuration Mode"), self.nimConfig.configMode)
+			self.list.append(self.configMode)
 			self.have_advanced = False
 			if self.nimConfig.configMode.value == "enabled":
 				self.list.append(getConfigListEntry(_("Terrestrial provider"), self.nimConfig.terrestrial))
@@ -137,7 +139,7 @@ class NimSetup(Screen, ConfigListScreen):
 	def run(self):
 		if self.have_advanced and self.nim.config_mode == "advanced":
 			self.fillAdvancedList()
-		for x in self["config"].list:
+		for x in self.list:
 			if x in [self.turnFastEpochBegin, self.turnFastEpochEnd]:
 				# workaround for storing only hour*3600+min*60 value in configfile
 				# not really needed.. just for cosmetics..