Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0075d781 authored by Aravind Akella's avatar Aravind Akella Committed by Android (Google) Code Review
Browse files

Merge "Bug fix for SensorFusion data rate."

parents a6c25917 88509090

services/sensorservice/SensorFusion.cpp

+4 −12
Original line number Diff line number Diff line
@@ -102,15 +102,6 @@ status_t SensorFusion::activate(void* ident, bool enabled) { 
        }

    }



    if (enabled) {

        ALOGD_IF(DEBUG_CONNECTIONS, "SensorFusion calling batch ident=%p ", ident);

        // Activating a sensor in continuous mode is equivalent to calling batch with the default

        // period and timeout equal to ZERO, followed by a call to activate.

        mSensorDevice.batch(ident, mAcc.getHandle(), 0, DEFAULT_EVENTS_PERIOD, 0);

        mSensorDevice.batch(ident, mMag.getHandle(), 0, DEFAULT_EVENTS_PERIOD, 0);

        mSensorDevice.batch(ident, mGyro.getHandle(), 0, DEFAULT_EVENTS_PERIOD, 0);

    }



    mSensorDevice.activate(ident, mAcc.getHandle(), enabled);

    mSensorDevice.activate(ident, mMag.getHandle(), enabled);

    mSensorDevice.activate(ident, mGyro.getHandle(), enabled);
@@ -127,9 +118,10 @@ status_t SensorFusion::activate(void* ident, bool enabled) { 
}



status_t SensorFusion::setDelay(void* ident, int64_t ns) {

    mSensorDevice.setDelay(ident, mAcc.getHandle(), ns);

    mSensorDevice.setDelay(ident, mMag.getHandle(), ms2ns(20));

    mSensorDevice.setDelay(ident, mGyro.getHandle(), mTargetDelayNs);

    // Call batch with timeout zero instead of setDelay().

    mSensorDevice.batch(ident, mAcc.getHandle(), 0, ns, 0);

    mSensorDevice.batch(ident, mMag.getHandle(), 0, ms2ns(20), 0);

    mSensorDevice.batch(ident, mGyro.getHandle(), 0, mTargetDelayNs, 0);

    return NO_ERROR;

}

services/sensorservice/SensorFusion.h

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ class SensorDevice; 


class SensorFusion : public Singleton<SensorFusion> {

    friend class Singleton<SensorFusion>;

    static const nsecs_t DEFAULT_EVENTS_PERIOD = 200000000;  //  5 Hz



    SensorDevice& mSensorDevice;

    Sensor mAcc;