X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ae7adb81ba7c4737cf8f92ae365df0f956de5749..5ce65d82dcb11e8c5886be467fefecc5e70d4868:/lib/python/Screens/Satconfig.py

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index e07b45e1..9f22013d 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -1,10 +1,13 @@
 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
 
+from time import mktime, localtime
+from datetime import datetime
+
 class NimSetup(Screen, ConfigListScreen):
 	def createSimpleSetup(self, list, mode):
 		if mode == "single":
@@ -19,14 +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))
-#		elif self.nimConfig.positionerMode.value == "manual": # manual
-#			pass
+		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))
+
+		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"
@@ -40,13 +52,16 @@ class NimSetup(Screen, ConfigListScreen):
 		self.advancedUsalsEntry = None
 		self.advancedLof = None
 		self.advancedPowerMeasurement = None
+		self.turningSpeed = None
+		self.turnFastEpochBegin = None
+		self.turnFastEpochEnd = None
 
 		self.cableScanType = None
 
 		if self.nim.isCompatible("DVB-S"):
 			self.configMode = getConfigListEntry(_("Configuration Mode"), self.nimConfig.configMode)
 			self.list.append(self.configMode)
-			
+
 			if self.nimConfig.configMode.value == "simple":			#simple setup
 				self.diseqcModeEntry = getConfigListEntry(_("DiSEqC Mode"), self.nimConfig.diseqcMode)
 				self.list.append(self.diseqcModeEntry)
@@ -103,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))
@@ -115,7 +131,7 @@ class NimSetup(Screen, ConfigListScreen):
 	def newConfig(self):
 		checkList = (self.configMode, self.diseqcModeEntry, self.advancedSatsEntry, \
 			self.advancedLnbsEntry, self.advancedDiseqcMode, self.advancedUsalsEntry, \
-			self.advancedLof, self.advancedPowerMeasurement, self.cableScanType)
+			self.advancedLof, self.advancedPowerMeasurement, self.turningSpeed, self.cableScanType)
 		for x in checkList:
 			if self["config"].getCurrent() == x:
 				self.createSetup()
@@ -123,7 +139,13 @@ 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..
+				tm = localtime(x[1].value)
+				dt = datetime(1970, 1, 1, tm.tm_hour, tm.tm_min)
+				x[1].value = int(mktime(dt.timetuple()))
 			x[1].save()
 		nimmanager.sec.update()
 
@@ -163,10 +185,17 @@ class NimSetup(Screen, ConfigListScreen):
 					self.list.append(getConfigListEntry(" ", currLnb.longitudeOrientation))
 					self.list.append(getConfigListEntry(_("Latitude"), currLnb.latitude))
 					self.list.append(getConfigListEntry(" ", currLnb.latitudeOrientation))
-					self.advancedPowerMeasurement = getConfigListEntry("Use Power Measurement", currLnb.powerMeasurement)
+					self.advancedPowerMeasurement = getConfigListEntry(_("Use Power Measurement"), currLnb.powerMeasurement)
 					self.list.append(self.advancedPowerMeasurement)
-					if currLnb.powerMeasurement.value == "yes":
-						self.list.append(getConfigListEntry("Power Threshold in mA", currLnb.powerThreshold))
+					if currLnb.powerMeasurement.value:
+						self.list.append(getConfigListEntry(_("Power threshold in mA"), currLnb.powerThreshold))
+						self.turningSpeed = getConfigListEntry(_("Rotor turning speed"), currLnb.turningSpeed)
+						self.list.append(self.turningSpeed)
+						if currLnb.turningSpeed.value == "fast epoch":
+							self.turnFastEpochBegin = getConfigListEntry(_("Begin time"), currLnb.fastTurningBegin)
+							self.turnFastEpochEnd = getConfigListEntry(_("End time"), currLnb.fastTurningEnd)
+							self.list.append(self.turnFastEpochBegin)
+							self.list.append(self.turnFastEpochEnd)
 			self.advancedLof = getConfigListEntry(_("LOF"), currLnb.lof)
 			self.list.append(self.advancedLof)
 			if currLnb.lof.value == "user_defined":