Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-09-21 02:06:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[sensor] draft new sensor-hal framework (#6746)

Browse Source 
* [sensor] new sensor framework
针对老版本sensor框架的诸多不合理设计进行重构
之前的PR中已经重构了浮点数相关的问题
本次PR主要围绕sensor的整体架构予以重构，对过于理想化的参数和模式予以删除
* [sensor] 增加can modbus总线类型
* [stm32l745] 完善sensor对接
* [sensor] fix the onchip ID print
This commit is contained in:
Man, Jianting (Meco)
2022-12-21 21:24:51 -05:00
committed by GitHub
parent c930b4f623
commit 262392a69c
4 changed files with 387 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/drivers/sensor/sensor.c
+50 -44
View File
@@ -7,6 +7,7 @@
* Date Author Notes
* 2019-01-31 flybreak first version
* 2020-02-22 luhuadong support custom commands
* 2022-12-17 Meco Man re-implement sensor framework
*/
#include <drivers/sensor.h>
@@ -61,12 +62,12 @@ static void _sensor_cb(rt_sensor_t sen)
{
sen->parent.rx_indicate(&sen->parent, sen->data_len / sizeof(struct rt_sensor_data));
}
else if (sen->config.mode == RT_SENSOR_MODE_INT)
else if (RT_SENSOR_MODE_GET_FETCH(sen->info.mode) == RT_SENSOR_MODE_FETCH_INT)
{
/* The interrupt mode only produces one data at a time */
sen->parent.rx_indicate(&sen->parent, 1);
}
else if (sen->config.mode == RT_SENSOR_MODE_FIFO)
else if (RT_SENSOR_MODE_GET_FETCH(sen->info.mode) == RT_SENSOR_MODE_FETCH_FIFO)
{
sen->parent.rx_indicate(&sen->parent, sen->info.fifo_max);
}
@@ -168,30 +169,32 @@ static rt_err_t _sensor_open(rt_device_t dev, rt_uint16_t oflag)
local_ctrl = sensor->ops->control;
}
sensor->config.mode = RT_SENSOR_MODE_POLLING;
if (oflag & RT_DEVICE_FLAG_RDONLY && dev->flag & RT_DEVICE_FLAG_RDONLY)
{
/* If polling mode is supported, configure it to polling mode */
local_ctrl(sensor, RT_SENSOR_CTRL_SET_MODE, (void *)RT_SENSOR_MODE_POLLING);
if (local_ctrl(sensor, RT_SENSOR_CTRL_SET_FETCH_MODE, (void *)RT_SENSOR_MODE_FETCH_POLLING) == RT_EOK)
{
RT_SENSOR_MODE_SET_FETCH(sensor->info.mode, RT_SENSOR_MODE_FETCH_POLLING);
}
}
else if (oflag & RT_DEVICE_FLAG_INT_RX && dev->flag & RT_DEVICE_FLAG_INT_RX)
{
/* If interrupt mode is supported, configure it to interrupt mode */
if (local_ctrl(sensor, RT_SENSOR_CTRL_SET_MODE, (void *)RT_SENSOR_MODE_INT) == RT_EOK)
if (local_ctrl(sensor, RT_SENSOR_CTRL_SET_FETCH_MODE, (void *)RT_SENSOR_MODE_FETCH_INT) == RT_EOK)
{
/* Initialization sensor interrupt */
_sensor_irq_init(sensor);
sensor->config.mode = RT_SENSOR_MODE_INT;
RT_SENSOR_MODE_SET_FETCH(sensor->info.mode, RT_SENSOR_MODE_FETCH_INT);
}
}
else if (oflag & RT_DEVICE_FLAG_FIFO_RX && dev->flag & RT_DEVICE_FLAG_FIFO_RX)
{
/* If fifo mode is supported, configure it to fifo mode */
if (local_ctrl(sensor, RT_SENSOR_CTRL_SET_MODE, (void *)RT_SENSOR_MODE_FIFO) == RT_EOK)
if (local_ctrl(sensor, RT_SENSOR_CTRL_SET_FETCH_MODE, (void *)RT_SENSOR_MODE_FETCH_FIFO) == RT_EOK)
{
/* Initialization sensor interrupt */
_sensor_irq_init(sensor);
sensor->config.mode = RT_SENSOR_MODE_FIFO;
RT_SENSOR_MODE_SET_FETCH(sensor->info.mode, RT_SENSOR_MODE_FETCH_FIFO);
}
}
else
@@ -200,10 +203,16 @@ static rt_err_t _sensor_open(rt_device_t dev, rt_uint16_t oflag)
goto __exit;
}
/* Configure power mode to normal mode */
if (local_ctrl(sensor, RT_SENSOR_CTRL_SET_POWER, (void *)RT_SENSOR_POWER_NORMAL) == RT_EOK)
/* Configure power mode to highest mode */
if (local_ctrl(sensor, RT_SENSOR_CTRL_SET_POWER_MODE, (void *)RT_SENSOR_MODE_POWER_HIGHEST) == RT_EOK)
{
sensor->config.power = RT_SENSOR_POWER_NORMAL;
RT_SENSOR_MODE_SET_POWER(sensor->info.mode, RT_SENSOR_MODE_POWER_HIGHEST);
}
/* Configure accuracy mode to highest mode */
if (local_ctrl(sensor, RT_SENSOR_CTRL_SET_ACCURACY_MODE, (void *)RT_SENSOR_MODE_ACCURACY_HIGHEST) == RT_EOK)
{
RT_SENSOR_MODE_SET_ACCURACY(sensor->info.mode, RT_SENSOR_MODE_ACCURACY_HIGHEST);
}
__exit:
@@ -234,9 +243,9 @@ static rt_err_t _sensor_close(rt_device_t dev)
}
/* Configure power mode to power down mode */
if (local_ctrl(sensor, RT_SENSOR_CTRL_SET_POWER, (void *)RT_SENSOR_POWER_DOWN) == RT_EOK)
if (local_ctrl(sensor, RT_SENSOR_CTRL_SET_POWER_MODE, (void *)RT_SENSOR_MODE_POWER_DOWN) == RT_EOK)
{
sensor->config.power = RT_SENSOR_POWER_DOWN;
RT_SENSOR_MODE_SET_POWER(sensor->info.mode, RT_SENSOR_MODE_POWER_DOWN);
}
if (sensor->module != RT_NULL && sensor->info.fifo_max > 0 && sensor->data_buf != RT_NULL)
@@ -257,7 +266,7 @@ static rt_err_t _sensor_close(rt_device_t dev)
}
}
}
if (sensor->config.mode != RT_SENSOR_MODE_POLLING)
if (RT_SENSOR_MODE_GET_FETCH(sensor->info.mode) != RT_SENSOR_MODE_FETCH_POLLING)
{
/* Sensor disable interrupt */
if (sensor->config.irq_pin.pin != RT_PIN_NONE)
@@ -346,45 +355,42 @@ static rt_err_t _sensor_control(rt_device_t dev, int cmd, void *args)
result = local_ctrl(sensor, RT_SENSOR_CTRL_GET_ID, args);
}
break;
case RT_SENSOR_CTRL_GET_INFO:
if (args)
{
rt_memcpy(args, &sensor->info, sizeof(struct rt_sensor_info));
}
break;
case RT_SENSOR_CTRL_SET_RANGE:
/* Configuration measurement range */
result = local_ctrl(sensor, RT_SENSOR_CTRL_SET_RANGE, args);
if (result == RT_EOK)
{
sensor->config.range = (rt_int32_t)args;
LOG_D("set range %d", sensor->config.range);
}
break;
case RT_SENSOR_CTRL_SET_ODR:
/* Configuration data output rate */
result = local_ctrl(sensor, RT_SENSOR_CTRL_SET_ODR, args);
if (result == RT_EOK)
{
sensor->config.odr = (rt_uint32_t)args & 0xFFFF;
LOG_D("set odr %d", sensor->config.odr);
}
break;
case RT_SENSOR_CTRL_SET_POWER:
case RT_SENSOR_CTRL_SET_ACCURACY_MODE:
/* Configuration sensor power mode */
result = local_ctrl(sensor, RT_SENSOR_CTRL_SET_POWER, args);
result = local_ctrl(sensor, RT_SENSOR_CTRL_SET_ACCURACY_MODE, args);
if (result == RT_EOK)
{
sensor->config.power = (rt_uint32_t)args & 0xFF;
LOG_D("set power mode code:", sensor->config.power);
RT_SENSOR_MODE_SET_ACCURACY(sensor->info.mode, (rt_uint32_t)args & 0x0F);
LOG_D("set accuracy mode code: %d", RT_SENSOR_MODE_GET_ACCURACY(sensor->info.mode));
}
break;
case RT_SENSOR_CTRL_SET_POWER_MODE:
/* Configuration sensor power mode */
result = local_ctrl(sensor, RT_SENSOR_CTRL_SET_POWER_MODE, args);
if (result == RT_EOK)
{
RT_SENSOR_MODE_SET_POWER(sensor->info.mode, (rt_uint32_t)args & 0x0F);
LOG_D("set power mode code: %d", RT_SENSOR_MODE_GET_POWER(sensor->info.mode));
}
break;
case RT_SENSOR_CTRL_SET_FETCH_MODE:
/* Configuration sensor power mode */
result = local_ctrl(sensor, RT_SENSOR_CTRL_SET_FETCH_MODE, args);
if (result == RT_EOK)
{
RT_SENSOR_MODE_SET_FETCH(sensor->info.mode, (rt_uint32_t)args & 0x0F);
LOG_D("set fetch mode code: %d", RT_SENSOR_MODE_GET_FETCH(sensor->info.mode));
}
break;
case RT_SENSOR_CTRL_SELF_TEST:
/* Device self-test */
/* device self test */
result = local_ctrl(sensor, RT_SENSOR_CTRL_SELF_TEST, args);
break;
case RT_SENSOR_CTRL_SOFT_RESET:
/* device soft reset */
result = local_ctrl(sensor, RT_SENSOR_CTRL_SOFT_RESET, args);
break;
default:
if (cmd > RT_SENSOR_CTRL_USER_CMD_START)
{
/* Custom commands */
components/drivers/sensor/sensor_cmd.c
+190 -116
View File
@@ -8,6 +8,7 @@
* 2019-01-31 flybreak first version
* 2019-07-16 WillianChan Increase the output of sensor information
* 2020-02-22 luhuadong Add vendor info and sensor types for cmd
* 2022-12-17 Meco Man re-implement sensor framework
*/
#include <drivers/sensor.h>
@@ -25,55 +26,55 @@ static const char *sensor_get_type_name(rt_sensor_info_t info)
{
switch(info->type)
{
case RT_SENSOR_CLASS_ACCE:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_ACCE);
case RT_SENSOR_CLASS_GYRO:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_GYRO);
case RT_SENSOR_CLASS_MAG:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_MAG);
case RT_SENSOR_CLASS_TEMP:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_TEMP);
case RT_SENSOR_CLASS_HUMI:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_HUMI);
case RT_SENSOR_CLASS_BARO:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_BARO);
case RT_SENSOR_CLASS_LIGHT:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_LIGHT);
case RT_SENSOR_CLASS_PROXIMITY:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_PROXIMITY);
case RT_SENSOR_CLASS_HR:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_HR);
case RT_SENSOR_CLASS_TVOC:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_TVOC);
case RT_SENSOR_CLASS_NOISE:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_NOISE);
case RT_SENSOR_CLASS_STEP:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_STEP);
case RT_SENSOR_CLASS_FORCE:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_FORCE);
case RT_SENSOR_CLASS_DUST:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_DUST);
case RT_SENSOR_CLASS_ECO2:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_ECO2);
case RT_SENSOR_CLASS_GNSS:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_GNSS);
case RT_SENSOR_CLASS_TOF:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_TOF);
case RT_SENSOR_CLASS_SPO2:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_SPO2);
case RT_SENSOR_CLASS_IAQ:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_IAQ);
case RT_SENSOR_CLASS_ETOH:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_ETOH);
case RT_SENSOR_CLASS_BP:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_BP);
case RT_SENSOR_CLASS_VOLTAGE:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_VOLTAGE);
case RT_SENSOR_CLASS_CURRENT:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_CURRENT);
case RT_SENSOR_CLASS_NONE:
case RT_SENSOR_TYPE_ACCE:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_TYPE_ACCE);
case RT_SENSOR_TYPE_GYRO:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_TYPE_GYRO);
case RT_SENSOR_TYPE_MAG:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_TYPE_MAG);
case RT_SENSOR_TYPE_TEMP:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_TYPE_TEMP);
case RT_SENSOR_TYPE_HUMI:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_TYPE_HUMI);
case RT_SENSOR_TYPE_BARO:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_TYPE_BARO);
case RT_SENSOR_TYPE_LIGHT:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_TYPE_LIGHT);
case RT_SENSOR_TYPE_PROXIMITY:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_TYPE_PROXIMITY);
case RT_SENSOR_TYPE_HR:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_TYPE_HR);
case RT_SENSOR_TYPE_TVOC:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_TYPE_TVOC);
case RT_SENSOR_TYPE_NOISE:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_TYPE_NOISE);
case RT_SENSOR_TYPE_STEP:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_TYPE_STEP);
case RT_SENSOR_TYPE_FORCE:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_TYPE_FORCE);
case RT_SENSOR_TYPE_DUST:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_TYPE_DUST);
case RT_SENSOR_TYPE_ECO2:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_TYPE_ECO2);
case RT_SENSOR_TYPE_GNSS:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_TYPE_GNSS);
case RT_SENSOR_TYPE_TOF:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_TYPE_TOF);
case RT_SENSOR_TYPE_SPO2:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_TYPE_SPO2);
case RT_SENSOR_TYPE_IAQ:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_TYPE_IAQ);
case RT_SENSOR_TYPE_ETOH:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_TYPE_ETOH);
case RT_SENSOR_TYPE_BP:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_TYPE_BP);
case RT_SENSOR_TYPE_VOLTAGE:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_TYPE_VOLTAGE);
case RT_SENSOR_TYPE_CURRENT:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_TYPE_CURRENT);
case RT_SENSOR_TYPE_NONE:
default:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_NONE);
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_TYPE_NONE);
}
}
@@ -185,76 +186,170 @@ static const char *sensor_get_unit_name(rt_sensor_info_t info)
}
}
static const char* sensor_get_accuracy_mode_name(rt_sensor_info_t info)
{
switch(RT_SENSOR_MODE_GET_ACCURACY(info->mode))
{
case RT_SENSOR_MODE_ACCURACY_HIGHEST:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_MODE_ACCURACY_HIGHEST);
case RT_SENSOR_MODE_ACCURACY_HIGH:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_MODE_ACCURACY_HIGH);
case RT_SENSOR_MODE_ACCURACY_MEDIUM:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_MODE_ACCURACY_MEDIUM);
case RT_SENSOR_MODE_ACCURACY_LOW:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_MODE_ACCURACY_LOW);
case RT_SENSOR_MODE_ACCURACY_LOWEST:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_MODE_ACCURACY_LOWEST);
case RT_SENSOR_MODE_ACCURACY_NOTRUST:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_MODE_ACCURACY_NOTRUST);
default:
LOG_E("accuracy mode illegal!");
return "";
}
}
static const char* sensor_get_power_mode_name(rt_sensor_info_t info)
{
switch(RT_SENSOR_MODE_GET_POWER(info->mode))
{
case RT_SENSOR_MODE_POWER_HIGHEST:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_MODE_POWER_HIGHEST);
case RT_SENSOR_MODE_POWER_HIGH:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_MODE_POWER_HIGH);
case RT_SENSOR_MODE_POWER_MEDIUM:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_MODE_POWER_MEDIUM);
case RT_SENSOR_MODE_POWER_LOW:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_MODE_POWER_LOW);
case RT_SENSOR_MODE_POWER_LOWEST:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_MODE_POWER_LOWEST);
case RT_SENSOR_MODE_POWER_DOWN:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_MODE_POWER_DOWN);
default:
LOG_E("power mode illegal!");
return "";
}
}
static const char* sensor_get_fetch_mode_name(rt_sensor_info_t info)
{
switch(RT_SENSOR_MODE_GET_FETCH(info->mode))
{
case RT_SENSOR_MODE_FETCH_POLLING:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_MODE_FETCH_POLLING);
case RT_SENSOR_MODE_FETCH_INT:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_MODE_FETCH_INT);
case RT_SENSOR_MODE_FETCH_FIFO:
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_MODE_FETCH_FIFO);
default:
LOG_E("fetch data mode illegal!");
return "";
}
}
static void sensor_show_data(rt_size_t num, rt_sensor_t sensor, struct rt_sensor_data *sensor_data)
{
const char *unit_name = sensor_get_unit_name(&sensor->info);
switch (sensor->info.type)
{
case RT_SENSOR_CLASS_ACCE:
case RT_SENSOR_TYPE_ACCE:
LOG_I("num:%d, x:%f, y:%f, z:%f %s, timestamp:%u", num, sensor_data->data.acce.x, sensor_data->data.acce.y, sensor_data->data.acce.z, unit_name, sensor_data->timestamp);
break;
case RT_SENSOR_CLASS_GYRO:
case RT_SENSOR_TYPE_GYRO:
LOG_I("num:%d, x:%f, y:%f, z:%f %s, timestamp:%u", num, sensor_data->data.gyro.x, sensor_data->data.gyro.y, sensor_data->data.gyro.z, unit_name, sensor_data->timestamp);
break;
case RT_SENSOR_CLASS_MAG:
case RT_SENSOR_TYPE_MAG:
LOG_I("num:%d, x:%f, y:%f, z:%f %s, timestamp:%u", num, sensor_data->data.mag.x, sensor_data->data.mag.y, sensor_data->data.mag.z, unit_name, sensor_data->timestamp);
break;
case RT_SENSOR_CLASS_GNSS:
case RT_SENSOR_TYPE_GNSS:
LOG_I("num:%d, lon:%f, lat:%f %s, timestamp:%u", num, sensor_data->data.coord.longitude, sensor_data->data.coord.latitude, unit_name, sensor_data->timestamp);
break;
case RT_SENSOR_CLASS_TEMP:
case RT_SENSOR_TYPE_TEMP:
LOG_I("num:%d, temp:%f%s, timestamp:%u", num, sensor_data->data.temp, unit_name, sensor_data->timestamp);
break;
case RT_SENSOR_CLASS_HUMI:
case RT_SENSOR_TYPE_HUMI:
LOG_I("num:%d, humi:%f%s, timestamp:%u", num, sensor_data->data.humi, unit_name, sensor_data->timestamp);
break;
case RT_SENSOR_CLASS_BARO:
case RT_SENSOR_TYPE_BARO:
LOG_I("num:%d, press:%f%s, timestamp:%u", num, sensor_data->data.baro, unit_name, sensor_data->timestamp);
break;
case RT_SENSOR_CLASS_LIGHT:
case RT_SENSOR_TYPE_LIGHT:
LOG_I("num:%d, light:%f%s, timestamp:%u", num, sensor_data->data.light, unit_name, sensor_data->timestamp);
break;
case RT_SENSOR_CLASS_PROXIMITY:
case RT_SENSOR_CLASS_TOF:
case RT_SENSOR_TYPE_PROXIMITY:
case RT_SENSOR_TYPE_TOF:
LOG_I("num:%d, distance:%f%s, timestamp:%u", num, sensor_data->data.proximity, unit_name, sensor_data->timestamp);
break;
case RT_SENSOR_CLASS_HR:
case RT_SENSOR_TYPE_HR:
LOG_I("num:%d, heart rate:%f%s, timestamp:%u", num, sensor_data->data.hr, unit_name, sensor_data->timestamp);
break;
case RT_SENSOR_CLASS_TVOC:
case RT_SENSOR_TYPE_TVOC:
LOG_I("num:%d, tvoc:%f%s, timestamp:%u", num, sensor_data->data.tvoc, unit_name, sensor_data->timestamp);
break;
case RT_SENSOR_CLASS_NOISE:
case RT_SENSOR_TYPE_NOISE:
LOG_I("num:%d, noise:%f%s, timestamp:%u", num, sensor_data->data.noise, unit_name, sensor_data->timestamp);
break;
case RT_SENSOR_CLASS_STEP:
case RT_SENSOR_TYPE_STEP:
LOG_I("num:%d, step:%f%s, timestamp:%u", num, sensor_data->data.step, unit_name, sensor_data->timestamp);
break;
case RT_SENSOR_CLASS_FORCE:
case RT_SENSOR_TYPE_FORCE:
LOG_I("num:%d, force:%f%s, timestamp:%u", num, sensor_data->data.force, unit_name, sensor_data->timestamp);
break;
case RT_SENSOR_CLASS_DUST:
case RT_SENSOR_TYPE_DUST:
LOG_I("num:%d, dust:%f%s, timestamp:%u", num, sensor_data->data.dust, unit_name, sensor_data->timestamp);
break;
case RT_SENSOR_CLASS_ECO2:
case RT_SENSOR_TYPE_ECO2:
LOG_I("num:%d, eco2:%f%s, timestamp:%u", num, sensor_data->data.eco2, unit_name, sensor_data->timestamp);
break;
case RT_SENSOR_CLASS_IAQ:
case RT_SENSOR_TYPE_IAQ:
LOG_I("num:%d, IAQ:%f%s, timestamp:%u", num, sensor_data->data.iaq, unit_name, sensor_data->timestamp);
break;
case RT_SENSOR_CLASS_ETOH:
case RT_SENSOR_TYPE_ETOH:
LOG_I("num:%d, EtOH:%f%s, timestamp:%u", num, sensor_data->data.etoh, unit_name, sensor_data->timestamp);
break;
case RT_SENSOR_CLASS_BP:
case RT_SENSOR_TYPE_BP:
LOG_I("num:%d, bp.sbp:%f, bp.dbp:%f %s, timestamp:%u", num, sensor_data->data.bp.sbp, sensor_data->data.bp.dbp, unit_name, sensor_data->timestamp);
break;
case RT_SENSOR_CLASS_NONE:
case RT_SENSOR_TYPE_NONE:
default:
LOG_E("Unknown type of sensor!");
break;
}
}
static const char* sensor_get_intf_name(rt_sensor_t sensor)
{
rt_uint8_t type = sensor->config.intf.type;
if (type | RT_SENSOR_INTF_I2C)
{
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_INTF_I2C);
}
else if (type | RT_SENSOR_INTF_SPI)
{
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_INTF_SPI);
}
else if (type | RT_SENSOR_INTF_UART)
{
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_INTF_UART);
}
else if (type | RT_SENSOR_INTF_ONEWIRE)
{
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_INTF_ONEWIRE);
}
else if (type | RT_SENSOR_INTF_CAN)
{
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_INTF_CAN);
}
else if (type | RT_SENSOR_INTF_MODBUS)
{
return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_INTF_MODBUS);
}
else
{
return "";
}
}
static rt_err_t rx_callback(rt_device_t dev, rt_size_t size)
{
rt_sem_release(sensor_rx_sem);
@@ -263,15 +358,11 @@ static rt_err_t rx_callback(rt_device_t dev, rt_size_t size)
static void sensor_fifo_rx_entry(void *parameter)
{
rt_device_t dev = (rt_device_t)parameter;
rt_sensor_t sensor = (rt_sensor_t)parameter;
struct rt_sensor_data *data = RT_NULL;
struct rt_sensor_info info;
rt_size_t res, i;
rt_device_control(dev, RT_SENSOR_CTRL_GET_INFO, &info);
data = (struct rt_sensor_data *)rt_malloc(sizeof(struct rt_sensor_data) * info.fifo_max);
data = (struct rt_sensor_data *)rt_malloc(sizeof(struct rt_sensor_data) * sensor->info.fifo_max);
if (data == RT_NULL)
{
LOG_E("Memory allocation failed!");
@@ -281,7 +372,7 @@ static void sensor_fifo_rx_entry(void *parameter)
{
rt_sem_take(sensor_rx_sem, RT_WAITING_FOREVER);
res = rt_device_read(dev, 0, data, info.fifo_max);
res = rt_device_read((rt_device_t)sensor, 0, data, sensor->info.fifo_max);
for (i = 0; i < res; i++)
{
sensor_show_data(i, sensor, &data[i]);
@@ -328,8 +419,6 @@ static void sensor_fifo(int argc, char **argv)
rt_thread_startup(tid1);
rt_device_set_rx_indicate(dev, rx_callback);
rt_device_control(dev, RT_SENSOR_CTRL_SET_ODR, (void *)20);
}
#ifdef RT_USING_FINSH
MSH_CMD_EXPORT(sensor_fifo, Sensor fifo mode test function);
@@ -393,7 +482,6 @@ static void sensor_int(int argc, char **argv)
LOG_E("open device failed!");
return;
}
rt_device_control(dev, RT_SENSOR_CTRL_SET_ODR, (void *)20);
}
#ifdef RT_USING_FINSH
MSH_CMD_EXPORT(sensor_int, Sensor interrupt mode test function);
@@ -419,7 +507,7 @@ static void sensor_polling(int argc, char **argv)
num = atoi(argv[2]);
sensor = (rt_sensor_t)dev;
delay = sensor->info.period_min > 100 ? sensor->info.period_min : 100;
delay = sensor->info.acquire_min > 100 ? sensor->info.acquire_min : 100;
result = rt_device_open(dev, RT_DEVICE_FLAG_RDONLY);
if (result != RT_EOK)
@@ -427,7 +515,6 @@ static void sensor_polling(int argc, char **argv)
LOG_E("open device failed! error code : %d", result);
return;
}
rt_device_control(dev, RT_SENSOR_CTRL_SET_ODR, (void *)100);
for (i = 0; i < num; i++)
{
@@ -461,32 +548,33 @@ static void sensor(int argc, char **argv)
{
rt_kprintf("\n");
rt_kprintf("sensor [OPTION] [PARAM]\n");
rt_kprintf(" probe <dev_name> Probe sensor by given name\n");
rt_kprintf(" info Get sensor info\n");
rt_kprintf(" range <var> Set range to var\n");
rt_kprintf(" mode <var> Set work mode to var\n");
rt_kprintf(" power <var> Set power mode to var\n");
rt_kprintf(" rate <var> Set output date rate to var\n");
rt_kprintf(" read [num] Read [num] times sensor (default 5)\n");
rt_kprintf(" probe <dev_name> probe sensor by given name\n");
rt_kprintf(" info get sensor information\n");
rt_kprintf(" read [num] read [num] times sensor (default 5)\n");
return ;
}
else if (!strcmp(argv[1], "info"))
{
struct rt_sensor_info info;
if (dev == RT_NULL)
{
LOG_W("Please probe sensor device first!");
return ;
}
rt_device_control(dev, RT_SENSOR_CTRL_GET_INFO, &info);
rt_kprintf("model :%s\n", info.model);
rt_kprintf("type: :%s\n", sensor_get_type_name(&info));
rt_kprintf("vendor :%s\n", sensor_get_vendor_name(&info));
rt_kprintf("unit :%s\n", sensor_get_unit_name(&info));
rt_kprintf("range_max :%d\n", info.range_max);
rt_kprintf("range_min :%d\n", info.range_min);
rt_kprintf("period_min:%dms\n", info.period_min);
rt_kprintf("fifo_max :%d\n", info.fifo_max);
sensor = (rt_sensor_t)dev;
rt_kprintf("name :%s\n", sensor->info.name);
rt_kprintf("type: :%s\n", sensor_get_type_name(&sensor->info));
rt_kprintf("vendor :%s\n", sensor_get_vendor_name(&sensor->info));
rt_kprintf("interface :%s\n", sensor_get_intf_name(sensor));
rt_kprintf("unit :%s\n", sensor_get_unit_name(&sensor->info));
rt_kprintf("fetch data:%s\n", sensor_get_fetch_mode_name(&sensor->info));
rt_kprintf("power :%s\n", sensor_get_power_mode_name(&sensor->info));
rt_kprintf("accuracy :%s\n", sensor_get_accuracy_mode_name(&sensor->info));
rt_kprintf("range max :%f\n", sensor->info.scale.range_max);
rt_kprintf("range min :%f\n", sensor->info.scale.range_min);
rt_kprintf("resolution:%f\n", sensor->info.accuracy.resolution);
rt_kprintf("error :%f\n", sensor->info.accuracy.error);
rt_kprintf("acquire min:%fms\n", sensor->info.acquire_min);
rt_kprintf("fifo max :%d\n", sensor->info.fifo_max);
}
else if (!strcmp(argv[1], "read"))
{
@@ -503,7 +591,7 @@ static void sensor(int argc, char **argv)
}
sensor = (rt_sensor_t)dev;
delay = sensor->info.period_min > 100 ? sensor->info.period_min : 100;
delay = sensor->info.acquire_min > 100 ? sensor->info.acquire_min : 100;
for (i = 0; i < num; i++)
{
@@ -537,8 +625,10 @@ static void sensor(int argc, char **argv)
LOG_E("open device failed!");
return;
}
rt_device_control(new_dev, RT_SENSOR_CTRL_GET_ID, &reg);
LOG_I("device id: 0x%x!", reg);
if (rt_device_control(new_dev, RT_SENSOR_CTRL_GET_ID, &reg) == RT_EOK)
{
LOG_I("Sensor Chip ID: %#x", reg);
}
if (dev)
{
rt_device_close(dev);
@@ -550,22 +640,6 @@ static void sensor(int argc, char **argv)
LOG_W("Please probe sensor first!");
return ;
}
else if (!strcmp(argv[1], "range"))
{
rt_device_control(dev, RT_SENSOR_CTRL_SET_RANGE, (void *)atoi(argv[2]));
}
else if (!strcmp(argv[1], "mode"))
{
rt_device_control(dev, RT_SENSOR_CTRL_SET_MODE, (void *)atoi(argv[2]));
}
else if (!strcmp(argv[1], "power"))
{
rt_device_control(dev, RT_SENSOR_CTRL_SET_POWER, (void *)atoi(argv[2]));
}
else if (!strcmp(argv[1], "rate"))
{
rt_device_control(dev, RT_SENSOR_CTRL_SET_ODR, (void *)atoi(argv[2]));
}
else
{
LOG_W("Unknown command, please enter 'sensor' get help information!");