summaryrefslogtreecommitdiff
authorschurig <schurig>2003-06-05 14:53:05 (UTC)
committer schurig <schurig>2003-06-05 14:53:05 (UTC)
commit9fe856c57c5df5a74f9276f500070f2d90cfe091 (patch) (side-by-side diff)
tree36ed349f9746897b4f2870a2e41c8845dfe1e0e2
parent76d25975a76699fedeca6917c530991071fcf4fa (diff)
downloadopie-9fe856c57c5df5a74f9276f500070f2d90cfe091.zip
opie-9fe856c57c5df5a74f9276f500070f2d90cfe091.tar.gz
opie-9fe856c57c5df5a74f9276f500070f2d90cfe091.tar.bz2
added ODevice::setDisplayContrast(), ODevice::displayContrast() as virtual function,
which will break binary compatibility, but zecke said I shoud for now do it this way. assorted Ramses specific patches
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie/odevice.cpp135
-rw-r--r--libopie/odevice.h2
2 files changed, 97 insertions, 40 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index d86654e..160568b 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -161,20 +161,22 @@ protected:
OLedState m_leds [1]; //FIXME check if really only one
};
class Ramses : public ODevice, public QWSServer::KeyboardFilter {
protected:
virtual void init ( );
- virtual void initButtons ( );
public:
virtual bool setSoftSuspend ( bool soft );
+ virtual bool suspend ( );
virtual bool setDisplayStatus( bool on );
virtual bool setDisplayBrightness ( int b );
virtual int displayBrightnessResolution ( ) const;
+ virtual bool setDisplayContrast ( int b );
+ virtual int displayContrastResolution ( ) const;
protected:
virtual bool filter ( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat );
virtual void timerEvent ( QTimerEvent *te );
int m_power_timer;
@@ -350,13 +352,13 @@ struct r_button {
char *fpressedaction;
char *fheldservice;
char *fheldaction;
} ramses_buttons [] = {
{ Model_Ramses_MNCI,
Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"),
- "devicebuttons/simpad_menu",
+ "devicebuttons/z_menu",
"QPE/TaskBar", "toggleMenu()",
"QPE/TaskBar", "toggleStartMenu()" },
{ Model_Ramses_MNCI,
Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"),
"devicebuttons/ipaq_home",
"QPE/Launcher", "home()",
@@ -490,12 +492,13 @@ bool ODevice::setSoftSuspend ( bool /*soft*/ )
* device and return once the device got woken up
*
* @return if the device got suspended
*/
bool ODevice::suspend ( )
{
+ qDebug("ODevice::suspend");
if ( !isQWS( ) ) // only qwsserver is allowed to suspend
return false;
if ( d-> m_model == Model_Unknown ) // better don't suspend in qvfb / on unkown devices
return false;
@@ -533,12 +536,14 @@ bool ODevice::suspend ( )
/**
* This sets the display on or off
*/
bool ODevice::setDisplayStatus ( bool on )
{
+ qDebug("ODevice::setDisplayStatus(%d)", on);
+
if ( d-> m_model == Model_Unknown )
return false;
bool res = false;
int fd;
@@ -556,18 +561,40 @@ bool ODevice::setDisplayStatus ( bool on )
bool ODevice::setDisplayBrightness ( int p)
{
Q_UNUSED( p )
return false;
}
+/**
+ * @return return the max value for the brightness settings slider
+ */
int ODevice::displayBrightnessResolution ( ) const
{
return 16;
}
/**
+ * This sets the display contrast
+ * @return success or failure
+ */
+bool ODevice::setDisplayContrast ( int p)
+{
+ Q_UNUSED( p )
+ return false;
+}
+
+/**
+ * @return return the max value for the brightness settings slider
+ * or 0 if the device doesn't support setting of a contrast
+ */
+int ODevice::displayContrastResolution ( ) const
+{
+ return 0;
+}
+
+/**
* This returns the vendor as string
* @return Vendor as QString
*/
QString ODevice::vendorString ( ) const
{
return d-> m_vendorstr;
@@ -667,13 +694,12 @@ void ODevice::keySound ( )
/**
* This plays a touch sound
*/
void ODevice::touchSound ( )
{
-
#ifndef QT_NO_SOUND
static Sound snd ( "touchsound" );
if ( snd. isFinished ( ))
snd. play ( );
#endif
@@ -1900,14 +1926,13 @@ void Ramses::init ( )
QFile f( "/proc/sys/board/ramses" );
d->m_modelstr = "Ramses";
d->m_model = Model_Ramses_MNCI;
- d->m_rotation = Rot180;
- d->m_direction = CCW;
+ d->m_rotation = Rot0;
d->m_holdtime = 1000;
f.setName( "/etc/oz_version" );
if ( f.open( IO_ReadOnly )) {
d->m_systemstr = "OpenEmbedded/Ramses";
@@ -1920,45 +1945,18 @@ void Ramses::init ( )
}
m_power_timer = 0;
}
-void Ramses::initButtons ( )
-{
- if ( d->m_buttons )
- return;
-
- if ( isQWS( ) )
- QWSServer::setKeyboardFilter ( this );
-
- d->m_buttons = new QValueList <ODeviceButton>;
-
- for ( uint i = 0; i < ( sizeof( ramses_buttons ) / sizeof( s_button )); i++ ) {
- r_button *rb = ramses_buttons + i;
- ODeviceButton b;
-
- if (( rb->model & d->m_model ) == d->m_model ) {
- b.setKeycode( rb->code );
- b.setUserText( QObject::tr ( "Button", rb->utext ));
- b.setPixmap( Resource::loadPixmap ( rb->pix ));
- b.setFactoryPresetPressedAction( OQCopMessage ( makeChannel ( rb->fpressedservice ), rb->fpressedaction ));
- b.setFactoryPresetHeldAction( OQCopMessage ( makeChannel ( rb->fheldservice ), rb->fheldaction ));
-
- d->m_buttons->append( b );
- }
- }
- reloadButtonMapping();
-
- QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
- connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), this, SLOT( systemMessage ( const QCString &, const QByteArray & )));
-}
-
bool Ramses::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat )
{
- //TODO
+ Q_UNUSED( keycode );
+ Q_UNUSED( modifiers );
+ Q_UNUSED( isPress );
+ Q_UNUSED( autoRepeat );
return false;
}
void Ramses::timerEvent ( QTimerEvent * )
{
killTimer ( m_power_timer );
@@ -1967,12 +1965,14 @@ void Ramses::timerEvent ( QTimerEvent * )
QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, false, false );
}
bool Ramses::setSoftSuspend ( bool soft )
{
+ qDebug("Ramses::setSoftSuspend(%d)", soft);
+#if 0
bool res = false;
int fd;
if ((( fd = ::open ( "/dev/apm_bios", O_RDWR )) >= 0 ) ||
(( fd = ::open ( "/dev/misc/apm_bios",O_RDWR )) >= 0 )) {
@@ -1995,49 +1995,104 @@ bool Ramses::setSoftSuspend ( bool soft )
::close ( fd );
}
else
perror ( "/dev/apm_bios or /dev/misc/apm_bios" );
return res;
+#else
+ return true;
+#endif
+}
+
+bool Ramses::suspend ( )
+{
+ qDebug("Ramses::suspend");
}
/**
* This sets the display on or off
*/
bool Ramses::setDisplayStatus ( bool on )
{
+ qDebug("Ramses::setDisplayStatus(%d)", on);
+#if 0
bool res = false;
int fd;
if (( fd = ::open ( "/dev/fb/0", O_RDWR )) >= 0 ) {
res = ( ::ioctl ( fd, FBIOBLANK, on ? VESA_NO_BLANKING : VESA_POWERDOWN ) == 0 );
::close ( fd );
}
return res;
+#else
+ return true;
+#endif
}
+/*
+ * We get something between 0..255 into us
+*/
bool Ramses::setDisplayBrightness ( int bright )
{
- qDebug( "ODevice for Ramses: setDisplayBrightness( %d )", bright );
+ qDebug("Ramses::setDisplayBrightness(%d)", bright);
bool res = false;
int fd;
+ // pwm1 brighness: 20 steps 500..0 (dunkel->hell)
+
if ( bright > 255 )
- bright = 100;
+ bright = 255;
if ( bright < 0 )
bright = 0;
+ bright = 500-(bright * 500 / 255);
- if (( fd = ::open ( "/proc/sys/board/pwm0", O_WRONLY )) >= 0 ) {
+ if ((fd = ::open("/proc/sys/board/pwm1", O_WRONLY)) >= 0) {
+ qDebug(" %d -> pwm1", bright);
char writeCommand[100];
const int count = sprintf( writeCommand, "%d\n", bright);
res = ( ::write ( fd, writeCommand, count ) != -1 );
::close ( fd );
+ } else {
+ qWarning("no write");
}
return res;
}
int Ramses::displayBrightnessResolution ( ) const
{
- return 100;
+ return 32;
+}
+
+bool Ramses::setDisplayContrast(int contr)
+{
+ qDebug("Ramses::setDisplayContrast(%d)", contr);
+ bool res = false;
+ int fd;
+
+ // pwm0 contrast: 35 steps 65..100 (dunkel->hell)
+
+ if (contr > 255 )
+ contr = 255;
+ if (contr < 0)
+ contr = 0;
+ contr = 65 + (contr * 350 / 255);
+
+ if ((fd = ::open("/proc/sys/board/pwm0", O_WRONLY)) >= 0) {
+ qDebug(" %d -> pwm0", contr);
+ char writeCommand[100];
+ const int count = sprintf(writeCommand, "%d\n", contr);
+ res = (::write(fd, writeCommand, count) != -1);
+ res = true;
+ ::close(fd);
+ } else {
+ qWarning("no write");
+ }
+ return res;
+}
+
+
+int Ramses::displayContrastResolution() const
+{
+ return 32;
}
diff --git a/libopie/odevice.h b/libopie/odevice.h
index 5829440..6c4830e 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -178,12 +178,14 @@ public:
virtual bool setSoftSuspend ( bool on );
virtual bool suspend ( );
virtual bool setDisplayStatus ( bool on );
virtual bool setDisplayBrightness ( int brightness );
virtual int displayBrightnessResolution ( ) const;
+ virtual bool setDisplayContrast ( int contrast );
+ virtual int displayContrastResolution ( ) const;
// input / output
//FIXME playAlarmSound and al might be better -zecke
virtual void alarmSound ( );
virtual void keySound ( );
virtual void touchSound ( );