| -rw-r--r-- | libopie/odevice.cpp | 135 | ||||
| -rw-r--r-- | libopie/odevice.h | 2 |
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 @@ -165,12 +165,14 @@ 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: @@ -354,5 +356,5 @@ struct r_button { { Model_Ramses_MNCI, Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), - "devicebuttons/simpad_menu", + "devicebuttons/z_menu", "QPE/TaskBar", "toggleMenu()", "QPE/TaskBar", "toggleStartMenu()" }, @@ -494,4 +496,5 @@ bool ODevice::setSoftSuspend ( bool /*soft*/ ) bool ODevice::suspend ( ) { + qDebug("ODevice::suspend"); if ( !isQWS( ) ) // only qwsserver is allowed to suspend return false; @@ -537,4 +540,6 @@ bool ODevice::suspend ( ) bool ODevice::setDisplayStatus ( bool on ) { + qDebug("ODevice::setDisplayStatus(%d)", on); + if ( d-> m_model == Model_Unknown ) return false; @@ -560,4 +565,7 @@ bool ODevice::setDisplayBrightness ( int p) } +/** + * @return return the max value for the brightness settings slider + */ int ODevice::displayBrightnessResolution ( ) const { @@ -566,4 +574,23 @@ int ODevice::displayBrightnessResolution ( ) const /** + * 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 @@ -671,5 +698,4 @@ void ODevice::keySound ( ) void ODevice::touchSound ( ) { - #ifndef QT_NO_SOUND static Sound snd ( "touchsound" ); @@ -1904,6 +1930,5 @@ void Ramses::init ( ) d->m_model = Model_Ramses_MNCI; - d->m_rotation = Rot180; - d->m_direction = CCW; + d->m_rotation = Rot0; d->m_holdtime = 1000; @@ -1924,37 +1949,10 @@ void Ramses::init ( ) } -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; } @@ -1971,4 +1969,6 @@ void Ramses::timerEvent ( QTimerEvent * ) bool Ramses::setSoftSuspend ( bool soft ) { + qDebug("Ramses::setSoftSuspend(%d)", soft); +#if 0 bool res = false; int fd; @@ -1999,4 +1999,12 @@ bool Ramses::setSoftSuspend ( bool soft ) return res; +#else + return true; +#endif +} + +bool Ramses::suspend ( ) +{ + qDebug("Ramses::suspend"); } @@ -2006,4 +2014,6 @@ bool Ramses::setSoftSuspend ( bool soft ) bool Ramses::setDisplayStatus ( bool on ) { + qDebug("Ramses::setDisplayStatus(%d)", on); +#if 0 bool res = false; int fd; @@ -2014,23 +2024,35 @@ bool Ramses::setDisplayStatus ( bool on ) } 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; @@ -2040,4 +2062,37 @@ bool Ramses::setDisplayBrightness ( int bright ) 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 @@ -182,4 +182,6 @@ public: virtual bool setDisplayBrightness ( int brightness ); virtual int displayBrightnessResolution ( ) const; + virtual bool setDisplayContrast ( int contrast ); + virtual int displayContrastResolution ( ) const; // input / output |