From 4715d1734d2c60cc91ef70d409678d8eda382fde Mon Sep 17 00:00:00 2001 From: Peng Xu Date: Tue, 4 Apr 2017 01:31:54 -0700 Subject: HID dynamic sensor: add support to three types of sensor Implemented HID dynamic sensor using linux hidraw driver and HidUtils. Support the following cases: 1) HID Sensor spec defined accelerometer, gyroscope, magnetometer and orientation (quaternion). 2) Android defined type sensors (HID sensor custom type): ambient temperature, barometer, light and heart rate sensor. 3) Android custom type sensor (based on HID sensor custom type). Test: run tests/examples in test/ Test: test with a USB HID hardware (launchpad sensor) and marlin Bug: 37482951 Bug: 31026607 Change-Id: I9d679fb34d15324a9df1cf19647ea638fd1a0e68 --- modules/sensors/dynamic_sensor/BaseSensorObject.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'modules/sensors/dynamic_sensor/BaseSensorObject.cpp') diff --git a/modules/sensors/dynamic_sensor/BaseSensorObject.cpp b/modules/sensors/dynamic_sensor/BaseSensorObject.cpp index 189e87fa..4ec76b27 100644 --- a/modules/sensors/dynamic_sensor/BaseSensorObject.cpp +++ b/modules/sensors/dynamic_sensor/BaseSensorObject.cpp @@ -16,8 +16,8 @@ #include "BaseSensorObject.h" #include "SensorEventCallback.h" +#include "Utils.h" -#include #include namespace android { @@ -28,7 +28,6 @@ BaseSensorObject::BaseSensorObject() : mCallback(nullptr) { bool BaseSensorObject::setEventCallback(SensorEventCallback* callback) { if (mCallback != nullptr) { - ALOGE("callback is already assigned, cannot change."); return false; } mCallback = callback; @@ -51,7 +50,7 @@ int BaseSensorObject::flush() { void BaseSensorObject::generateEvent(const sensors_event_t &e) { if (mCallback) { - mCallback->submitEvent(this, e); + mCallback->submitEvent(SP_THIS, e); } } -- cgit v1.2.3