From 67858ed10ece500b2cf68dafb39886a0b873ec4c Mon Sep 17 00:00:00 2001 From: thedoc Date: Mon, 7 Dec 2009 22:38:20 +0100 Subject: [PATCH] first working version of TempFanControl plugin with Sensors and FanControl component --- configure.ac | 1 + lib/python/Components/Converter/Makefile.am | 2 +- .../Components/Converter/SensorToText.py | 12 +++ lib/python/Components/FanControl.py | 76 +++++++++++++++++++ lib/python/Components/Makefile.am | 2 +- lib/python/Components/Sensors.py | 72 ++++++++++++++++++ lib/python/Components/Sources/Makefile.am | 2 +- lib/python/Components/Sources/Sensor.py | 27 +++++++ lib/python/Plugins/SystemPlugins/Makefile.am | 3 +- .../SystemPlugins/TempFanControl/Makefile.am | 5 ++ .../SystemPlugins/TempFanControl/__init__.py | 0 .../SystemPlugins/TempFanControl/plugin.py | 62 +++++++++++++++ 12 files changed, 260 insertions(+), 4 deletions(-) create mode 100644 lib/python/Components/Converter/SensorToText.py create mode 100644 lib/python/Components/FanControl.py create mode 100644 lib/python/Components/Sensors.py create mode 100644 lib/python/Components/Sources/Sensor.py create mode 100644 lib/python/Plugins/SystemPlugins/TempFanControl/Makefile.am create mode 100644 lib/python/Plugins/SystemPlugins/TempFanControl/__init__.py create mode 100644 lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py diff --git a/configure.ac b/configure.ac index 5e403deb..18801002 100755 --- a/configure.ac +++ b/configure.ac @@ -155,6 +155,7 @@ lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile lib/python/Plugins/SystemPlugins/Hotplug/Makefile lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile lib/python/Plugins/SystemPlugins/Makefile +lib/python/Plugins/SystemPlugins/TempFanControl/Makefile lib/python/Plugins/SystemPlugins/NetworkWizard/Makefile lib/python/Plugins/SystemPlugins/NetworkWizard/meta/Makefile lib/python/Plugins/SystemPlugins/NFIFlash/Makefile diff --git a/lib/python/Components/Converter/Makefile.am b/lib/python/Components/Converter/Makefile.am index 75c8a08e..3b6fd3e8 100644 --- a/lib/python/Components/Converter/Makefile.am +++ b/lib/python/Components/Converter/Makefile.am @@ -6,4 +6,4 @@ install_PYTHON = \ ConditionalShowHide.py ServicePosition.py ValueRange.py RdsInfo.py Streaming.py \ StaticMultiList.py ServiceTime.py MovieInfo.py MenuEntryCompare.py StringListSelection.py \ ValueBitTest.py TunerInfo.py ConfigEntryTest.py TemplatedMultiContent.py ProgressToText.py \ - Combine.py + Combine.py SensorToText.py diff --git a/lib/python/Components/Converter/SensorToText.py b/lib/python/Components/Converter/SensorToText.py new file mode 100644 index 00000000..ab87ee2e --- /dev/null +++ b/lib/python/Components/Converter/SensorToText.py @@ -0,0 +1,12 @@ +from Components.Converter.Converter import Converter + +class SensorToText(Converter, object): + def __init__(self, arguments): + Converter.__init__(self, arguments) + + def getText(self): + return "%d %s" % (self.source.getValue(), self.source.getUnit()) + + text = property(getText) + + \ No newline at end of file diff --git a/lib/python/Components/FanControl.py b/lib/python/Components/FanControl.py new file mode 100644 index 00000000..d7986c25 --- /dev/null +++ b/lib/python/Components/FanControl.py @@ -0,0 +1,76 @@ +import os + +from Components.config import config, ConfigSubList, ConfigSubsection, ConfigSlider +from Tools.BoundFunction import boundFunction + +class FanControl: + # ATM there's only support for one fan + def __init__(self): + if os.path.exists("/proc/stb/fp/fan_vlt") or os.path.exists("/proc/stb/fp/fan_pwm") or os.path.exists("/proc/stb/fp/fan_speed"): + self.fancount = 1 + else: + self.fancount = 0 + self.createConfig() + + def createConfig(self): + def setVlt(fancontrol, fanid, configElement): + fancontrol.setVoltage(fanid, configElement.value) + def setPWM(fancontrol, fanid, configElement): + fancontrol.setPWM(fanid, configElement.value) + + config.fans = ConfigSubList() + for fanid in range(self.getFanCount()): + default_vlt = self.getVoltage(fanid) + default_pwm = self.getPWM(fanid) + fan = ConfigSubsection() + fan.vlt = ConfigSlider(default = default_vlt, increment = 10, limits = (0, 255)) + fan.pwm = ConfigSlider(default = default_vlt, increment = 10, limits = (0, 255)) + fan.vlt.addNotifier(boundFunction(setVlt, self, fanid)) + fan.pwm.addNotifier(boundFunction(setPWM, self, fanid)) + config.fans.append(fan) + + def getConfig(self, fanid): + return config.fans[fanid] + + def getFanCount(self): + return self.fancount + + def hasRPMSensor(self, fanid): + return os.path.exists("/proc/stb/fp/fan_speed") + + def hasFanControl(self, fanid): + return os.path.exists("/proc/stb/fp/fan_vlt") or os.path.exists("/proc/stb/fp/fan_pwm") + + def getFanSpeed(self, fanid): + f = open("/proc/stb/fp/fan_speed", "r") + value = int(f.readline().strip()[:-4]) + f.close() + return value + + def getVoltage(self, fanid): + f = open("/proc/stb/fp/fan_vlt", "r") + value = int(f.readline().strip(), 16) + f.close() + return value + + def setVoltage(self, fanid, value): + if value > 255: + return + f = open("/proc/stb/fp/fan_vlt", "w") + f.write("%x" % value) + f.close() + + def getPWM(self, fanid): + f = open("/proc/stb/fp/fan_pwm", "r") + value = int(f.readline().strip(), 16) + f.close() + return value + + def setPWM(self, fanid, value): + if value > 255: + return + f = open("/proc/stb/fp/fan_pwm", "w") + f.write("%x" % value) + f.close() + +fancontrol = FanControl() \ No newline at end of file diff --git a/lib/python/Components/Makefile.am b/lib/python/Components/Makefile.am index 34710fa1..b5ef0688 100755 --- a/lib/python/Components/Makefile.am +++ b/lib/python/Components/Makefile.am @@ -19,4 +19,4 @@ install_PYTHON = \ Element.py Playlist.py ParentalControl.py ParentalControlList.py \ Ipkg.py SelectionList.py Scanner.py SystemInfo.py DreamInfoHandler.py \ Task.py language_cache.py Console.py ResourceManager.py TuneTest.py \ - Keyboard.py + Keyboard.py Sensors.py FanControl.py diff --git a/lib/python/Components/Sensors.py b/lib/python/Components/Sensors.py new file mode 100644 index 00000000..7f63455b --- /dev/null +++ b/lib/python/Components/Sensors.py @@ -0,0 +1,72 @@ +from Components.FanControl import fancontrol + +class Sensors: + # (type, name, unit, directory) + TYPE_TEMPERATURE = 0 + # (type, name, unit, fanid) + TYPE_FAN_RPM = 1 + + def __init__(self): + # (type, name, unit, sensor_specific_dict/list) + self.sensors_list = [] + self.addSensors() + + def getSensorsCount(self, type = None): + if type is None: + return len(self.sensors_list) + count = 0 + for sensor in self.sensors_list: + if sensor[0] == type: + count += 1 + return count + + # returns a list of sensorids of type "type" + def getSensorsList(self, type = None): + if type is None: + return range(len(self.sensors_list)) + list = [] + for sensorid in range(len(self.sensors_list)): + if self.sensors_list[sensorid][0] == type: + list.append(sensorid) + return list + + + def getSensorType(self, sensorid): + return self.sensors_list[sensorid][0] + + def getSensorName(self, sensorid): + return self.sensors_list[sensorid][1] + + def getSensorValue(self, sensorid): + value = -1 + sensor = self.sensors_list[sensorid] + if sensor[0] == self.TYPE_TEMPERATURE: + f = open("%s/value" % sensor[3], "r") + value = int(f.readline().strip()) + f.close() + elif sensor[0] == self.TYPE_FAN_RPM: + value = fancontrol.getFanSpeed(sensor[3]) + return value + + def getSensorUnit(self, sensorid): + return self.sensors_list[sensorid][2] + + def addSensors(self): + import os + if os.path.exists("/proc/stb/sensors"): + for dirname in os.listdir("/proc/stb/sensors"): + if dirname.find("temp", 0, 4) == 0: + f = open("/proc/stb/sensors/%s/name" % dirname, "r") + name = f.readline().strip() + f.close() + + f = open("/proc/stb/sensors/%s/unit" % dirname, "r") + unit = f.readline().strip() + f.close() + + self.sensors_list.append((self.TYPE_TEMPERATURE, name, unit, "/proc/stb/sensors/%s" % dirname)) + for fanid in range(fancontrol.getFanCount()): + if fancontrol.hasRPMSensor(fanid): + self.sensors_list.append((self.TYPE_FAN_RPM, _("fan"), "rpm", fanid)) + +sensors = Sensors() \ No newline at end of file diff --git a/lib/python/Components/Sources/Makefile.am b/lib/python/Components/Sources/Makefile.am index 6ef8cac6..436d31be 100644 --- a/lib/python/Components/Sources/Makefile.am +++ b/lib/python/Components/Sources/Makefile.am @@ -4,4 +4,4 @@ install_PYTHON = \ __init__.py Clock.py EventInfo.py Source.py List.py CurrentService.py \ FrontendStatus.py Boolean.py Config.py ServiceList.py RdsDecoder.py StreamService.py \ StaticText.py CanvasSource.py ServiceEvent.py Event.py FrontendInfo.py TunerInfo.py \ - RecordState.py Progress.py + RecordState.py Progress.py Sensor.py diff --git a/lib/python/Components/Sources/Sensor.py b/lib/python/Components/Sources/Sensor.py new file mode 100644 index 00000000..3f6c8f0f --- /dev/null +++ b/lib/python/Components/Sources/Sensor.py @@ -0,0 +1,27 @@ +from Components.Sensors import sensors + +from enigma import eTimer + +from Source import Source + +class SensorSource(Source): + def __init__(self, update_interval = 500, sensorid = 0): + self.update_interval = update_interval + self.sensorid = sensorid + Source.__init__(self) + + self.update_timer = eTimer() + self.update_timer.callback.append(self.updateValue) + self.update_timer.start(self.update_interval) + + def getValue(self): + return sensors.getSensorValue(self.sensorid) + + def getUnit(self): + return sensors.getSensorUnit(self.sensorid) + + def updateValue(self): + self.changed((self.CHANGED_POLL,)) + + def destroy(self): + self.update_timer.callback.remove(self.updateValue) diff --git a/lib/python/Plugins/SystemPlugins/Makefile.am b/lib/python/Plugins/SystemPlugins/Makefile.am index a8b187dc..9cc538f3 100755 --- a/lib/python/Plugins/SystemPlugins/Makefile.am +++ b/lib/python/Plugins/SystemPlugins/Makefile.am @@ -3,7 +3,8 @@ installdir = $(pkglibdir)/python/Plugins/SystemPlugins SUBDIRS = SoftwareManager FrontprocessorUpgrade PositionerSetup Satfinder \ SkinSelector SatelliteEquipmentControl Videomode VideoTune Hotplug \ DefaultServicesScanner NFIFlash DiseqcTester CommonInterfaceAssignment \ - CrashlogAutoSubmit CleanupWizard VideoEnhancement WirelessLan NetworkWizard + CrashlogAutoSubmit CleanupWizard VideoEnhancement WirelessLan NetworkWizard \ + TempFanControl install_PYTHON = \ __init__.py diff --git a/lib/python/Plugins/SystemPlugins/TempFanControl/Makefile.am b/lib/python/Plugins/SystemPlugins/TempFanControl/Makefile.am new file mode 100644 index 00000000..78ff11c3 --- /dev/null +++ b/lib/python/Plugins/SystemPlugins/TempFanControl/Makefile.am @@ -0,0 +1,5 @@ +installdir = $(LIBDIR)/enigma2/python/Plugins/SystemPlugins/TempFanControl + +install_PYTHON = \ + __init__.py \ + plugin.py diff --git a/lib/python/Plugins/SystemPlugins/TempFanControl/__init__.py b/lib/python/Plugins/SystemPlugins/TempFanControl/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py b/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py new file mode 100644 index 00000000..60af03cb --- /dev/null +++ b/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py @@ -0,0 +1,62 @@ +from Components.ActionMap import ActionMap +from Components.Sensors import sensors +from Components.Sources.Sensor import SensorSource +from Components.ConfigList import ConfigListScreen +from Components.config import getConfigListEntry + +from Screens.Screen import Screen + +from Plugins.Plugin import PluginDescriptor +from Components.FanControl import fancontrol + +class TempFanControl(Screen, ConfigListScreen): + skin = """ + + + + + + + + + + """ + + def __init__(self, session, args = None): + Screen.__init__(self, session) + + id = sensors.getSensorsList(sensors.TYPE_TEMPERATURE)[0] + self["SensorTemp"] = SensorSource(sensorid = id) + id = sensors.getSensorsList(sensors.TYPE_FAN_RPM)[0] + self["SensorFan"] = SensorSource(sensorid = id, update_interval = 100) + + self.list = [] + if fancontrol.getFanCount() > 0: + self.list.append(getConfigListEntry(_("Fan Voltage"), fancontrol.getConfig(0).vlt)) + self.list.append(getConfigListEntry(_("Fan PWM"), fancontrol.getConfig(0).pwm)) + ConfigListScreen.__init__(self, self.list, session = self.session) + #self["config"].list = self.list + #self["config"].setList(self.list) + + self["actions"] = ActionMap(["OkCancelActions"], + { + "ok": self.save, + "cancel": self.revert + }, -1) + + def save(self): + fancontrol.getConfig(0).vlt.save() + fancontrol.getConfig(0).pwm.save() + self.close() + + def revert(self): + fancontrol.getConfig(0).vlt.load() + fancontrol.getConfig(0).pwm.load() + self.close() + +def main(session, **kwargs): + session.open(TempFanControl) + +def Plugins(**kwargs): + return PluginDescriptor(name = "Temperature and Fan control", description = _("Temperature and Fan control"), where = PluginDescriptor.WHERE_EXTENSIONSMENU, fnc = main) + \ No newline at end of file -- 2.30.2