ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Add heart rate to ASensorEvent" into klp-modular-dev

This commit is contained in:
Etienne Le Grand 2014-05-27 18:02:49 +00:00 committed by Android (Google) Code Review
parent 1236710bcc 630e31d6ed
commit 9dcd38ad3b
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/android/sensor.h
View File

@ -66,6 +66,7 @@ enum {
* Sensor accuracy measure * Sensor accuracy measure
*/ */
enum { enum {
ASENSOR_STATUS_NO_CONTACT = -1,
ASENSOR_STATUS_UNRELIABLE = 0, ASENSOR_STATUS_UNRELIABLE = 0,
ASENSOR_STATUS_ACCURACY_LOW = 1, ASENSOR_STATUS_ACCURACY_LOW = 1,
ASENSOR_STATUS_ACCURACY_MEDIUM = 2, ASENSOR_STATUS_ACCURACY_MEDIUM = 2,
@ -130,6 +131,11 @@ typedef struct AUncalibratedEvent {
}; };
} AUncalibratedEvent; } AUncalibratedEvent;
typedef struct AHeartRateEvent {
float bpm;
int8_t status;
} AHeartRateEvent;
/* NOTE: Must match hardware/sensors.h */ /* NOTE: Must match hardware/sensors.h */
typedef struct ASensorEvent { typedef struct ASensorEvent {
int32_t version; /* sizeof(struct ASensorEvent) */ int32_t version; /* sizeof(struct ASensorEvent) */
@ -151,6 +157,7 @@ typedef struct ASensorEvent {
AUncalibratedEvent uncalibrated_gyro; AUncalibratedEvent uncalibrated_gyro;
AUncalibratedEvent uncalibrated_magnetic; AUncalibratedEvent uncalibrated_magnetic;
AMetaDataEvent meta_data; AMetaDataEvent meta_data;
AHeartRateEvent heart_rate;
}; };
union { union {
uint64_t data[8]; uint64_t data[8];