diff options
| author | Bernard Xiong <[email protected]> | 2020-02-20 18:56:02 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-02-20 18:56:02 +0800 |
| commit | 4bec714516fa0b227e63564f9e7db28fa218030e (patch) | |
| tree | 5d68647be6ed9ea15fb5d4c5eb0f9d925f95fd8a | |
| parent | e5bd2884d72c3dbe7a596609beda21e971e993f8 (diff) | |
| parent | 26fa5e5fa2f196e4bec637861352ae2dea7e6cc1 (diff) | |
Merge pull request #3393 from luhuadong/develop
[Sensor] Modified vendor name and add two prefix corresponding to sensor types
| -rw-r--r-- | components/drivers/sensors/sensor.c | 4 | ||||
| -rwxr-xr-x | components/drivers/sensors/sensor.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/components/drivers/sensors/sensor.c b/components/drivers/sensors/sensor.c index 91b256bd66..18c5830fbf 100644 --- a/components/drivers/sensors/sensor.c +++ b/components/drivers/sensors/sensor.c @@ -31,7 +31,9 @@ static char *const sensor_name_str[] = "tvoc_", /* TVOC Level */ "noi_", /* Noise Loudness */ "step_", /* Step sensor */ - "forc_" /* Force sensor */ + "forc_", /* Force sensor */ + "dust_", /* Dust sensor */ + "eco2_" /* eCO2 sensor */ }; /* Sensor interrupt correlation function */ diff --git a/components/drivers/sensors/sensor.h b/components/drivers/sensors/sensor.h index 79e8d4bde8..0dae3d66f5 100755 --- a/components/drivers/sensors/sensor.h +++ b/components/drivers/sensors/sensor.h @@ -58,7 +58,7 @@ extern "C" { #define RT_SENSOR_VENDOR_GOERTEK (5) /* Goertek */ #define RT_SENSOR_VENDOR_MIRAMEMS (6) /* MiraMEMS */ #define RT_SENSOR_VENDOR_DALLAS (7) /* Dallas */ -#define RT_SENSOR_VENDOR_AOSONG (8) /* Aosong */ +#define RT_SENSOR_VENDOR_ASAIR (8) /* Aosong */ #define RT_SENSOR_VENDOR_SHARP (9) /* Sharp */ #define RT_SENSOR_VENDOR_SENSIRION (10) /* Sensirion */ |