From c495d5a2473596f632a51edfdc0fa029759d7f99 Mon Sep 17 00:00:00 2001 From: SimpleInit <63694297@qq.com> Date: Tue, 20 Oct 2020 20:29:06 +0800 Subject: [PATCH] 1.Add sensor vendor MAXIM. 2.Fix: When printing sub-zero temperature, "-" is displayed after ".". Signed-off-by: SimpleInit <63694297@qq.com> --- components/drivers/sensors/sensor.h | 1 + components/drivers/sensors/sensor_cmd.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/components/drivers/sensors/sensor.h b/components/drivers/sensors/sensor.h index 99cf073dd0..5a069edc25 100755 --- a/components/drivers/sensors/sensor.h +++ b/components/drivers/sensors/sensor.h @@ -65,6 +65,7 @@ extern "C" { #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 */ /* Sensor unit types */ diff --git a/components/drivers/sensors/sensor_cmd.c b/components/drivers/sensors/sensor_cmd.c index 70e08f601a..284db75cf6 100755 --- a/components/drivers/sensors/sensor_cmd.c +++ b/components/drivers/sensors/sensor_cmd.c @@ -38,7 +38,7 @@ static void sensor_show_data(rt_size_t num, rt_sensor_t sensor, struct rt_sensor LOG_I("num:%3d, lon:%5d, lat:%5d, timestamp:%5d", num, sensor_data->data.coord.longitude, sensor_data->data.coord.latitude, sensor_data->timestamp); break; case RT_SENSOR_CLASS_TEMP: - LOG_I("num:%3d, temp:%3d.%d C, timestamp:%5d", num, sensor_data->data.temp / 10, sensor_data->data.temp % 10, sensor_data->timestamp); + LOG_I("num:%3d, temp:%3d.%d C, timestamp:%5d", num, sensor_data->data.temp / 10, (rt_uint32_t)sensor_data->data.temp % 10, sensor_data->timestamp); break; case RT_SENSOR_CLASS_HUMI: LOG_I("num:%3d, humi:%3d.%d%%, timestamp:%5d", num, sensor_data->data.humi / 10, sensor_data->data.humi % 10, sensor_data->timestamp); @@ -345,6 +345,9 @@ static void sensor(int argc, char **argv) case RT_SENSOR_VENDOR_AMS: rt_kprintf("vendor :AMS\n"); break; + case RT_SENSOR_VENDOR_MAXIM: + rt_kprintf("vendor :Maxim Integrated\n"); + break; } rt_kprintf("model :%s\n", info.model); switch (info.unit)