- 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 !!

1 files changed, 42 insertions, 0 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 58bd663..44fe35f 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -54,64 +54,67 @@ class ODeviceData {
 public:
         bool m_qwsserver;
 
         QString m_vendorstr;
         OVendor m_vendor;
         
         QString m_modelstr;
         OModel m_model;
 
         QString m_systemstr;
         OSystem m_system;
         
         QString m_sysverstr;
 };
 
 
 class iPAQ : public QObject, public ODevice, public QWSServer::KeyboardFilter {
 protected: 
         virtual void init ( );
         
 public:
         virtual bool setSoftSuspend ( bool soft );
 
         virtual bool setDisplayBrightness ( int b );
         virtual int displayBrightnessResolution ( ) const;
 
         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 );
         
         int m_power_timer;
         
         OLedState m_leds [2];
 };
 
 class Zaurus : public ODevice {
 protected:
         virtual void init ( );
 
         public:
         virtual bool setSoftSuspend ( bool soft );
 
         virtual bool setDisplayBrightness ( int b );
         virtual int displayBrightnessResolution ( ) const;
 
         virtual void alarmSound ( );
         virtual void keySound ( );
                 virtual void touchSound ( );
 
     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 QValueList <int> keyList ( ) const;
@@ -327,64 +330,73 @@ void ODevice::touchSound ( )
 
 #ifndef QT_QWS_EBX
 #ifndef QT_NO_SOUND
         static Sound snd ( "touchsound" );
 
         if ( snd. isFinished ( ))
                 snd. play ( );
 #endif
 #endif
 }
 
 
 QValueList <OLed> ODevice::ledList ( ) const
 {
         return QValueList <OLed> ( );
 }
 
 QValueList <OLedState> ODevice::ledStateList ( OLed /*which*/ ) const
 {
         return QValueList <OLedState> ( );
 }
 
 OLedState ODevice::ledState ( OLed /*which*/ ) const
 {
         return Led_Off;
 }
 
 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> ( );
 //}
 
 
 
 /**************************************************
  *
  * iPAQ
  *
  **************************************************/
 
 void iPAQ::init ( )
 {
         d-> m_vendorstr = "HP";
         d-> m_vendor = Vendor_HP;
 
         QFile f ( "/proc/hal/model" );
 
         if ( f. open ( IO_ReadOnly )) {
                 QTextStream ts ( &f );
 
                 d-> m_modelstr = "H" + ts. readLine ( );
 
                 if ( d-> m_modelstr == "H3100" )
                         d-> m_model = Model_iPAQ_H31xx;
                 else if ( d-> m_modelstr == "H3600" )
                         d-> m_model = Model_iPAQ_H36xx;
                 else if ( d-> m_modelstr == "H3700" )
@@ -637,64 +649,94 @@ bool iPAQ::setDisplayBrightness ( int bright )
 {
         bool res = false;
         int fd;
         
         if ( bright > 255 )
                 bright = 255;
         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;
                 bl. brightness = bright;
                 res = ( ::ioctl ( fd, FLITE_ON, &bl ) == 0 );
                 ::close ( fd );
         }
         return res;
 }
 
 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
  *
  **************************************************/
 
 
 
 void Zaurus::init ( )
 {
         d-> m_modelstr = "Zaurus SL5000";
         d-> m_model = Model_Zaurus_SL5000;
         d-> m_vendorstr = "Sharp";
         d-> m_vendor = Vendor_Sharp;
 
         QFile f ( "/proc/filesystems" );
 
         if ( f. open ( IO_ReadOnly ) && ( QTextStream ( &f ). read ( ). find ( "\tjffs2\n" ) >= 0 )) {
                 d-> m_systemstr = "OpenZaurus";
                 d-> m_system = System_OpenZaurus;
 
                 f. close ( );
 
                 f. setName ( "/etc/oz_version" );
                 if ( f. open ( IO_ReadOnly )) { 
                         QTextStream ts ( &f );
                         d-> m_sysverstr = ts. readLine ( ). mid ( 10 );
                         f. close ( );
                 }
         }
         else {
                 d-> m_systemstr = "Zaurus";