diff options
| author | Arve Hjønnevåg <arve@android.com> | 2011-11-02 20:52:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-02 20:52:21 +0000 |
| commit | 38d42a11b04daf5a209e6b52c867b811c274430c (patch) | |
| tree | bee9b62eb152a6c896c3f904df6edb3c6515cd32 /libsensors/sensors.cpp | |
| parent | a0f26eed9e225d9bf02ce4528584b836dcfbdbe6 (diff) | |
| parent | 63bb261af2ae4213fc8cb0ce81367af63616a773 (diff) | |
| download | device_samsung_tuna-38d42a11b04daf5a209e6b52c867b811c274430c.tar.gz device_samsung_tuna-38d42a11b04daf5a209e6b52c867b811c274430c.tar.bz2 device_samsung_tuna-38d42a11b04daf5a209e6b52c867b811c274430c.zip | |
am 63bb261a: Merge "sensors: Return a calculated lux value instead using the current 8 entry table" into ics-mr1
* commit '63bb261af2ae4213fc8cb0ce81367af63616a773':
sensors: Return a calculated lux value instead using the current 8 entry table
Diffstat (limited to 'libsensors/sensors.cpp')
| -rw-r--r-- | libsensors/sensors.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libsensors/sensors.cpp b/libsensors/sensors.cpp index 96f128d..fb159d9 100644 --- a/libsensors/sensors.cpp +++ b/libsensors/sensors.cpp @@ -80,7 +80,7 @@ static struct sensor_t sSensorList[LOCAL_SENSORS + MPLSensor::numSensors] = { { "GP2A Light sensor", "Sharp", 1, SENSORS_LIGHT_HANDLE, - SENSOR_TYPE_LIGHT, 3000.0f, 1.0f, 0.75f, 0, { } }, + SENSOR_TYPE_LIGHT, powf(10, 125.0f/ 24.0f) * 4, 1.0f, 0.75f, 0, { } }, { "GP2A Proximity sensor", "Sharp", 1, SENSORS_PROXIMITY_HANDLE, |
