diff options
| author | Javi Ferrer <javi.f.o@gmail.com> | 2015-06-11 17:06:40 +0400 |
|---|---|---|
| committer | forkbomb <keepcalm444@gmail.com> | 2015-11-25 08:34:47 +1100 |
| commit | ea6c7d9c8609022e19200d888f449139139d9173 (patch) | |
| tree | 0afbc194d760d8799367e1cbf49a5131357cd7b3 | |
| parent | f7d2dfda36dfb9e35914249ce62376c4fd2e8e32 (diff) | |
| download | device_samsung_i9300-ea6c7d9c8609022e19200d888f449139139d9173.zip device_samsung_i9300-ea6c7d9c8609022e19200d888f449139139d9173.tar.gz device_samsung_i9300-ea6c7d9c8609022e19200d888f449139139d9173.tar.bz2 | |
libsensors: fix light sensor
Change-Id: I7cad5c048c1a9877889216ca8ca43bb13daeb4b0
| -rw-r--r-- | libsensors/cm36651_light.c | 40 |
1 files changed, 37 insertions, 3 deletions
diff --git a/libsensors/cm36651_light.c b/libsensors/cm36651_light.c index bab689a..bd7617b 100644 --- a/libsensors/cm36651_light.c +++ b/libsensors/cm36651_light.c @@ -171,9 +171,37 @@ int cm36651_light_set_delay(struct smdk4x12_sensors_handlers *handlers, long int return 0; } -float cm36651_light_convert(int value) +float cm36651_light_convert(int white, int green) { - return (float) value * 1.7f - 0.5f; + float gwrel = 1.0f; + float aux; + float r1, r2, r3, r4; + + if (green <= 4) + return 0.0f; + else { + if (white > 0) + gwrel = (float) green / (float) white; + + r1 = floorf( (float) (pow((double) green, 1.3341) * 0.0258) ); + + aux = floorf( ((float) green * 0.18f * 9.44f) / gwrel); + r2 = aux; + r3 = aux * 0.77f; + + r4 = floorf( (float) green * ( (gwrel * 1.546) - 0.46) ); + + if (gwrel <= 0.5f) { + return r1; + } else if (gwrel >= 0.9f) { + if (white <= 5999) + return r2; + else + return r3; + } else { + return r4; + } + } } int cm36651_light_get_data(struct smdk4x12_sensors_handlers *handlers, @@ -181,6 +209,8 @@ int cm36651_light_get_data(struct smdk4x12_sensors_handlers *handlers, { struct input_event input_event; int input_fd; + int green = 0; + int white = 0; int rc; // ALOGD("%s(%p, %p)", __func__, handlers, event); @@ -203,14 +233,18 @@ int cm36651_light_get_data(struct smdk4x12_sensors_handlers *handlers, break; if (input_event.type == EV_REL) { + if (input_event.code == REL_Y) + green = input_event.value; if (input_event.code == REL_MISC) - event->light = cm36651_light_convert(input_event.value); + white = input_event.value; } else if (input_event.type == EV_SYN) { if (input_event.code == SYN_REPORT) event->timestamp = input_timestamp(&input_event); } } while (input_event.type != EV_SYN); + event->light = cm36651_light_convert(white, green); + return 0; } |