- light sensor data was not scaled (no effect for iPAQs though)

- light sensor can now switch off the lcd backlight
- setBacklight ( -3 / -2 ) doesn't switch off the sensor mode anymore

1 files changed, 5 insertions, 7 deletions

diff --git a/core/launcher/screensaver.cpp b/core/launcher/screensaver.cpp
index 088ed19..b9bb64c 100644
--- a/core/launcher/screensaver.cpp
+++ b/core/launcher/screensaver.cpp
@@ -136,3 +136,3 @@ void OpieScreenSaver::setIntervals ( int i1, int i2, int i3 )
         
-        qDebug("screen saver intervals: %d %d %d", i1, i2, i3);
+        //qDebug("screen saver intervals: %d %d %d", i1, i2, i3);
 
@@ -173,6 +173,6 @@ void OpieScreenSaver::setBacklight ( int bright )
 
-        //qDebug ( "setBacklight: %d (ls: %d)", m_backlight_normal, m_use_light_sensor ? 1 : 0 );
+        //qDebug ( "setBacklight: %d (norm: %d) (ls: %d)", bright, m_backlight_normal, m_use_light_sensor ? 1 : 0 );
 
         killTimers ( );
-        if ( m_use_light_sensor ) {
+        if (( bright < 0 ) && m_use_light_sensor ) {
                 QStringList sl = config. readListEntry ( "LightSensorData", ';' );
@@ -227,3 +227,3 @@ void OpieScreenSaver::timerEvent ( QTimerEvent * )
 {
-        int s = ODevice::inst ( )-> readLightSensor ( );
+        int s = ODevice::inst ( )-> readLightSensor ( ) * 256 / ODevice::inst ( )-> lightSensorResolution ( );
         
@@ -241,6 +241,4 @@ void OpieScreenSaver::timerEvent ( QTimerEvent * )
         }
-        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] );
+        //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] );