| -rw-r--r-- | libopie/odevice.cpp | 34 | ||||
| -rw-r--r-- | libopie/odevice.h | 21 |
2 files changed, 31 insertions, 24 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index 4c49c4f..8f4e296 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp @@ -407,8 +407,10 @@ void iPAQ::init ( ) else if ( d-> m_modelstr == "H3700" ) d-> m_model = Model_iPAQ_H37xx; else if ( d-> m_modelstr == "H3800" ) d-> m_model = Model_iPAQ_H38xx; + else if ( d-> m_modelstr == "H3900" ) + d-> m_model = Model_iPAQ_H39xx; else d-> m_model = Model_Unknown; f. close ( ); @@ -654,19 +656,15 @@ bool iPAQ::setDisplayBrightness ( int bright ) { bool res = false; int fd; - if ( bright > 255 ) - bright = 255; + int maxbright = displayBrightnessResolution ( ); + + if ( bright > maxbright ) + bright = maxbright; if ( bright < 0 ) bright = 0; - // 128 is the maximum if you want a decent lifetime for the LCD - - if ( bright > 1 ) - bright = (int) ( 0.5 + ( ::pow ( 2, double( bright ) / 255.0 ) - 1 ) * 128.0 ); // logarithmic -// bright = ( bright + 1 ) / 2; - if (( fd = ::open ( "/dev/touchscreen/0", O_WRONLY )) >= 0 ) { FLITE_IN bl; bl. mode = 1; bl. pwr = bright ? 1 : 0; @@ -678,9 +676,21 @@ bool iPAQ::setDisplayBrightness ( int bright ) } int iPAQ::displayBrightnessResolution ( ) const { - return 256; // really 128, but logarithmic control is smoother this way + switch ( model ( )) { + case Model_iPAQ_H31xx: + case Model_iPAQ_H36xx: + case Model_iPAQ_H37xx: + return 128; // really 256, but >128 could damage the LCD + + case Model_iPAQ_H38xx: + case Model_iPAQ_H39xx: + return 64; + + default: + return 2; + } } bool iPAQ::hasLightSensor ( ) const @@ -956,11 +966,5 @@ int Zaurus::displayBrightnessResolution ( ) const { return 5; } -//QValueList <int> Zaurus::keyList ( ) const -//{ -// QValueList <int> vl; -// vl << HardKey_Datebook << HardKey_Contacts << HardKey_Mail << HardKey_Menu << HardKey_Home << HardKey_Suspend << HardKey_Backlight; -// return vl; -//} diff --git a/libopie/odevice.h b/libopie/odevice.h index e07b91c..e50009c 100644 --- a/libopie/odevice.h +++ b/libopie/odevice.h @@ -28,19 +28,23 @@ class ODeviceData; namespace Opie { enum OModel { Model_Unknown, + + Model_Series_Mask = 0xff000000, - Model_iPAQ = ( 1 << 16 ), + Model_iPAQ = ( 1 << 24 ), - Model_iPAQ_H31xx = ( Model_iPAQ | 1 ), - Model_iPAQ_H36xx = ( Model_iPAQ | 2 ), - Model_iPAQ_H37xx = ( Model_iPAQ | 3 ), - Model_iPAQ_H38xx = ( Model_iPAQ | 4 ), + Model_iPAQ_All = ( Model_iPAQ | 0xffffff ), + Model_iPAQ_H31xx = ( Model_iPAQ | 0x000001 ), + Model_iPAQ_H36xx = ( Model_iPAQ | 0x000002 ), + Model_iPAQ_H37xx = ( Model_iPAQ | 0x000004 ), + Model_iPAQ_H38xx = ( Model_iPAQ | 0x000008 ), + Model_iPAQ_H39xx = ( Model_iPAQ | 0x000010 ), - Model_Zaurus = ( 2 << 16 ), + Model_Zaurus = ( 2 << 24 ), - Model_Zaurus_SL5000 = ( Model_Zaurus | 1 ), + Model_Zaurus_SL5000 = ( Model_Zaurus | 0x000001 ), }; enum OVendor { Vendor_Unknown, @@ -103,8 +107,9 @@ public: // information QString modelString ( ) const; OModel model ( ) const; + inline OModel series ( ) const { return (OModel) ( model ( ) & Model_Series_Mask ); } QString vendorString ( ) const; OVendor vendor ( ) const; @@ -135,10 +140,8 @@ public: virtual bool hasLightSensor ( ) const; virtual int readLightSensor ( ); virtual int lightSensorResolution ( ) const; - - //virtual QValueList <int> keyList ( ) const; }; } |