diff options
| author | Mathias Agopian <mathias@google.com> | 2011-01-19 18:22:35 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-19 18:22:35 -0800 |
| commit | 54714b8b956be92e8f4c5884fd104867872b9001 (patch) | |
| tree | ba7da8e5bdefba2189177d3017e9d2bc1f1e6fdf /services | |
| parent | 961d2c6acf9a4a61648f040aaaf1e40a83674d59 (diff) | |
| parent | 0bcd713977be17cf1f3c485e9e2277bfaea175af (diff) | |
| download | frameworks_base-54714b8b956be92e8f4c5884fd104867872b9001.zip frameworks_base-54714b8b956be92e8f4c5884fd104867872b9001.tar.gz frameworks_base-54714b8b956be92e8f4c5884fd104867872b9001.tar.bz2 | |
Merge "fix [3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs when running slowly" into honeycomb
Diffstat (limited to 'services')
| -rw-r--r-- | services/sensorservice/RotationVectorSensor.cpp | 4 | ||||
| -rw-r--r-- | services/sensorservice/RotationVectorSensor.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/services/sensorservice/RotationVectorSensor.cpp b/services/sensorservice/RotationVectorSensor.cpp index 418e7f8..3abfc12 100644 --- a/services/sensorservice/RotationVectorSensor.cpp +++ b/services/sensorservice/RotationVectorSensor.cpp @@ -34,9 +34,9 @@ static inline T clamp(T v) { RotationVectorSensor::RotationVectorSensor(sensor_t const* list, size_t count) : mSensorDevice(SensorDevice::getInstance()), - mALowPass(M_SQRT1_2, 5.0f), + mALowPass(M_SQRT1_2, 1.5f), mAX(mALowPass), mAY(mALowPass), mAZ(mALowPass), - mMLowPass(M_SQRT1_2, 2.5f), + mMLowPass(M_SQRT1_2, 1.5f), mMX(mMLowPass), mMY(mMLowPass), mMZ(mMLowPass) { for (size_t i=0 ; i<count ; i++) { diff --git a/services/sensorservice/RotationVectorSensor.h b/services/sensorservice/RotationVectorSensor.h index b7c9512..17699f8 100644 --- a/services/sensorservice/RotationVectorSensor.h +++ b/services/sensorservice/RotationVectorSensor.h @@ -38,9 +38,9 @@ class RotationVectorSensor : public SensorInterface { double mAccTime; double mMagTime; SecondOrderLowPassFilter mALowPass; - BiquadFilter mAX, mAY, mAZ; + CascadedBiquadFilter mAX, mAY, mAZ; SecondOrderLowPassFilter mMLowPass; - BiquadFilter mMX, mMY, mMZ; + CascadedBiquadFilter mMX, mMY, mMZ; public: RotationVectorSensor(sensor_t const* list, size_t count); |