From 18cd235874b5e13ea69c25be9f79c14785bd1d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B5=8C=E5=85=A5=E5=BC=8F=E8=B7=AF=E4=B8=8A=E7=9A=84?= =?UTF-8?q?=E6=B5=81=E6=B5=AA?= <1308465141@qq.com> Date: Thu, 5 Jan 2023 12:51:21 +0000 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91SENSOR?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BC=A0=E6=84=9F=E5=99=A8=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=A4=BA=E4=BE=8B=20=E7=94=B1=E4=BA=8Esensor=E6=9E=B6=E6=9E=84?= =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=AF=BC=E8=87=B4=E5=8E=9F=E6=9C=AC=E5=AE=9E?= =?UTF-8?q?=E4=BE=8B=E6=97=A0=E6=B3=95=E8=BF=90=E8=A1=8C=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=AD=A4=E8=83=BD=E9=80=82=E9=85=8D=E6=96=B0?= =?UTF-8?q?=E6=9E=B6=E6=9E=84=EF=BC=8C=E5=B7=B2=E7=BB=8F=E5=9C=A8STM32F1?= =?UTF-8?q?=E7=B3=BB=E5=88=97=E8=8A=AF=E7=89=87=E6=88=90=E5=8A=9F=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 嵌入式路上的流浪 <1308465141@qq.com> --- .../device/sensor/sensor.md | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/rt-thread-version/rt-thread-standard/programming-manual/device/sensor/sensor.md b/rt-thread-version/rt-thread-standard/programming-manual/device/sensor/sensor.md index 0206970..e79f6cd 100644 --- a/rt-thread-version/rt-thread-standard/programming-manual/device/sensor/sensor.md +++ b/rt-thread-version/rt-thread-standard/programming-manual/device/sensor/sensor.md @@ -377,33 +377,27 @@ rt_err_t rt_device_close(rt_device_t dev); * 命令解释：命令第二个参数是要使用的传感器设备名称 * 程序功能：打开对应的传感器，然后连续读取 5 次数据并打印出来。 */ - #include "sensor.h" + 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: + case RT_SENSOR_TYPE_ACCE: rt_kprintf("num:%3d, x:%5d, y:%5d, z:%5d, timestamp:%5d\n", 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: + case RT_SENSOR_TYPE_GYRO: rt_kprintf("num:%3d, x:%8d, y:%8d, z:%8d, timestamp:%5d\n", 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: + case RT_SENSOR_TYPE_MAG: rt_kprintf("num:%3d, x:%5d, y:%5d, z:%5d, timestamp:%5d\n", 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: - rt_kprintf("num:%3d, humi:%3d.%d%%, timestamp:%5d\n", num, sensor_data->data.humi / 10, sensor_data->data.humi % 10, sensor_data->timestamp); - break; - case RT_SENSOR_CLASS_TEMP: - rt_kprintf("num:%3d, temp:%3d.%dC, timestamp:%5d\n", num, sensor_data->data.temp / 10, sensor_data->data.temp % 10, sensor_data->timestamp); - break; - case RT_SENSOR_CLASS_BARO: - rt_kprintf("num:%3d, press:%5d, timestamp:%5d\n", num, sensor_data->data.baro, sensor_data->timestamp); + case RT_SENSOR_TYPE_HUMI: + rt_kprintf("num:%d, humi:%2.2fC, timestamp:%u\r\n", num, sensor_data->data.humi,sensor_data->timestamp); break; - case RT_SENSOR_CLASS_STEP: - rt_kprintf("num:%3d, step:%5d, timestamp:%5d\n", num, sensor_data->data.step, sensor_data->timestamp); + case RT_SENSOR_TYPE_TEMP: + rt_kprintf("num:%d, temp:%2.2fC, timestamp:%u\r\n", num, sensor_data->data.temp,sensor_data->timestamp); break; default: break; -- Gitee