add support for dm8000 rtc,

[vuplus_dvbapp] / mytest.py

diff --git a/mytest.py b/mytest.py
index 5b3258d..2dcd0d3 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -7,7 +7,7 @@ from Tools.Profile import profile, profile_final
 
 profile("PYTHON_START")
 
-from enigma import runMainloop, eDVBDB, eTimer, quitMainloop, eDVBVolumecontrol, \
+from enigma import runMainloop, eDVBDB, eTimer, quitMainloop, \
        getDesktop, ePythonConfigQuery, eAVSwitch, eServiceEvent
 from tools import *
 
@@ -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
 
@@ -314,87 +315,11 @@ class Session:
                if self.summary is not None:
                        self.summary.show()
 
-from Screens.Volume import Volume
-from Screens.Mute import Mute
-from GlobalActions import globalActionMap
-
-profile("VolumeControl")
-#TODO .. move this to a own .py file
-class VolumeControl:
-       """Volume control, handles volUp, volDown, volMute actions and display
-       a corresponding dialog"""
-       def __init__(self, session):
-               global globalActionMap
-               globalActionMap.actions["volumeUp"]=self.volUp
-               globalActionMap.actions["volumeDown"]=self.volDown
-               globalActionMap.actions["volumeMute"]=self.volMute
-
-               config.audio = ConfigSubsection()
-               config.audio.volume = ConfigInteger(default = 100, limits = (0, 100))
-
-               self.volumeDialog = session.instantiateDialog(Volume)
-               self.muteDialog = session.instantiateDialog(Mute)
-
-               self.hideVolTimer = eTimer()
-               self.hideVolTimer.callback.append(self.volHide)
-
-               vol = config.audio.volume.value
-               self.volumeDialog.setValue(vol)
-               self.volctrl = eDVBVolumecontrol.getInstance()
-               self.volctrl.setVolume(vol, vol)
-
-       def volSave(self):
-               if self.volctrl.isMuted():
-                       config.audio.volume.value = 0
-               else:
-                       config.audio.volume.value = self.volctrl.getVolume()
-               config.audio.volume.save()
-
-       def volUp(self):
-               self.setVolume(+1)
-
-       def volDown(self):
-               self.setVolume(-1)
-
-       def setVolume(self, direction):
-               oldvol = self.volctrl.getVolume()
-               if direction > 0:
-                       self.volctrl.volumeUp()
-               else:
-                       self.volctrl.volumeDown()
-               is_muted = self.volctrl.isMuted()
-               vol = self.volctrl.getVolume()
-               self.volumeDialog.show()
-               if is_muted:
-                       self.volMute() # unmute
-               elif not vol:
-                       self.volMute(False, True) # mute but dont show mute symbol
-               if self.volctrl.isMuted():
-                       self.volumeDialog.setValue(0)
-               else:
-                       self.volumeDialog.setValue(self.volctrl.getVolume())
-               self.volSave()
-               self.hideVolTimer.start(3000, True)
-
-       def volHide(self):
-               self.volumeDialog.hide()
-
-       def volMute(self, showMuteSymbol=True, force=False):
-               vol = self.volctrl.getVolume()
-               if vol or force:
-                       self.volctrl.volumeToggleMute()
-                       if self.volctrl.isMuted():
-                               if showMuteSymbol:
-                                       self.muteDialog.show()
-                               self.volumeDialog.setValue(0)
-                       else:
-                               self.muteDialog.hide()
-                               self.volumeDialog.setValue(vol)
-
 profile("Standby,PowerKey")
 import Screens.Standby
 from Screens.Menu import MainMenu, mdom
 import xml.dom.minidom
+from GlobalActions import globalActionMap
 
 class PowerKey:
        """ PowerKey stuff - handles the powerkey press and powerkey release actions"""
@@ -480,6 +405,9 @@ profile("Load:CI")
 from enigma import eDVBCIInterfaces
 from Screens.Ci import CiHandler
 
+profile("Load:VolumeControl")
+from Components.VolumeControl import VolumeControl
+
 def runScreenTest():
        profile("readPluginList")
        plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
@@ -539,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 = [
@@ -550,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")