X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=mytest.py;h=2dcd0d3317c5c3d7abd83361b090156e0c0fcda3;hp=d58649cfafe45126ccf7a0f918803706058ace58;hb=92362f1b73f1e61ad0cb1c581b318b360e0bb6fe;hpb=19d19912b3f7ff117f4f9e8136c428b664d806cb

diff --git a/mytest.py b/mytest.py
index d58649c..2dcd0d3 100644
--- a/mytest.py
+++ b/mytest.py
@@ -36,11 +36,11 @@ profile("LOAD:Navigation")
 from Navigation import Navigation
 
 profile("LOAD:skin")
-from skin import readSkin, applyAllAttributes
+from skin import readSkin
 
 profile("LOAD:Tools")
 from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
-from Components.config import config, configfile, ConfigText, ConfigSubsection, ConfigInteger
+from Components.config import config, configfile, ConfigText
 InitFallbackFiles()
 
 profile("ReloadProfiles")
@@ -72,10 +72,11 @@ from Components.PluginComponent import plugins
 
 profile("LOAD:Wizard")
 from Screens.Wizard import wizardManager
+from Screens.DefaultWizard import *
 from Screens.ImageWizard import *
 from Screens.StartWizard import *
-from Screens.DefaultWizard import *
 from Screens.TutorialWizard import *
+import Screens.Rc
 from Tools.BoundFunction import boundFunction
 from Plugins.Plugin import PluginDescriptor
 
@@ -466,7 +467,7 @@ def runScreenTest():
 
 	profile("wakeup")
 	from time import time
-	from Tools.DreamboxHardware import setFPWakeuptime
+	from Tools.DreamboxHardware import setFPWakeuptime, getFPWakeuptime
 	#get currentTime
 	nowTime = time()
 	wakeupList = [
@@ -477,12 +478,16 @@ def runScreenTest():
 		if x != -1
 	]
 	wakeupList.sort()
-	if len(wakeupList):
+	if len(wakeupList) and getFPWakeuptime(): # getFPWakeuptime returns 1 when the sanity check in Navigation.py was okay..
 		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
+		if (startTime - nowTime) < 330: # no time to switch box back on
+			wptime = nowTime + 30  # so switch back on in 30 seconds
 		else:
-			setFPWakeuptime(startTime - 300)
+			wptime = startTime - 300
+		setFPWakeuptime(wptime)
+	else:
+		print "buggy atmel firmware detected... dont set a wakeup time!"
+		setFPWakeuptime(0)
 	profile("stopService")
 	session.nav.stopService()
 	profile("nav shutdown")