From: Chang.H.S <jhs@dev3>
Date: Tue, 3 Jan 2012 06:32:35 +0000 (+0900)
Subject: LEDBrightnessSetup : move setLED func to python code
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=1d10d4a489d6700c942d00358822728390f8fcd7

LEDBrightnessSetup : move setLED func to python code
---

diff --git a/lib/gdi/lcd.cpp b/lib/gdi/lcd.cpp
index 6e97179..794e9ab 100755
--- a/lib/gdi/lcd.cpp
+++ b/lib/gdi/lcd.cpp
@@ -124,28 +124,6 @@ void eDBoxLCD::setInverted(unsigned char inv)
 	update();
 }
 
-void eDBoxLCD::setLED(int value, int option)
-{
-	switch(option)
-	{
-		case LED_BRIGHTNESS:
-			ioctl(lcdfd, LED_IOCTL_BRIGHTNESS_NORMAL, (unsigned char)value);
-			break;
-		case LED_DEEPSTANDBY:
-			ioctl(lcdfd, LED_IOCTL_BRIGHTNESS_DEEPSTANDBY, (unsigned char)value);
-			break;
-		case LED_BLINKINGTIME:
-			ioctl(lcdfd, LED_IOCTL_BLINKING_TIME, (unsigned char)value);
-			break;
-	}
-}
-
-void eDBoxLCD::setLEDDefault(int normal, int deepstandby, int blinktime)
-{
-	int value = (blinktime << 16) + (deepstandby << 8) + normal;
-	ioctl(lcdfd, LED_IOCTL_SET_DEFAULT, value);
-}
-
 int eDBoxLCD::setLCDContrast(int contrast)
 {
 #ifndef NO_LCD
diff --git a/lib/gdi/lcd.h b/lib/gdi/lcd.h
index 0cf2156..e7b4c2c 100755
--- a/lib/gdi/lcd.h
+++ b/lib/gdi/lcd.h
@@ -10,13 +10,6 @@
 #define LCD_BRIGHTNESS_MIN 0
 #define LCD_BRIGHTNESS_MAX 255
 
-enum op { LED_BRIGHTNESS = 0, LED_DEEPSTANDBY, LED_BLINKINGTIME };
-
-#define LED_IOCTL_BRIGHTNESS_NORMAL 0X10
-#define LED_IOCTL_BRIGHTNESS_DEEPSTANDBY 0X11
-#define LED_IOCTL_BLINKING_TIME 0X12
-#define LED_IOCTL_SET_DEFAULT 0X13
-
 class eLCD
 {
 #ifdef SWIG
@@ -61,8 +54,6 @@ public:
 	~eDBoxLCD();
 #endif
 	static eDBoxLCD *getInstance();
-	void setLED(int value, int option);
-	void setLEDDefault(int normal, int deepstandby, int blinktime);
 	int setLCDContrast(int contrast);
 	int setLCDBrightness(int brightness);
 	void setInverted( unsigned char );
diff --git a/lib/python/Plugins/SystemPlugins/LEDBrightnessSetup/plugin.py b/lib/python/Plugins/SystemPlugins/LEDBrightnessSetup/plugin.py
index 04e2a08..f5cc4fc 100755
--- a/lib/python/Plugins/SystemPlugins/LEDBrightnessSetup/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/LEDBrightnessSetup/plugin.py
@@ -8,7 +8,7 @@ from Plugins.Plugin import PluginDescriptor
 from Screens.MessageBox import MessageBox
 from Tools.Directories import fileExists
 from enigma import eTimer
-from enigma import eDBoxLCD
+import fcntl
 
 config.plugins.brightnesssetup = ConfigSubsection()
 config.plugins.brightnesssetup.brightness = ConfigSlider(default = 1, increment = 1, limits = (0,15))
@@ -20,15 +20,41 @@ class LEDOption:
 	DEEPSTANDBY = 1
 	BLINKINGTIME = 2
 
-class LEDBrightnessSetupStandby:
+class LEDSetup:
+	LED_IOCTL_BRIGHTNESS_NORMAL = 0X10
+	LED_IOCTL_BRIGHTNESS_DEEPSTANDBY = 0X11
+	LED_IOCTL_BLINKING_TIME = 0X12
+	LED_IOCTL_SET_DEFAULT = 0X13
+
 	def __init__(self):
+		self.led_fd = open("/dev/dbox/oled0",'rw')
 		self.initLEDSetup()
 
 	def initLEDSetup(self):
 		brightness = int(config.plugins.brightnesssetup.brightness.value)
 		brightnessstandby = int(config.plugins.brightnesssetup.brightnessdeepstandby.value)
 		blinkingtime = int(config.plugins.brightnesssetup.blinkingtime.value)
-		eDBoxLCD.getInstance().setLEDDefault(brightness, brightnessstandby, blinkingtime)
+		self.setLEDDefault(brightness, brightnessstandby, blinkingtime)
+
+	def setLEDDefault(self, brightness = 1, brightnessstandby = 5, blinkingtime = 5):
+		default_value = (blinkingtime<<16) + (brightnessstandby<<8) + brightness
+		fcntl.ioctl(self.led_fd , self.LED_IOCTL_SET_DEFAULT, default_value)
+
+	def setLED(self, value, option):
+		if option == LEDOption.BRIGHTNESS:
+			cmd = self.LED_IOCTL_BRIGHTNESS_NORMAL
+		elif option == LEDOption.DEEPSTANDBY:
+			cmd = self.LED_IOCTL_BRIGHTNESS_DEEPSTANDBY
+		elif option == LEDOption.BLINKINGTIME:
+			cmd = self.LED_IOCTL_BLINKING_TIME
+		else:
+			return
+		fcntl.ioctl(self.led_fd, cmd, value)
+
+	def __del__(self):
+		self.led_fd.close()
+
+ledsetup = LEDSetup()
 
 class LEDBrightnessSetup(Screen,ConfigListScreen):
 	skin = """
@@ -108,10 +134,10 @@ class LEDBrightnessSetup(Screen,ConfigListScreen):
 
 	def setCurrentValue(self):
 		if self["config"].getCurrent() == self.blinkingtime:
-			eDBoxLCD.getInstance().setLED(1 ,LEDOption.BRIGHTNESS)
-			eDBoxLCD.getInstance().setLED(self["config"].getCurrent()[1].value ,LEDOption.BLINKINGTIME)
+			ledsetup.setLED(1 ,LEDOption.BRIGHTNESS)
+			ledsetup.setLED(self["config"].getCurrent()[1].value ,LEDOption.BLINKINGTIME)
 		else:
-			eDBoxLCD.getInstance().setLED(self["config"].getCurrent()[1].value ,LEDOption.BRIGHTNESS)
+			ledsetup.setLED(self["config"].getCurrent()[1].value ,LEDOption.BRIGHTNESS)
 
 	def keyLeft(self):
 		ConfigListScreen.keyLeft(self)
@@ -125,9 +151,9 @@ class LEDBrightnessSetup(Screen,ConfigListScreen):
 		brightness = config.plugins.brightnesssetup.brightness.value
 		brightnessstandby = config.plugins.brightnesssetup.brightnessdeepstandby.value
 		blinkingtime = config.plugins.brightnesssetup.blinkingtime.value
-		eDBoxLCD.getInstance().setLED(brightness ,LEDOption.BRIGHTNESS)
-		eDBoxLCD.getInstance().setLED(brightnessstandby ,LEDOption.DEEPSTANDBY)
-		eDBoxLCD.getInstance().setLED(blinkingtime ,LEDOption.BLINKINGTIME)
+		ledsetup.setLED(brightness ,LEDOption.BRIGHTNESS)
+		ledsetup.setLED(brightnessstandby ,LEDOption.DEEPSTANDBY)
+		ledsetup.setLED(blinkingtime ,LEDOption.BLINKINGTIME)
 
 	def keySave(self):
 		if self["config"].isChanged():
@@ -141,6 +167,12 @@ class LEDBrightnessSetup(Screen,ConfigListScreen):
 		for entry in self["config"].getList():
 			self["config"].l.invalidateEntry(self["config"].getList().index(entry))
 
+		if self["config"].getCurrent() == self.blinkingtime:
+			self.setCurrentValue()
+		else:
+			ledsetup.setLED(5 ,LEDOption.BLINKINGTIME)
+			ledsetup.setLED(self["config"].getCurrent()[1].value ,LEDOption.BRIGHTNESS)
+
 	def cancelConfirm(self, result):
 		if not result:
 			return
@@ -155,4 +187,3 @@ def main(session, **kwargs):
 def Plugins(**kwargs):
 	return [PluginDescriptor(name=_("LED Brightness Setup"), description="Setup LED brightness and blink interval", where = PluginDescriptor.WHERE_PLUGINMENU, needsRestart = False, fnc=main)]
 
-ledbrightnesssetupstandby = LEDBrightnessSetupStandby()