- new function to check for and read the light sensor

- redone the Model enum, to make it easier to check for "any iPAQ"
  !! This means every application using this enum has to be recompiled !!

2 files changed, 54 insertions, 5 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 58bd663..44fe35f 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -80,12 +80,15 @@ public:
         virtual void alarmSound ( );
         
     virtual QValueList <OLed> ledList ( ) const;
         virtual QValueList <OLedState> ledStateList ( OLed led ) const;
         virtual OLedState ledState ( OLed led ) const;
         virtual bool setLedState ( OLed led, OLedState st );
+
+        virtual bool hasLightSensor ( ) const;
+        virtual int readLightSensor ( );
         
         //virtual QValueList <int> keyList ( ) const;
         
 protected:
         virtual bool filter ( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat );
         virtual void timerEvent ( QTimerEvent *te );
@@ -353,12 +356,21 @@ OLedState ODevice::ledState ( OLed /*which*/ ) const
 
 bool ODevice::setLedState ( OLed /*which*/, OLedState /*st*/ )
 {
         return false;
 }
 
+bool ODevice::hasLightSensor ( ) const
+{
+        return false;
+}
+
+int ODevice::readLightSensor ( )
+{
+        return -1;
+}
 
 
 //QValueList <int> ODevice::keyList ( ) const
 //{
         //return QValueList <int> ( );
 //}
@@ -663,12 +675,42 @@ bool iPAQ::setDisplayBrightness ( int bright )
 int iPAQ::displayBrightnessResolution ( ) const
 {
         return 255; // really 128, but logarithmic control is smoother this way
 }
 
 
+bool iPAQ::hasLightSensor ( ) const
+{
+        return true;
+}
+
+int iPAQ::readLightSensor ( )
+{
+        int fd;
+        int val = -1;
+        
+        if (( fd = ::open ( "/proc/hal/lightsensor", O_RDONLY )) >= 0 ) {
+                char buffer [5];
+        
+                if ( ::read ( fd, buffer, 4 ) == 4 ) {
+                        char *endptr;
+                
+                        buffer [4] = 0;
+                        val = ::strtol ( buffer + 2, &endptr, 16 );
+                        
+                        if ( *endptr != 0 )
+                                val = -1;
+                }
+        
+                ::close ( fd );
+        }
+
+        return val;
+}
+
+
 /**************************************************
  *
  * Zaurus
  *
  **************************************************/
 
diff --git a/libopie/odevice.h b/libopie/odevice.h
index 38f3787..be2a9c7 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -27,18 +27,22 @@ class ODeviceData;
 
 namespace Opie {
 
 enum OModel {
         Model_Unknown,
 
-        Model_iPAQ_H31xx,
-        Model_iPAQ_H36xx,
-        Model_iPAQ_H37xx,
-        Model_iPAQ_H38xx,
+        Model_iPAQ = ( 1 << 16 ),
 
-        Model_Zaurus_SL5000
+        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_Zaurus = ( 2 << 16 ),
+
+        Model_Zaurus_SL5000 = ( Model_Zaurus | 1 ),
 };
 
         enum OVendor {
         Vendor_Unknown,
 
         Vendor_HP,
@@ -126,12 +130,15 @@ public:
 
         virtual QValueList <OLed> ledList ( ) const;
         virtual QValueList <OLedState> ledStateList ( OLed led ) const;
         virtual OLedState ledState ( OLed led ) const;
         virtual bool setLedState ( OLed led, OLedState st );
 
+        virtual bool hasLightSensor ( ) const;
+        virtual int readLightSensor ( );
+
         //virtual QValueList <int> keyList ( ) const;
 };
 
 }
 
 #endif