diff options
| author | Bernard Xiong <[email protected]> | 2020-03-16 21:28:30 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-03-16 21:28:30 +0800 |
| commit | beda0899f5e91647c5a048bab9fce91f4a627036 (patch) | |
| tree | fd753b99a66d8ddac69da90c4a0f4d4180224cf9 /components/drivers | |
| parent | 19a7e5fd2c6bd2e020a2b9f722ed614371a4abdf (diff) | |
| parent | 7c4e70b3b3872afc3350f798170a7d885a997873 (diff) | |
Merge pull request #3397 from luhuadong/develop
[Sensor] Support custom commands for rt_sensor_control
Diffstat (limited to 'components/drivers')
| -rw-r--r-- | components/drivers/sensors/sensor.c | 15 | ||||
| -rwxr-xr-x | components/drivers/sensors/sensor.h | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/components/drivers/sensors/sensor.c b/components/drivers/sensors/sensor.c index 18c5830fbf..08127bc292 100644 --- a/components/drivers/sensors/sensor.c +++ b/components/drivers/sensors/sensor.c @@ -6,6 +6,7 @@ * Change Logs: * Date Author Notes * 2019-01-31 flybreak first version + * 2020-02-22 luhuadong support custom commands */ #include "sensor.h" @@ -307,7 +308,7 @@ static rt_err_t rt_sensor_control(rt_device_t dev, int cmd, void *args) case RT_SENSOR_CTRL_GET_ID: if (args) { - sensor->ops->control(sensor, RT_SENSOR_CTRL_GET_ID, args); + result = sensor->ops->control(sensor, RT_SENSOR_CTRL_GET_ID, args); } break; case RT_SENSOR_CTRL_GET_INFO: @@ -352,7 +353,17 @@ static rt_err_t rt_sensor_control(rt_device_t dev, int cmd, void *args) result = sensor->ops->control(sensor, RT_SENSOR_CTRL_SELF_TEST, args); break; default: - return -RT_ERROR; + + if (cmd > RT_SENSOR_CTRL_USER_CMD_START) + { + /* Custom commands */ + result = sensor->ops->control(sensor, cmd, args); + } + else + { + result = -RT_ERROR; + } + break; } if (sensor->module) diff --git a/components/drivers/sensors/sensor.h b/components/drivers/sensors/sensor.h index 0dae3d66f5..a0eaaae9ea 100755 --- a/components/drivers/sensors/sensor.h +++ b/components/drivers/sensors/sensor.h @@ -111,6 +111,8 @@ extern "C" { #define RT_SENSOR_CTRL_SET_POWER (5) /* Set power mode. args type of sensor power mode. ex. RT_SENSOR_POWER_DOWN,RT_SENSOR_POWER_NORMAL */ #define RT_SENSOR_CTRL_SELF_TEST (6) /* Take a self test */ +#define RT_SENSOR_CTRL_USER_CMD_START 0x100 /* User commands should be greater than 0x100 */ + struct rt_sensor_info { rt_uint8_t type; /* The sensor type */ |