From e7ed7642540ba97045cd0c717d503431d4eea371 Mon Sep 17 00:00:00 2001 From: Prry <445395670@qq.com> Date: Sat, 19 Dec 2020 12:23:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0TOF=E4=BC=A0=E6=84=9F?= =?UTF-8?q?=E5=99=A8=E6=8F=8F=E8=BF=B0=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/drivers/sensors/sensor.c | 3 ++- components/drivers/sensors/sensor.h | 1 + components/drivers/sensors/sensor_cmd.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/components/drivers/sensors/sensor.c b/components/drivers/sensors/sensor.c index eb5c97a574..07999c73b3 100644 --- a/components/drivers/sensors/sensor.c +++ b/components/drivers/sensors/sensor.c @@ -35,7 +35,8 @@ static char *const sensor_name_str[] = "forc_", /* Force sensor */ "dust_", /* Dust sensor */ "eco2_", /* eCO2 sensor */ - "gnss_" /* GPS/GNSS sensor */ + "gnss_", /* GPS/GNSS sensor */ + "tof_" /* TOF sensor */ }; /* Sensor interrupt correlation function */ diff --git a/components/drivers/sensors/sensor.h b/components/drivers/sensors/sensor.h index 5a069edc25..b180e36a73 100755 --- a/components/drivers/sensors/sensor.h +++ b/components/drivers/sensors/sensor.h @@ -48,6 +48,7 @@ extern "C" { #define RT_SENSOR_CLASS_DUST (14) /* Dust sensor */ #define RT_SENSOR_CLASS_ECO2 (15) /* eCO2 sensor */ #define RT_SENSOR_CLASS_GNSS (16) /* GPS/GNSS sensor */ +#define RT_SENSOR_CLASS_TOF (17) /* TOF sensor */ /* Sensor vendor types */ diff --git a/components/drivers/sensors/sensor_cmd.c b/components/drivers/sensors/sensor_cmd.c index 284db75cf6..09887d4b5f 100755 --- a/components/drivers/sensors/sensor_cmd.c +++ b/components/drivers/sensors/sensor_cmd.c @@ -50,6 +50,7 @@ static void sensor_show_data(rt_size_t num, rt_sensor_t sensor, struct rt_sensor LOG_I("num:%3d, light:%5d lux, timestamp:%5d", num, sensor_data->data.light, sensor_data->timestamp); break; case RT_SENSOR_CLASS_PROXIMITY: + case RT_SENSOR_CLASS_TOF: LOG_I("num:%3d, distance:%5d, timestamp:%5d", num, sensor_data->data.proximity, sensor_data->timestamp); break; case RT_SENSOR_CLASS_HR: From a38e7768ac9037b6c530dabdea90747e6dbd2a88 Mon Sep 17 00:00:00 2001 From: Prry <445395670@qq.com> Date: Sun, 20 Dec 2020 22:23:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BC=A9=E8=BF=9B=E7=94=B1=E2=80=9CTAB?= =?UTF-8?q?=E9=94=AE=E2=80=9D=E6=94=B9=E7=94=A8=E4=B8=BA=E2=80=9C=E7=A9=BA?= =?UTF-8?q?=E6=A0=BC=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/drivers/sensors/sensor.c | 2 +- components/drivers/sensors/sensor_cmd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/drivers/sensors/sensor.c b/components/drivers/sensors/sensor.c index 07999c73b3..bbfcea97be 100644 --- a/components/drivers/sensors/sensor.c +++ b/components/drivers/sensors/sensor.c @@ -36,7 +36,7 @@ static char *const sensor_name_str[] = "dust_", /* Dust sensor */ "eco2_", /* eCO2 sensor */ "gnss_", /* GPS/GNSS sensor */ - "tof_" /* TOF sensor */ + "tof_" /* TOF sensor */ }; /* Sensor interrupt correlation function */ diff --git a/components/drivers/sensors/sensor_cmd.c b/components/drivers/sensors/sensor_cmd.c index 09887d4b5f..cbf7d233c6 100755 --- a/components/drivers/sensors/sensor_cmd.c +++ b/components/drivers/sensors/sensor_cmd.c @@ -50,7 +50,7 @@ static void sensor_show_data(rt_size_t num, rt_sensor_t sensor, struct rt_sensor LOG_I("num:%3d, light:%5d lux, timestamp:%5d", num, sensor_data->data.light, sensor_data->timestamp); break; case RT_SENSOR_CLASS_PROXIMITY: - case RT_SENSOR_CLASS_TOF: + case RT_SENSOR_CLASS_TOF: LOG_I("num:%3d, distance:%5d, timestamp:%5d", num, sensor_data->data.proximity, sensor_data->timestamp); break; case RT_SENSOR_CLASS_HR: