X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b8e9b51fb1a75b1805cf3108ffdc22aff9f75cf2..06578d6778bff8aa2bd6a2387651dd0ba55aa27c:/lib/gdi/lcd.cpp

diff --git a/lib/gdi/lcd.cpp b/lib/gdi/lcd.cpp
index 6b353230..ac273c61 100644
--- a/lib/gdi/lcd.cpp
+++ b/lib/gdi/lcd.cpp
@@ -16,8 +16,10 @@ eDBoxLCD *eDBoxLCD::instance;
 
 eLCD::eLCD(eSize size): res(size)
 {
+	lcdfd = -1;
 	locked=0;
 	_buffer=new unsigned char[res.height()*res.width()];
+	memset(_buffer, 0, res.height()*res.width());
 	_stride=res.width();
 }
 
@@ -37,24 +39,24 @@ int eLCD::lock()
 
 void eLCD::unlock()
 {
-	read( lcdfd, NULL, 0);
-	if ( errno == 9 )
-	{
-		eDebug("reopen lcd");
-		lcdfd=open("/dev/dbox/lcd0", O_RDWR);  // reopen device
-	}
-	else
-		eDebug("do not reopen lcd.. errno = %d", errno);
-    
 	locked=0;
 }
 
-eDBoxLCD::eDBoxLCD(): eLCD(eSize(128, 64))
+eDBoxLCD::eDBoxLCD(): eLCD(eSize(132, 64))
 {
 #ifndef NO_LCD
-	lcdfd=open("/dev/dbox/lcd0", O_RDWR);
+	lcdfd = open("/dev/dbox/oled0", O_RDWR);
+	if (lcdfd < 0)
+	{
+		lcdfd = open("/dev/dbox/lcd0", O_RDWR);
+		is_oled = 0;
+	} else
+	{
+		eDebug("found OLED display!");
+		is_oled = 1;
+	}
 #else
-	lcdfd=-1;
+	lcdfd = -1;
 #endif
 	instance=this;
 
@@ -64,11 +66,6 @@ eDBoxLCD::eDBoxLCD(): eLCD(eSize(128, 64))
 	{
 		int i=LCD_MODE_BIN;
 		ioctl(lcdfd, LCD_IOCTL_ASC_MODE, &i);
-		int lcdbrightness=0, lcdcontrast=0;
-
-		lcdbrightness=130;
-		lcdcontrast=32;
-		setLCDParameter(lcdbrightness, lcdcontrast);
 		inverted=0;
 	}
 }
@@ -79,7 +76,7 @@ void eDBoxLCD::setInverted(unsigned char inv)
 	update();	
 }
 
-int eDBoxLCD::setLCDParameter(int brightness, int contrast)
+int eDBoxLCD::setLCDContrast(int contrast)
 {
 	int fp;
 	if((fp=open("/dev/dbox/fp0", O_RDWR))<=0)
@@ -92,21 +89,33 @@ int eDBoxLCD::setLCDParameter(int brightness, int contrast)
 	{
 		eDebug("[LCD] can't set lcd contrast");
 	}
+	close(fp);
+	return(0);
+}
+
+int eDBoxLCD::setLCDBrightness(int brightness)
+{
+	int fp;
+	if((fp=open("/dev/dbox/fp0", O_RDWR))<=0)
+	{
+		eDebug("[LCD] can't open /dev/dbox/fp0");
+		return(-1);
+	}
 
 	if(ioctl(fp, FP_IOCTL_LCD_DIMM, &brightness))
 	{
 		eDebug("[LCD] can't set lcd brightness");
 	}
-	eDebug("[LCD] set brightness %d, contrast %d", brightness, contrast);
+	close(fp);
 	return(0);
 }
 
 eDBoxLCD::~eDBoxLCD()
 {
-	if (lcdfd>0)
+	if (lcdfd>=0)
 	{
 		close(lcdfd);
-		lcdfd=0;
+		lcdfd=-1;
 	}
 }
 
@@ -117,21 +126,36 @@ eDBoxLCD *eDBoxLCD::getInstance()
 
 void eDBoxLCD::update()
 {
-	unsigned char raw[120*8];
-	int x, y, yy;
-	for (y=0; y<8; y++)
+	if (!is_oled)
 	{
-		for (x=0; x<120; x++)
+		unsigned char raw[132*8];
+		int x, y, yy;
+		for (y=0; y<8; y++)
 		{
-			int pix=0;
-			for (yy=0; yy<8; yy++)
+			for (x=0; x<132; x++)
 			{
-				pix|=(_buffer[(y*8+yy)*128+x]>=108)<<yy;
+				int pix=0;
+				for (yy=0; yy<8; yy++)
+				{
+					pix|=(_buffer[(y*8+yy)*132+x]>=108)<<yy;
+				}
+				raw[y*132+x]=(pix^inverted);
 			}
-			raw[y*120+x]=(pix^inverted);
 		}
+		if (lcdfd >= 0)
+			write(lcdfd, raw, 132*8);
+	} else
+	{
+		unsigned char raw[64*64];
+		int x, y;
+		memset(raw, 0, 64*64);
+		for (y=0; y<64; y++)
+		{
+			for (x=0; x<128 / 2; x++)
+				raw[y*64+x] = (_buffer[y*132 + x * 2 + 2] & 0xF0) |(_buffer[y*132 + x * 2 + 1 + 2] >> 4);
+		}
+		if (lcdfd >= 0)
+			write(lcdfd, raw, 64*64);
 	}
-	if (lcdfd>0)
-		write(lcdfd, raw, 120*8);
 }