50b66767f6
whether a physical sensor needed to be active or not was managed by a simpe reference counter; unfortunatelly nothing prevented it to get out of sync if a sensor was disabled more than once. sensorservice already maintainted a list of all the "clients" connected to a physical sensor; we now use that list to determine if a sensor should be enabled. This can never be "out-of-sync" since this is the only data structure linking a sensor to a user of that sensor. also removed the isEnabled() method, which was never used and implemented wrongly (since it didn't take into account that a sensor could be disabled for a client but not of another). Change-Id: I789affb877728ca957e99f7ba749def37c4db1c7
107 lines
3.2 KiB
C++
107 lines
3.2 KiB
C++
/*
|
|
* Copyright (C) 2010 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 <stdint.h>
|
|
#include <math.h>
|
|
#include <sys/types.h>
|
|
|
|
#include <utils/Errors.h>
|
|
|
|
#include <hardware/sensors.h>
|
|
|
|
#include "GravitySensor.h"
|
|
|
|
namespace android {
|
|
// ---------------------------------------------------------------------------
|
|
|
|
GravitySensor::GravitySensor(sensor_t const* list, size_t count)
|
|
: mSensorDevice(SensorDevice::getInstance()),
|
|
mAccTime(0),
|
|
mLowPass(M_SQRT1_2, 1.5f),
|
|
mX(mLowPass), mY(mLowPass), mZ(mLowPass)
|
|
|
|
{
|
|
for (size_t i=0 ; i<count ; i++) {
|
|
if (list[i].type == SENSOR_TYPE_ACCELEROMETER) {
|
|
mAccelerometer = Sensor(list + i);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
bool GravitySensor::process(sensors_event_t* outEvent,
|
|
const sensors_event_t& event)
|
|
{
|
|
const static double NS2S = 1.0 / 1000000000.0;
|
|
if (event.type == SENSOR_TYPE_ACCELEROMETER) {
|
|
float x, y, z;
|
|
const double now = event.timestamp * NS2S;
|
|
if (mAccTime == 0) {
|
|
x = mX.init(event.acceleration.x);
|
|
y = mY.init(event.acceleration.y);
|
|
z = mZ.init(event.acceleration.z);
|
|
} else {
|
|
double dT = now - mAccTime;
|
|
mLowPass.setSamplingPeriod(dT);
|
|
x = mX(event.acceleration.x);
|
|
y = mY(event.acceleration.y);
|
|
z = mZ(event.acceleration.z);
|
|
}
|
|
mAccTime = now;
|
|
*outEvent = event;
|
|
outEvent->data[0] = x;
|
|
outEvent->data[1] = y;
|
|
outEvent->data[2] = z;
|
|
outEvent->sensor = '_grv';
|
|
outEvent->type = SENSOR_TYPE_GRAVITY;
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
status_t GravitySensor::activate(void* ident, bool enabled) {
|
|
status_t err = mSensorDevice.activate(this, mAccelerometer.getHandle(), enabled);
|
|
if (err == NO_ERROR) {
|
|
if (enabled) {
|
|
mAccTime = 0;
|
|
}
|
|
}
|
|
return err;
|
|
}
|
|
|
|
status_t GravitySensor::setDelay(void* ident, int handle, int64_t ns)
|
|
{
|
|
return mSensorDevice.setDelay(this, mAccelerometer.getHandle(), ns);
|
|
}
|
|
|
|
Sensor GravitySensor::getSensor() const {
|
|
sensor_t hwSensor;
|
|
hwSensor.name = "Gravity Sensor";
|
|
hwSensor.vendor = "Google Inc.";
|
|
hwSensor.version = 1;
|
|
hwSensor.handle = '_grv';
|
|
hwSensor.type = SENSOR_TYPE_GRAVITY;
|
|
hwSensor.maxRange = mAccelerometer.getMaxValue();
|
|
hwSensor.resolution = mAccelerometer.getResolution();
|
|
hwSensor.power = mAccelerometer.getPowerUsage();
|
|
hwSensor.minDelay = mAccelerometer.getMinDelay();
|
|
Sensor sensor(&hwSensor);
|
|
return sensor;
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
}; // namespace android
|
|
|