From 18cd95688d8e5f040329d32f12e217d3f6a6e830 Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Sat, 1 Nov 2014 09:09:52 +0800 Subject: [Drivers] Add sensor framework --- components/drivers/sensors/sensor.cpp | 135 ++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 components/drivers/sensors/sensor.cpp (limited to 'components/drivers/sensors/sensor.cpp') diff --git a/components/drivers/sensors/sensor.cpp b/components/drivers/sensors/sensor.cpp new file mode 100644 index 0000000000..f15ee3a3ca --- /dev/null +++ b/components/drivers/sensors/sensor.cpp @@ -0,0 +1,135 @@ +#include +#include "sensor.h" + +/** + * Sensor + */ +Sensor::Sensor() +{ + this->next = this->prev = NULL; + Subscribe(NULL, NULL); +} + +Sensor::~Sensor() +{ +} + +int Sensor::GetType(void) +{ + return this->type; +} + +int Sensor::Subscribe(SensorEventHandler_t *handler, void* user_data) +{ + this->evtHandler = handler; + this->userData = user_data; + + return 0; +} + +int Sensor::Publish(sensors_event_t* event) +{ + if (this->evtHandler != NULL) + { + /* invoke subscribed handler */ + (*evtHandler)(this, event, this->userData); + } + + return 0; +} + +/** + * Sensor Manager + */ +/* sensor manager instance */ +static SensorManager _sensor_manager; + +SensorManager::SensorManager() +{ + sensorList = NULL; +} + +SensorManager::~SensorManager() +{ +} + +int SensorManager::RegisterSensor(Sensor* sensor) +{ + SensorManager* self = &_sensor_manager; + + RT_ASSERT(sensor != RT_NULL); + + /* add sensor into the list */ + if (self->sensorList = NULL) + { + sensor->prev = sensor->next = sensor; + } + else + { + sensor->prev = self->sensorList; + sensor->next = self->sensorList->next; + + self->sensorList->next->prev = sensor; + self->sensorList->next = sensor; + } + + /* point the sensorList to this sensor */ + self->sensorList = sensor; + + return 0; +} + +int SensorManager::DeregisterSensor(Sensor* sensor) +{ + SensorManager* self = &_sensor_manager; + + /* disconnect sensor list */ + sensor->next->prev = sensor->prev; + sensor->prev->next = sensor->next; + + /* check the sensorList */ + if (sensor == self->sensorList) + { + if (sensor->next == sensor) self->sensorList = NULL; /* empty list */ + else self->sensorList = sensor->next; + } + + /* re-initialize sensor node */ + sensor->next = sensor->prev = sensor; + + return 0; +} + +Sensor *SensorManager::GetDefaultSensor(int type) +{ + SensorManager* self = &_sensor_manager; + Sensor *sensor = self->sensorList; + + if (sensor == NULL) return NULL; + + do + { + /* find the same type */ + if (sensor->GetType() == type) return sensor; + + sensor = sensor->next; + } + while (sensor != self->sensorList); + + return NULL; +} + +int SensorManager::Subscribe(int type, SensorEventHandler_t *handler, void* user_data) +{ + Sensor *sensor; + + sensor = SensorManager::GetDefaultSensor(type); + if (sensor != NULL) + { + sensor->Subscribe(handler, user_data); + return 0; + } + + return -1; +} + -- cgit v1.3.1 From 0fa10629f71f6f971b694aeda408b23f6c4ea0c0 Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Sat, 1 Nov 2014 15:52:25 +0800 Subject: [Sensor] code cleanup --- components/drivers/sensors/sensor.cpp | 122 +++++++++++++++++----------------- components/drivers/sensors/sensor.h | 90 ++++++++++++++----------- 2 files changed, 113 insertions(+), 99 deletions(-) (limited to 'components/drivers/sensors/sensor.cpp') diff --git a/components/drivers/sensors/sensor.cpp b/components/drivers/sensors/sensor.cpp index f15ee3a3ca..52718183f3 100644 --- a/components/drivers/sensors/sensor.cpp +++ b/components/drivers/sensors/sensor.cpp @@ -1,13 +1,13 @@ #include #include "sensor.h" -/** +/** * Sensor */ Sensor::Sensor() { - this->next = this->prev = NULL; - Subscribe(NULL, NULL); + this->next = this->prev = NULL; + Subscribe(NULL, NULL); } Sensor::~Sensor() @@ -19,7 +19,7 @@ int Sensor::GetType(void) return this->type; } -int Sensor::Subscribe(SensorEventHandler_t *handler, void* user_data) +int Sensor::Subscribe(SensorEventHandler_t *handler, void *user_data) { this->evtHandler = handler; this->userData = user_data; @@ -27,13 +27,13 @@ int Sensor::Subscribe(SensorEventHandler_t *handler, void* user_data) return 0; } -int Sensor::Publish(sensors_event_t* event) +int Sensor::Publish(sensors_event_t *event) { - if (this->evtHandler != NULL) - { - /* invoke subscribed handler */ - (*evtHandler)(this, event, this->userData); - } + if (this->evtHandler != NULL) + { + /* invoke subscribed handler */ + (*evtHandler)(this, event, this->userData); + } return 0; } @@ -46,89 +46,89 @@ static SensorManager _sensor_manager; SensorManager::SensorManager() { - sensorList = NULL; + sensorList = NULL; } SensorManager::~SensorManager() { } -int SensorManager::RegisterSensor(Sensor* sensor) +int SensorManager::RegisterSensor(Sensor *sensor) { - SensorManager* self = &_sensor_manager; - + SensorManager *self = &_sensor_manager; + RT_ASSERT(sensor != RT_NULL); - /* add sensor into the list */ - if (self->sensorList = NULL) - { - sensor->prev = sensor->next = sensor; - } - else - { - sensor->prev = self->sensorList; - sensor->next = self->sensorList->next; + /* add sensor into the list */ + if (self->sensorList = NULL) + { + sensor->prev = sensor->next = sensor; + } + else + { + sensor->prev = self->sensorList; + sensor->next = self->sensorList->next; - self->sensorList->next->prev = sensor; - self->sensorList->next = sensor; - } + self->sensorList->next->prev = sensor; + self->sensorList->next = sensor; + } - /* point the sensorList to this sensor */ - self->sensorList = sensor; + /* point the sensorList to this sensor */ + self->sensorList = sensor; - return 0; + return 0; } -int SensorManager::DeregisterSensor(Sensor* sensor) +int SensorManager::DeregisterSensor(Sensor *sensor) { - SensorManager* self = &_sensor_manager; + SensorManager *self = &_sensor_manager; - /* disconnect sensor list */ - sensor->next->prev = sensor->prev; - sensor->prev->next = sensor->next; + /* disconnect sensor list */ + sensor->next->prev = sensor->prev; + sensor->prev->next = sensor->next; - /* check the sensorList */ - if (sensor == self->sensorList) - { - if (sensor->next == sensor) self->sensorList = NULL; /* empty list */ - else self->sensorList = sensor->next; - } + /* check the sensorList */ + if (sensor == self->sensorList) + { + if (sensor->next == sensor) self->sensorList = NULL; /* empty list */ + else self->sensorList = sensor->next; + } - /* re-initialize sensor node */ - sensor->next = sensor->prev = sensor; + /* re-initialize sensor node */ + sensor->next = sensor->prev = sensor; return 0; } Sensor *SensorManager::GetDefaultSensor(int type) { - SensorManager* self = &_sensor_manager; - Sensor *sensor = self->sensorList; + SensorManager *self = &_sensor_manager; + Sensor *sensor = self->sensorList; - if (sensor == NULL) return NULL; + if (sensor == NULL) return NULL; - do - { - /* find the same type */ - if (sensor->GetType() == type) return sensor; + do + { + /* find the same type */ + if (sensor->GetType() == type) return sensor; - sensor = sensor->next; - } - while (sensor != self->sensorList); + sensor = sensor->next; + } + while (sensor != self->sensorList); return NULL; } -int SensorManager::Subscribe(int type, SensorEventHandler_t *handler, void* user_data) +int SensorManager::Subscribe(int type, SensorEventHandler_t *handler, void *user_data) { - Sensor *sensor; - - sensor = SensorManager::GetDefaultSensor(type); - if (sensor != NULL) - { - sensor->Subscribe(handler, user_data); - return 0; - } + Sensor *sensor; + + sensor = SensorManager::GetDefaultSensor(type); + if (sensor != NULL) + { + sensor->Subscribe(handler, user_data); + return 0; + } return -1; } diff --git a/components/drivers/sensors/sensor.h b/components/drivers/sensors/sensor.h index 199db8644b..09929d1b58 100644 --- a/components/drivers/sensors/sensor.h +++ b/components/drivers/sensors/sensor.h @@ -55,7 +55,8 @@ * Availability: SENSORS_DEVICE_API_VERSION_1_0 * see (*batch)() documentation for details */ -enum { +enum +{ SENSORS_BATCH_DRY_RUN = 0x00000001, SENSORS_BATCH_WAKE_UPON_FIFO_FULL = 0x00000002 }; @@ -63,7 +64,8 @@ enum { /* * what field for meta_data_event_t */ -enum { +enum +{ /* a previous flush operation has completed */ META_DATA_FLUSH_COMPLETE = 1, META_DATA_VERSION /* always last, leave auto-assigned */ @@ -749,14 +751,17 @@ enum { */ typedef struct { - union { + union + { float v[3]; - struct { + struct + { float x; float y; float z; }; - struct { + struct + { float azimuth; float pitch; float roll; @@ -771,22 +776,26 @@ typedef struct */ typedef struct { - union { - float uncalib[3]; - struct { - float x_uncalib; - float y_uncalib; - float z_uncalib; + union + { + float uncalib[3]; + struct + { + float x_uncalib; + float y_uncalib; + float z_uncalib; + }; }; - }; - union { - float bias[3]; - struct { - float x_bias; - float y_bias; - float z_bias; + union + { + float bias[3]; + struct + { + float x_bias; + float y_bias; + float z_bias; + }; }; - }; } uncalibrated_event_t; typedef struct meta_data_event @@ -799,7 +808,8 @@ typedef struct meta_data_event * Union of the various types of sensor data * that can be returned. */ -typedef struct sensors_event_t { +typedef struct sensors_event_t +{ /* must be sizeof(struct sensors_event_t) */ int32_t version; @@ -815,8 +825,10 @@ typedef struct sensors_event_t { /* time is in nanosecond */ int64_t timestamp; - union { - union { + union + { + union + { float data[16]; /* acceleration values are in meter per second per second (m/s^2) */ @@ -859,7 +871,8 @@ typedef struct sensors_event_t { meta_data_event_t meta_data; }; - union { + union + { uint64_t data[8]; /* step-counter */ @@ -872,15 +885,16 @@ typedef struct sensors_event_t { /* see SENSOR_TYPE_META_DATA */ typedef sensors_event_t sensors_meta_data_event_t; -typedef struct sensor_t { +typedef struct sensor_t +{ /* Name of this sensor. * All sensors of the same "type" must have a different "name". */ - const char* name; + const char *name; /* vendor of the hardware part */ - const char* vendor; + const char *vendor; /* version of the hardware part + driver. The value of this field * must increase when the driver is updated in a way that changes the @@ -929,7 +943,7 @@ typedef struct sensor_t { uint32_t fifoMaxEventCount; /* reserved fields, must be zero */ - void* reserved[6]; + void *reserved[6]; } sensor_t; class SensorConfigure @@ -939,7 +953,7 @@ class SensorConfigure class Sensor; class SensorManager; -typedef void (*SensorEventHandler_t)(Sensor* sensor, sensors_event_t* event, void* user_data); +typedef void (*SensorEventHandler_t)(Sensor *sensor, sensors_event_t *event, void *user_data); /** * Sensor Base Class @@ -961,17 +975,17 @@ public: int GetType(void); - int Subscribe(SensorEventHandler_t *handler, void* user_data); - int Publish(sensors_event_t* event); + int Subscribe(SensorEventHandler_t *handler, void *user_data); + int Publish(sensors_event_t *event); -protected: +protected: Sensor *next; - Sensor *prev; + Sensor *prev; SensorEventHandler_t *evtHandler; void *userData; - friend class SensorManager; + friend class SensorManager; }; /** @@ -982,15 +996,15 @@ class SensorManager public: SensorManager(); ~SensorManager(); - - static int RegisterSensor(Sensor* sensor); - static int DeregisterSensor(Sensor* sensor); + + static int RegisterSensor(Sensor *sensor); + static int DeregisterSensor(Sensor *sensor); static Sensor *GetDefaultSensor(int type); - static int Subscribe(int type, SensorEventHandler_t *handler, void* user_data); + static int Subscribe(int type, SensorEventHandler_t *handler, void *user_data); private: - Sensor* sensorList; + Sensor *sensorList; }; #endif -- cgit v1.3.1 From c26b999360ddbc6392f36ac8f7abed0f7cb457cc Mon Sep 17 00:00:00 2001 From: bernard Date: Mon, 1 Dec 2014 12:22:17 +0800 Subject: Fix the sensor list issue. --- components/drivers/sensors/sensor.cpp | 19 ++++++++++++++++--- components/drivers/sensors/sensor.h | 3 --- 2 files changed, 16 insertions(+), 6 deletions(-) (limited to 'components/drivers/sensors/sensor.cpp') diff --git a/components/drivers/sensors/sensor.cpp b/components/drivers/sensors/sensor.cpp index 52718183f3..8751efd36d 100644 --- a/components/drivers/sensors/sensor.cpp +++ b/components/drivers/sensors/sensor.cpp @@ -1,3 +1,17 @@ +/* + * File : sensors.cpp + * This file is part of RT-Thread RTOS + * COPYRIGHT (C) 2014, RT-Thread Development Team + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rt-thread.org/license/LICENSE + * + * Change Logs: + * Date Author Notes + * 2014-08-03 Bernard the first version + */ + #include #include "sensor.h" @@ -60,7 +74,7 @@ int SensorManager::RegisterSensor(Sensor *sensor) RT_ASSERT(sensor != RT_NULL); /* add sensor into the list */ - if (self->sensorList = NULL) + if (self->sensorList == NULL) { sensor->prev = sensor->next = sensor; } @@ -113,8 +127,7 @@ Sensor *SensorManager::GetDefaultSensor(int type) if (sensor->GetType() == type) return sensor; sensor = sensor->next; - } - while (sensor != self->sensorList); + }while (sensor != self->sensorList); return NULL; } diff --git a/components/drivers/sensors/sensor.h b/components/drivers/sensors/sensor.h index 09929d1b58..065422944d 100644 --- a/components/drivers/sensors/sensor.h +++ b/components/drivers/sensors/sensor.h @@ -34,10 +34,7 @@ #define SENSORS_H__ #include - #include -#include -#include /** * Handles must be higher than SENSORS_HANDLE_BASE and must be unique. -- cgit v1.3.1 From 58163f49e01e351699134426db90f2bd6529ca57 Mon Sep 17 00:00:00 2001 From: bernard Date: Wed, 31 Dec 2014 22:33:54 +0800 Subject: [DeviceDriver] change the name style of method of C++ code; Add raw mode for sensor. --- components/drivers/sensors/sensor.cpp | 111 ++++++++++++++++-------- components/drivers/sensors/sensor.h | 154 ++++++++++++++++++++++++++++------ 2 files changed, 205 insertions(+), 60 deletions(-) (limited to 'components/drivers/sensors/sensor.cpp') diff --git a/components/drivers/sensors/sensor.cpp b/components/drivers/sensors/sensor.cpp index 8751efd36d..88342d6dac 100644 --- a/components/drivers/sensors/sensor.cpp +++ b/components/drivers/sensors/sensor.cpp @@ -13,27 +13,52 @@ */ #include +#include + #include "sensor.h" /** - * Sensor + * SensorBase */ -Sensor::Sensor() +SensorBase::SensorBase(int type) { + memset(&(this->config), 0x0, sizeof(SensorConfig)); + + this->type = type; this->next = this->prev = NULL; - Subscribe(NULL, NULL); + subscribe(NULL, NULL); } -Sensor::~Sensor() +SensorBase::~SensorBase() { } -int Sensor::GetType(void) +int SensorBase::getType(void) { return this->type; } -int Sensor::Subscribe(SensorEventHandler_t *handler, void *user_data) +int SensorBase::setConfig(SensorConfig *config) +{ + int result; + + /* configure to the low level sensor */ + result = this->configure(config); + if (result == 0) + { + this->config = *config; + } + + return result; +} + +int SensorBase::getConfig(SensorConfig *config) +{ + *config = this->config; + return 0; +} + +int SensorBase::subscribe(SensorEventHandler_t *handler, void *user_data) { this->evtHandler = handler; this->userData = user_data; @@ -41,7 +66,7 @@ int Sensor::Subscribe(SensorEventHandler_t *handler, void *user_data) return 0; } -int Sensor::Publish(sensors_event_t *event) +int SensorBase::publish(sensors_event_t *event) { if (this->evtHandler != NULL) { @@ -55,57 +80,52 @@ int Sensor::Publish(sensors_event_t *event) /** * Sensor Manager */ -/* sensor manager instance */ -static SensorManager _sensor_manager; +/* sensors list */ +static SensorBase *sensor_list = NULL; SensorManager::SensorManager() { - sensorList = NULL; } SensorManager::~SensorManager() { } -int SensorManager::RegisterSensor(Sensor *sensor) +int SensorManager::registerSensor(SensorBase *sensor) { - SensorManager *self = &_sensor_manager; - RT_ASSERT(sensor != RT_NULL); /* add sensor into the list */ - if (self->sensorList == NULL) + if (sensor_list == NULL) { sensor->prev = sensor->next = sensor; } else { - sensor->prev = self->sensorList; - sensor->next = self->sensorList->next; + sensor_list->prev->next = sensor; + sensor->prev = sensor_list->prev; - self->sensorList->next->prev = sensor; - self->sensorList->next = sensor; + sensor_list->prev = sensor; + sensor->next = sensor_list; } /* point the sensorList to this sensor */ - self->sensorList = sensor; + sensor_list = sensor; return 0; } -int SensorManager::DeregisterSensor(Sensor *sensor) +int SensorManager::unregisterSensor(SensorBase *sensor) { - SensorManager *self = &_sensor_manager; - /* disconnect sensor list */ sensor->next->prev = sensor->prev; sensor->prev->next = sensor->next; /* check the sensorList */ - if (sensor == self->sensorList) + if (sensor == sensor_list) { - if (sensor->next == sensor) self->sensorList = NULL; /* empty list */ - else self->sensorList = sensor->next; + if (sensor->next == sensor) sensor_list = NULL; /* empty list */ + else sensor_list = sensor->next; } /* re-initialize sensor node */ @@ -114,35 +134,58 @@ int SensorManager::DeregisterSensor(Sensor *sensor) return 0; } -Sensor *SensorManager::GetDefaultSensor(int type) +SensorBase *SensorManager::getDefaultSensor(int type) { - SensorManager *self = &_sensor_manager; - Sensor *sensor = self->sensorList; + SensorBase *sensor = sensor_list; if (sensor == NULL) return NULL; do { /* find the same type */ - if (sensor->GetType() == type) return sensor; + if (sensor->getType() == type) return sensor; sensor = sensor->next; - }while (sensor != self->sensorList); + }while (sensor != sensor_list); return NULL; } -int SensorManager::Subscribe(int type, SensorEventHandler_t *handler, void *user_data) +int SensorManager::subscribe(int type, SensorEventHandler_t *handler, void *user_data) { - Sensor *sensor; + SensorBase *sensor; - sensor = SensorManager::GetDefaultSensor(type); + sensor = SensorManager::getDefaultSensor(type); if (sensor != NULL) { - sensor->Subscribe(handler, user_data); + sensor->subscribe(handler, user_data); return 0; } return -1; } +int SensorManager::sensorEventReady(SensorBase *sensor) +{ + return 0; +} + +int SensorManager::pollSensor(SensorBase *sensor, sensors_event_t *events, int number, int duration) +{ + rt_tick_t tick; + int result, index; + + if (sensor == NULL) return -1; + + tick = rt_tick_get(); + for (index = 0; index < number; index ++) + { + result = sensor->poll(&events[index]); + if (result < 0) break; + + if (rt_tick_get() - tick > duration) break; + } + + return index; +} + diff --git a/components/drivers/sensors/sensor.h b/components/drivers/sensors/sensor.h index 065422944d..5545242056 100644 --- a/components/drivers/sensors/sensor.h +++ b/components/drivers/sensors/sensor.h @@ -36,6 +36,8 @@ #include #include +#pragma anon_unions + /** * Handles must be higher than SENSORS_HANDLE_BASE and must be unique. * A Handle identifies a given sensors. The handle is used to activate @@ -726,14 +728,24 @@ enum * Values returned by the accelerometer in various locations in the universe. * all values are in SI units (m/s^2) */ -#define GRAVITY_SUN (275.0f) -#define GRAVITY_EARTH (9.80665f) +#define SENSORS_GRAVITY_SUN (275.0f) +#define SENSORS_GRAVITY_MOON (1.6f) +#define SENSORS_GRAVITY_EARTH (9.80665f) +#define SENSORS_GRAVITY_STANDARD (SENSORS_GRAVITY_EARTH) /** Maximum magnetic field on Earth's surface */ -#define MAGNETIC_FIELD_EARTH_MAX (60.0f) +#define MAGNETIC_FIELD_EARTH_MAX (60.0f) /** Minimum magnetic field on Earth's surface */ -#define MAGNETIC_FIELD_EARTH_MIN (30.0f) +#define MAGNETIC_FIELD_EARTH_MIN (30.0f) + +/** Average sea level pressure is 1013.25 hPa */ +#define SENSORS_PRESSURE_SEALEVELHPA (1013.25F) + +/** Degrees/s to rad/s multiplier */ +#define SENSORS_DPS_TO_RADS (0.017453293F) +/** Gauss to micro-Tesla multiplier */ +#define SENSORS_GAUSS_TO_MICROTESLA (100) /** * status of orientation sensor @@ -768,6 +780,22 @@ typedef struct uint8_t reserved[3]; } sensors_vec_t; +/** + * sensor raw vector data + */ +typedef struct +{ + struct + { + int16_t x; + int16_t y; + int16_t z; + }; + + int8_t status; + uint8_t reserved[1]; +} sensors_raw_vec_t; + /** * uncalibrated gyroscope and magnetometer event data */ @@ -830,15 +858,21 @@ typedef struct sensors_event_t /* acceleration values are in meter per second per second (m/s^2) */ sensors_vec_t acceleration; + /* raw acceleration data */ + sensors_raw_vec_t raw_acceleration; /* magnetic vector values are in micro-Tesla (uT) */ sensors_vec_t magnetic; + /* raw magnetic data */ + sensors_raw_vec_t raw_magnetic; /* orientation values are in degrees */ sensors_vec_t orientation; /* gyroscope values are in rad/s */ sensors_vec_t gyro; + /* raw gyroscope data */ + sensors_raw_vec_t raw_gyro; /* temperature is in degrees centigrade (Celsius) */ float temperature; @@ -943,41 +977,109 @@ typedef struct sensor_t void *reserved[6]; } sensor_t; -class SensorConfigure +enum SensorMode +{ + SENSOR_MODE_RAW, + SENSOR_MODE_CALIBRATED, + SENSOR_MODE_NORMAL, +}; + +enum SensorAccelRange +{ + SENSOR_ACCEL_RANGE_2G, + SENSOR_ACCEL_RANGE_4G, + SENSOR_ACCEL_RANGE_8G, + SENSOR_ACCEL_RANGE_16G, +}; +#define SENSOR_ACCEL_SENSITIVITY_2G (0.001F) +#define SENSOR_ACCEL_SENSITIVITY_4G (0.002F) +#define SENSOR_ACCEL_SENSITIVITY_8G (0.004F) +#define SENSOR_ACCEL_SENSITIVITY_16G (0.012F) + +enum SensorGyroRange +{ + SENSOR_GYRO_RANGE_250DPS, + SENSOR_GYRO_RANGE_500DPS, + SENSOR_GYRO_RANGE_1000DPS, + SENSOR_GYRO_RANGE_2000DPS, +}; +#define SENSOR_GYRO_SENSITIVITY_250DPS (0.00875F) +#define SENSOR_GYRO_SENSITIVITY_500DPS (0.0175F) +#define SENSOR_GYRO_SENSITIVITY_1000DPS (0.035F) +#define SENSOR_GYRO_SENSITIVITY_2000DPS (0.070F) + +enum SensorDataRate { - int32_t delay; + SENSOR_DATARATE_3200HZ, + SENSOR_DATARATE_1600HZ, + SENSOR_DATARATE_800HZ, + SENSOR_DATARATE_400HZ, + SENSOR_DATARATE_200HZ, + SENSOR_DATARATE_100HZ, + SENSOR_DATARATE_50HZ, + SENSOR_DATARATE_25HZ, + SENSOR_DATARATE_12_5HZ, + SENSOR_DATARATE_6_25HZ, + SENSOR_DATARATE_3_13HZ, + SENSOR_DATARATE_1_56HZ, + SENSOR_DATARATE_0_78HZ, + SENSOR_DATARATE_0_39HZ, + SENSOR_DATARATE_0_20HZ, + SENSOR_DATARATE_0_10HZ, }; -class Sensor; +class SensorBase; class SensorManager; -typedef void (*SensorEventHandler_t)(Sensor *sensor, sensors_event_t *event, void *user_data); +typedef void (*SensorEventHandler_t)(SensorBase *sensor, sensors_event_t *event, void *user_data); + +/** + * Sensor Configuration + */ +typedef struct SensorConfig +{ + int mode; + + enum SensorDataRate data_rate; + + union range + { + enum SensorAccelRange accel_range; + enum SensorGyroRange gyro_range; + } range; +}SensorConfig; /** * Sensor Base Class */ -class Sensor +class SensorBase { private: int type; public: - Sensor(); - ~Sensor(); + SensorBase(int type); + ~SensorBase(); - virtual int Configure(SensorConfigure *config) = 0; - virtual int Activate(int enable) = 0; + virtual int configure(SensorConfig *config) = 0; + virtual int activate(int enable) = 0; - virtual int Poll(sensors_event_t *events, int number, int duration) = 0; - virtual void GetSensor(struct sensor_t *sensor) = 0; + virtual int poll(sensors_event_t *events) = 0; + virtual void getSensor(struct sensor_t *sensor) = 0; - int GetType(void); + int getType(void); - int Subscribe(SensorEventHandler_t *handler, void *user_data); - int Publish(sensors_event_t *event); + int setConfig(SensorConfig *config); + int getConfig(SensorConfig *config); + + int subscribe(SensorEventHandler_t *handler, void *user_data); + int publish(sensors_event_t *event); protected: - Sensor *next; - Sensor *prev; + SensorBase *next; + SensorBase *prev; + + /* sensor configuration */ + SensorConfig config; SensorEventHandler_t *evtHandler; void *userData; @@ -994,14 +1096,14 @@ public: SensorManager(); ~SensorManager(); - static int RegisterSensor(Sensor *sensor); - static int DeregisterSensor(Sensor *sensor); + static int registerSensor(SensorBase *sensor); + static int unregisterSensor(SensorBase *sensor); - static Sensor *GetDefaultSensor(int type); - static int Subscribe(int type, SensorEventHandler_t *handler, void *user_data); + static SensorBase *getDefaultSensor(int type); + static int subscribe(int type, SensorEventHandler_t *handler, void *user_data); -private: - Sensor *sensorList; + static int sensorEventReady(SensorBase *sensor); + static int pollSensor(SensorBase *sensor, sensors_event_t *events, int number, int duration); }; #endif -- cgit v1.3.1 From 46bca6f84a18576bf134bd184e825e905f83802d Mon Sep 17 00:00:00 2001 From: bernard Date: Sun, 4 Jan 2015 12:24:46 +0800 Subject: Add C programming language APIs. --- components/drivers/sensors/sensor.cpp | 38 +++++++- components/drivers/sensors/sensor.h | 164 +++++++++++++++++++--------------- 2 files changed, 130 insertions(+), 72 deletions(-) (limited to 'components/drivers/sensors/sensor.cpp') diff --git a/components/drivers/sensors/sensor.cpp b/components/drivers/sensors/sensor.cpp index 88342d6dac..2848707192 100644 --- a/components/drivers/sensors/sensor.cpp +++ b/components/drivers/sensors/sensor.cpp @@ -71,7 +71,7 @@ int SensorBase::publish(sensors_event_t *event) if (this->evtHandler != NULL) { /* invoke subscribed handler */ - (*evtHandler)(this, event, this->userData); + (*evtHandler)(event, this->userData); } return 0; @@ -189,3 +189,39 @@ int SensorManager::pollSensor(SensorBase *sensor, sensors_event_t *events, int n return index; } +int rt_sensor_subscribe(int type, SensorEventHandler_t *handler, void *user_data) +{ + return SensorManager::subscribe(type, handler, user_data); +} + +rt_sensor_t rt_sensor_get_default(int type) +{ + return (rt_sensor_t)SensorManager::getDefaultSensor(type); +} + +int rt_sensor_poll(rt_sensor_t sensor, sensors_event_t *event) +{ + SensorBase *sensor_base; + if (sensor == NULL || event == NULL) return -1; + + return sensor_base->poll(event); +} + +int rt_sensor_configure(rt_sensor_t sensor, SensorConfig *config) +{ + SensorBase *sensor_base; + if (sensor == NULL || config == NULL) return -1; + + sensor_base = (SensorBase*)sensor; + return sensor_base->setConfig(config); +} + +int rt_sensor_activate(rt_sensor_t sensor, int enable) +{ + SensorBase *sensor_base; + if (sensor == NULL) return -1; + + sensor_base = (SensorBase*)sensor; + return sensor_base->activate(enable); +} + diff --git a/components/drivers/sensors/sensor.h b/components/drivers/sensors/sensor.h index 5545242056..2962b21a80 100644 --- a/components/drivers/sensors/sensor.h +++ b/components/drivers/sensors/sensor.h @@ -36,7 +36,9 @@ #include #include +#ifdef __CC_ARM /* skip warning in armcc */ #pragma anon_unions +#endif /** * Handles must be higher than SENSORS_HANDLE_BASE and must be unique. @@ -729,23 +731,23 @@ enum * all values are in SI units (m/s^2) */ #define SENSORS_GRAVITY_SUN (275.0f) -#define SENSORS_GRAVITY_MOON (1.6f) +#define SENSORS_GRAVITY_MOON (1.6f) #define SENSORS_GRAVITY_EARTH (9.80665f) -#define SENSORS_GRAVITY_STANDARD (SENSORS_GRAVITY_EARTH) +#define SENSORS_GRAVITY_STANDARD (SENSORS_GRAVITY_EARTH) /** Maximum magnetic field on Earth's surface */ -#define MAGNETIC_FIELD_EARTH_MAX (60.0f) +#define MAGNETIC_FIELD_EARTH_MAX (60.0f) /** Minimum magnetic field on Earth's surface */ -#define MAGNETIC_FIELD_EARTH_MIN (30.0f) +#define MAGNETIC_FIELD_EARTH_MIN (30.0f) /** Average sea level pressure is 1013.25 hPa */ -#define SENSORS_PRESSURE_SEALEVELHPA (1013.25F) +#define SENSORS_PRESSURE_SEALEVELHPA (1013.25F) /** Degrees/s to rad/s multiplier */ -#define SENSORS_DPS_TO_RADS (0.017453293F) +#define SENSORS_DPS_TO_RADS (0.017453293F) /** Gauss to micro-Tesla multiplier */ -#define SENSORS_GAUSS_TO_MICROTESLA (100) +#define SENSORS_GAUSS_TO_MICROTESLA (100) /** * status of orientation sensor @@ -785,15 +787,15 @@ typedef struct */ typedef struct { - struct - { - int16_t x; - int16_t y; - int16_t z; - }; - - int8_t status; - uint8_t reserved[1]; + struct + { + int16_t x; + int16_t y; + int16_t z; + }; + + int8_t status; + uint8_t reserved[1]; } sensors_raw_vec_t; /** @@ -858,21 +860,21 @@ typedef struct sensors_event_t /* acceleration values are in meter per second per second (m/s^2) */ sensors_vec_t acceleration; - /* raw acceleration data */ - sensors_raw_vec_t raw_acceleration; + /* raw acceleration data */ + sensors_raw_vec_t raw_acceleration; /* magnetic vector values are in micro-Tesla (uT) */ sensors_vec_t magnetic; - /* raw magnetic data */ - sensors_raw_vec_t raw_magnetic; + /* raw magnetic data */ + sensors_raw_vec_t raw_magnetic; /* orientation values are in degrees */ sensors_vec_t orientation; /* gyroscope values are in rad/s */ sensors_vec_t gyro; - /* raw gyroscope data */ - sensors_raw_vec_t raw_gyro; + /* raw gyroscope data */ + sensors_raw_vec_t raw_gyro; /* temperature is in degrees centigrade (Celsius) */ float temperature; @@ -918,7 +920,6 @@ typedef sensors_event_t sensors_meta_data_event_t; typedef struct sensor_t { - /* Name of this sensor. * All sensors of the same "type" must have a different "name". */ @@ -979,17 +980,17 @@ typedef struct sensor_t enum SensorMode { - SENSOR_MODE_RAW, - SENSOR_MODE_CALIBRATED, - SENSOR_MODE_NORMAL, + SENSOR_MODE_RAW, + SENSOR_MODE_CALIBRATED, + SENSOR_MODE_NORMAL, }; enum SensorAccelRange { - SENSOR_ACCEL_RANGE_2G, - SENSOR_ACCEL_RANGE_4G, - SENSOR_ACCEL_RANGE_8G, - SENSOR_ACCEL_RANGE_16G, + SENSOR_ACCEL_RANGE_2G, + SENSOR_ACCEL_RANGE_4G, + SENSOR_ACCEL_RANGE_8G, + SENSOR_ACCEL_RANGE_16G, }; #define SENSOR_ACCEL_SENSITIVITY_2G (0.001F) #define SENSOR_ACCEL_SENSITIVITY_4G (0.002F) @@ -998,56 +999,58 @@ enum SensorAccelRange enum SensorGyroRange { - SENSOR_GYRO_RANGE_250DPS, - SENSOR_GYRO_RANGE_500DPS, - SENSOR_GYRO_RANGE_1000DPS, - SENSOR_GYRO_RANGE_2000DPS, + SENSOR_GYRO_RANGE_250DPS, + SENSOR_GYRO_RANGE_500DPS, + SENSOR_GYRO_RANGE_1000DPS, + SENSOR_GYRO_RANGE_2000DPS, }; -#define SENSOR_GYRO_SENSITIVITY_250DPS (0.00875F) -#define SENSOR_GYRO_SENSITIVITY_500DPS (0.0175F) -#define SENSOR_GYRO_SENSITIVITY_1000DPS (0.035F) -#define SENSOR_GYRO_SENSITIVITY_2000DPS (0.070F) +#define SENSOR_GYRO_SENSITIVITY_250DPS (0.00875F) +#define SENSOR_GYRO_SENSITIVITY_500DPS (0.0175F) +#define SENSOR_GYRO_SENSITIVITY_1000DPS (0.035F) +#define SENSOR_GYRO_SENSITIVITY_2000DPS (0.070F) enum SensorDataRate { - SENSOR_DATARATE_3200HZ, - SENSOR_DATARATE_1600HZ, - SENSOR_DATARATE_800HZ, - SENSOR_DATARATE_400HZ, - SENSOR_DATARATE_200HZ, - SENSOR_DATARATE_100HZ, - SENSOR_DATARATE_50HZ, - SENSOR_DATARATE_25HZ, - SENSOR_DATARATE_12_5HZ, - SENSOR_DATARATE_6_25HZ, - SENSOR_DATARATE_3_13HZ, - SENSOR_DATARATE_1_56HZ, - SENSOR_DATARATE_0_78HZ, - SENSOR_DATARATE_0_39HZ, - SENSOR_DATARATE_0_20HZ, - SENSOR_DATARATE_0_10HZ, + SENSOR_DATARATE_3200HZ, + SENSOR_DATARATE_1600HZ, + SENSOR_DATARATE_800HZ, + SENSOR_DATARATE_400HZ, + SENSOR_DATARATE_200HZ, + SENSOR_DATARATE_100HZ, + SENSOR_DATARATE_50HZ, + SENSOR_DATARATE_25HZ, + SENSOR_DATARATE_12_5HZ, + SENSOR_DATARATE_6_25HZ, + SENSOR_DATARATE_3_13HZ, + SENSOR_DATARATE_1_56HZ, + SENSOR_DATARATE_0_78HZ, + SENSOR_DATARATE_0_39HZ, + SENSOR_DATARATE_0_20HZ, + SENSOR_DATARATE_0_10HZ, }; -class SensorBase; -class SensorManager; -typedef void (*SensorEventHandler_t)(SensorBase *sensor, sensors_event_t *event, void *user_data); - /** * Sensor Configuration */ typedef struct SensorConfig { - int mode; + int mode; - enum SensorDataRate data_rate; + enum SensorDataRate data_rate; - union range - { - enum SensorAccelRange accel_range; - enum SensorGyroRange gyro_range; - } range; + union range + { + enum SensorAccelRange accel_range; + enum SensorGyroRange gyro_range; + } range; }SensorConfig; +typedef void (*SensorEventHandler_t)(sensors_event_t *event, void *user_data); + +#ifdef __cplusplus +class SensorBase; +class SensorManager; + /** * Sensor Base Class */ @@ -1068,8 +1071,8 @@ public: int getType(void); - int setConfig(SensorConfig *config); - int getConfig(SensorConfig *config); + int setConfig(SensorConfig *config); + int getConfig(SensorConfig *config); int subscribe(SensorEventHandler_t *handler, void *user_data); int publish(sensors_event_t *event); @@ -1078,8 +1081,8 @@ protected: SensorBase *next; SensorBase *prev; - /* sensor configuration */ - SensorConfig config; + /* sensor configuration */ + SensorConfig config; SensorEventHandler_t *evtHandler; void *userData; @@ -1102,9 +1105,28 @@ public: static SensorBase *getDefaultSensor(int type); static int subscribe(int type, SensorEventHandler_t *handler, void *user_data); - static int sensorEventReady(SensorBase *sensor); - static int pollSensor(SensorBase *sensor, sensors_event_t *events, int number, int duration); + static int sensorEventReady(SensorBase *sensor); + static int pollSensor(SensorBase *sensor, sensors_event_t *events, int number, int duration); }; +#endif + +/* C programming language APIs */ +/* rt_sensor_t is a C typedef for SensorBase */ +typedef void* rt_sensor_t; +#ifdef __cplusplus +extern "C" { #endif +rt_sensor_t rt_sensor_get_default(int type); + +int rt_sensor_subscribe(rt_sensor_t sensor, SensorEventHandler_t *handler, void *user_data); +int rt_sensor_activate (rt_sensor_t sensor, int enable); +int rt_sensor_configure(rt_sensor_t sensor, SensorConfig *config); +int rt_sensor_poll(rt_sensor_t sensor, sensors_event_t *event); + +#ifdef __cplusplus +} +#endif + +#endif -- cgit v1.3.1 From 06454fd484ebe510494e19bf3094bb4f67312383 Mon Sep 17 00:00:00 2001 From: bernard Date: Sun, 4 Jan 2015 13:14:53 +0800 Subject: [DeviceDrivers] change tab to space in sensor. --- components/drivers/sensors/sensor.cpp | 68 +++++++++++++++++------------------ 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'components/drivers/sensors/sensor.cpp') diff --git a/components/drivers/sensors/sensor.cpp b/components/drivers/sensors/sensor.cpp index 2848707192..34bf5a5890 100644 --- a/components/drivers/sensors/sensor.cpp +++ b/components/drivers/sensors/sensor.cpp @@ -22,9 +22,9 @@ */ SensorBase::SensorBase(int type) { - memset(&(this->config), 0x0, sizeof(SensorConfig)); + memset(&(this->config), 0x0, sizeof(SensorConfig)); - this->type = type; + this->type = type; this->next = this->prev = NULL; subscribe(NULL, NULL); } @@ -40,22 +40,22 @@ int SensorBase::getType(void) int SensorBase::setConfig(SensorConfig *config) { - int result; + int result; - /* configure to the low level sensor */ - result = this->configure(config); - if (result == 0) - { - this->config = *config; - } + /* configure to the low level sensor */ + result = this->configure(config); + if (result == 0) + { + this->config = *config; + } - return result; + return result; } int SensorBase::getConfig(SensorConfig *config) { - *config = this->config; - return 0; + *config = this->config; + return 0; } int SensorBase::subscribe(SensorEventHandler_t *handler, void *user_data) @@ -146,7 +146,7 @@ SensorBase *SensorManager::getDefaultSensor(int type) if (sensor->getType() == type) return sensor; sensor = sensor->next; - }while (sensor != sensor_list); + }while (sensor != sensor_list); return NULL; } @@ -167,61 +167,61 @@ int SensorManager::subscribe(int type, SensorEventHandler_t *handler, void *user int SensorManager::sensorEventReady(SensorBase *sensor) { - return 0; + return 0; } int SensorManager::pollSensor(SensorBase *sensor, sensors_event_t *events, int number, int duration) { - rt_tick_t tick; - int result, index; + rt_tick_t tick; + int result, index; - if (sensor == NULL) return -1; + if (sensor == NULL) return -1; - tick = rt_tick_get(); - for (index = 0; index < number; index ++) - { - result = sensor->poll(&events[index]); - if (result < 0) break; + tick = rt_tick_get(); + for (index = 0; index < number; index ++) + { + result = sensor->poll(&events[index]); + if (result < 0) break; - if (rt_tick_get() - tick > duration) break; - } + if (rt_tick_get() - tick > duration) break; + } - return index; + return index; } int rt_sensor_subscribe(int type, SensorEventHandler_t *handler, void *user_data) { - return SensorManager::subscribe(type, handler, user_data); + return SensorManager::subscribe(type, handler, user_data); } rt_sensor_t rt_sensor_get_default(int type) { - return (rt_sensor_t)SensorManager::getDefaultSensor(type); + return (rt_sensor_t)SensorManager::getDefaultSensor(type); } int rt_sensor_poll(rt_sensor_t sensor, sensors_event_t *event) { SensorBase *sensor_base; - if (sensor == NULL || event == NULL) return -1; + if (sensor == NULL || event == NULL) return -1; - return sensor_base->poll(event); + return sensor_base->poll(event); } int rt_sensor_configure(rt_sensor_t sensor, SensorConfig *config) { SensorBase *sensor_base; - if (sensor == NULL || config == NULL) return -1; + if (sensor == NULL || config == NULL) return -1; sensor_base = (SensorBase*)sensor; - return sensor_base->setConfig(config); + return sensor_base->setConfig(config); } int rt_sensor_activate(rt_sensor_t sensor, int enable) { SensorBase *sensor_base; - if (sensor == NULL) return -1; - + if (sensor == NULL) return -1; + sensor_base = (SensorBase*)sensor; - return sensor_base->activate(enable); + return sensor_base->activate(enable); } -- cgit v1.3.1 From f6ed27b863b974f1b6acc2df8d9287ecedcefb2f Mon Sep 17 00:00:00 2001 From: bernard Date: Sun, 4 Jan 2015 20:01:52 +0800 Subject: [DeviceDrivers] Fix sensor_poll issue. --- components/drivers/sensors/sensor.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'components/drivers/sensors/sensor.cpp') diff --git a/components/drivers/sensors/sensor.cpp b/components/drivers/sensors/sensor.cpp index 34bf5a5890..18eb8eee18 100644 --- a/components/drivers/sensors/sensor.cpp +++ b/components/drivers/sensors/sensor.cpp @@ -189,14 +189,19 @@ int SensorManager::pollSensor(SensorBase *sensor, sensors_event_t *events, int n return index; } -int rt_sensor_subscribe(int type, SensorEventHandler_t *handler, void *user_data) +rt_sensor_t rt_sensor_get_default(int type) { - return SensorManager::subscribe(type, handler, user_data); + return (rt_sensor_t)SensorManager::getDefaultSensor(type); } -rt_sensor_t rt_sensor_get_default(int type) +int rt_sensor_subscribe(rt_sensor_t sensor, SensorEventHandler_t *handler, void *user_data) { - return (rt_sensor_t)SensorManager::getDefaultSensor(type); + SensorBase *sensor_base; + if (sensor == NULL) return -1; + + sensor_base = (SensorBase*)sensor; + + return sensor_base->subscribe(handler, user_data); } int rt_sensor_poll(rt_sensor_t sensor, sensors_event_t *event) @@ -204,6 +209,7 @@ int rt_sensor_poll(rt_sensor_t sensor, sensors_event_t *event) SensorBase *sensor_base; if (sensor == NULL || event == NULL) return -1; + sensor_base = (SensorBase*)sensor; return sensor_base->poll(event); } @@ -224,4 +230,3 @@ int rt_sensor_activate(rt_sensor_t sensor, int enable) sensor_base = (SensorBase*)sensor; return sensor_base->activate(enable); } - -- cgit v1.3.1