-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
sensors: Use hammerhead's own sensor HAL
Add light and proximity sensor based on invensense HAL Bug: 8968282 Change-Id: I9952ca39ec090b0ce3ec3425f366dc8c8fac4409
- Loading branch information
Showing
7 changed files
with
955 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
# Copyright 2013 The Android Open Source Project | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
|
||
LOCAL_PATH := $(call my-dir) | ||
|
||
# HAL module implemenation stored in | ||
# hw/<SENSORS_HARDWARE_MODULE_ID>.<ro.product.board>.so | ||
include $(CLEAR_VARS) | ||
|
||
LOCAL_MODULE := sensors.hammerhead | ||
|
||
LOCAL_PRELINK_MODULE := false | ||
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw | ||
|
||
LOCAL_MODULE_TAGS := optional | ||
LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\" | ||
LOCAL_CFLAGS += -DINVENSENSE_COMPASS_CAL | ||
LOCAL_C_INCLUDES += hardware/invensense/65xx/libsensors_iio | ||
LOCAL_SRC_FILES := \ | ||
sensors.cpp \ | ||
LightSensor.cpp \ | ||
ProximitySensor.cpp | ||
|
||
LOCAL_SHARED_LIBRARIES := libinvensense_hal liblog libutils libdl | ||
|
||
include $(BUILD_SHARED_LIBRARY) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,165 @@ | ||
/* | ||
* Copyright 2013 The Android Open Source Project | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
#include <fcntl.h> | ||
#include <errno.h> | ||
#include <math.h> | ||
#include <poll.h> | ||
#include <unistd.h> | ||
#include <dirent.h> | ||
#include <sys/select.h> | ||
#include <cutils/log.h> | ||
|
||
#include "sensors.h" | ||
#include "LightSensor.h" | ||
|
||
#define ABS_LIGHT 0x29 | ||
|
||
LightSensor::LightSensor() | ||
: SensorBase(NULL, LIGHT_DATA), | ||
mEnabled(0), | ||
mEventsSinceEnable(0), | ||
mInputReader(4), | ||
mHasPendingEvent(false) | ||
{ | ||
mPendingEvent.sensor = ID_L; | ||
mPendingEvent.type = SENSOR_TYPE_LIGHT; | ||
memset(mPendingEvent.data, 0, sizeof(mPendingEvent.data)); | ||
} | ||
|
||
LightSensor::~LightSensor() | ||
{ | ||
} | ||
|
||
int LightSensor::setInitialState() | ||
{ | ||
return 0; | ||
} | ||
|
||
int LightSensor::setDelay(int32_t handle, int64_t ns) | ||
{ | ||
int fd; | ||
char sysfs[PATH_MAX]; | ||
|
||
strcpy(sysfs, I2C); | ||
strcat(sysfs, "als_poll_delay"); | ||
|
||
fd = open(sysfs, O_RDWR); | ||
if (fd >= 0) { | ||
char buf[16] = {0,}; | ||
snprintf(buf, sizeof(buf), "%lld", ns); | ||
write(fd, buf, sizeof(buf)); | ||
close(fd); | ||
return 0; | ||
} | ||
return -1; | ||
} | ||
|
||
int LightSensor::enable(int32_t handle, int en) | ||
{ | ||
int newState = en ? 1 : 0; | ||
int err = 0; | ||
|
||
if (newState != mEnabled) { | ||
if (!mEnabled && dev_name != NULL) { | ||
open_device(); | ||
} | ||
|
||
char sysfs[PATH_MAX]; | ||
|
||
strcpy(sysfs, I2C); | ||
strcat(sysfs, "enable_als_sensor"); | ||
|
||
ALOGI_IF(DEBUG, "enable.open(%s), en(%d)", sysfs, en); | ||
|
||
int fd = open(sysfs, O_RDWR); | ||
if (fd < 0) { | ||
ALOGE("couldn't open '%s' input device", sysfs); | ||
err = -1; | ||
} else { | ||
char buf[2]; | ||
|
||
buf[0] = newState ? '1' : '0'; | ||
buf[1] = '\0'; | ||
|
||
write(fd, buf, sizeof(buf)); | ||
close(fd); | ||
setInitialState(); | ||
} | ||
|
||
mEnabled = newState; | ||
|
||
if (!mEnabled && dev_name != NULL) { | ||
close_device(); | ||
} | ||
} | ||
return err; | ||
} | ||
|
||
bool LightSensor::hasPendingEvents() const | ||
{ | ||
return mHasPendingEvent; | ||
} | ||
|
||
int LightSensor::readEvents(sensors_event_t* data, int count) | ||
{ | ||
if (count < 1) | ||
return -EINVAL; | ||
|
||
if (mHasPendingEvent) { | ||
mHasPendingEvent = false; | ||
mPendingEvent.timestamp = getTimestamp(); | ||
*data = mPendingEvent; | ||
return mEnabled ? 1 : 0; | ||
} | ||
|
||
ssize_t n = mInputReader.fill(data_fd); | ||
if (n < 0) | ||
return n; | ||
|
||
int numEventReceived = 0; | ||
input_event const* event; | ||
|
||
while (count && mInputReader.readEvent(&event)) { | ||
int type = event->type; | ||
if (type == EV_ABS) { | ||
if (event->code == ABS_LIGHT) { | ||
mPendingEvent.sensor = ID_L; | ||
mPendingEvent.type = SENSOR_TYPE_LIGHT; | ||
mPendingEvent.light = (float)event->value; | ||
} | ||
} else if (type == EV_SYN) { | ||
mPendingEvent.timestamp = timevalToNano(event->time); | ||
if (mEnabled && (mPendingEvent.light != mPreviousLight) ) { | ||
*data++ = mPendingEvent; | ||
count--; | ||
numEventReceived++; | ||
mPreviousLight = mPendingEvent.light; | ||
} | ||
} else { | ||
ALOGE("LightSensor: unknown event (type=%d, code=%d)", | ||
type, event->code); | ||
} | ||
mInputReader.next(); | ||
} | ||
|
||
return numEventReceived; | ||
} | ||
|
||
float LightSensor::indexToValue(size_t index) const | ||
{ | ||
return 0.0; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
/* | ||
* Copyright 2013 The Android Open Source Project | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
#ifndef ANDROID_LIGHT_SENSOR_H | ||
#define ANDROID_LIGHT_SENSOR_H | ||
|
||
#include <stdint.h> | ||
#include <errno.h> | ||
#include <sys/cdefs.h> | ||
#include <sys/types.h> | ||
|
||
#include "SensorBase.h" | ||
#include "InputEventReader.h" | ||
#include "sensors.h" | ||
|
||
/*****************************************************************************/ | ||
|
||
struct input_event; | ||
|
||
class LightSensor : public SensorBase { | ||
int mEnabled; | ||
int mEventsSinceEnable; | ||
InputEventCircularReader mInputReader; | ||
sensors_event_t mPendingEvent; | ||
bool mHasPendingEvent; | ||
char input_sysfs_path[PATH_MAX]; | ||
int input_sysfs_path_len; | ||
|
||
int setInitialState(); | ||
float mPreviousLight; | ||
float indexToValue(size_t index) const; | ||
|
||
public: | ||
LightSensor(); | ||
virtual ~LightSensor(); | ||
virtual int readEvents(sensors_event_t* data, int count); | ||
virtual bool hasPendingEvents() const; | ||
virtual int setDelay(int32_t handle, int64_t ns); | ||
virtual int enable(int32_t handle, int enabled); | ||
}; | ||
|
||
/*****************************************************************************/ | ||
|
||
#endif // ANDROID_LIGHT_SENSOR_H |
Oops, something went wrong.