am 66cff624: Merge "Uses 4-th order low-pass for extracting gravity." into gingerbread (4b7de2c8) · Commits · e / os / android_frameworks_base

services/sensorservice/GravitySensor.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ namespace android {
		GravitySensor::GravitySensor(sensor_t const* list, size_t count)
		: mSensorDevice(SensorDevice::getInstance()),
		mEnabled(false), mAccTime(0),
		mLowPass(M_SQRT1_2, 1),
		mLowPass(M_SQRT1_2, 1.5f),
		mX(mLowPass), mY(mLowPass), mZ(mLowPass)

		{

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ class GravitySensor : public SensorInterface {
		double mAccTime;

		SecondOrderLowPassFilter mLowPass;
		BiquadFilter mX, mY, mZ;
		CascadedBiquadFilter mX, mY, mZ;

		public:
		GravitySensor(sensor_t const* list, size_t count);

+19 −0

Original line number	Diff line number	Diff line
		@@ -66,5 +66,24 @@ float BiquadFilter::operator()(float x)
		return y;
		}

		// ---------------------------------------------------------------------------

		CascadedBiquadFilter::CascadedBiquadFilter(const SecondOrderLowPassFilter& s)
		: mA(s), mB(s)
		{
		}

		float CascadedBiquadFilter::init(float x)
		{
		mA.init(x);
		mB.init(x);
		return x;
		}

		float CascadedBiquadFilter::operator()(float x)
		{
		return mB(mA(x));
		}

		// ---------------------------------------------------------------------------
		}; // namespace android

+12 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,18 @@ public:
		float operator()(float in);
		};

		/*
		* Two cascaded biquad IIR filters
		* (4-poles IIR)
		*/
		class CascadedBiquadFilter {
		BiquadFilter mA;
		BiquadFilter mB;
		public:
		CascadedBiquadFilter(const SecondOrderLowPassFilter& s);
		float init(float in);
		float operator()(float in);
		};

		// ---------------------------------------------------------------------------
		}; // namespace android