git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
experiments
[enigma2.git]
/
lib
/
gdi
/
lcd.cpp
diff --git
a/lib/gdi/lcd.cpp
b/lib/gdi/lcd.cpp
index 8f8cd06529952bfc24b363ba75e8b91107e781b5..0908d890994bc896091bf7844898ff1ce1c27ed0 100644
(file)
--- a/
lib/gdi/lcd.cpp
+++ b/
lib/gdi/lcd.cpp
@@
-16,6
+16,7
@@
eDBoxLCD *eDBoxLCD::instance;
eLCD::eLCD(eSize size): res(size)
{
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());
locked=0;
_buffer=new unsigned char[res.height()*res.width()];
memset(_buffer, 0, res.height()*res.width());
@@
-43,12
+44,20
@@
void eLCD::unlock()
eDBoxLCD::eDBoxLCD(): eLCD(eSize(132, 64))
{
eDBoxLCD::eDBoxLCD(): eLCD(eSize(132, 64))
{
+ is_oled = 0;
#ifndef NO_LCD
lcdfd = open("/dev/dbox/oled0", O_RDWR);
if (lcdfd < 0)
{
#ifndef NO_LCD
lcdfd = open("/dev/dbox/oled0", O_RDWR);
if (lcdfd < 0)
{
+ FILE *f=fopen("/proc/stb/lcd/oled_brightness", "w");
+ if (!f)
+ f = fopen("/proc/stb/fp/oled_brightness", "w");
+ if (f)
+ {
+ is_oled = 2;
+ fclose(f);
+ }
lcdfd = open("/dev/dbox/lcd0", O_RDWR);
lcdfd = open("/dev/dbox/lcd0", O_RDWR);
- is_oled = 0;
} else
{
eDebug("found OLED display!");
} else
{
eDebug("found OLED display!");
@@
-94,27
+103,38
@@
int eDBoxLCD::setLCDContrast(int contrast)
int eDBoxLCD::setLCDBrightness(int brightness)
{
int eDBoxLCD::setLCDBrightness(int brightness)
{
- int fp;
- if((fp=open("/dev/dbox/fp0", O_RDWR))<=0)
+ eDebug("setLCDBrightness %d", brightness);
+ FILE *f=fopen("/proc/stb/lcd/oled_brightness", "w");
+ if (!f)
+ f = fopen("/proc/stb/fp/oled_brightness", "w");
+ if (f)
{
{
- eDebug("[LCD] can't open /dev/dbox/fp0");
- return(-1);
+ if (fprintf(f, "%d", brightness) == 0)
+ eDebug("write /proc/stb/lcd/oled_brightness failed!! (%m)");
+ fclose(f);
}
}
-
- if(ioctl(fp, FP_IOCTL_LCD_DIMM, &brightness))
+ else
{
{
- eDebug("[LCD] can't set lcd 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)<=0)
+ eDebug("[LCD] can't set lcd brightness (%m)");
+ close(fp);
}
}
- close(fp);
return(0);
}
eDBoxLCD::~eDBoxLCD()
{
return(0);
}
eDBoxLCD::~eDBoxLCD()
{
- if (lcdfd>0)
+ if (lcdfd>
=
0)
{
close(lcdfd);
{
close(lcdfd);
- lcdfd=
0
;
+ lcdfd=
-1
;
}
}
}
}
@@
-125,7
+145,7
@@
eDBoxLCD *eDBoxLCD::getInstance()
void eDBoxLCD::update()
{
void eDBoxLCD::update()
{
- if (!is_oled)
+ if (!is_oled
|| is_oled == 2
)
{
unsigned char raw[132*8];
int x, y, yy;
{
unsigned char raw[132*8];
int x, y, yy;
@@
-141,7
+161,7
@@
void eDBoxLCD::update()
raw[y*132+x]=(pix^inverted);
}
}
raw[y*132+x]=(pix^inverted);
}
}
- if (lcdfd
>
0)
+ if (lcdfd
>=
0)
write(lcdfd, raw, 132*8);
} else
{
write(lcdfd, raw, 132*8);
} else
{
@@
-150,10
+170,16
@@
void eDBoxLCD::update()
memset(raw, 0, 64*64);
for (y=0; y<64; y++)
{
memset(raw, 0, 64*64);
for (y=0; y<64; y++)
{
+ int pix=0;
for (x=0; x<128 / 2; x++)
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);
+ {
+ pix = (_buffer[y*132 + x * 2 + 2] & 0xF0) |(_buffer[y*132 + x * 2 + 1 + 2] >> 4);
+ if (inverted)
+ pix = 0xFF - pix;
+ raw[y*64+x] = pix;
+ }
}
}
- if (lcdfd > 0)
+ if (lcdfd >
=
0)
write(lcdfd, raw, 64*64);
}
}
write(lcdfd, raw, 64*64);
}
}