- OpieScreenSaver now uses the calibration data for the light sensor

2 files changed, 48 insertions, 2 deletions

diff --git a/core/launcher/screensaver.cpp b/core/launcher/screensaver.cpp
index 9e823ff..741591e 100644
--- a/core/launcher/screensaver.cpp
+++ b/core/launcher/screensaver.cpp
@@ -1,237 +1,270 @@
 
 #include "screensaver.h"
 
 #include <qpe/config.h>
 #include <qpe/power.h>
 #include <qpe/network.h>
 
 #include <opie/odevice.h>
 
 
 using namespace Opie;
 
 
+
 OpieScreenSaver::OpieScreenSaver ( )
                 : QObject ( 0, "screensaver" ), QWSScreenSaver ( )
 {
         m_disable_suspend = 100;
         m_enable_dim = false;
         m_enable_lightoff = false;
         m_enable_suspend = false;
         m_onlylcdoff = false;
 
         m_enable_dim_ac = false;
         m_enable_lightoff_ac = false;
         m_enable_suspend_ac = false;
         m_onlylcdoff_ac = false;
 
         m_use_light_sensor = false;
         m_backlight_sensor = -1;
+        ::memset ( m_sensordata, 0xff, LS_Count * sizeof( m_sensordata [0] ));
 
         m_lcd_status = true;
 
         m_backlight_normal = -1;
         m_backlight_current = -1;
         m_backlight_forcedoff = false;
 
         m_on_ac = false;
 
         m_level = -1;
 
         // Make sure the LCD is in fact on, (if opie was killed while the LCD is off it would still be off)
         ODevice::inst ( )-> setDisplayStatus ( true );
         setBacklight ( -1 );
 }
 
 
 void OpieScreenSaver::restore()
 {
         m_level = -1;
 
         if ( !m_lcd_status ) {    // We must have turned it off
                 ODevice::inst ( ) -> setDisplayStatus ( true );
                 m_lcd_status = true;
         }
 
         setBacklightInternal ( -1 );
 }
 
 
 bool OpieScreenSaver::save( int level )
 {
         m_level = level;
 
         switch ( level ) {
                 case 0:
                         if (( m_on_ac && m_enable_dim_ac ) ||
                                 ( !m_on_ac && m_enable_dim )) {
                                 if (( m_disable_suspend > 0 ) && ( m_backlight_current > 1 ) && !m_use_light_sensor )
                                         setBacklightInternal ( 1 ); // lowest non-off
                         }
                         return true;
                         break;
 
                 case 1:
                         if (( m_on_ac && m_enable_lightoff_ac ) ||
                                 ( !m_on_ac && m_enable_lightoff )) {
                                 if ( m_disable_suspend > 1 )
                                         setBacklightInternal ( 0 ); // off
                         }
                         return true;
                         break;
 
                 case 2:
                         if (( m_on_ac && !m_enable_suspend_ac ) ||
                                 ( !m_on_ac && !m_enable_suspend )) {
                                 return true;
                         }
 
                         if (( m_on_ac && m_onlylcdoff_ac ) ||
                                 ( !m_on_ac && m_onlylcdoff )) {
                                 ODevice::inst ( ) -> setDisplayStatus ( false );
                                 m_lcd_status = false;
                                 return true;
                         }
 
                         // We're going to suspend the whole machine
 
                         if (( m_disable_suspend > 2 ) && !Network::networkOnline ( )) {
                                 QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE );
                                 return true;
                         }
 
                         break;
         }
         return false;
 }
 
 
 void OpieScreenSaver::setIntervals ( int i1, int i2, int i3 )
 {
         Config config ( "apm" );
         config. setGroup ( m_on_ac ? "AC" : "Battery" );
 
         int v[ 4 ];
         if ( i1 < 0 )
                 i1 = config. readNumEntry ( "Dim", 30 );
         if ( i2 < 0 )
                 i2 = config. readNumEntry ( "LightOff", 20 );
         if ( i3 < 0 )
                 i3 = config. readNumEntry ( "Suspend", 60 );
 
         if ( m_on_ac ) {
                 m_enable_dim_ac = ( i1 > 0 );
                 m_enable_lightoff_ac = ( i2 > 0 );
                 m_enable_suspend_ac = ( i3 > 0 );
                 m_onlylcdoff_ac = config.readNumEntry ( "LcdOffOnly", 0 );
         }
         else {
                 m_enable_dim = ( i1 > 0 );
                 m_enable_lightoff = ( i2 > 0 );
                 m_enable_suspend = ( i3 > 0 );
                 m_onlylcdoff = config.readNumEntry ( "LcdOffOnly", 0 );
         }
         
         qDebug("screen saver intervals: %d %d %d", i1, i2, i3);
 
         v [ 0 ] = QMAX( 1000 * i1, 100 );
         v [ 1 ] = QMAX( 1000 * i2, 100 );
         v [ 2 ] = QMAX( 1000 * i3, 100 );
         v [ 3 ] = 0;
 
         if ( !i1 && !i2 && !i3 )
                 QWSServer::setScreenSaverInterval( 0 );
         else
                 QWSServer::setScreenSaverIntervals( v );
 }
 
 
 void OpieScreenSaver::setInterval ( int interval )
 {
         setIntervals ( -1, -1, interval );
 }
 
 
 void OpieScreenSaver::setMode ( int mode )
 {
         if ( mode > m_disable_suspend )
                 setInterval ( -1 );
         m_disable_suspend = mode;
 }
 
 
 void OpieScreenSaver::setBacklight ( int bright )
 {
         // Read from config
         Config config ( "apm" );
         config. setGroup ( m_on_ac ? "AC" : "Battery" );
         m_backlight_normal = config. readNumEntry ( "Brightness", 255 );
 
         m_use_light_sensor = config. readBoolEntry ( "LightSensor", false );
 
         qDebug ( "setBacklight: %d (ls: %d)", m_backlight_normal, m_use_light_sensor ? 1 : 0 );
 
         killTimers ( );
         if ( m_use_light_sensor ) {
+                QStringList sl = config. readListEntry ( "LightSensorData", ';' );
+                
+                m_sensordata [LS_SensorMin] = 40;
+                m_sensordata [LS_SensorMax] = 215;
+                m_sensordata [LS_LightMin] = 1;
+                m_sensordata [LS_LightMax] = 255;
+                m_sensordata [LS_Steps] = 12;
+                        m_sensordata [LS_Interval] = 2000;      
+                
+                for ( uint i = 0; i < LS_Count; i++ ) {
+                        if ( i < sl. count ( ))
+                                m_sensordata [i] = sl [i]. toInt ( );
+                }
+
                 timerEvent ( 0 );
-                startTimer ( 2000 );
+                startTimer ( m_sensordata [LS_Interval] );
         }
 
         setBacklightInternal ( bright );
 }
 
 
 void OpieScreenSaver::setBacklightInternal ( int bright )
 {
         if ( bright == -3 ) {
                 // Forced on
                 m_backlight_forcedoff = false;
                 bright = -1;
         }
         if ( m_backlight_forcedoff && bright != -2 )
                 return ;
         if ( bright == -2 ) {
                 // Toggle between off and on
                 bright = m_backlight_current ? 0 : -1;
                 m_backlight_forcedoff = !bright;
         }
         if ( bright == -1 )
                 bright = m_use_light_sensor ? m_backlight_sensor : m_backlight_normal;
 
         if ( bright != m_backlight_current ) {
                 ODevice::inst ( )-> setDisplayBrightness ( bright );
                 m_backlight_current = bright;
         }
 }
 
 
 void OpieScreenSaver::timerEvent ( QTimerEvent * )
 {
-        m_backlight_sensor = (( 255 - ODevice::inst ( )-> readLightSensor ( )) * m_backlight_normal ) / 255;
+        int s = ODevice::inst ( )-> readLightSensor ( );
+        
+        if ( s < m_sensordata [LS_SensorMin] )
+                m_backlight_sensor = m_sensordata [LS_LightMax];
+        else if ( s >= m_sensordata [LS_SensorMax] )
+                m_backlight_sensor = m_sensordata [LS_LightMin];
+        else {
+                int dx = m_sensordata [LS_SensorMax] - m_sensordata [LS_SensorMin];
+                int dy = m_sensordata [LS_LightMax] - m_sensordata [LS_LightMin];
+                
+                int stepno = ( s - m_sensordata [LS_SensorMin] ) * m_sensordata [LS_Steps] / dx;
+                
+                m_backlight_sensor = m_sensordata [LS_LightMax] - dy * stepno / ( m_sensordata [LS_Steps] - 1 );
+        }
+        if ( !m_backlight_sensor )
+                m_backlight_sensor = 1;
+
+        // qDebug ( "f(%d) = %d [%d - %d] -> [%d - %d] / %d", s, m_backlight_sensor, m_sensordata [LS_SensorMin], m_sensordata [LS_SensorMax], m_sensordata [LS_LightMin], m_sensordata [LS_LightMax], m_sensordata [LS_Steps] );
 
         if ( m_level <= 0 )
                 setBacklightInternal ( -1 );
 }
 
 
 void OpieScreenSaver::setDisplayState ( bool on )
 {
         if ( m_lcd_status != on ) {
                 ODevice::inst ( ) -> setDisplayStatus ( on );
                 m_lcd_status = on;
         }
 }
 
 
 void OpieScreenSaver::powerStatusChanged ( PowerStatus ps )
 {
         bool newonac = ( ps. acStatus ( ) == PowerStatus::Online );
         
         if ( newonac != m_on_ac ) {
                 m_on_ac = newonac;
                 setInterval ( -1 );
                 setBacklight ( -1 );
                         restore ( );    
         }
 }
 
diff --git a/core/launcher/screensaver.h b/core/launcher/screensaver.h
index 9126f33..da10a8d 100644
--- a/core/launcher/screensaver.h
+++ b/core/launcher/screensaver.h
@@ -1,61 +1,74 @@
 #ifndef __LAUNCHER_SCREENSAVER_H__
 #define __LAUNCHER_SCREENSAVER_H__
 
 #include <qwindowsystem_qws.h>
 #include <qobject.h>
 
 #include <qpe/power.h>
 
 class OpieScreenSaver : public QObject, public QWSScreenSaver
 {
 public:
         OpieScreenSaver ( );
 
         void restore ( );
         bool save ( int level );
 
         void setIntervals( int i1, int i2, int i3 );
         void setIntervalsAC( int i1, int i2, int i3 );
 
         void setInterval ( int interval );
 
         void setMode ( int mode );
 
         void setBacklight ( int bright );
         void setDisplayState ( bool on );
 
         void powerStatusChanged ( PowerStatus ps );
 
 private:
         void setBacklightInternal ( int bright );
 
 protected:
         virtual void timerEvent ( QTimerEvent * );
 
 private:
         int m_disable_suspend;
         bool m_enable_dim;
         bool m_enable_lightoff;
         bool m_enable_suspend;
         bool m_onlylcdoff;
 
         bool m_enable_dim_ac;
         bool m_enable_lightoff_ac;
         bool m_enable_suspend_ac;
         bool m_onlylcdoff_ac;
 
         bool m_use_light_sensor;
         int m_backlight_sensor;
 
+        enum {
+                LS_Interval = 0,
+                LS_Steps,
+                LS_SensorMin,
+                LS_SensorMax,
+                LS_LightMin,
+                LS_LightMax,
+        
+                LS_Count
+        };
+
+        int m_sensordata [LS_Count];
+
         bool m_lcd_status;
 
         int m_backlight_normal;
         int m_backlight_current;
         bool m_backlight_forcedoff;
 
         bool m_on_ac;
         
         int m_level;
 };
 
 #endif