From b9937f076bbdc09762819c59b68ec5edeb412e0c Mon Sep 17 00:00:00 2001 From: guozhanxin Date: Wed, 13 Feb 2019 15:07:11 +0800 Subject: rename sensor_test to sensor_cmd --- components/drivers/Kconfig | 4 +- components/drivers/sensors/SConscript | 4 +- components/drivers/sensors/sensor_cmd.c | 361 +++++++++++++++++++++++++++++++ components/drivers/sensors/sensor_test.c | 361 ------------------------------- 4 files changed, 365 insertions(+), 365 deletions(-) create mode 100644 components/drivers/sensors/sensor_cmd.c delete mode 100644 components/drivers/sensors/sensor_test.c (limited to 'components/drivers') diff --git a/components/drivers/Kconfig b/components/drivers/Kconfig index 6246a97160..137402489a 100755 --- a/components/drivers/Kconfig +++ b/components/drivers/Kconfig @@ -245,8 +245,8 @@ config RT_USING_SENSOR default n if RT_USING_SENSOR - config RT_USING_SENSOR_TEST - bool "Use Sensor test" + config RT_USING_SENSOR_CMD + bool "Using Sensor cmd" default y endif diff --git a/components/drivers/sensors/SConscript b/components/drivers/sensors/SConscript index e727b14136..51c4b50eef 100644 --- a/components/drivers/sensors/SConscript +++ b/components/drivers/sensors/SConscript @@ -6,8 +6,8 @@ cwd = GetCurrentDir() src = ['sensor.c'] CPPPATH = [cwd, cwd + '/../include'] -if GetDepend('RT_USING_SENSOR_TEST'): - src += ['sensor_test.c']; +if GetDepend('RT_USING_SENSOR_CMD'): + src += ['sensor_cmd.c']; group = DefineGroup('Sensors', src, depend = ['RT_USING_SENSOR', 'RT_USING_DEVICE'], CPPPATH = CPPPATH) diff --git a/components/drivers/sensors/sensor_cmd.c b/components/drivers/sensors/sensor_cmd.c new file mode 100644 index 0000000000..d1c7057c2f --- /dev/null +++ b/components/drivers/sensors/sensor_cmd.c @@ -0,0 +1,361 @@ +/* + * Copyright (c) 2006-2018, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + * + * Change Logs: + * Date Author Notes + * 2019-01-31 flybreak first version + */ + +#include "sensor.h" + +#define DBG_ENABLE +#define DBG_LEVEL DBG_INFO +#define DBG_SECTION_NAME "sensor.cmd" +#define DBG_COLOR +#include + +#include +#include + +static rt_sem_t sensor_rx_sem = RT_NULL; + +static void sensor_show_data(rt_size_t num, rt_sensor_t sensor, struct rt_sensor_data *sensor_data) +{ + switch (sensor->info.type) + { + case RT_SENSOR_CLASS_ACCE: + LOG_I("num:%3d, x:%5d, y:%5d, z:%5d, timestamp:%5d", num, sensor_data->data.acce.x, sensor_data->data.acce.y, sensor_data->data.acce.z, sensor_data->timestamp); + break; + case RT_SENSOR_CLASS_GYRO: + LOG_I("num:%3d, x:%8d, y:%8d, z:%8d, timestamp:%5d", num, sensor_data->data.gyro.x, sensor_data->data.gyro.y, sensor_data->data.gyro.z, sensor_data->timestamp); + break; + case RT_SENSOR_CLASS_MAG: + LOG_I("num:%3d, x:%5d, y:%5d, z:%5d, timestamp:%5d", num, sensor_data->data.mag.x, sensor_data->data.mag.y, sensor_data->data.mag.z, sensor_data->timestamp); + break; + case RT_SENSOR_CLASS_HUMI: + LOG_I("num:%3d, humi:%3d.%d%%, timestamp:%5d", num, sensor_data->data.humi / 10, sensor_data->data.humi % 10, sensor_data->timestamp); + break; + case RT_SENSOR_CLASS_TEMP: + LOG_I("num:%3d, temp:%3d.%dC, timestamp:%5d", num, sensor_data->data.temp / 10, sensor_data->data.temp % 10, sensor_data->timestamp); + break; + case RT_SENSOR_CLASS_BARO: + LOG_I("num:%3d, press:%5d, timestamp:%5d", num, sensor_data->data.baro, sensor_data->timestamp); + break; + case RT_SENSOR_CLASS_STEP: + LOG_I("num:%3d, step:%5d, timestamp:%5d", num, sensor_data->data.step, sensor_data->timestamp); + break; + default: + break; + } +} + +rt_err_t rx_callback(rt_device_t dev, rt_size_t size) +{ + rt_sem_release(sensor_rx_sem); + return 0; +} + +static void sensor_fifo_rx_entry(void *parameter) +{ + rt_device_t dev = parameter; + rt_sensor_t sensor = 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 = rt_malloc(sizeof(struct rt_sensor_data) * info.fifo_max); + if (data == RT_NULL) + { + LOG_E("Memory allocation failed!"); + } + + while (1) + { + rt_sem_take(sensor_rx_sem, RT_WAITING_FOREVER); + + res = rt_device_read(dev, 0, data, info.fifo_max); + for (i = 0; i < res; i++) + { + sensor_show_data(i, sensor, &data[i]); + } + } +} + +static void sensor_fifo(int argc, char **argv) +{ + static rt_thread_t tid1 = RT_NULL; + rt_device_t dev = RT_NULL; + rt_sensor_t sensor; + + dev = rt_device_find(argv[1]); + if (dev == RT_NULL) + { + LOG_E("Can't find device:%s", argv[1]); + return; + } + sensor = (rt_sensor_t)dev; + + if (sensor_rx_sem == RT_NULL) + { + sensor_rx_sem = rt_sem_create("sen_rx_sem", 0, RT_IPC_FLAG_FIFO); + } + else + { + LOG_E("The thread is running, please reboot and try again"); + return; + } + + tid1 = rt_thread_create("sen_rx_thread", + sensor_fifo_rx_entry, sensor, + 1024, + 15, 5); + + if (tid1 != RT_NULL) + rt_thread_startup(tid1); + + rt_device_set_rx_indicate(dev, rx_callback); + + if (rt_device_open(dev, RT_SENSOR_FLAG_FIFO) != RT_EOK) + { + LOG_E("open device failed!"); + return; + } + rt_device_control(dev, RT_SENSOR_CTRL_SET_ODR, (void *)20); +} +#ifdef FINSH_USING_MSH +MSH_CMD_EXPORT(sensor_fifo, Sensor fifo mode test function); +#endif + +static void sensor_irq_rx_entry(void *parameter) +{ + rt_device_t dev = parameter; + rt_sensor_t sensor = parameter; + struct rt_sensor_data data; + rt_size_t res, i = 0; + + while (1) + { + rt_sem_take(sensor_rx_sem, RT_WAITING_FOREVER); + + res = rt_device_read(dev, 0, &data, 1); + if (res == 1) + { + sensor_show_data(i++, sensor, &data); + } + } +} + +static void sensor_int(int argc, char **argv) +{ + static rt_thread_t tid1 = RT_NULL; + rt_device_t dev = RT_NULL; + rt_sensor_t sensor; + + dev = rt_device_find(argv[1]); + if (dev == RT_NULL) + { + LOG_E("Can't find device:%s", argv[1]); + return; + } + sensor = (rt_sensor_t)dev; + + if (sensor_rx_sem == RT_NULL) + { + sensor_rx_sem = rt_sem_create("sen_rx_sem", 0, RT_IPC_FLAG_FIFO); + } + else + { + LOG_E("The thread is running, please reboot and try again"); + return; + } + + tid1 = rt_thread_create("sen_rx_thread", + sensor_irq_rx_entry, sensor, + 1024, + 15, 5); + + if (tid1 != RT_NULL) + rt_thread_startup(tid1); + + rt_device_set_rx_indicate(dev, rx_callback); + + if (rt_device_open(dev, RT_DEVICE_FLAG_INT_RX) != RT_EOK) + { + LOG_E("open device failed!"); + return; + } + rt_device_control(dev, RT_SENSOR_CTRL_SET_ODR, (void *)20); +} +#ifdef FINSH_USING_MSH +MSH_CMD_EXPORT(sensor_int, Sensor interrupt mode test function); +#endif + +static void sensor_polling(int argc, char **argv) +{ + uint16_t num = 10; + rt_device_t dev = RT_NULL; + rt_sensor_t sensor; + struct rt_sensor_data data; + rt_size_t res, i; + + dev = rt_device_find(argv[1]); + if (dev == RT_NULL) + { + LOG_E("Can't find device:%s", argv[1]); + return; + } + if (argc > 2) + num = atoi(argv[2]); + + sensor = (rt_sensor_t)dev; + + if (rt_device_open(dev, RT_DEVICE_FLAG_RDWR) != RT_EOK) + { + LOG_E("open device failed!"); + return; + } + rt_device_control(dev, RT_SENSOR_CTRL_SET_ODR, (void *)100); + + for (i = 0; i < num; i++) + { + res = rt_device_read(dev, 0, &data, 1); + if (res != 1) + { + LOG_E("read data failed!size is %d", res); + } + else + { + sensor_show_data(i, sensor, &data); + } + rt_thread_mdelay(100); + } + rt_device_close(dev); +} +#ifdef FINSH_USING_MSH +MSH_CMD_EXPORT(sensor_polling, Sensor polling mode test function); +#endif + +static void sensor(int argc, char **argv) +{ + static rt_device_t dev = RT_NULL; + struct rt_sensor_data data; + rt_size_t res, i; + + /* If the number of arguments less than 2 */ + if (argc < 2) + { + rt_kprintf("\n"); + rt_kprintf("sensor [OPTION] [PARAM]\n"); + rt_kprintf(" probe Probe sensor by given name\n"); + rt_kprintf(" info Get sensor info\n"); + rt_kprintf(" sr Set range to var\n"); + rt_kprintf(" sm Set work mode to var\n"); + rt_kprintf(" sp Set power mode to var\n"); + rt_kprintf(" sodr Set output date rate to var\n"); + rt_kprintf(" read [num] Read [num] times sensor\n"); + rt_kprintf(" num default 5\n"); + return ; + } + else if (!strcmp(argv[1], "info")) + { + struct rt_sensor_info info; + rt_device_control(dev, RT_SENSOR_CTRL_GET_INFO, &info); + rt_kprintf("vendor :%d\n", info.vendor); + rt_kprintf("model :%s\n", info.model); + rt_kprintf("unit :%d\n", info.unit); + rt_kprintf("range_max :%d\n", info.range_max); + rt_kprintf("range_min :%d\n", info.range_min); + rt_kprintf("period_min:%d\n", info.period_min); + rt_kprintf("fifo_max :%d\n", info.fifo_max); + } + else if (!strcmp(argv[1], "read")) + { + uint16_t num = 5; + + if (dev == RT_NULL) + { + LOG_W("Please probe sensor device first!"); + return ; + } + if (argc == 3) + { + num = atoi(argv[2]); + } + + for (i = 0; i < num; i++) + { + res = rt_device_read(dev, 0, &data, 1); + if (res != 1) + { + LOG_E("read data failed!size is %d", res); + } + else + { + sensor_show_data(i, (rt_sensor_t)dev, &data); + } + rt_thread_mdelay(100); + } + } + else if (argc == 3) + { + if (!strcmp(argv[1], "probe")) + { + rt_uint8_t reg = 0xFF; + if (dev) + { + rt_device_close(dev); + } + + dev = rt_device_find(argv[2]); + if (dev == RT_NULL) + { + LOG_E("Can't find device:%s", argv[1]); + return; + } + if (rt_device_open(dev, RT_DEVICE_FLAG_RDWR) != RT_EOK) + { + LOG_E("open device failed!"); + return; + } + rt_device_control(dev, RT_SENSOR_CTRL_GET_ID, ®); + LOG_I("device id: 0x%x!", reg); + + } + else if (dev == RT_NULL) + { + LOG_W("Please probe sensor first!"); + return ; + } + else if (!strcmp(argv[1], "sr")) + { + rt_device_control(dev, RT_SENSOR_CTRL_SET_RANGE, (void *)atoi(argv[2])); + } + else if (!strcmp(argv[1], "sm")) + { + rt_device_control(dev, RT_SENSOR_CTRL_SET_MODE, (void *)atoi(argv[2])); + } + else if (!strcmp(argv[1], "sp")) + { + rt_device_control(dev, RT_SENSOR_CTRL_SET_POWER, (void *)atoi(argv[2])); + } + else if (!strcmp(argv[1], "sodr")) + { + rt_device_control(dev, RT_SENSOR_CTRL_SET_ODR, (void *)atoi(argv[2])); + } + else + { + LOG_W("Unknown command, please enter 'sensor' get help information!"); + } + } + else + { + LOG_W("Unknown command, please enter 'sensor' get help information!"); + } +} +#ifdef FINSH_USING_MSH +MSH_CMD_EXPORT(sensor, sensor test function); +#endif diff --git a/components/drivers/sensors/sensor_test.c b/components/drivers/sensors/sensor_test.c deleted file mode 100644 index 4b7fea2d03..0000000000 --- a/components/drivers/sensors/sensor_test.c +++ /dev/null @@ -1,361 +0,0 @@ -/* - * Copyright (c) 2006-2018, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2019-01-31 flybreak first version - */ - -#include "sensor.h" - -#define DBG_ENABLE -#define DBG_LEVEL DBG_INFO -#define DBG_SECTION_NAME "sensor.test" -#define DBG_COLOR -#include - -#include -#include - -static rt_sem_t sensor_rx_sem = RT_NULL; - -static void sensor_show_data(rt_size_t num, rt_sensor_t sensor, struct rt_sensor_data *sensor_data) -{ - switch (sensor->info.type) - { - case RT_SENSOR_CLASS_ACCE: - LOG_I("num:%3d, x:%5d, y:%5d, z:%5d, timestamp:%5d", num, sensor_data->data.acce.x, sensor_data->data.acce.y, sensor_data->data.acce.z, sensor_data->timestamp); - break; - case RT_SENSOR_CLASS_GYRO: - LOG_I("num:%3d, x:%8d, y:%8d, z:%8d, timestamp:%5d", num, sensor_data->data.gyro.x, sensor_data->data.gyro.y, sensor_data->data.gyro.z, sensor_data->timestamp); - break; - case RT_SENSOR_CLASS_MAG: - LOG_I("num:%3d, x:%5d, y:%5d, z:%5d, timestamp:%5d", num, sensor_data->data.mag.x, sensor_data->data.mag.y, sensor_data->data.mag.z, sensor_data->timestamp); - break; - case RT_SENSOR_CLASS_HUMI: - LOG_I("num:%3d, humi:%3d.%d%%, timestamp:%5d", num, sensor_data->data.humi / 10, sensor_data->data.humi % 10, sensor_data->timestamp); - break; - case RT_SENSOR_CLASS_TEMP: - LOG_I("num:%3d, temp:%3d.%dC, timestamp:%5d", num, sensor_data->data.temp / 10, sensor_data->data.temp % 10, sensor_data->timestamp); - break; - case RT_SENSOR_CLASS_BARO: - LOG_I("num:%3d, press:%5d, timestamp:%5d", num, sensor_data->data.baro, sensor_data->timestamp); - break; - case RT_SENSOR_CLASS_STEP: - LOG_I("num:%3d, step:%5d, timestamp:%5d", num, sensor_data->data.step, sensor_data->timestamp); - break; - default: - break; - } -} - -rt_err_t rx_callback(rt_device_t dev, rt_size_t size) -{ - rt_sem_release(sensor_rx_sem); - return 0; -} - -static void sensor_fifo_rx_entry(void *parameter) -{ - rt_device_t dev = parameter; - rt_sensor_t sensor = 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 = rt_malloc(sizeof(struct rt_sensor_data) * info.fifo_max); - if (data == RT_NULL) - { - LOG_E("Memory allocation failed!"); - } - - while (1) - { - rt_sem_take(sensor_rx_sem, RT_WAITING_FOREVER); - - res = rt_device_read(dev, 0, data, info.fifo_max); - for (i = 0; i < res; i++) - { - sensor_show_data(i, sensor, &data[i]); - } - } -} - -static void sensor_fifo(int argc, char **argv) -{ - static rt_thread_t tid1 = RT_NULL; - rt_device_t dev = RT_NULL; - rt_sensor_t sensor; - - dev = rt_device_find(argv[1]); - if (dev == RT_NULL) - { - LOG_E("Can't find device:%s", argv[1]); - return; - } - sensor = (rt_sensor_t)dev; - - if (sensor_rx_sem == RT_NULL) - { - sensor_rx_sem = rt_sem_create("sen_rx_sem", 0, RT_IPC_FLAG_FIFO); - } - else - { - LOG_E("The thread is running, please reboot and try again"); - return; - } - - tid1 = rt_thread_create("sen_rx_thread", - sensor_fifo_rx_entry, sensor, - 1024, - 15, 5); - - if (tid1 != RT_NULL) - rt_thread_startup(tid1); - - rt_device_set_rx_indicate(dev, rx_callback); - - if (rt_device_open(dev, RT_SENSOR_FLAG_FIFO) != RT_EOK) - { - LOG_E("open device failed!"); - return; - } - rt_device_control(dev, RT_SENSOR_CTRL_SET_ODR, (void *)20); -} -#ifdef FINSH_USING_MSH -MSH_CMD_EXPORT(sensor_fifo, Sensor fifo mode test function); -#endif - -static void sensor_irq_rx_entry(void *parameter) -{ - rt_device_t dev = parameter; - rt_sensor_t sensor = parameter; - struct rt_sensor_data data; - rt_size_t res, i = 0; - - while (1) - { - rt_sem_take(sensor_rx_sem, RT_WAITING_FOREVER); - - res = rt_device_read(dev, 0, &data, 1); - if (res == 1) - { - sensor_show_data(i++, sensor, &data); - } - } -} - -static void sensor_int(int argc, char **argv) -{ - static rt_thread_t tid1 = RT_NULL; - rt_device_t dev = RT_NULL; - rt_sensor_t sensor; - - dev = rt_device_find(argv[1]); - if (dev == RT_NULL) - { - LOG_E("Can't find device:%s", argv[1]); - return; - } - sensor = (rt_sensor_t)dev; - - if (sensor_rx_sem == RT_NULL) - { - sensor_rx_sem = rt_sem_create("sen_rx_sem", 0, RT_IPC_FLAG_FIFO); - } - else - { - LOG_E("The thread is running, please reboot and try again"); - return; - } - - tid1 = rt_thread_create("sen_rx_thread", - sensor_irq_rx_entry, sensor, - 1024, - 15, 5); - - if (tid1 != RT_NULL) - rt_thread_startup(tid1); - - rt_device_set_rx_indicate(dev, rx_callback); - - if (rt_device_open(dev, RT_DEVICE_FLAG_INT_RX) != RT_EOK) - { - LOG_E("open device failed!"); - return; - } - rt_device_control(dev, RT_SENSOR_CTRL_SET_ODR, (void *)20); -} -#ifdef FINSH_USING_MSH -MSH_CMD_EXPORT(sensor_int, Sensor interrupt mode test function); -#endif - -static void sensor_polling(int argc, char **argv) -{ - uint16_t num = 10; - rt_device_t dev = RT_NULL; - rt_sensor_t sensor; - struct rt_sensor_data data; - rt_size_t res, i; - - dev = rt_device_find(argv[1]); - if (dev == RT_NULL) - { - LOG_E("Can't find device:%s", argv[1]); - return; - } - if (argc > 2) - num = atoi(argv[2]); - - sensor = (rt_sensor_t)dev; - - if (rt_device_open(dev, RT_DEVICE_FLAG_RDWR) != RT_EOK) - { - LOG_E("open device failed!"); - return; - } - rt_device_control(dev, RT_SENSOR_CTRL_SET_ODR, (void *)100); - - for (i = 0; i < num; i++) - { - res = rt_device_read(dev, 0, &data, 1); - if (res != 1) - { - LOG_E("read data failed!size is %d", res); - } - else - { - sensor_show_data(i, sensor, &data); - } - rt_thread_mdelay(100); - } - rt_device_close(dev); -} -#ifdef FINSH_USING_MSH -MSH_CMD_EXPORT(sensor_polling, Sensor polling mode test function); -#endif - -static void sensor(int argc, char **argv) -{ - static rt_device_t dev = RT_NULL; - struct rt_sensor_data data; - rt_size_t res, i; - - /* If the number of arguments less than 2 */ - if (argc < 2) - { - rt_kprintf("\n"); - rt_kprintf("sensor [OPTION] [PARAM]\n"); - rt_kprintf(" probe Probe sensor by given name\n"); - rt_kprintf(" info Get sensor info\n"); - rt_kprintf(" sr Set range to var\n"); - rt_kprintf(" sm Set work mode to var\n"); - rt_kprintf(" sp Set power mode to var\n"); - rt_kprintf(" sodr Set output date rate to var\n"); - rt_kprintf(" read [num] Read [num] times sensor\n"); - rt_kprintf(" num default 5\n"); - return ; - } - else if (!strcmp(argv[1], "info")) - { - struct rt_sensor_info info; - rt_device_control(dev, RT_SENSOR_CTRL_GET_INFO, &info); - rt_kprintf("vendor :%d\n", info.vendor); - rt_kprintf("model :%s\n", info.model); - rt_kprintf("unit :%d\n", info.unit); - rt_kprintf("range_max :%d\n", info.range_max); - rt_kprintf("range_min :%d\n", info.range_min); - rt_kprintf("period_min:%d\n", info.period_min); - rt_kprintf("fifo_max :%d\n", info.fifo_max); - } - else if (!strcmp(argv[1], "read")) - { - uint16_t num = 5; - - if (dev == RT_NULL) - { - LOG_W("Please probe sensor device first!"); - return ; - } - if (argc == 3) - { - num = atoi(argv[2]); - } - - for (i = 0; i < num; i++) - { - res = rt_device_read(dev, 0, &data, 1); - if (res != 1) - { - LOG_E("read data failed!size is %d", res); - } - else - { - sensor_show_data(i, (rt_sensor_t)dev, &data); - } - rt_thread_mdelay(100); - } - } - else if (argc == 3) - { - if (!strcmp(argv[1], "probe")) - { - rt_uint8_t reg = 0xFF; - if (dev) - { - rt_device_close(dev); - } - - dev = rt_device_find(argv[2]); - if (dev == RT_NULL) - { - LOG_E("Can't find device:%s", argv[1]); - return; - } - if (rt_device_open(dev, RT_DEVICE_FLAG_RDWR) != RT_EOK) - { - LOG_E("open device failed!"); - return; - } - rt_device_control(dev, RT_SENSOR_CTRL_GET_ID, ®); - LOG_I("device id: 0x%x!", reg); - - } - else if (dev == RT_NULL) - { - LOG_W("Please probe sensor first!"); - return ; - } - else if (!strcmp(argv[1], "sr")) - { - rt_device_control(dev, RT_SENSOR_CTRL_SET_RANGE, (void *)atoi(argv[2])); - } - else if (!strcmp(argv[1], "sm")) - { - rt_device_control(dev, RT_SENSOR_CTRL_SET_MODE, (void *)atoi(argv[2])); - } - else if (!strcmp(argv[1], "sp")) - { - rt_device_control(dev, RT_SENSOR_CTRL_SET_POWER, (void *)atoi(argv[2])); - } - else if (!strcmp(argv[1], "sodr")) - { - rt_device_control(dev, RT_SENSOR_CTRL_SET_ODR, (void *)atoi(argv[2])); - } - else - { - LOG_W("Unknown command, please enter 'sensor' get help information!"); - } - } - else - { - LOG_W("Unknown command, please enter 'sensor' get help information!"); - } -} -#ifdef FINSH_USING_MSH -MSH_CMD_EXPORT(sensor, sensor test function); -#endif -- cgit v1.3.1