From fdc968315055bcd829bf1700595b00aa9d863ae3 Mon Sep 17 00:00:00 2001 From: Zhou DingHua Date: Wed, 17 Apr 2019 16:09:06 +0800 Subject: [PATCH] Add new sensor type and vendor type. sensor type: force sensor vendor type: MiraMEMS --- components/drivers/sensors/sensor.c | 1 + components/drivers/sensors/sensor.h | 4 ++++ components/drivers/sensors/sensor_cmd.c | 3 +++ 3 files changed, 8 insertions(+) mode change 100644 => 100755 components/drivers/sensors/sensor.c mode change 100644 => 100755 components/drivers/sensors/sensor.h mode change 100644 => 100755 components/drivers/sensors/sensor_cmd.c diff --git a/components/drivers/sensors/sensor.c b/components/drivers/sensors/sensor.c old mode 100644 new mode 100755 index c86f96c14d..e76ac51f12 --- a/components/drivers/sensors/sensor.c +++ b/components/drivers/sensors/sensor.c @@ -31,6 +31,7 @@ static char *const sensor_name_str[] = "tvoc_", /* TVOC Level */ "noi_", /* Noise Loudness */ "step_" /* Step sensor */ + "forc_" /* Force sensor */ }; /* Sensor interrupt correlation function */ diff --git a/components/drivers/sensors/sensor.h b/components/drivers/sensors/sensor.h old mode 100644 new mode 100755 index 94650ea886..4f8ee47eb8 --- a/components/drivers/sensors/sensor.h +++ b/components/drivers/sensors/sensor.h @@ -44,6 +44,7 @@ extern "C" { #define RT_SENSOR_CLASS_TVOC (10) /* TVOC Level */ #define RT_SENSOR_CLASS_NOISE (11) /* Noise Loudness */ #define RT_SENSOR_CLASS_STEP (12) /* Step sensor */ +#define RT_SENSOR_CLASS_FORCE (13) /* Force sensor */ /* Sensor vendor types */ @@ -53,6 +54,7 @@ extern "C" { #define RT_SENSOR_VENDOR_INVENSENSE (3) /* Invensense */ #define RT_SENSOR_VENDOR_SEMTECH (4) /* Semtech */ #define RT_SENSOR_VENDOR_GOERTEK (5) /* Goertek */ +#define RT_SENSOR_VENDOR_MIRAMEMS (6) /* MiraMEMS */ /* Sensor unit types */ @@ -69,6 +71,7 @@ extern "C" { #define RT_SENSOR_UNIT_ONE (10) /* Dimensionless quantity unit: 1 */ #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 */ /* Sensor communication interface types */ @@ -185,6 +188,7 @@ struct rt_sensor_data rt_int32_t tvoc; /* TVOC. unit: permillage */ rt_int32_t noise; /* Noise Loudness. unit: HZ */ rt_uint32_t step; /* Step sensor. unit: 1 */ + rt_int32_t force; /* Force sensor. unit: mN */ } data; }; diff --git a/components/drivers/sensors/sensor_cmd.c b/components/drivers/sensors/sensor_cmd.c old mode 100644 new mode 100755 index 3369ee376a..2760892cfe --- a/components/drivers/sensors/sensor_cmd.c +++ b/components/drivers/sensors/sensor_cmd.c @@ -47,6 +47,9 @@ static void sensor_show_data(rt_size_t num, rt_sensor_t sensor, struct rt_sensor case RT_SENSOR_CLASS_PROXIMITY: LOG_I("num:%3d, distance:%5d, timestamp:%5d", num, sensor_data->data.proximity, sensor_data->timestamp); break; + case RT_SENSOR_CLASS_FORCE: + LOG_I("num:%3d, force:%5d, timestamp:%5d", num, sensor_data->data.force, sensor_data->timestamp); + break; default: break; }