author | sandman <sandman> | 2002-10-28 23:41:14 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-28 23:41:14 (UTC) |
commit | a775c3be38fc7fbd5d120e7e3c1dd3a80a250293 (patch) (unidiff) | |
tree | 6cca17bab081143f2d0321c317d26f91042f729f | |
parent | 7aaf3d45d9156a126a753311ffdb220a550d47a5 (diff) | |
download | opie-a775c3be38fc7fbd5d120e7e3c1dd3a80a250293.zip opie-a775c3be38fc7fbd5d120e7e3c1dd3a80a250293.tar.gz opie-a775c3be38fc7fbd5d120e7e3c1dd3a80a250293.tar.bz2 |
- OpieScreenSaver now uses the calibration data for the light sensor
-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 | |||
@@ -11,6 +11,7 @@ | |||
11 | using namespace Opie; | 11 | using namespace Opie; |
12 | 12 | ||
13 | 13 | ||
14 | |||
14 | OpieScreenSaver::OpieScreenSaver ( ) | 15 | OpieScreenSaver::OpieScreenSaver ( ) |
15 | : QObject ( 0, "screensaver" ), QWSScreenSaver ( ) | 16 | : QObject ( 0, "screensaver" ), QWSScreenSaver ( ) |
16 | { | 17 | { |
@@ -27,6 +28,7 @@ OpieScreenSaver::OpieScreenSaver ( ) | |||
27 | 28 | ||
28 | m_use_light_sensor = false; | 29 | m_use_light_sensor = false; |
29 | m_backlight_sensor = -1; | 30 | m_backlight_sensor = -1; |
31 | ::memset ( m_sensordata, 0xff, LS_Count * sizeof( m_sensordata [0] )); | ||
30 | 32 | ||
31 | m_lcd_status = true; | 33 | m_lcd_status = true; |
32 | 34 | ||
@@ -173,8 +175,22 @@ void OpieScreenSaver::setBacklight ( int bright ) | |||
173 | 175 | ||
174 | killTimers ( ); | 176 | killTimers ( ); |
175 | if ( m_use_light_sensor ) { | 177 | if ( m_use_light_sensor ) { |
178 | QStringList sl = config. readListEntry ( "LightSensorData", ';' ); | ||
179 | |||
180 | m_sensordata [LS_SensorMin] = 40; | ||
181 | m_sensordata [LS_SensorMax] = 215; | ||
182 | m_sensordata [LS_LightMin] = 1; | ||
183 | m_sensordata [LS_LightMax] = 255; | ||
184 | m_sensordata [LS_Steps] = 12; | ||
185 | m_sensordata [LS_Interval] = 2000; | ||
186 | |||
187 | for ( uint i = 0; i < LS_Count; i++ ) { | ||
188 | if ( i < sl. count ( )) | ||
189 | m_sensordata [i] = sl [i]. toInt ( ); | ||
190 | } | ||
191 | |||
176 | timerEvent ( 0 ); | 192 | timerEvent ( 0 ); |
177 | startTimer ( 2000 ); | 193 | startTimer ( m_sensordata [LS_Interval] ); |
178 | } | 194 | } |
179 | 195 | ||
180 | setBacklightInternal ( bright ); | 196 | setBacklightInternal ( bright ); |
@@ -207,7 +223,24 @@ void OpieScreenSaver::setBacklightInternal ( int bright ) | |||
207 | 223 | ||
208 | void OpieScreenSaver::timerEvent ( QTimerEvent * ) | 224 | void OpieScreenSaver::timerEvent ( QTimerEvent * ) |
209 | { | 225 | { |
210 | m_backlight_sensor = (( 255 - ODevice::inst ( )-> readLightSensor ( )) * m_backlight_normal ) / 255; | 226 | int s = ODevice::inst ( )-> readLightSensor ( ); |
227 | |||
228 | if ( s < m_sensordata [LS_SensorMin] ) | ||
229 | m_backlight_sensor = m_sensordata [LS_LightMax]; | ||
230 | else if ( s >= m_sensordata [LS_SensorMax] ) | ||
231 | m_backlight_sensor = m_sensordata [LS_LightMin]; | ||
232 | else { | ||
233 | int dx = m_sensordata [LS_SensorMax] - m_sensordata [LS_SensorMin]; | ||
234 | int dy = m_sensordata [LS_LightMax] - m_sensordata [LS_LightMin]; | ||
235 | |||
236 | int stepno = ( s - m_sensordata [LS_SensorMin] ) * m_sensordata [LS_Steps] / dx; | ||
237 | |||
238 | m_backlight_sensor = m_sensordata [LS_LightMax] - dy * stepno / ( m_sensordata [LS_Steps] - 1 ); | ||
239 | } | ||
240 | if ( !m_backlight_sensor ) | ||
241 | m_backlight_sensor = 1; | ||
242 | |||
243 | // 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] ); | ||
211 | 244 | ||
212 | if ( m_level <= 0 ) | 245 | if ( m_level <= 0 ) |
213 | setBacklightInternal ( -1 ); | 246 | setBacklightInternal ( -1 ); |
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 | |||
@@ -47,6 +47,19 @@ private: | |||
47 | bool m_use_light_sensor; | 47 | bool m_use_light_sensor; |
48 | int m_backlight_sensor; | 48 | int m_backlight_sensor; |
49 | 49 | ||
50 | enum { | ||
51 | LS_Interval = 0, | ||
52 | LS_Steps, | ||
53 | LS_SensorMin, | ||
54 | LS_SensorMax, | ||
55 | LS_LightMin, | ||
56 | LS_LightMax, | ||
57 | |||
58 | LS_Count | ||
59 | }; | ||
60 | |||
61 | int m_sensordata [LS_Count]; | ||
62 | |||
50 | bool m_lcd_status; | 63 | bool m_lcd_status; |
51 | 64 | ||
52 | int m_backlight_normal; | 65 | int m_backlight_normal; |