summaryrefslogtreecommitdiff
authorsandman <sandman>2002-10-29 18:43:23 (UTC)
committer sandman <sandman>2002-10-29 18:43:23 (UTC)
commit5ac67b8aece5aca20419f8953f88a36fd729adfc (patch) (side-by-side diff)
tree3ce57c7a938d36ce40ff0dfe4b114233febf7b08
parent45d9a30ec17b5146ffdac8e776003752fe2deeea (diff)
downloadopie-5ac67b8aece5aca20419f8953f88a36fd729adfc.zip
opie-5ac67b8aece5aca20419f8953f88a36fd729adfc.tar.gz
opie-5ac67b8aece5aca20419f8953f88a36fd729adfc.tar.bz2
- redone the Model enum to make it easy to check for series (like: is this an
iPAQ - and not is this a 31xx or 36xx or ...) - fixed the disply brightness resolution bug on H38xx
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/odevice.cpp34
-rw-r--r--libopie/odevice.h21
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
@@ -408,6 +408,8 @@ void iPAQ::init ( )
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;
@@ -655,17 +657,13 @@ 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;
@@ -679,7 +677,19 @@ 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;
+ }
}
@@ -957,10 +967,4 @@ 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
@@ -29,17 +29,21 @@ 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 {
@@ -104,6 +108,7 @@ public:
QString modelString ( ) const;
OModel model ( ) const;
+ inline OModel series ( ) const { return (OModel) ( model ( ) & Model_Series_Mask ); }
QString vendorString ( ) const;
OVendor vendor ( ) const;
@@ -136,8 +141,6 @@ public:
virtual bool hasLightSensor ( ) const;
virtual int readLightSensor ( );
virtual int lightSensorResolution ( ) const;
-
- //virtual QValueList <int> keyList ( ) const;
};
}