| -rw-r--r-- | core/launcher/screensaver.cpp | 37 | ||||
| -rw-r--r-- | core/launcher/screensaver.h | 13 |
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 @@ -13,2 +13,3 @@ using namespace Opie; + OpieScreenSaver::OpieScreenSaver ( ) @@ -29,2 +30,3 @@ OpieScreenSaver::OpieScreenSaver ( ) m_backlight_sensor = -1; + ::memset ( m_sensordata, 0xff, LS_Count * sizeof( m_sensordata [0] )); @@ -175,4 +177,18 @@ void OpieScreenSaver::setBacklight ( int bright ) 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] ); } @@ -209,3 +225,20 @@ 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] ); 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 @@ -49,2 +49,15 @@ private: + 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; |