diff options
| author | Meco Man <[email protected]> | 2020-12-28 04:13:25 -0600 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-12-28 04:13:25 -0600 |
| commit | 3bca2cfb418f03c529fc8563b62c19d391caf90b (patch) | |
| tree | 469dbaebaa3325f64e59b71b4063f135bb6fdfd8 /components/drivers/sensors | |
| parent | 84a5f96453ee2719695b719142af08b7a51b623d (diff) | |
| parent | 936db0e396f286a7f493cdadb698cf9340a82448 (diff) | |
Merge pull request #7 from RT-Thread/master
pr
Diffstat (limited to 'components/drivers/sensors')
| -rw-r--r-- | components/drivers/sensors/SConscript | 2 | ||||
| -rw-r--r-- | components/drivers/sensors/sensor.c | 3 | ||||
| -rwxr-xr-x | components/drivers/sensors/sensor.h | 1 | ||||
| -rwxr-xr-x | components/drivers/sensors/sensor_cmd.c | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/components/drivers/sensors/SConscript b/components/drivers/sensors/SConscript index 51c4b50eef..b56ae5ce6e 100644 --- a/components/drivers/sensors/SConscript +++ b/components/drivers/sensors/SConscript @@ -7,7 +7,7 @@ src = ['sensor.c'] CPPPATH = [cwd, cwd + '/../include'] if GetDepend('RT_USING_SENSOR_CMD'): - src += ['sensor_cmd.c']; + src += ['sensor_cmd.c'] group = DefineGroup('Sensors', src, depend = ['RT_USING_SENSOR', 'RT_USING_DEVICE'], CPPPATH = CPPPATH) diff --git a/components/drivers/sensors/sensor.c b/components/drivers/sensors/sensor.c index eb5c97a574..bbfcea97be 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..cbf7d233c6 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: |