michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: sensor: Fix some code style issues

Browse source 
Signed-off-by: Yongfa Zhou <yongfa.zhou@intel.com>
This commit is contained in:
Yongfa Zhou 2017-11-24 21:50:13 +08:00 • committed by Anas Nashif
commit ce6f6f4985
5 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/sensor/CMakeLists.txt
View file

@ -27,12 +27,12 @@ add_subdirectory_ifdef(CONFIG_MAX30101 max30101)
add_subdirectory_ifdef(CONFIG_MAX44009 max44009) add_subdirectory_ifdef(CONFIG_MAX44009 max44009)
add_subdirectory_ifdef(CONFIG_MCP9808 mcp9808) add_subdirectory_ifdef(CONFIG_MCP9808 mcp9808)
add_subdirectory_ifdef(CONFIG_MPU6050 mpu6050) add_subdirectory_ifdef(CONFIG_MPU6050 mpu6050)
add_subdirectory_ifdef(CONFIG_PMS7003 pms7003)
add_subdirectory_ifdef(CONFIG_TEMP_NRF5 nrf5) add_subdirectory_ifdef(CONFIG_TEMP_NRF5 nrf5)
add_subdirectory_ifdef(CONFIG_SHT3XD sht3xd) add_subdirectory_ifdef(CONFIG_SHT3XD sht3xd)
add_subdirectory_ifdef(CONFIG_SX9500 sx9500) add_subdirectory_ifdef(CONFIG_SX9500 sx9500)
add_subdirectory_ifdef(CONFIG_TH02 th02) add_subdirectory_ifdef(CONFIG_TH02 th02)
add_subdirectory_ifdef(CONFIG_TMP007 tmp007) add_subdirectory_ifdef(CONFIG_TMP007 tmp007)
add_subdirectory_ifdef(CONFIG_TMP112 tmp112) add_subdirectory_ifdef(CONFIG_TMP112 tmp112)
add_subdirectory_ifdef(CONFIG_PMS7003 pms7003)
zephyr_sources_ifdef(CONFIG_USERSPACE sensor_handlers.c) zephyr_sources_ifdef(CONFIG_USERSPACE sensor_handlers.c)

4
drivers/sensor/Kconfig
View file

@ -100,6 +100,8 @@ source "drivers/sensor/mpu6050/Kconfig"
source "drivers/sensor/nrf5/Kconfig" source "drivers/sensor/nrf5/Kconfig"
source "drivers/sensor/pms7003/Kconfig"
source "drivers/sensor/sht3xd/Kconfig" source "drivers/sensor/sht3xd/Kconfig"
source "drivers/sensor/sx9500/Kconfig" source "drivers/sensor/sx9500/Kconfig"
@ -110,6 +112,4 @@ source "drivers/sensor/tmp007/Kconfig"
source "drivers/sensor/tmp112/Kconfig" source "drivers/sensor/tmp112/Kconfig"
source "drivers/sensor/pms7003/Kconfig"
endif # SENSOR endif # SENSOR

6
drivers/sensor/pms7003/Kconfig
View file

@ -1,4 +1,4 @@
# Kconfig - PMS7003 PM2.5 sensor configuration options # Kconfig - PMS7003 particulate matter sensor configuration options
# #
# Copyright (c) 2017 Intel Corporation # Copyright (c) 2017 Intel Corporation
@ -7,11 +7,11 @@
# #
menuconfig PMS7003 menuconfig PMS7003
bool "PMS7003 PM2.5 sensor" bool "PMS7003 particulate matter sensor"
depends on SERIAL depends on SERIAL
default n default n
help help
Enable driver for pms7003 PM2.5 sensor. Enable driver for pms7003 particulate matter sensor.
config PMS7003_UART_DEVICE config PMS7003_UART_DEVICE
string "UART device" string "UART device"

18
drivers/sensor/pms7003/pms7003.c
View file

@ -42,13 +42,13 @@ struct pms7003_data {
* @param timeout the timeout in milliseconds * @param timeout the timeout in milliseconds
* @return 0 if success; -ETIME if timeout * @return 0 if success; -ETIME if timeout
*/ */
int uart_wait_for(struct device *dev, uint8_t *data, int len, int timeout) static int uart_wait_for(struct device *dev, u8_t *data, int len, int timeout)
{ {
int matched_size = 0; int matched_size = 0;
s64_t timeout_time = k_uptime_get() + K_MSEC(timeout); s64_t timeout_time = k_uptime_get() + K_MSEC(timeout);
while (1) { while (1) {
unsigned char c; u8_t c;
if (k_uptime_get() > timeout_time) { if (k_uptime_get() > timeout_time) {
return -ETIME; return -ETIME;
@ -79,13 +79,13 @@ int uart_wait_for(struct device *dev, uint8_t *data, int len, int timeout)
* @param timeout the timeout in milliseconds * @param timeout the timeout in milliseconds
* @return 0 if success; -ETIME if timeout * @return 0 if success; -ETIME if timeout
*/ */
int uart_read_bytes(struct device *dev, uint8_t *data, int len, int timeout) static int uart_read_bytes(struct device *dev, u8_t *data, int len, int timeout)
{ {
int read_size = 0; int read_size = 0;
s64_t timeout_time = k_uptime_get() + K_MSEC(timeout); s64_t timeout_time = k_uptime_get() + K_MSEC(timeout);
while (1) { while (1) {
unsigned char c; u8_t c;
if (k_uptime_get() > timeout_time) { if (k_uptime_get() > timeout_time) {
return -ETIME; return -ETIME;
@ -110,8 +110,8 @@ static int pms7003_sample_fetch(struct device *dev, enum sensor_channel chan)
* 00 4E 00 03 00 00 00 00 00 00 71 00 02 06 * 00 4E 00 03 00 00 00 00 00 00 71 00 02 06
*/ */
unsigned char pms7003_start_bytes[] = {0x42, 0x4d}; u8_t pms7003_start_bytes[] = {0x42, 0x4d};
unsigned char pms7003_receive_buffer[30]; u8_t pms7003_receive_buffer[30];
if (uart_wait_for(drv_data->uart_dev, pms7003_start_bytes, if (uart_wait_for(drv_data->uart_dev, pms7003_start_bytes,
sizeof(pms7003_start_bytes), sizeof(pms7003_start_bytes),
@ -126,11 +126,11 @@ static int pms7003_sample_fetch(struct device *dev, enum sensor_channel chan)
} }
drv_data->pm_1_0 = drv_data->pm_1_0 =
pms7003_receive_buffer[8] * 0xff + pms7003_receive_buffer[9]; (pms7003_receive_buffer[8] << 8) + pms7003_receive_buffer[9];
drv_data->pm_2_5 = drv_data->pm_2_5 =
pms7003_receive_buffer[10] * 0xff + pms7003_receive_buffer[11]; (pms7003_receive_buffer[10] << 8) + pms7003_receive_buffer[11];
drv_data->pm_10 = drv_data->pm_10 =
pms7003_receive_buffer[12] * 0xff + pms7003_receive_buffer[13]; (pms7003_receive_buffer[12] << 8) + pms7003_receive_buffer[13];
SYS_LOG_DBG("pm1.0 = %d", drv_data->pm_1_0); SYS_LOG_DBG("pm1.0 = %d", drv_data->pm_1_0);
SYS_LOG_DBG("pm2.5 = %d", drv_data->pm_2_5); SYS_LOG_DBG("pm2.5 = %d", drv_data->pm_2_5);

6
include/sensor.h
View file

@ -113,11 +113,11 @@ enum sensor_channel {
/** Altitude, in meters */ /** Altitude, in meters */
SENSOR_CHAN_ALTITUDE, SENSOR_CHAN_ALTITUDE,
/** 1.0 micro-meters Particulate Matter, in ug/m3 */ /** 1.0 micro-meters Particulate Matter, in ug/m^3 */
SENSOR_CHAN_PM_1_0, SENSOR_CHAN_PM_1_0,
/** 2.5 micro-meters Particulate Matter, in ug/m3 */ /** 2.5 micro-meters Particulate Matter, in ug/m^3 */
SENSOR_CHAN_PM_2_5, SENSOR_CHAN_PM_2_5,
/** 10 micro-meters Particulate Matter, in ug/m3 */ /** 10 micro-meters Particulate Matter, in ug/m^3 */
SENSOR_CHAN_PM_10, SENSOR_CHAN_PM_10,
/** All channels. */ /** All channels. */
SENSOR_CHAN_ALL, SENSOR_CHAN_ALL,