diff options
| author | Mathias Agopian <mathias@google.com> | 2011-01-20 17:41:20 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-20 17:41:20 -0800 |
| commit | b703d338c3b940de1bc45554116e20975145548d (patch) | |
| tree | 4abdb4a5a1aada49dbabc63a4783dca5e2cfd94c /services | |
| parent | 9cc55346ecb1c1f35760a71b5f3cdaebd02892e6 (diff) | |
| parent | 822d4ce61687d386f9630b33113c6193257d6878 (diff) | |
| download | frameworks_base-b703d338c3b940de1bc45554116e20975145548d.zip frameworks_base-b703d338c3b940de1bc45554116e20975145548d.tar.gz frameworks_base-b703d338c3b940de1bc45554116e20975145548d.tar.bz2 | |
am 822d4ce6: Merge "fix [3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs when running slowly" into gingerbread
* commit '822d4ce61687d386f9630b33113c6193257d6878':
fix [3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs when running slowly
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); |