X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bd7a5be245b3f3bac1a822baec4378f341e0b781..1b4aad48a679d50a81692082e02040c56a9920a9:/mytest.py

diff --git a/mytest.py b/mytest.py
index e0b86e7e..3bdbcf2d 100644
--- a/mytest.py
+++ b/mytest.py
@@ -404,18 +404,22 @@ class PowerKey:
 		globalActionMap.actions["power_down"]=self.powerdown
 		globalActionMap.actions["power_up"]=self.powerup
 		globalActionMap.actions["power_long"]=self.powerlong
+		globalActionMap.actions["deepstandby"]=self.shutdown # frontpanel long power button press
 		self.standbyblocked = 1
 
 	def MenuClosed(self, *val):
 		self.session.infobar = None
 
+	def shutdown(self):
+		print "PowerOff - Now!"
+		if not Screens.Standby.inTryQuitMainloop:
+			self.session.open(Screens.Standby.TryQuitMainloop, 1)
+		
 	def powerlong(self):
 		self.standbyblocked = 1
 		action = config.usage.on_long_powerpress.value
 		if action == "shutdown":
-			print "PowerOff - Now!"
-			if not Screens.Standby.inTryQuitMainloop:
-				self.session.open(Screens.Standby.TryQuitMainloop, 1)
+			self.shutdown()
 		elif action == "show_menu":
 			print "Show shutdown Menu"
 			menu = mdom.childNodes[0]
@@ -472,12 +476,15 @@ class AutoScartControl:
 				self.scartDialog.switchToTV()
 
 from enigma import eDVBCIInterfaces
+from Screens.Ci import CiHandler
 
 def runScreenTest():
 	plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
 
 	session = Session(desktop = getDesktop(0), summary_desktop = getDesktop(1), navigation = Navigation())
 
+	CiHandler.setSession(session)
+
 	screensToRun = [ ]
 
 	for p in plugins.getPlugins(PluginDescriptor.WHERE_WIZARD):
@@ -521,17 +528,18 @@ def runScreenTest():
 
 	from time import time
 	from Tools.DreamboxHardware import setFPWakeuptime
-	#get next record timer start time
-	nextRecordingTime = session.nav.RecordTimer.getNextRecordingTime()
-	#get next zap timer start time
-	nextZapTime = session.nav.RecordTimer.getNextZapTime()
 	#get currentTime
 	nowTime = time()
-	if nextZapTime != -1 and nextRecordingTime != -1:
-		startTime = nextZapTime < nextRecordingTime and nextZapTime or nextRecordingTime
-	else:
-		startTime = nextZapTime != -1 and nextZapTime or nextRecordingTime
-	if startTime != -1:
+	wakeupList = [
+		x for x in
+				[session.nav.RecordTimer.getNextRecordingTime(),
+				session.nav.RecordTimer.getNextZapTime(),
+				plugins.getNextWakeupTime()]
+		if x != -1
+	]
+	wakeupList.sort()
+	if len(wakeupList):
+		startTime = wakeupList.pop(0)
 		if (startTime - nowTime < 330): # no time to switch box back on
 			setFPWakeuptime(nowTime + 30) # so switch back on in 30 seconds
 		else: