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 0206970e190cb11b7eec61b06cb635c5d7b1e1b5..e79f6cd15065cf1cfb797e2f39673b8dce3e3195 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;