ManualFancontrol : check fan_pwm & remove print lines..

[vuplus_dvbapp] / lib / python / Plugins / SystemPlugins / ManualFancontrol / InstandbyOn.py

diff --git a/lib/python/Plugins/SystemPlugins/ManualFancontrol/InstandbyOn.py b/lib/python/Plugins/SystemPlugins/ManualFancontrol/InstandbyOn.py
index df7e5b6..b4af0ad 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/ManualFancontrol/InstandbyOn.py
+++ b/lib/python/Plugins/SystemPlugins/ManualFancontrol/InstandbyOn.py
@@ -5,10 +5,21 @@ from Components.ConfigList import ConfigListScreen
 from Components.config import config, ConfigSubsection, ConfigSelection, ConfigSlider
 from Components.Harddisk import harddiskmanager
 
+def getModel():
+       file = open("/proc/stb/info/vumodel", "r")
+       modelname = file.readline().strip()
+       file.close()
+       return modelname
+
 config.plugins.manualfancontrols = ConfigSubsection()
 config.plugins.manualfancontrols.standbymode = ConfigSelection(default = "yes", choices = [
        ("no", _("no")), ("yes", _("yes"))])
-config.plugins.manualfancontrols.pwmvalue = ConfigSlider(default = 10, increment = 5, limits = (0, 255))
+
+if getModel() == "ultimo":
+       config.plugins.manualfancontrols.pwmvalue = ConfigSlider(default = 100, increment = 5, limits = (0, 255))
+else:
+       config.plugins.manualfancontrols.pwmvalue = ConfigSlider(default = 10, increment = 5, limits = (0, 255))
+
 config.plugins.manualfancontrols.checkperiod = ConfigSelection(default = "10", choices = [
                ("5", "5 " + _("seconds")), ("10", "10 " + _("seconds")), ("30", "30 " + _("seconds")),
                ("60", "1 " + _("minute")), ("120", "2 " + _("minutes")),
@@ -25,24 +36,24 @@ class instandbyOn:
                self.checkStstusTimer.callback.append(self.checkStstus)
                if config.plugins.manualfancontrols.pwmvalue.value == 0:
                        self.fanoffmode = 'ON'
-               if self.fanoffmode == 'ON':
-                       self.checkStatusLoopStart()
-
-               config.misc.standbyCounter.addNotifier(self.standbyBegin, initial_call = False)
-               print "<ManualFancontrol> init :  self.fanoffmode : ", self.fanoffmode
-               print "<ManualFancontrol> init :  config.plugins.manualfancontrols.pwmvalue.value : ", config.plugins.manualfancontrols.pwmvalue.value
+               if self.check_fan_pwm():
+                       if self.fanoffmode == 'ON':
+                               self.checkStatusLoopStart()
+                       config.misc.standbyCounter.addNotifier(self.standbyBegin, initial_call = False)
+#              print "[ManualFancontrol] init :  self.fanoffmode : ", self.fanoffmode
+#              print "[ManualFancontrol] init :  config.plugins.manualfancontrols.pwmvalue.value : ", config.plugins.manualfancontrols.pwmvalue.value
 
        def checkStatusLoopStart(self):
-               print "<ManualFancontrol> checkStatusLoopStart"
+#              print "[ManualFancontrol] checkStatusLoopStart"
                self.checkStstusTimer.start(int(config.plugins.manualfancontrols.checkperiod.value) * 1000)
 
        def checkStatusLoopStop(self):
-               print "<ManualFancontrol> checkStatusLoopStop"
+#              print "[ManualFancontrol] checkStatusLoopStop"
                self.checkStstusTimer.stop()
 
        def checkStstus(self):
                from Screens.Standby import inStandby
-               print "<ManualFancontrol> checkStstus, fanoffmode : %s, "%self.fanoffmode,"inStandby : ",inStandby and True or False
+               print "[ManualFancontrol] checkStstus, fanoffmode : %s, "%self.fanoffmode,"inStandby : ",inStandby and True or False
                if self.fanoffmode is 'ON' : # pwmvalue is '0'
                        if self.isRecording() or self.isHDDActive():
                                self.setPWM(self.minimum_pwm)
@@ -53,11 +64,13 @@ class instandbyOn:
                                self.setPWM(config.plugins.manualfancontrols.pwmvalue.value)
                        else:
                                self.setPWM(0)
-               elif self.getPWM() != config.plugins.manualfancontrols.pwmvalue.value : # normal mode
-                       self.setPWM(config.plugins.manualfancontrols.pwmvalue.value)
+               else:
+                       pwm = self.getPWM()
+                       if pwm is not None and pwm != config.plugins.manualfancontrols.pwmvalue.value : # normal mode
+                               self.setPWM(config.plugins.manualfancontrols.pwmvalue.value)
 
        def standbyBegin(self, configElement):
-               print "<ManualFancontrol> Standby Begin"
+#              print "[ManualFancontrol] Standby Begin"
                if config.plugins.manualfancontrols.standbymode.value == "yes" and self.fanoffmode is "OFF":
                        from Screens.Standby import inStandby
                        inStandby.onClose.append(self.StandbyEnd)
@@ -66,19 +79,19 @@ class instandbyOn:
                        self.checkStstus()
 
        def StandbyEnd(self):
-               print "<ManualFancontrol> Standby End"
+#              print "[ManualFancontrol] Standby End"
                if self.fanoffmode is "OFF":
                        self.removeRecordEventCB()
                        self.checkStatusLoopStop()
                self.checkStstus()
 
        def addRecordEventCB(self):
-               print "<ManualFancontrol> addRecordEventCB"
+#              print "[ManualFancontrol] addRecordEventCB"
                if self.getRecordEvent not in NavigationInstance.instance.record_event:
                        NavigationInstance.instance.record_event.append(self.getRecordEvent)
 
        def removeRecordEventCB(self):
-               print "<ManualFancontrol> removeRecordEventCB"
+#              print "[ManualFancontrol] removeRecordEventCB"
                if self.getRecordEvent in NavigationInstance.instance.record_event:
                        NavigationInstance.instance.record_event.remove(self.getRecordEvent)
 
@@ -103,17 +116,31 @@ class instandbyOn:
                return False
 
        def getPWM(self):
-               f = open("/proc/stb/fp/fan_pwm", "r")
-               value = int(f.readline().strip(), 16)
-               f.close()
-               print "<ManualFancontrol> getPWM : %d "%value
-               return value
+               try:
+                       f = open("/proc/stb/fp/fan_pwm", "r")
+                       value = int(f.readline().strip(), 16)
+                       f.close()
+                       print "[ManualFancontrol] getPWM : %d "%value
+                       return value
+               except:
+                       print "[ManualFancontrol] /proc/stb/fp/fan_pwm is not exist"
+                       return None
 
        def setPWM(self, value):
-               print "<ManualFancontrol> setPWM to : %d"%value
-               f = open("/proc/stb/fp/fan_pwm", "w")
-               f.write("%x" % value)
-               f.close()
+               try:
+                       f = open("/proc/stb/fp/fan_pwm", "w")
+                       f.write("%x" % value)
+                       f.close()
+                       print "[ManualFancontrol] setPWM to : %d"%value
+               except:
+                       print "[ManualFancontrol] /proc/stb/fp/fan_pwm is not exist"
+
+       def check_fan_pwm(self):
+               from os import access, F_OK
+               if access("/proc/stb/fp/fan_pwm", F_OK):
+                       return True
+               else:
+                       return False
 
 instandbyon = instandbyOn()