diff --git a/components/drivers/include/drivers/sensor.h b/components/drivers/include/drivers/sensor.h index a1de110a08..da1567bf2e 100644 --- a/components/drivers/include/drivers/sensor.h +++ b/components/drivers/include/drivers/sensor.h @@ -29,97 +29,172 @@ extern "C" { #define RT_SENSOR_MODULE_MAX (3) /* The maximum number of members of a sensor module */ +#define RT_SENSOR_MACRO_GET_NAME(macro) (macro##_STR) + /* Sensor types */ #define RT_SENSOR_CLASS_NONE (0) -#define RT_SENSOR_CLASS_ACCE (1) /* Accelerometer */ -#define RT_SENSOR_CLASS_GYRO (2) /* Gyroscope */ -#define RT_SENSOR_CLASS_MAG (3) /* Magnetometer */ -#define RT_SENSOR_CLASS_TEMP (4) /* Temperature */ -#define RT_SENSOR_CLASS_HUMI (5) /* Relative Humidity */ -#define RT_SENSOR_CLASS_BARO (6) /* Barometer */ -#define RT_SENSOR_CLASS_LIGHT (7) /* Ambient light */ -#define RT_SENSOR_CLASS_PROXIMITY (8) /* Proximity */ -#define RT_SENSOR_CLASS_HR (9) /* Heart Rate */ -#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 */ -#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 */ -#define RT_SENSOR_CLASS_SPO2 (18) /* SpO2 sensor */ -#define RT_SENSOR_CLASS_IAQ (19) /* IAQ sensor. */ -#define RT_SENSOR_CLASS_ETOH (20) /* EtOH sensor. */ -#define RT_SENSOR_CLASS_BP (21) /* Blood Pressure */ +#define RT_SENSOR_CLASS_NONE_STR "None" +#define RT_SENSOR_CLASS_ACCE (1) +#define RT_SENSOR_CLASS_ACCE_STR "Accelerometer" +#define RT_SENSOR_CLASS_GYRO (2) +#define RT_SENSOR_CLASS_GYRO_STR "Gyroscope" +#define RT_SENSOR_CLASS_MAG (3) +#define RT_SENSOR_CLASS_MAG_STR "Magnetometer" +#define RT_SENSOR_CLASS_TEMP (4) +#define RT_SENSOR_CLASS_TEMP_STR "Temperature" +#define RT_SENSOR_CLASS_HUMI (5) +#define RT_SENSOR_CLASS_HUMI_STR "Relative Humidity" +#define RT_SENSOR_CLASS_BARO (6) +#define RT_SENSOR_CLASS_BARO_STR "Barometer" +#define RT_SENSOR_CLASS_LIGHT (7) +#define RT_SENSOR_CLASS_LIGHT_STR "Ambient light" +#define RT_SENSOR_CLASS_PROXIMITY (8) +#define RT_SENSOR_CLASS_PROXIMITY_STR "Proximity" +#define RT_SENSOR_CLASS_HR (9) +#define RT_SENSOR_CLASS_HR_STR "Heart Rate" +#define RT_SENSOR_CLASS_TVOC (10) +#define RT_SENSOR_CLASS_TVOC_STR "TVOC Level" +#define RT_SENSOR_CLASS_NOISE (11) +#define RT_SENSOR_CLASS_NOISE_STR "Noise Loudness" +#define RT_SENSOR_CLASS_STEP (12) +#define RT_SENSOR_CLASS_STEP_STR "Step" +#define RT_SENSOR_CLASS_FORCE (13) +#define RT_SENSOR_CLASS_FORCE_STR "Force" +#define RT_SENSOR_CLASS_DUST (14) +#define RT_SENSOR_CLASS_DUST_STR "Dust" +#define RT_SENSOR_CLASS_ECO2 (15) +#define RT_SENSOR_CLASS_ECO2_STR "eCO2" +#define RT_SENSOR_CLASS_GNSS (16) +#define RT_SENSOR_CLASS_GNSS_STR "GNSS" +#define RT_SENSOR_CLASS_TOF (17) +#define RT_SENSOR_CLASS_TOF_STR "ToF" +#define RT_SENSOR_CLASS_SPO2 (18) +#define RT_SENSOR_CLASS_SPO2_STR "SpO2" +#define RT_SENSOR_CLASS_IAQ (19) +#define RT_SENSOR_CLASS_IAQ_STR "IAQ" +#define RT_SENSOR_CLASS_ETOH (20) +#define RT_SENSOR_CLASS_ETOH_STR "EtOH" +#define RT_SENSOR_CLASS_BP (21) +#define RT_SENSOR_CLASS_BP_STR "Blood Pressure" /* Sensor vendor types */ #define RT_SENSOR_VENDOR_UNKNOWN (0) -#define RT_SENSOR_VENDOR_STM (1) /* STMicroelectronics */ -#define RT_SENSOR_VENDOR_BOSCH (2) /* Bosch */ -#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 */ -#define RT_SENSOR_VENDOR_DALLAS (7) /* Dallas */ -#define RT_SENSOR_VENDOR_ASAIR (8) /* Aosong */ -#define RT_SENSOR_VENDOR_SHARP (9) /* Sharp */ -#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 */ -#define RT_SENSOR_VENDOR_MAXIM (14) /* Maxim Integrated */ -#define RT_SENSOR_VENDOR_MELEXIS (15) /* Melexis */ +#define RT_SENSOR_VENDOR_UNKNOWN_STR "Vendor Unknown" +#define RT_SENSOR_VENDOR_STM (1) +#define RT_SENSOR_VENDOR_STM_STR "STMicroelectronics" +#define RT_SENSOR_VENDOR_BOSCH (2) +#define RT_SENSOR_VENDOR_BOSCH_STR "Bosch" +#define RT_SENSOR_VENDOR_INVENSENSE (3) +#define RT_SENSOR_VENDOR_INVENSENSE_STR "Invensense" +#define RT_SENSOR_VENDOR_SEMTECH (4) +#define RT_SENSOR_VENDOR_SEMTECH_STR "Semtech" +#define RT_SENSOR_VENDOR_GOERTEK (5) +#define RT_SENSOR_VENDOR_GOERTEK_STR "Goertek" +#define RT_SENSOR_VENDOR_MIRAMEMS (6) +#define RT_SENSOR_VENDOR_MIRAMEMS_STR "MiraMEMS" +#define RT_SENSOR_VENDOR_DALLAS (7) +#define RT_SENSOR_VENDOR_DALLAS_STR "Dallas" +#define RT_SENSOR_VENDOR_ASAIR (8) +#define RT_SENSOR_VENDOR_ASAIR_STR "Aosong" +#define RT_SENSOR_VENDOR_SHARP (9) +#define RT_SENSOR_VENDOR_SHARP_STR "Sharp" +#define RT_SENSOR_VENDOR_SENSIRION (10) +#define RT_SENSOR_VENDOR_SENSIRION_STR "Sensirion" +#define RT_SENSOR_VENDOR_TI (11) +#define RT_SENSOR_VENDOR_TI_STR "Texas Instruments" +#define RT_SENSOR_VENDOR_PLANTOWER (12) +#define RT_SENSOR_VENDOR_PLANTOWER_STR "Plantower" +#define RT_SENSOR_VENDOR_AMS (13) +#define RT_SENSOR_VENDOR_AMS_STR "ams-OSRAM AG" +#define RT_SENSOR_VENDOR_MAXIM (14) +#define RT_SENSOR_VENDOR_MAXIM_STR "Maxim Integrated" +#define RT_SENSOR_VENDOR_MELEXIS (15) +#define RT_SENSOR_VENDOR_MELEXIS_STR "Melexis" /* Sensor unit types */ -#define RT_SENSOR_UNIT_NONE (0) -#define RT_SENSOR_UNIT_MG (1) /* Accelerometer unit: mG */ -#define RT_SENSOR_UNIT_MDPS (2) /* Gyroscope unit: mdps */ -#define RT_SENSOR_UNIT_MGAUSS (3) /* Magnetometer unit: mGauss */ -#define RT_SENSOR_UNIT_LUX (4) /* Ambient light unit: lux */ -#define RT_SENSOR_UNIT_CM (5) /* Distance unit: cm */ -#define RT_SENSOR_UNIT_PA (6) /* Barometer unit: pa */ -#define RT_SENSOR_UNIT_PERMILLAGE (7) /* Relative Humidity unit: permillage */ -#define RT_SENSOR_UNIT_DCELSIUS (8) /* Temperature unit: dCelsius */ -#define RT_SENSOR_UNIT_HZ (9) /* Frequency unit: HZ */ -#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 */ -#define RT_SENSOR_UNIT_PPM (14) /* Concentration unit: ppm */ -#define RT_SENSOR_UNIT_PPB (15) /* Concentration unit: ppb */ -#define RT_SENSOR_UNIT_DMS (16) /* Coordinates unit: DMS */ -#define RT_SENSOR_UNIT_DD (17) /* Coordinates unit: DD */ -#define RT_SENSOR_UNIT_MGM3 (18) /* Concentration unit: mg/m3 */ -#define RT_SENSOR_UNIT_MMHG (19) /* Blood Pressure unit: mmHg */ +#define RT_SENSOR_UNIT_NONE (0) /* Dimensionless quantity */ +#define RT_SENSOR_UNIT_NONE_STR "" +#define RT_SENSOR_UNIT_MG (1) /* Accelerometer unit: mG */ +#define RT_SENSOR_UNIT_MG_STR "mG" +#define RT_SENSOR_UNIT_MDPS (2) /* Gyroscope unit: mdps */ +#define RT_SENSOR_UNIT_MDPS_STR "mdps" +#define RT_SENSOR_UNIT_MGAUSS (3) /* Magnetometer unit: mGauss */ +#define RT_SENSOR_UNIT_MGAUSS_STR "mGauss" +#define RT_SENSOR_UNIT_LUX (4) /* Ambient light unit: lux */ +#define RT_SENSOR_UNIT_LUX_STR "lux" +#define RT_SENSOR_UNIT_CM (5) /* Distance unit: cm */ +#define RT_SENSOR_UNIT_CM_STR "cm" +#define RT_SENSOR_UNIT_MM (6) /* Distance unit: mm */ +#define RT_SENSOR_UNIT_MM_STR "mm" +#define RT_SENSOR_UNIT_PA (7) /* Barometer unit: Pa */ +#define RT_SENSOR_UNIT_PA_STR "Pa" +#define RT_SENSOR_UNIT_MMHG (8) /* Blood Pressure unit: mmHg */ +#define RT_SENSOR_UNIT_MMHG_STR "mmHg" +#define RT_SENSOR_UNIT_PERMILLAGE (9) /* Relative Humidity unit: permillage */ +#define RT_SENSOR_UNIT_PERMILLAGE_STR "‰" +#define RT_SENSOR_UNIT_PERCENTAGE (10) /* Relative Humidity unit: percentage */ +#define RT_SENSOR_UNIT_PERCENTAGE_STR "%" +#define RT_SENSOR_UNIT_CELSIUS (11) /* Temperature unit: Celsius ℃ */ +#define RT_SENSOR_UNIT_CELSIUS_STR "℃" +#define RT_SENSOR_UNIT_FAHRENHEIT (12) /* Temperature unit: Fahrenheit ℉ */ +#define RT_SENSOR_UNIT_FAHRENHEIT_STR "℉" +#define RT_SENSOR_UNIT_KELVIN (13) /* Temperature unit: K */ +#define RT_SENSOR_UNIT_KELVIN_STR "K" +#define RT_SENSOR_UNIT_HZ (14) /* Frequency unit: Hz */ +#define RT_SENSOR_UNIT_HZ_STR "Hz" +#define RT_SENSOR_UNIT_BPM (15) /* Heart rate unit: bpm */ +#define RT_SENSOR_UNIT_BPM_STR "bpm" +#define RT_SENSOR_UNIT_MN (16) /* Force unit: mN */ +#define RT_SENSOR_UNIT_MN_STR "mN" +#define RT_SENSOR_UNIT_N (17) /* Force unit: N */ +#define RT_SENSOR_UNIT_N_STR "N" +#define RT_SENSOR_UNIT_PPM (18) /* Concentration unit: ppm */ +#define RT_SENSOR_UNIT_PPM_STR "ppm" +#define RT_SENSOR_UNIT_PPB (19) /* Concentration unit: ppb */ +#define RT_SENSOR_UNIT_PPB_STR "ppb" +#define RT_SENSOR_UNIT_DMS (20) /* Coordinates unit: DMS */ +#define RT_SENSOR_UNIT_DMS_STR "DMS" +#define RT_SENSOR_UNIT_DD (21) /* Coordinates unit: DD */ +#define RT_SENSOR_UNIT_DD_STR "DD" +#define RT_SENSOR_UNIT_MGM3 (22) /* Concentration unit: mg/m3 */ +#define RT_SENSOR_UNIT_MGM3_STR "mg/m3" /* Sensor communication interface types */ -#define RT_SENSOR_INTF_I2C (1 << 0) -#define RT_SENSOR_INTF_SPI (1 << 1) -#define RT_SENSOR_INTF_UART (1 << 2) -#define RT_SENSOR_INTF_ONEWIRE (1 << 3) +#define RT_SENSOR_INTF_I2C (1 << 0) +#define RT_SENSOR_INTF_I2C_STR "I2C" +#define RT_SENSOR_INTF_SPI (1 << 1) +#define RT_SENSOR_INTF_SPI_STR "SPI" +#define RT_SENSOR_INTF_UART (1 << 2) +#define RT_SENSOR_INTF_UART_STR "UART" +#define RT_SENSOR_INTF_ONEWIRE (1 << 3) +#define RT_SENSOR_INTF_ONEWIRE_STR "1-Wire" /* Sensor power mode types */ -#define RT_SENSOR_POWER_NONE (0) -#define RT_SENSOR_POWER_DOWN (1) /* power down mode */ -#define RT_SENSOR_POWER_NORMAL (2) /* normal-power mode */ -#define RT_SENSOR_POWER_LOW (3) /* low-power mode */ -#define RT_SENSOR_POWER_HIGH (4) /* high-power mode */ +#define RT_SENSOR_POWER_NONE (0) +#define RT_SENSOR_POWER_NONE_STR "None" +#define RT_SENSOR_POWER_DOWN (1) /* power down mode */ +#define RT_SENSOR_POWER_DOWN_STR "Down" +#define RT_SENSOR_POWER_NORMAL (2) /* normal-power mode */ +#define RT_SENSOR_POWER_NORMAL_STR "Normal" +#define RT_SENSOR_POWER_LOW (3) /* low-power mode */ +#define RT_SENSOR_POWER_LOW_STR "Low" +#define RT_SENSOR_POWER_HIGH (4) /* high-power mode */ +#define RT_SENSOR_POWER_HIGH_STR "High" /* Sensor work mode types */ -#define RT_SENSOR_MODE_NONE (0) -#define RT_SENSOR_MODE_POLLING (1) /* One shot only read a data */ -#define RT_SENSOR_MODE_INT (2) /* TODO: One shot interrupt only read a data */ -#define RT_SENSOR_MODE_FIFO (3) /* TODO: One shot interrupt read all fifo data */ +#define RT_SENSOR_MODE_NONE (0) +#define RT_SENSOR_MODE_POLLING (1) /* One shot only read a data */ +#define RT_SENSOR_MODE_INT (2) /* TODO: One shot interrupt only read a data */ +#define RT_SENSOR_MODE_FIFO (3) /* TODO: One shot interrupt read all fifo data */ /* Sensor control cmd types */ -#define RT_SENSOR_CTRL_GET_ID (RT_DEVICE_CTRL_BASE(Sensor) + 0) /* Get device id */ -#define RT_SENSOR_CTRL_GET_INFO (RT_DEVICE_CTRL_BASE(Sensor) + 1) /* Get sensor info */ -#define RT_SENSOR_CTRL_SET_RANGE (RT_DEVICE_CTRL_BASE(Sensor) + 2) /* Set the measure range of sensor. unit is info of sensor */ -#define RT_SENSOR_CTRL_SET_ODR (RT_DEVICE_CTRL_BASE(Sensor) + 3) /* Set output date rate. unit is HZ */ -#define RT_SENSOR_CTRL_SET_MODE (RT_DEVICE_CTRL_BASE(Sensor) + 4) /* Set sensor's work mode. ex. RT_SENSOR_MODE_POLLING,RT_SENSOR_MODE_INT */ -#define RT_SENSOR_CTRL_SET_POWER (RT_DEVICE_CTRL_BASE(Sensor) + 5) /* Set power mode. args type of sensor power mode. ex. RT_SENSOR_POWER_DOWN,RT_SENSOR_POWER_NORMAL */ -#define RT_SENSOR_CTRL_SELF_TEST (RT_DEVICE_CTRL_BASE(Sensor) + 6) /* Take a self test */ +#define RT_SENSOR_CTRL_GET_ID (RT_DEVICE_CTRL_BASE(Sensor) + 0) /* Get device id */ +#define RT_SENSOR_CTRL_GET_INFO (RT_DEVICE_CTRL_BASE(Sensor) + 1) /* Get sensor info */ +#define RT_SENSOR_CTRL_SET_RANGE (RT_DEVICE_CTRL_BASE(Sensor) + 2) /* Set the measure range of sensor. unit is info of sensor */ +#define RT_SENSOR_CTRL_SET_ODR (RT_DEVICE_CTRL_BASE(Sensor) + 3) /* Set output date rate. unit is HZ */ +#define RT_SENSOR_CTRL_SET_MODE (RT_DEVICE_CTRL_BASE(Sensor) + 4) /* Set sensor's work mode. ex. RT_SENSOR_MODE_POLLING,RT_SENSOR_MODE_INT */ +#define RT_SENSOR_CTRL_SET_POWER (RT_DEVICE_CTRL_BASE(Sensor) + 5) /* Set power mode. args type of sensor power mode. ex. RT_SENSOR_POWER_DOWN,RT_SENSOR_POWER_NORMAL */ +#define RT_SENSOR_CTRL_SELF_TEST (RT_DEVICE_CTRL_BASE(Sensor) + 6) /* Take a self test */ #define RT_SENSOR_CTRL_USER_CMD_START 0x100 /* User commands should be greater than 0x100 */ @@ -162,6 +237,7 @@ struct rt_sensor_config typedef struct rt_sensor_device *rt_sensor_t; typedef struct rt_sensor_data *rt_sensor_data_t; +typedef struct rt_sensor_info *rt_sensor_info_t; struct rt_sensor_device { diff --git a/components/drivers/sensors/SConscript b/components/drivers/sensor/SConscript similarity index 100% rename from components/drivers/sensors/SConscript rename to components/drivers/sensor/SConscript diff --git a/components/drivers/sensors/sensor.c b/components/drivers/sensor/sensor.c similarity index 100% rename from components/drivers/sensors/sensor.c rename to components/drivers/sensor/sensor.c diff --git a/components/drivers/sensors/sensor_cmd.c b/components/drivers/sensor/sensor_cmd.c old mode 100755 new mode 100644 similarity index 58% rename from components/drivers/sensors/sensor_cmd.c rename to components/drivers/sensor/sensor_cmd.c index 71446c8c58..7c45c3dac1 --- a/components/drivers/sensors/sensor_cmd.c +++ b/components/drivers/sensor/sensor_cmd.c @@ -21,68 +21,216 @@ static rt_sem_t sensor_rx_sem = RT_NULL; +static const char *sensor_get_type_name(rt_sensor_info_t info) +{ + switch(info->type) + { + case RT_SENSOR_CLASS_ACCE: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_ACCE); + case RT_SENSOR_CLASS_GYRO: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_GYRO); + case RT_SENSOR_CLASS_MAG: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_MAG); + case RT_SENSOR_CLASS_TEMP: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_TEMP); + case RT_SENSOR_CLASS_HUMI: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_HUMI); + case RT_SENSOR_CLASS_BARO: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_BARO); + case RT_SENSOR_CLASS_LIGHT: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_LIGHT); + case RT_SENSOR_CLASS_PROXIMITY: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_PROXIMITY); + case RT_SENSOR_CLASS_HR: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_HR); + case RT_SENSOR_CLASS_TVOC: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_TVOC); + case RT_SENSOR_CLASS_NOISE: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_NOISE); + case RT_SENSOR_CLASS_STEP: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_STEP); + case RT_SENSOR_CLASS_FORCE: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_FORCE); + case RT_SENSOR_CLASS_DUST: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_DUST); + case RT_SENSOR_CLASS_ECO2: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_ECO2); + case RT_SENSOR_CLASS_GNSS: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_GNSS); + case RT_SENSOR_CLASS_TOF: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_TOF); + case RT_SENSOR_CLASS_SPO2: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_SPO2); + case RT_SENSOR_CLASS_IAQ: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_IAQ); + case RT_SENSOR_CLASS_ETOH: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_ETOH); + case RT_SENSOR_CLASS_BP: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_BP); + case RT_SENSOR_CLASS_NONE: + default: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_CLASS_NONE); + } +} + +static const char *sensor_get_vendor_name(rt_sensor_info_t info) +{ + switch(info->vendor) + { + case RT_SENSOR_VENDOR_STM: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_VENDOR_STM); + case RT_SENSOR_VENDOR_BOSCH: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_VENDOR_BOSCH); + case RT_SENSOR_VENDOR_INVENSENSE: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_VENDOR_INVENSENSE); + case RT_SENSOR_VENDOR_SEMTECH: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_VENDOR_SEMTECH); + case RT_SENSOR_VENDOR_GOERTEK: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_VENDOR_GOERTEK); + case RT_SENSOR_VENDOR_MIRAMEMS: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_VENDOR_MIRAMEMS); + case RT_SENSOR_VENDOR_DALLAS: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_VENDOR_DALLAS); + case RT_SENSOR_VENDOR_ASAIR: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_VENDOR_ASAIR); + case RT_SENSOR_VENDOR_SHARP: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_VENDOR_SHARP); + case RT_SENSOR_VENDOR_SENSIRION: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_VENDOR_SENSIRION); + case RT_SENSOR_VENDOR_TI: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_VENDOR_TI); + case RT_SENSOR_VENDOR_PLANTOWER: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_VENDOR_PLANTOWER); + case RT_SENSOR_VENDOR_AMS: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_VENDOR_AMS); + case RT_SENSOR_VENDOR_MAXIM: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_VENDOR_MAXIM); + case RT_SENSOR_VENDOR_MELEXIS: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_VENDOR_MELEXIS); + case RT_SENSOR_VENDOR_UNKNOWN: + default: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_VENDOR_UNKNOWN); + } +} + +static const char *sensor_get_unit_name(rt_sensor_info_t info) +{ + switch(info->unit) + { + case RT_SENSOR_UNIT_MG: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_UNIT_MG); + case RT_SENSOR_UNIT_MDPS: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_UNIT_MDPS); + case RT_SENSOR_UNIT_MGAUSS: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_UNIT_MGAUSS); + case RT_SENSOR_UNIT_LUX: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_UNIT_LUX); + case RT_SENSOR_UNIT_CM: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_UNIT_CM); + case RT_SENSOR_UNIT_MM: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_UNIT_MM); + case RT_SENSOR_UNIT_PA: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_UNIT_PA); + case RT_SENSOR_UNIT_MMHG: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_UNIT_MMHG); + case RT_SENSOR_UNIT_PERMILLAGE: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_UNIT_PERMILLAGE); + case RT_SENSOR_UNIT_PERCENTAGE: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_UNIT_PERCENTAGE); + case RT_SENSOR_UNIT_CELSIUS: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_UNIT_CELSIUS); + case RT_SENSOR_UNIT_FAHRENHEIT: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_UNIT_FAHRENHEIT); + case RT_SENSOR_UNIT_KELVIN: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_UNIT_KELVIN); + case RT_SENSOR_UNIT_HZ: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_UNIT_HZ); + case RT_SENSOR_UNIT_BPM: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_UNIT_BPM); + case RT_SENSOR_UNIT_MN: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_UNIT_MN); + case RT_SENSOR_UNIT_N: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_UNIT_N); + case RT_SENSOR_UNIT_PPM: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_UNIT_PPM); + case RT_SENSOR_UNIT_PPB: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_UNIT_PPB); + case RT_SENSOR_UNIT_DMS: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_UNIT_DMS); + case RT_SENSOR_UNIT_DD: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_UNIT_DD); + case RT_SENSOR_UNIT_MGM3: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_UNIT_MGM3); + case RT_SENSOR_UNIT_NONE: + default: + return RT_SENSOR_MACRO_GET_NAME(RT_SENSOR_UNIT_NONE); + } +} + static void sensor_show_data(rt_size_t num, rt_sensor_t sensor, struct rt_sensor_data *sensor_data) { + const char *unit_name = sensor_get_unit_name(&sensor->info); switch (sensor->info.type) { case RT_SENSOR_CLASS_ACCE: - LOG_I("num:%d, x:%f, y:%f, z:%f mg, timestamp:%u", num, sensor_data->data.acce.x, sensor_data->data.acce.y, sensor_data->data.acce.z, sensor_data->timestamp); + LOG_I("num:%d, x:%f, y:%f, z:%f %s, timestamp:%u", num, sensor_data->data.acce.x, sensor_data->data.acce.y, sensor_data->data.acce.z, unit_name, sensor_data->timestamp); break; case RT_SENSOR_CLASS_GYRO: - LOG_I("num:%d, x:%f, y:%f, z:%f dps, timestamp:%u", num, sensor_data->data.gyro.x, sensor_data->data.gyro.y, sensor_data->data.gyro.z, sensor_data->timestamp); + LOG_I("num:%d, x:%f, y:%f, z:%f %s, timestamp:%u", num, sensor_data->data.gyro.x, sensor_data->data.gyro.y, sensor_data->data.gyro.z, unit_name, sensor_data->timestamp); break; case RT_SENSOR_CLASS_MAG: - LOG_I("num:%d, x:%f, y:%f, z:%f mGauss, timestamp:%u", num, sensor_data->data.mag.x, sensor_data->data.mag.y, sensor_data->data.mag.z, sensor_data->timestamp); + LOG_I("num:%d, x:%f, y:%f, z:%f %s, timestamp:%u", num, sensor_data->data.mag.x, sensor_data->data.mag.y, sensor_data->data.mag.z, unit_name, sensor_data->timestamp); break; case RT_SENSOR_CLASS_GNSS: - LOG_I("num:%d, lon:%f, lat:%f, timestamp:%u", num, sensor_data->data.coord.longitude, sensor_data->data.coord.latitude, sensor_data->timestamp); + LOG_I("num:%d, lon:%f, lat:%f %s, timestamp:%u", num, sensor_data->data.coord.longitude, sensor_data->data.coord.latitude, unit_name, sensor_data->timestamp); break; case RT_SENSOR_CLASS_TEMP: - LOG_I("num:%d, temp:%f C, timestamp:%u", num, sensor_data->data.temp, sensor_data->timestamp); + LOG_I("num:%d, temp:%f%s, timestamp:%u", num, sensor_data->data.temp, unit_name, sensor_data->timestamp); break; case RT_SENSOR_CLASS_HUMI: - LOG_I("num:%d, humi:%f%%, timestamp:%u", num, sensor_data->data.humi, sensor_data->timestamp); + LOG_I("num:%d, humi:%f%s, timestamp:%u", num, sensor_data->data.humi, unit_name, sensor_data->timestamp); break; case RT_SENSOR_CLASS_BARO: - LOG_I("num:%d, press:%f pa, timestamp:%u", num, sensor_data->data.baro, sensor_data->timestamp); + LOG_I("num:%d, press:%f%s, timestamp:%u", num, sensor_data->data.baro, unit_name, sensor_data->timestamp); break; case RT_SENSOR_CLASS_LIGHT: - LOG_I("num:%d, light:%f lux, timestamp:%u", num, sensor_data->data.light, sensor_data->timestamp); + LOG_I("num:%d, light:%f%s, timestamp:%u", num, sensor_data->data.light, unit_name, sensor_data->timestamp); break; case RT_SENSOR_CLASS_PROXIMITY: case RT_SENSOR_CLASS_TOF: - LOG_I("num:%d, distance:%f, timestamp:%u", num, sensor_data->data.proximity, sensor_data->timestamp); + LOG_I("num:%d, distance:%f%s, timestamp:%u", num, sensor_data->data.proximity, unit_name, sensor_data->timestamp); break; case RT_SENSOR_CLASS_HR: - LOG_I("num:%d, heart rate:%f bpm, timestamp:%u", num, sensor_data->data.hr, sensor_data->timestamp); + LOG_I("num:%d, heart rate:%f%s, timestamp:%u", num, sensor_data->data.hr, unit_name, sensor_data->timestamp); break; case RT_SENSOR_CLASS_TVOC: - LOG_I("num:%d, tvoc:%f ppb, timestamp:%u", num, sensor_data->data.tvoc, sensor_data->timestamp); + LOG_I("num:%d, tvoc:%f%s, timestamp:%u", num, sensor_data->data.tvoc, unit_name, sensor_data->timestamp); break; case RT_SENSOR_CLASS_NOISE: - LOG_I("num:%d, noise:%f, timestamp:%u", num, sensor_data->data.noise, sensor_data->timestamp); + LOG_I("num:%d, noise:%f%s, timestamp:%u", num, sensor_data->data.noise, unit_name, sensor_data->timestamp); break; case RT_SENSOR_CLASS_STEP: - LOG_I("num:%d, step:%f, timestamp:%u", num, sensor_data->data.step, sensor_data->timestamp); + LOG_I("num:%d, step:%f%s, timestamp:%u", num, sensor_data->data.step, unit_name, sensor_data->timestamp); break; case RT_SENSOR_CLASS_FORCE: - LOG_I("num:%d, force:%f, timestamp:%u", num, sensor_data->data.force, sensor_data->timestamp); + LOG_I("num:%d, force:%f%s, timestamp:%u", num, sensor_data->data.force, unit_name, sensor_data->timestamp); break; case RT_SENSOR_CLASS_DUST: - LOG_I("num:%d, dust:%f ug/m3, timestamp:%u", num, sensor_data->data.dust, sensor_data->timestamp); + LOG_I("num:%d, dust:%f%s, timestamp:%u", num, sensor_data->data.dust, unit_name, sensor_data->timestamp); break; case RT_SENSOR_CLASS_ECO2: - LOG_I("num:%d, eco2:%f ppm, timestamp:%u", num, sensor_data->data.eco2, sensor_data->timestamp); + LOG_I("num:%d, eco2:%f%s, timestamp:%u", num, sensor_data->data.eco2, unit_name, sensor_data->timestamp); break; case RT_SENSOR_CLASS_IAQ: - LOG_I("num:%d, IAQ:%f, timestamp:%u", num, sensor_data->data.iaq, sensor_data->timestamp); + LOG_I("num:%d, IAQ:%f%s, timestamp:%u", num, sensor_data->data.iaq, unit_name, sensor_data->timestamp); break; case RT_SENSOR_CLASS_ETOH: - LOG_I("num:%d, EtOH:%f ppm, timestamp:%u", num, sensor_data->data.etoh, sensor_data->timestamp); + LOG_I("num:%d, EtOH:%f%s, timestamp:%u", num, sensor_data->data.etoh, unit_name, sensor_data->timestamp); break; case RT_SENSOR_CLASS_BP: - LOG_I("num:%d, bp.sbp:%f mmHg, bp.dbp:%f mmHg, timestamp:%u", num, sensor_data->data.bp.sbp, sensor_data->data.bp.dbp, sensor_data->timestamp); + LOG_I("num:%d, bp.sbp:%f, bp.dbp:%f %s, timestamp:%u", num, sensor_data->data.bp.sbp, sensor_data->data.bp.dbp, unit_name, sensor_data->timestamp); break; + case RT_SENSOR_CLASS_NONE: default: LOG_E("Unknown type of sensor!"); break; @@ -313,112 +461,10 @@ static void sensor(int argc, char **argv) return ; } rt_device_control(dev, RT_SENSOR_CTRL_GET_INFO, &info); - switch (info.vendor) - { - case RT_SENSOR_VENDOR_UNKNOWN: - rt_kprintf("vendor :unknown vendor\n"); - break; - case RT_SENSOR_VENDOR_STM: - rt_kprintf("vendor :STMicroelectronics\n"); - break; - case RT_SENSOR_VENDOR_BOSCH: - rt_kprintf("vendor :Bosch\n"); - break; - case RT_SENSOR_VENDOR_INVENSENSE: - rt_kprintf("vendor :Invensense\n"); - break; - case RT_SENSOR_VENDOR_SEMTECH: - rt_kprintf("vendor :Semtech\n"); - break; - case RT_SENSOR_VENDOR_GOERTEK: - rt_kprintf("vendor :Goertek\n"); - break; - case RT_SENSOR_VENDOR_MIRAMEMS: - rt_kprintf("vendor :MiraMEMS\n"); - break; - case RT_SENSOR_VENDOR_DALLAS: - rt_kprintf("vendor :Dallas\n"); - break; - case RT_SENSOR_VENDOR_ASAIR: - rt_kprintf("vendor :Asair\n"); - break; - case RT_SENSOR_VENDOR_SHARP: - rt_kprintf("vendor :Sharp\n"); - break; - case RT_SENSOR_VENDOR_SENSIRION: - rt_kprintf("vendor :Sensirion\n"); - break; - case RT_SENSOR_VENDOR_TI: - rt_kprintf("vendor :Texas Instruments\n"); - break; - case RT_SENSOR_VENDOR_PLANTOWER: - rt_kprintf("vendor :Plantower\n"); - break; - case RT_SENSOR_VENDOR_AMS: - rt_kprintf("vendor :AMS\n"); - break; - case RT_SENSOR_VENDOR_MAXIM: - rt_kprintf("vendor :Maxim Integrated\n"); - break; - case RT_SENSOR_VENDOR_MELEXIS: - rt_kprintf("vendor :Melexis\n"); - break; - } rt_kprintf("model :%s\n", info.model); - switch (info.unit) - { - case RT_SENSOR_UNIT_NONE: - rt_kprintf("unit :none\n"); - break; - case RT_SENSOR_UNIT_MG: - rt_kprintf("unit :mG\n"); - break; - case RT_SENSOR_UNIT_MDPS: - rt_kprintf("unit :mdps\n"); - break; - case RT_SENSOR_UNIT_MGAUSS: - rt_kprintf("unit :mGauss\n"); - break; - case RT_SENSOR_UNIT_LUX: - rt_kprintf("unit :lux\n"); - break; - case RT_SENSOR_UNIT_CM: - rt_kprintf("unit :cm\n"); - break; - case RT_SENSOR_UNIT_PA: - rt_kprintf("unit :pa\n"); - break; - case RT_SENSOR_UNIT_PERMILLAGE: - rt_kprintf("unit :permillage\n"); - break; - case RT_SENSOR_UNIT_DCELSIUS: - rt_kprintf("unit :Celsius\n"); - break; - case RT_SENSOR_UNIT_HZ: - rt_kprintf("unit :HZ\n"); - break; - case RT_SENSOR_UNIT_ONE: - rt_kprintf("unit :1\n"); - break; - case RT_SENSOR_UNIT_BPM: - rt_kprintf("unit :bpm\n"); - break; - case RT_SENSOR_UNIT_MM: - rt_kprintf("unit :mm\n"); - break; - 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; - case RT_SENSOR_UNIT_MMHG: - rt_kprintf("unit :mmHg\n"); - break; - } + rt_kprintf("type: :%s\n", sensor_get_type_name(&info)); + rt_kprintf("vendor :%s\n", sensor_get_vendor_name(&info)); + rt_kprintf("unit :%s\n", sensor_get_unit_name(&info)); rt_kprintf("range_max :%d\n", info.range_max); rt_kprintf("range_min :%d\n", info.range_min); rt_kprintf("period_min:%dms\n", info.period_min);