From 1fde73a93c923ab1ee8c69d2f58972be3a5d478c Mon Sep 17 00:00:00 2001 From: luhuadong Date: Sat, 4 Jul 2020 16:48:05 +0800 Subject: [PATCH 1/2] [Sensor] Add AMS sensor vendor info --- components/drivers/sensors/sensor.h | 1 + components/drivers/sensors/sensor_cmd.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/components/drivers/sensors/sensor.h b/components/drivers/sensors/sensor.h index 625fd566f27..52bbb9bf76c 100755 --- a/components/drivers/sensors/sensor.h +++ b/components/drivers/sensors/sensor.h @@ -63,6 +63,7 @@ extern "C" { #define RT_SENSOR_VENDOR_SENSIRION (10) /* Sensirion */ #define RT_SENSOR_VENDOR_TI (11) /* Texas Instruments */ #define RT_SENSOR_VENDOR_PLANTOWER (12) /* Plantower */ +#define RT_SENSOR_VENDOR_AMS (13) /* ams AG */ /* Sensor unit types */ diff --git a/components/drivers/sensors/sensor_cmd.c b/components/drivers/sensors/sensor_cmd.c index 5f1f31c9e5c..4c5509c0b69 100755 --- a/components/drivers/sensors/sensor_cmd.c +++ b/components/drivers/sensors/sensor_cmd.c @@ -335,6 +335,9 @@ static void sensor(int argc, char **argv) case RT_SENSOR_VENDOR_PLANTOWER: rt_kprintf("vendor :Plantower\n"); break; + case RT_SENSOR_VENDOR_AMS: + rt_kprintf("vendor :AMS\n"); + break; } rt_kprintf("model :%s\n", info.model); switch (info.unit) From f2070beb54d828f205dad81ea10127599c5eb79e Mon Sep 17 00:00:00 2001 From: luhuadong Date: Sat, 4 Jul 2020 17:14:31 +0800 Subject: [PATCH 2/2] [Sensor] Add two concentration unit ppm & ppb --- components/drivers/sensors/sensor.h | 2 ++ components/drivers/sensors/sensor_cmd.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/components/drivers/sensors/sensor.h b/components/drivers/sensors/sensor.h index 52bbb9bf76c..e61b32acba0 100755 --- a/components/drivers/sensors/sensor.h +++ b/components/drivers/sensors/sensor.h @@ -82,6 +82,8 @@ extern "C" { #define RT_SENSOR_UNIT_BPM (11) /* Heart rate unit: bpm */ #define RT_SENSOR_UNIT_MM (12) /* Distance unit: mm */ #define RT_SENSOR_UNIT_MN (13) /* Force unit: mN */ +#define RT_SENSOR_UNIT_PPM (14) /* Concentration unit: ppm */ +#define RT_SENSOR_UNIT_PPB (15) /* Concentration unit: ppb */ /* Sensor communication interface types */ diff --git a/components/drivers/sensors/sensor_cmd.c b/components/drivers/sensors/sensor_cmd.c index 4c5509c0b69..d46b23f4cf1 100755 --- a/components/drivers/sensors/sensor_cmd.c +++ b/components/drivers/sensors/sensor_cmd.c @@ -384,6 +384,12 @@ static void sensor(int argc, char **argv) case RT_SENSOR_UNIT_MN: rt_kprintf("unit :mN\n"); break; + case RT_SENSOR_UNIT_PPM: + rt_kprintf("unit :ppm\n"); + break; + case RT_SENSOR_UNIT_PPB: + rt_kprintf("unit :ppb\n"); + break; } rt_kprintf("range_max :%d\n", info.range_max); rt_kprintf("range_min :%d\n", info.range_min);