You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ja...@apache.org on 2017/04/26 22:40:57 UTC
[09/50] [abbrv] incubator-mynewt-core git commit: No Ticket:
Redefining user defined sensor types
No Ticket: Redefining user defined sensor types
- It was correct before. It was changed to accomodate more sensors but
there was discontinuation in the types.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/813463ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/813463ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/813463ed
Branch: refs/heads/bluetooth5
Commit: 813463edfaa10383a35798ead25ac2708a69608f
Parents: 3bd1a0d
Author: Vipul Rahane <vi...@apache.org>
Authored: Tue Apr 18 11:42:02 2017 -0700
Committer: Vipul Rahane <vi...@apache.org>
Committed: Tue Apr 18 11:47:55 2017 -0700
----------------------------------------------------------------------
hw/sensor/include/sensor/sensor.h | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/813463ed/hw/sensor/include/sensor/sensor.h
----------------------------------------------------------------------
diff --git a/hw/sensor/include/sensor/sensor.h b/hw/sensor/include/sensor/sensor.h
index fb5bf2d..b792685 100644
--- a/hw/sensor/include/sensor/sensor.h
+++ b/hw/sensor/include/sensor/sensor.h
@@ -68,17 +68,28 @@ typedef enum {
/* Weight Supported */
SENSOR_TYPE_WEIGHT = (1 << 11),
/* Linear Accelerometer (Without Gravity) */
- SENSOR_TYPE_LINEAR_ACCEL = (1 << 26),
+ SENSOR_TYPE_LINEAR_ACCEL = (1 << 12),
/* Gravity Sensor */
- SENSOR_TYPE_GRAVITY = (1 << 27),
+ SENSOR_TYPE_GRAVITY = (1 << 13),
/* Euler Orientation Sensor */
- SENSOR_TYPE_EULER = (1 << 28),
+ SENSOR_TYPE_EULER = (1 << 14),
/* Color Sensor */
- SENSOR_TYPE_COLOR = (1 << 29),
+ SENSOR_TYPE_COLOR = (1 << 15),
+
+ /* Standard sensor types to be defined here */
+
/* User defined sensor type 1 */
- SENSOR_TYPE_USER_DEFINED_1 = (1 << 30),
+ SENSOR_TYPE_USER_DEFINED_1 = (1 << 26),
/* User defined sensor type 2 */
- SENSOR_TYPE_USER_DEFINED_2 = (1 << 31),
+ SENSOR_TYPE_USER_DEFINED_2 = (1 << 27),
+ /* User defined sensor type 3 */
+ SENSOR_TYPE_USER_DEFINED_3 = (1 << 28),
+ /* User defined sensor type 4 */
+ SENSOR_TYPE_USER_DEFINED_4 = (1 << 29),
+ /* User defined sensor type 5 */
+ SENSOR_TYPE_USER_DEFINED_5 = (1 << 30),
+ /* User defined sensor type 6 */
+ SENSOR_TYPE_USER_DEFINED_6 = (1 << 31),
/* A selector, describes all sensors */
SENSOR_TYPE_ALL = 0xFFFFFFFF
} sensor_type_t;