summaryrefslogtreecommitdiff
path: root/6515/libsensors_iio/MPLSensor.h
diff options
context:
space:
mode:
authorNick Vaccaro <nvaccaro@google.com>2014-03-27 12:31:34 -0700
committerNick Vaccaro <nvaccaro@google.com>2014-03-27 12:31:34 -0700
commita73d574dda77810ae10046c68e7a9aa38ad77603 (patch)
tree8d7fde753f1b893b97361091e816a3f2f9d28e78 /6515/libsensors_iio/MPLSensor.h
parenta3027840d30592cf143be31df19a2bf68cf92672 (diff)
downloadinvensense-a73d574dda77810ae10046c68e7a9aa38ad77603.tar.gz
Invensense: 6515: Import of Motion Apps 5.2.0 HAL RC20 Release
Import latest Invensense HAL for use by devices using the 6515. Change-Id: I1b585df6882ea007ffafba44261283784d667c2a
Diffstat (limited to '6515/libsensors_iio/MPLSensor.h')
-rwxr-xr-x[-rw-r--r--]6515/libsensors_iio/MPLSensor.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/6515/libsensors_iio/MPLSensor.h b/6515/libsensors_iio/MPLSensor.h
index 65e3b23..aa9dbc5 100644..100755
--- a/6515/libsensors_iio/MPLSensor.h
+++ b/6515/libsensors_iio/MPLSensor.h
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2012 Invensense, Inc.
+* Copyright (C) 2014 Invensense, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -186,6 +186,7 @@ public:
int selectAndSetQuaternion(int batchMode, int mEnabled, long long featureMask);
int checkBatchEnabled();
int setBatch(int en, int toggleEnable);
+ int writeBatchTimeout(int en);
int32_t getEnableMask() { return mEnabled; }
void getHandle(int32_t handle, int &what, android::String8 &sname);
@@ -199,7 +200,6 @@ public:
virtual bool hasStepCountPendingEvents();
int populateSensorList(struct sensor_t *list, int len);
- int readAccelEvents(sensors_event_t* data, int count);
void buildCompassEvent();
void buildMpuEvent();
int checkValidHeader(unsigned short data_format);
@@ -263,10 +263,13 @@ protected:
int enablePedStandaloneData(int en);
int enablePedQuaternion(int);
int enablePedQuaternionData(int);
+ int setPedQuaternionRate(int64_t wanted);
int enable6AxisQuaternion(int);
int enable6AxisQuaternionData(int);
+ int set6AxisQuaternionRate(int64_t wanted);
int enableLPQuaternion(int);
int enableQuaternionData(int);
+ int setQuaternionRate(int64_t wanted);
int enableAccelPedometer(int);
int enableAccelPedData(int);
int onDmp(int);
@@ -292,6 +295,7 @@ protected:
int computeAndSetDmpState(void);
int enablePedometer(int);
int enablePedIndicator(int en);
+ int checkPedStandaloneBatched(void);
int checkPedStandaloneEnabled(void);
int checkPedQuatEnabled();
int check6AxisQuatEnabled();
@@ -348,7 +352,7 @@ protected:
uint32_t mEnabled;
uint32_t mBatchEnabled;
- int32_t mFlushSensorEnabled;
+ android::Vector<int> mFlushSensorEnabledVector;
uint32_t mOldBatchEnabledMask;
int64_t mBatchTimeoutInMs;
sensors_event_t mPendingEvents[NumSensors];
@@ -489,6 +493,7 @@ protected:
char *pedometer_int_on;
char *event_pedometer;
char *pedometer_steps;
+ char *pedometer_step_thresh;
char *pedometer_counter;
char *motion_lpa_on;