aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2006-12-05 13:56:06 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2006-12-05 13:56:06 +0000
commit200f092160951622fbe7c3d0c207dccfab72a4be (patch)
tree90e2f69e83c3aac678869d329888cc8e13d423ca
parent767f09427a5dbfa924bcf487c09491ed34a4a7ce (diff)
downloadenigma2-200f092160951622fbe7c3d0c207dccfab72a4be.tar.gz
enigma2-200f092160951622fbe7c3d0c207dccfab72a4be.zip
add possibility to enable/disable 12V Chinch output via usage setup
-rw-r--r--data/setup.xml1
-rw-r--r--lib/driver/Makefile.am2
-rw-r--r--lib/python/Components/UsageConfig.py13
-rw-r--r--lib/python/enigma_python.i2
4 files changed, 15 insertions, 3 deletions
diff --git a/data/setup.xml b/data/setup.xml
index 36a243f3..e7498780 100644
--- a/data/setup.xml
+++ b/data/setup.xml
@@ -24,6 +24,7 @@
<item text="Change bouquets in quickzap">config.usage.quickzap_bouquet_change</item>
<item text="Alternative radio mode">config.usage.e1like_radio_mode</item>
<item text="Infobar timeout">config.usage.infobar_timeout</item>
+ <item text="12V output">config.usage.output_12V</item>
<item text="Show infobar on channel change">config.usage.show_infobar_on_zap</item>
<item text="Show infobar on skip forward/backward">config.usage.show_infobar_on_skip</item>
</setup>
diff --git a/lib/driver/Makefile.am b/lib/driver/Makefile.am
index 227d9279..de1271b6 100644
--- a/lib/driver/Makefile.am
+++ b/lib/driver/Makefile.am
@@ -4,4 +4,4 @@ INCLUDES = \
noinst_LIBRARIES = libenigma_driver.a
libenigma_driver_a_SOURCES = \
- rc.cpp rcinput.cpp rcconsole.cpp avswitch.cpp rfmod.cpp etimezone.cpp
+ rc.cpp rcinput.cpp rcconsole.cpp avswitch.cpp rfmod.cpp etimezone.cpp misc_options.cpp
diff --git a/lib/python/Components/UsageConfig.py b/lib/python/Components/UsageConfig.py
index 9d5e959f..7a286da1 100644
--- a/lib/python/Components/UsageConfig.py
+++ b/lib/python/Components/UsageConfig.py
@@ -1,4 +1,5 @@
from config import ConfigSubsection, ConfigYesNo, config, ConfigSelection
+from enigma import Misc_Options
import os
def InitUsageConfig():
@@ -19,8 +20,16 @@ def InitUsageConfig():
("60", "5 " + _("minutes")), ("120", "10 " + _("minutes")), ("240", "20 " + _("minutes")),
("241", "30 " + _("minutes")), ("242", "1 " + _("hour")), ("244", "2 " + _("hours")),
("248", "4 " + _("hours")) ])
-
+ config.usage.output_12V = ConfigSelection(default = "do not change", choices = [
+ ("do not change", _("do not change")), ("off", _("off")), ("on", _("on")) ])
+
def setHDDStandby(configElement):
os.system("hdparm -S" + configElement.value + " /dev/ide/host0/bus0/target0/lun0/disc")
+ config.usage.hdd_standby.addNotifier(setHDDStandby)
- config.usage.hdd_standby.addNotifier(setHDDStandby); \ No newline at end of file
+ def set12VOutput(configElement):
+ if configElement.value == "on":
+ Misc_Options.getInstance().set_12V_output(1)
+ elif configElement.value == "off":
+ Misc_Options.getInstance().set_12V_output(0)
+ config.usage.output_12V.addNotifier(set12VOutput)
diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i
index ebe934a5..b03be7b5 100644
--- a/lib/python/enigma_python.i
+++ b/lib/python/enigma_python.i
@@ -85,6 +85,7 @@ is usually caused by not marking PSignals as immutable.
#include <lib/dvb/dvbtime.h>
#include <lib/driver/avswitch.h>
#include <lib/driver/rfmod.h>
+#include <lib/driver/misc_options.h>
#include <lib/driver/etimezone.h>
#include <lib/gdi/lcd.h>
#include <lib/dvb_ci/dvbci_ui.h>
@@ -214,6 +215,7 @@ typedef long time_t;
%include <lib/dvb/frontend.h>
%include <lib/driver/avswitch.h>
%include <lib/driver/rfmod.h>
+%include <lib/driver/misc_options.h>
%include <lib/driver/etimezone.h>
%include <lib/gdi/lcd.h>
%include <lib/dvb_ci/dvbci_ui.h>