diff --git a/drivers/sensor/Kconfig b/drivers/sensor/Kconfig index edd6c085528..95ef3cb2763 100644 --- a/drivers/sensor/Kconfig +++ b/drivers/sensor/Kconfig @@ -13,19 +13,9 @@ menuconfig SENSOR if SENSOR -config SYS_LOG_SENSOR_LEVEL - int "Sensor Log level" - depends on SYS_LOG - default 0 - range 0 4 - help - Sets log level for Sensor Device Drivers. - Levels are: - 0 OFF, do not write - 1 ERROR, only write SYS_LOG_ERR - 2 WARNING, write SYS_LOG_WRN in addition to previous level - 3 INFO, write SYS_LOG_INF in addition to previous levels - 4 DEBUG, write SYS_LOG_DBG in addition to previous levels +module = SENSOR +module-str = sensor +source "subsys/logging/Kconfig.template.log_config" config SENSOR_INIT_PRIORITY int "Sensor init priority" diff --git a/drivers/sensor/adt7420/adt7420.c b/drivers/sensor/adt7420/adt7420.c index a666287ce1a..46d5e4cb94b 100644 --- a/drivers/sensor/adt7420/adt7420.c +++ b/drivers/sensor/adt7420/adt7420.c @@ -11,8 +11,13 @@ #include #include #include + #include "adt7420.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_REGISTER(ADT7420); + static int adt7420_temp_reg_read(struct device *dev, u8_t reg, s16_t *val) { struct adt7420_data *drv_data = dev->driver_data; @@ -71,7 +76,7 @@ static int adt7420_attr_set(struct device *dev, ADT7420_REG_CONFIG, ADT7420_CONFIG_OP_MODE(~0), ADT7420_CONFIG_OP_MODE(val8)) < 0) { - SYS_LOG_DBG("Failed to set attribute!"); + LOG_DBG("Failed to set attribute!"); return -EIO; } @@ -92,7 +97,7 @@ static int adt7420_attr_set(struct device *dev, value = (value / ADT7420_TEMP_SCALE) << 1; if (adt7420_temp_reg_write(dev, reg, value) < 0) { - SYS_LOG_DBG("Failed to set attribute!"); + LOG_DBG("Failed to set attribute!"); return -EIO; } @@ -185,7 +190,7 @@ static int adt7420_probe(struct device *dev) #ifdef CONFIG_ADT7420_TRIGGER if (adt7420_init_interrupt(dev) < 0) { - SYS_LOG_ERR("Failed to initialize interrupt!"); + LOG_ERR("Failed to initialize interrupt!"); return -EIO; } #endif @@ -200,7 +205,7 @@ static int adt7420_init(struct device *dev) drv_data->i2c = device_get_binding(cfg->i2c_port); if (drv_data->i2c == NULL) { - SYS_LOG_DBG("Failed to get pointer to %s device!", + LOG_DBG("Failed to get pointer to %s device!", cfg->i2c_port); return -EINVAL; } diff --git a/drivers/sensor/adt7420/adt7420.h b/drivers/sensor/adt7420/adt7420.h index d31f6c78927..ed1e02ac699 100644 --- a/drivers/sensor/adt7420/adt7420.h +++ b/drivers/sensor/adt7420/adt7420.h @@ -97,8 +97,5 @@ int adt7420_trigger_set(struct device *dev, int adt7420_init_interrupt(struct device *dev); #endif /* CONFIG_ADT7420_TRIGGER */ -#define SYS_LOG_DOMAIN "ADT7420" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include #endif /* ZEPHYR_DRIVERS_SENSOR_ADT7420_ADT7420_H_ */ diff --git a/drivers/sensor/adt7420/adt7420_trigger.c b/drivers/sensor/adt7420/adt7420_trigger.c index f24f251d563..96999d10412 100644 --- a/drivers/sensor/adt7420/adt7420_trigger.c +++ b/drivers/sensor/adt7420/adt7420_trigger.c @@ -10,8 +10,13 @@ #include #include #include + #include "adt7420.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_DECLARE(ADT7420); + static void adt7420_thread_cb(void *arg) { struct device *dev = arg; @@ -84,7 +89,7 @@ int adt7420_trigger_set(struct device *dev, drv_data->th_handler = handler; drv_data->th_trigger = *trig; } else { - SYS_LOG_ERR("Unsupported sensor trigger"); + LOG_ERR("Unsupported sensor trigger"); return -ENOTSUP; } @@ -100,7 +105,7 @@ int adt7420_init_interrupt(struct device *dev) drv_data->gpio = device_get_binding(cfg->gpio_port); if (drv_data->gpio == NULL) { - SYS_LOG_DBG("Failed to get pointer to %s device!", + LOG_DBG("Failed to get pointer to %s device!", cfg->gpio_port); return -EINVAL; } @@ -114,7 +119,7 @@ int adt7420_init_interrupt(struct device *dev) BIT(cfg->int_gpio)); if (gpio_add_callback(drv_data->gpio, &drv_data->gpio_cb) < 0) { - SYS_LOG_DBG("Failed to set gpio callback!"); + LOG_DBG("Failed to set gpio callback!"); return -EIO; } diff --git a/drivers/sensor/adxl362/adxl362.c b/drivers/sensor/adxl362/adxl362.c index dbf5e945cb4..f4442de2189 100644 --- a/drivers/sensor/adxl362/adxl362.c +++ b/drivers/sensor/adxl362/adxl362.c @@ -14,9 +14,12 @@ #include #include #include +#include #include "adxl362.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(ADXL362); static struct adxl362_data adxl362_data; @@ -213,7 +216,7 @@ static int axl362_acc_config(struct device *dev, enum sensor_channel chan, range_reg = adxl362_range_to_reg_val(sensor_ms2_to_g(val)); if (range_reg < 0) { - SYS_LOG_DBG("invalid range requested."); + LOG_DBG("invalid range requested."); return -ENOTSUP; } @@ -229,7 +232,7 @@ static int axl362_acc_config(struct device *dev, enum sensor_channel chan, out_rate = adxl362_freq_to_odr_val(val->val1, val->val2 / 1000); if (out_rate < 0) { - SYS_LOG_DBG("invalid output rate."); + LOG_DBG("invalid output rate."); return -ENOTSUP; } @@ -238,7 +241,7 @@ static int axl362_acc_config(struct device *dev, enum sensor_channel chan, break; #endif default: - SYS_LOG_DBG("Accel attribute not supported."); + LOG_DBG("Accel attribute not supported."); return -ENOTSUP; } @@ -256,7 +259,7 @@ static int adxl362_attr_set(struct device *dev, enum sensor_channel chan, return axl362_acc_config(dev, chan, attr, val); default: - SYS_LOG_DBG("attr_set() not supported on this channel."); + LOG_DBG("attr_set() not supported on this channel."); return -ENOTSUP; } @@ -573,7 +576,7 @@ static int adxl362_init(struct device *dev) data->spi = device_get_binding(CONFIG_ADXL362_SPI_DEV_NAME); if (!data->spi) { - SYS_LOG_DBG("spi device not found: %s", + LOG_DBG("spi device not found: %s", CONFIG_ADXL362_SPI_DEV_NAME); return -EINVAL; } diff --git a/drivers/sensor/adxl362/adxl362.h b/drivers/sensor/adxl362/adxl362.h index db4e0a02d78..0621423d4bc 100644 --- a/drivers/sensor/adxl362/adxl362.h +++ b/drivers/sensor/adxl362/adxl362.h @@ -188,7 +188,4 @@ struct adxl362_data { # define ADXL362_DEFAULT_ODR_ACC ADXL362_ODR_400_HZ #endif -#define SYS_LOG_DOMAIN "ADXL362" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include #endif /* ZEPHYR_DRIVERS_SENSOR_ADXL362_ADXL362_H_ */ diff --git a/drivers/sensor/adxl372/adxl372.c b/drivers/sensor/adxl372/adxl372.c index be858429a4a..25ae8ec6f3b 100644 --- a/drivers/sensor/adxl372/adxl372.c +++ b/drivers/sensor/adxl372/adxl372.c @@ -14,9 +14,13 @@ #include #include #include +#include #include "adxl372.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(ADXL372); + static int adxl372_bus_access(struct device *dev, u8_t reg, void *data, size_t length) { @@ -115,7 +119,7 @@ static int adxl372_reg_write(struct device *dev, u8_t reg_addr, u8_t reg_data) { - SYS_LOG_DBG("[0x%X] = 0x%X", reg_addr, reg_data); + LOG_DBG("[0x%X] = 0x%X", reg_addr, reg_data); return adxl372_bus_access(dev, ADXL372_REG_WRITE(reg_addr), ®_data, 1); @@ -664,7 +668,7 @@ static int adxl372_attr_set_thresh(struct device *dev, enum sensor_channel chan, case SENSOR_CHAN_ACCEL_XYZ: return adxl372_set_activity_threshold_xyz(dev, reg, &threshold); default: - SYS_LOG_ERR("attr_set() not supported on this channel"); + LOG_ERR("attr_set() not supported on this channel"); return -ENOTSUP; } } @@ -759,7 +763,7 @@ static int adxl372_probe(struct device *dev) } if (dev_id != ADXL372_DEVID_VAL || part_id != ADXL372_PARTID_VAL) { - SYS_LOG_ERR("failed to read id (0x%X:0x%X)", dev_id, part_id); + LOG_ERR("failed to read id (0x%X:0x%X)", dev_id, part_id); return -ENODEV; } @@ -770,7 +774,7 @@ static int adxl372_probe(struct device *dev) */ adxl372_reg_read(dev, ADXL372_REVID, &dev_id); if (dev_id < 3) { - SYS_LOG_WRN("The ADXL372 Rev %u only supports point to point I2C communication!", + LOG_WRN("The ADXL372 Rev %u only supports point to point I2C communication!", dev_id); } #endif @@ -852,7 +856,7 @@ static int adxl372_probe(struct device *dev) #ifdef CONFIG_ADXL372_TRIGGER if (adxl372_init_interrupt(dev) < 0) { - SYS_LOG_ERR("Failed to initialize interrupt!"); + LOG_ERR("Failed to initialize interrupt!"); return -EIO; } #endif @@ -878,7 +882,7 @@ static int adxl372_init(struct device *dev) #ifdef CONFIG_ADXL372_I2C data->bus = device_get_binding(cfg->i2c_port); if (data->bus == NULL) { - SYS_LOG_ERR("Failed to get pointer to %s device!", + LOG_ERR("Failed to get pointer to %s device!", cfg->i2c_port); return -EINVAL; } @@ -886,7 +890,7 @@ static int adxl372_init(struct device *dev) #ifdef CONFIG_ADXL372_SPI data->bus = device_get_binding(cfg->spi_port); if (!data->bus) { - SYS_LOG_ERR("spi device not found: %s", cfg->spi_port); + LOG_ERR("spi device not found: %s", cfg->spi_port); return -EINVAL; } /* CPOL=0, CPHA=0, max 10MHz */ @@ -899,7 +903,7 @@ static int adxl372_init(struct device *dev) data->adxl372_cs_ctrl.gpio_dev = device_get_binding(cfg->gpio_cs_port); if (!data->adxl372_cs_ctrl.gpio_dev) { - SYS_LOG_ERR("Unable to get GPIO SPI CS device"); + LOG_ERR("Unable to get GPIO SPI CS device"); return -ENODEV; } diff --git a/drivers/sensor/adxl372/adxl372.h b/drivers/sensor/adxl372/adxl372.h index 668619d918b..93d1ef19d04 100644 --- a/drivers/sensor/adxl372/adxl372.h +++ b/drivers/sensor/adxl372/adxl372.h @@ -368,7 +368,4 @@ int adxl372_trigger_set(struct device *dev, int adxl372_init_interrupt(struct device *dev); #endif /* CONFIG_ADT7420_TRIGGER */ -#define SYS_LOG_DOMAIN "ADXL372" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include #endif /* ZEPHYR_DRIVERS_SENSOR_ADXL372_ADXL372_H_ */ diff --git a/drivers/sensor/adxl372/adxl372_trigger.c b/drivers/sensor/adxl372/adxl372_trigger.c index e084e5d6a24..556ca99d6dd 100644 --- a/drivers/sensor/adxl372/adxl372_trigger.c +++ b/drivers/sensor/adxl372/adxl372_trigger.c @@ -11,6 +11,10 @@ #include #include "adxl372.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_DECLARE(ADXL372); + static void adxl372_thread_cb(void *arg) { struct device *dev = arg; @@ -109,7 +113,7 @@ int adxl372_trigger_set(struct device *dev, int_mask = ADXL372_INT1_MAP_DATA_RDY_MSK; break; default: - SYS_LOG_ERR("Unsupported sensor trigger"); + LOG_ERR("Unsupported sensor trigger"); ret = -ENOTSUP; goto out; } @@ -136,7 +140,7 @@ int adxl372_init_interrupt(struct device *dev) drv_data->gpio = device_get_binding(cfg->gpio_port); if (drv_data->gpio == NULL) { - SYS_LOG_ERR("Failed to get pointer to %s device!", + LOG_ERR("Failed to get pointer to %s device!", cfg->gpio_port); return -EINVAL; } @@ -150,7 +154,7 @@ int adxl372_init_interrupt(struct device *dev) BIT(cfg->int_gpio)); if (gpio_add_callback(drv_data->gpio, &drv_data->gpio_cb) < 0) { - SYS_LOG_ERR("Failed to set gpio callback!"); + LOG_ERR("Failed to set gpio callback!"); return -EIO; } diff --git a/drivers/sensor/ak8975/ak8975.c b/drivers/sensor/ak8975/ak8975.c index abac809522e..4d3eb3ddf08 100644 --- a/drivers/sensor/ak8975/ak8975.c +++ b/drivers/sensor/ak8975/ak8975.c @@ -11,9 +11,13 @@ #include #include #include +#include #include "ak8975.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(AK8975); + static int ak8975_sample_fetch(struct device *dev, enum sensor_channel chan) { struct ak8975_data *drv_data = dev->driver_data; @@ -23,7 +27,7 @@ static int ak8975_sample_fetch(struct device *dev, enum sensor_channel chan) if (i2c_reg_write_byte(drv_data->i2c, CONFIG_AK8975_I2C_ADDR, AK8975_REG_CNTL, AK8975_MODE_MEASURE) < 0) { - SYS_LOG_ERR("Failed to start measurement."); + LOG_ERR("Failed to start measurement."); return -EIO; } @@ -31,7 +35,7 @@ static int ak8975_sample_fetch(struct device *dev, enum sensor_channel chan) if (i2c_burst_read(drv_data->i2c, CONFIG_AK8975_I2C_ADDR, AK8975_REG_DATA_START, buf, 6) < 0) { - SYS_LOG_ERR("Failed to read sample data."); + LOG_ERR("Failed to read sample data."); return -EIO; } @@ -90,13 +94,13 @@ static int ak8975_read_adjustment_data(struct ak8975_data *drv_data) if (i2c_reg_write_byte(drv_data->i2c, CONFIG_AK8975_I2C_ADDR, AK8975_REG_CNTL, AK8975_MODE_FUSE_ACCESS) < 0) { - SYS_LOG_ERR("Failed to set chip in fuse access mode."); + LOG_ERR("Failed to set chip in fuse access mode."); return -EIO; } if (i2c_burst_read(drv_data->i2c, CONFIG_AK8975_I2C_ADDR, AK8975_REG_ADJ_DATA_START, buf, 3) < 0) { - SYS_LOG_ERR("Failed to read adjustment data."); + LOG_ERR("Failed to read adjustment data."); return -EIO; } @@ -114,7 +118,7 @@ int ak8975_init(struct device *dev) drv_data->i2c = device_get_binding(CONFIG_AK8975_I2C_MASTER_DEV_NAME); if (drv_data->i2c == NULL) { - SYS_LOG_ERR("Failed to get pointer to %s device!", + LOG_ERR("Failed to get pointer to %s device!", CONFIG_AK8975_I2C_MASTER_DEV_NAME); return -EINVAL; } @@ -124,7 +128,7 @@ int ak8975_init(struct device *dev) if (i2c_reg_update_byte(drv_data->i2c, MPU9150_I2C_ADDR, MPU9150_REG_PWR_MGMT1, MPU9150_SLEEP_EN, 0) < 0) { - SYS_LOG_ERR("Failed to wake up MPU9150 chip."); + LOG_ERR("Failed to wake up MPU9150 chip."); return -EIO; } @@ -132,7 +136,7 @@ int ak8975_init(struct device *dev) if (i2c_reg_update_byte(drv_data->i2c, MPU9150_I2C_ADDR, MPU9150_REG_BYPASS_CFG, MPU9150_I2C_BYPASS_EN, MPU9150_I2C_BYPASS_EN) < 0) { - SYS_LOG_ERR("Failed to enable pass-through mode for MPU9150."); + LOG_ERR("Failed to enable pass-through mode for MPU9150."); return -EIO; } #endif @@ -140,12 +144,12 @@ int ak8975_init(struct device *dev) /* check chip ID */ if (i2c_reg_read_byte(drv_data->i2c, CONFIG_AK8975_I2C_ADDR, AK8975_REG_CHIP_ID, &id) < 0) { - SYS_LOG_ERR("Failed to read chip ID."); + LOG_ERR("Failed to read chip ID."); return -EIO; } if (id != AK8975_CHIP_ID) { - SYS_LOG_ERR("Invalid chip ID."); + LOG_ERR("Invalid chip ID."); return -EINVAL; } diff --git a/drivers/sensor/ak8975/ak8975.h b/drivers/sensor/ak8975/ak8975.h index 61dc86c56ce..281330ec6c1 100644 --- a/drivers/sensor/ak8975/ak8975.h +++ b/drivers/sensor/ak8975/ak8975.h @@ -9,10 +9,6 @@ #include -#define SYS_LOG_DOMAIN "AK8975" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include - #define AK8975_REG_CHIP_ID 0x00 #define AK8975_CHIP_ID 0x48 diff --git a/drivers/sensor/amg88xx/amg88xx.c b/drivers/sensor/amg88xx/amg88xx.c index 300690ca156..9bee22260dc 100644 --- a/drivers/sensor/amg88xx/amg88xx.c +++ b/drivers/sensor/amg88xx/amg88xx.c @@ -13,9 +13,13 @@ #include #include #include +#include #include "amg88xx.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(AMG88XX); + static int amg88xx_sample_fetch(struct device *dev, enum sensor_channel chan) { struct amg88xx_data *drv_data = dev->driver_data; @@ -63,11 +67,11 @@ static int amg88xx_init_device(struct device *dev) u8_t tmp; if (amg88xx_reg_read(drv_data, AMG88XX_PCLT, &tmp)) { - SYS_LOG_ERR("Failed to read Power mode"); + LOG_ERR("Failed to read Power mode"); return -EIO; } - SYS_LOG_DBG("Power mode 0x%02x", tmp); + LOG_DBG("Power mode 0x%02x", tmp); if (tmp != AMG88XX_PCLT_NORMAL_MODE) { if (amg88xx_reg_write(drv_data, AMG88XX_PCLT, AMG88XX_PCLT_NORMAL_MODE)) { @@ -87,7 +91,7 @@ static int amg88xx_init_device(struct device *dev) return -EIO; } - SYS_LOG_DBG(""); + LOG_DBG(""); return 0; } @@ -98,20 +102,20 @@ int amg88xx_init(struct device *dev) drv_data->i2c = device_get_binding(CONFIG_AMG88XX_I2C_MASTER_DEV_NAME); if (drv_data->i2c == NULL) { - SYS_LOG_ERR("Failed to get pointer to %s device!", + LOG_ERR("Failed to get pointer to %s device!", CONFIG_AMG88XX_I2C_MASTER_DEV_NAME); return -EINVAL; } if (amg88xx_init_device(dev) < 0) { - SYS_LOG_ERR("Failed to initialize device!"); + LOG_ERR("Failed to initialize device!"); return -EIO; } #ifdef CONFIG_AMG88XX_TRIGGER if (amg88xx_init_interrupt(dev) < 0) { - SYS_LOG_ERR("Failed to initialize interrupt!"); + LOG_ERR("Failed to initialize interrupt!"); return -EIO; } #endif diff --git a/drivers/sensor/amg88xx/amg88xx.h b/drivers/sensor/amg88xx/amg88xx.h index a28c10b959a..a6d63349e22 100644 --- a/drivers/sensor/amg88xx/amg88xx.h +++ b/drivers/sensor/amg88xx/amg88xx.h @@ -136,9 +136,4 @@ int amg88xx_trigger_set(struct device *dev, int amg88xx_init_interrupt(struct device *dev); #endif /* CONFIG_AMG88XX_TRIGGER */ -#define SYS_LOG_DOMAIN "AMG88XX" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL - -#include - #endif diff --git a/drivers/sensor/amg88xx/amg88xx_trigger.c b/drivers/sensor/amg88xx/amg88xx_trigger.c index e36e5f1decd..32c463d9457 100644 --- a/drivers/sensor/amg88xx/amg88xx_trigger.c +++ b/drivers/sensor/amg88xx/amg88xx_trigger.c @@ -15,6 +15,10 @@ extern struct amg88xx_data amg88xx_driver; +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_DECLARE(AMG88XX); + int amg88xx_attr_set(struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, @@ -30,7 +34,7 @@ int amg88xx_attr_set(struct device *dev, return -ENOTSUP; } - SYS_LOG_DBG("set threshold to %d", int_level); + LOG_DBG("set threshold to %d", int_level); if (attr == SENSOR_ATTR_UPPER_THRESH) { intl_reg = AMG88XX_INTHL; @@ -43,12 +47,12 @@ int amg88xx_attr_set(struct device *dev, } if (amg88xx_reg_write(drv_data, intl_reg, (u8_t)int_level)) { - SYS_LOG_DBG("Failed to set INTxL attribute!"); + LOG_DBG("Failed to set INTxL attribute!"); return -EIO; } if (amg88xx_reg_write(drv_data, inth_reg, (u8_t)(int_level >> 8))) { - SYS_LOG_DBG("Failed to set INTxH attribute!"); + LOG_DBG("Failed to set INTxH attribute!"); return -EIO; } @@ -129,7 +133,7 @@ int amg88xx_trigger_set(struct device *dev, drv_data->th_handler = handler; drv_data->th_trigger = *trig; } else { - SYS_LOG_ERR("Unsupported sensor trigger"); + LOG_ERR("Unsupported sensor trigger"); return -ENOTSUP; } @@ -146,7 +150,7 @@ int amg88xx_init_interrupt(struct device *dev) /* setup gpio interrupt */ drv_data->gpio = device_get_binding(CONFIG_AMG88XX_GPIO_DEV_NAME); if (drv_data->gpio == NULL) { - SYS_LOG_DBG("Failed to get pointer to %s device!", + LOG_DBG("Failed to get pointer to %s device!", CONFIG_AMG88XX_GPIO_DEV_NAME); return -EINVAL; } @@ -160,7 +164,7 @@ int amg88xx_init_interrupt(struct device *dev) BIT(CONFIG_AMG88XX_GPIO_PIN_NUM)); if (gpio_add_callback(drv_data->gpio, &drv_data->gpio_cb) < 0) { - SYS_LOG_DBG("Failed to set gpio callback!"); + LOG_DBG("Failed to set gpio callback!"); return -EIO; } diff --git a/drivers/sensor/apds9960/apds9960.c b/drivers/sensor/apds9960/apds9960.c index a16bba6c38e..6ecb3854b06 100644 --- a/drivers/sensor/apds9960/apds9960.c +++ b/drivers/sensor/apds9960/apds9960.c @@ -17,9 +17,13 @@ #include #include #include +#include #include "apds9960.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(APDS9960); + static void apds9960_gpio_callback(struct device *dev, struct gpio_callback *cb, u32_t pins) { @@ -41,7 +45,7 @@ static int apds9960_sample_fetch(struct device *dev, enum sensor_channel chan) u8_t status; if (chan != SENSOR_CHAN_ALL) { - SYS_LOG_ERR("Unsupported sensor channel"); + LOG_ERR("Unsupported sensor channel"); return -ENOTSUP; } @@ -53,7 +57,7 @@ static int apds9960_sample_fetch(struct device *dev, enum sensor_channel chan) APDS9960_ENABLE_REG, APDS9960_ENABLE_PON | APDS9960_ENABLE_AIEN, APDS9960_ENABLE_PON | APDS9960_ENABLE_AIEN)) { - SYS_LOG_ERR("Power on bit not set."); + LOG_ERR("Power on bit not set."); return -EIO; } @@ -65,7 +69,7 @@ static int apds9960_sample_fetch(struct device *dev, enum sensor_channel chan) return -EIO; } - SYS_LOG_DBG("status: 0x%x", status); + LOG_DBG("status: 0x%x", status); if (status & APDS9960_STATUS_PINT) { if (i2c_reg_read_byte(data->i2c, APDS9960_I2C_ADDRESS, APDS9960_PDATA_REG, &data->pdata)) { @@ -141,21 +145,21 @@ static int apds9960_proxy_setup(struct device *dev, int gain) if (i2c_reg_write_byte(data->i2c, APDS9960_I2C_ADDRESS, APDS9960_POFFSET_UR_REG, APDS9960_DEFAULT_POFFSET_UR)) { - SYS_LOG_ERR("Default offset UR not set "); + LOG_ERR("Default offset UR not set "); return -EIO; } if (i2c_reg_write_byte(data->i2c, APDS9960_I2C_ADDRESS, APDS9960_POFFSET_DL_REG, APDS9960_DEFAULT_POFFSET_DL)) { - SYS_LOG_ERR("Default offset DL not set "); + LOG_ERR("Default offset DL not set "); return -EIO; } if (i2c_reg_write_byte(data->i2c, APDS9960_I2C_ADDRESS, APDS9960_PPULSE_REG, APDS9960_DEFAULT_PROX_PPULSE)) { - SYS_LOG_ERR("Default pulse count not set "); + LOG_ERR("Default pulse count not set "); return -EIO; } @@ -163,33 +167,33 @@ static int apds9960_proxy_setup(struct device *dev, int gain) APDS9960_CONTROL_REG, APDS9960_CONTROL_LDRIVE, APDS9960_DEFAULT_LDRIVE)) { - SYS_LOG_ERR("LED Drive Strength not set"); + LOG_ERR("LED Drive Strength not set"); return -EIO; } if (i2c_reg_update_byte(data->i2c, APDS9960_I2C_ADDRESS, APDS9960_CONTROL_REG, APDS9960_CONTROL_PGAIN, (gain & APDS9960_PGAIN_8X))) { - SYS_LOG_ERR("Gain is not set"); + LOG_ERR("Gain is not set"); return -EIO; } if (i2c_reg_write_byte(data->i2c, APDS9960_I2C_ADDRESS, APDS9960_PILT_REG, APDS9960_DEFAULT_PILT)) { - SYS_LOG_ERR("Low threshold not set"); + LOG_ERR("Low threshold not set"); return -EIO; } if (i2c_reg_write_byte(data->i2c, APDS9960_I2C_ADDRESS, APDS9960_PIHT_REG, APDS9960_DEFAULT_PIHT)) { - SYS_LOG_ERR("High threshold not set"); + LOG_ERR("High threshold not set"); return -EIO; } if (i2c_reg_update_byte(data->i2c, APDS9960_I2C_ADDRESS, APDS9960_ENABLE_REG, APDS9960_ENABLE_PEN, APDS9960_ENABLE_PEN)) { - SYS_LOG_ERR("Proximity mode is not enabled"); + LOG_ERR("Proximity mode is not enabled"); return -EIO; } @@ -204,7 +208,7 @@ static int apds9960_ambient_setup(struct device *dev, int gain) /* ADC value */ if (i2c_reg_write_byte(data->i2c, APDS9960_I2C_ADDRESS, APDS9960_ATIME_REG, APDS9960_DEFAULT_ATIME)) { - SYS_LOG_ERR("Default integration time not set for ADC"); + LOG_ERR("Default integration time not set for ADC"); return -EIO; } @@ -213,7 +217,7 @@ static int apds9960_ambient_setup(struct device *dev, int gain) APDS9960_CONTROL_REG, APDS9960_CONTROL_AGAIN, (gain & APDS9960_AGAIN_64X))) { - SYS_LOG_ERR("Ambient Gain is not set"); + LOG_ERR("Ambient Gain is not set"); return -EIO; } @@ -221,7 +225,7 @@ static int apds9960_ambient_setup(struct device *dev, int gain) if (i2c_burst_write(data->i2c, APDS9960_I2C_ADDRESS, APDS9960_INT_AILTL_REG, (u8_t *)&th, sizeof(th))) { - SYS_LOG_ERR("ALS low threshold not set"); + LOG_ERR("ALS low threshold not set"); return -EIO; } @@ -229,7 +233,7 @@ static int apds9960_ambient_setup(struct device *dev, int gain) if (i2c_burst_write(data->i2c, APDS9960_I2C_ADDRESS, APDS9960_INT_AIHTL_REG, (u8_t *)&th, sizeof(th))) { - SYS_LOG_ERR("ALS low threshold not set"); + LOG_ERR("ALS low threshold not set"); return -EIO; } @@ -237,7 +241,7 @@ static int apds9960_ambient_setup(struct device *dev, int gain) if (i2c_reg_update_byte(data->i2c, APDS9960_I2C_ADDRESS, APDS9960_ENABLE_REG, APDS9960_ENABLE_AEN, APDS9960_ENABLE_AEN)) { - SYS_LOG_ERR("ALS is not enabled"); + LOG_ERR("ALS is not enabled"); return -EIO; } @@ -251,19 +255,19 @@ static int apds9960_sensor_setup(struct device *dev) if (i2c_reg_read_byte(data->i2c, APDS9960_I2C_ADDRESS, APDS9960_ID_REG, &chip_id)) { - SYS_LOG_ERR("Failed reading chip id"); + LOG_ERR("Failed reading chip id"); return -EIO; } if (!((chip_id == APDS9960_ID_1) || (chip_id == APDS9960_ID_2))) { - SYS_LOG_ERR("Invalid chip id 0x%x", chip_id); + LOG_ERR("Invalid chip id 0x%x", chip_id); return -EIO; } /* Disable all functions and interrupts */ if (i2c_reg_write_byte(data->i2c, APDS9960_I2C_ADDRESS, APDS9960_ENABLE_REG, 0)) { - SYS_LOG_ERR("ENABLE register is not cleared"); + LOG_ERR("ENABLE register is not cleared"); return -EIO; } @@ -275,51 +279,51 @@ static int apds9960_sensor_setup(struct device *dev) /* Disable gesture interrupt */ if (i2c_reg_write_byte(data->i2c, APDS9960_I2C_ADDRESS, APDS9960_GCONFIG4_REG, 0)) { - SYS_LOG_ERR("GCONFIG4 register is not cleared"); + LOG_ERR("GCONFIG4 register is not cleared"); return -EIO; } if (i2c_reg_write_byte(data->i2c, APDS9960_I2C_ADDRESS, APDS9960_WTIME_REG, APDS9960_DEFAULT_WTIME)) { - SYS_LOG_ERR("Default wait time not set"); + LOG_ERR("Default wait time not set"); return -EIO; } if (i2c_reg_write_byte(data->i2c, APDS9960_I2C_ADDRESS, APDS9960_CONFIG1_REG, APDS9960_DEFAULT_CONFIG1)) { - SYS_LOG_ERR("Default WLONG not set"); + LOG_ERR("Default WLONG not set"); return -EIO; } if (i2c_reg_write_byte(data->i2c, APDS9960_I2C_ADDRESS, APDS9960_CONFIG2_REG, APDS9960_DEFAULT_CONFIG2)) { - SYS_LOG_ERR("Configuration Register Two not set"); + LOG_ERR("Configuration Register Two not set"); return -EIO; } if (i2c_reg_write_byte(data->i2c, APDS9960_I2C_ADDRESS, APDS9960_CONFIG3_REG, APDS9960_DEFAULT_CONFIG3)) { - SYS_LOG_ERR("Configuration Register Three not set"); + LOG_ERR("Configuration Register Three not set"); return -EIO; } if (i2c_reg_write_byte(data->i2c, APDS9960_I2C_ADDRESS, APDS9960_PERS_REG, APDS9960_DEFAULT_PERS)) { - SYS_LOG_ERR("Interrupt persistence not set"); + LOG_ERR("Interrupt persistence not set"); return -EIO; } if (apds9960_proxy_setup(dev, APDS9960_DEFAULT_PGAIN)) { - SYS_LOG_ERR("Failed to setup proximity functionality"); + LOG_ERR("Failed to setup proximity functionality"); return -EIO; } if (apds9960_ambient_setup(dev, APDS9960_DEFAULT_AGAIN)) { - SYS_LOG_ERR("Failed to setup ambient light functionality"); + LOG_ERR("Failed to setup ambient light functionality"); return -EIO; } @@ -333,7 +337,7 @@ static int apds9960_init_interrupt(struct device *dev) /* setup gpio interrupt */ drv_data->gpio = device_get_binding(CONFIG_APDS9960_GPIO_DEV_NAME); if (drv_data->gpio == NULL) { - SYS_LOG_ERR("Failed to get pointer to %s device!", + LOG_ERR("Failed to get pointer to %s device!", CONFIG_APDS9960_GPIO_DEV_NAME); return -EINVAL; } @@ -348,7 +352,7 @@ static int apds9960_init_interrupt(struct device *dev) BIT(CONFIG_APDS9960_GPIO_PIN_NUM)); if (gpio_add_callback(drv_data->gpio, &drv_data->gpio_cb) < 0) { - SYS_LOG_DBG("Failed to set gpio callback!"); + LOG_DBG("Failed to set gpio callback!"); return -EIO; } @@ -359,7 +363,7 @@ static int apds9960_init_interrupt(struct device *dev) APDS9960_ENABLE_REG, APDS9960_ENABLE_PON, APDS9960_ENABLE_PON)) { - SYS_LOG_ERR("Power on bit not set."); + LOG_ERR("Power on bit not set."); return -EIO; } @@ -419,7 +423,7 @@ static int apds9960_init(struct device *dev) data->i2c = device_get_binding(CONFIG_APDS9960_I2C_DEV_NAME); if (data->i2c == NULL) { - SYS_LOG_ERR("Failed to get pointer to %s device!", + LOG_ERR("Failed to get pointer to %s device!", CONFIG_APDS9960_I2C_DEV_NAME); return -EINVAL; } @@ -430,7 +434,7 @@ static int apds9960_init(struct device *dev) apds9960_sensor_setup(dev); if (apds9960_init_interrupt(dev) < 0) { - SYS_LOG_ERR("Failed to initialize interrupt!"); + LOG_ERR("Failed to initialize interrupt!"); return -EIO; } diff --git a/drivers/sensor/apds9960/apds9960.h b/drivers/sensor/apds9960/apds9960.h index 7079bb8bf1a..acb5ee46854 100644 --- a/drivers/sensor/apds9960/apds9960.h +++ b/drivers/sensor/apds9960/apds9960.h @@ -248,8 +248,4 @@ int apds9960_trigger_set(struct device *dev, sensor_trigger_handler_t handler); #endif /* CONFIG_APDS9960_TRIGGER */ -#define SYS_LOG_DOMAIN "APDS9960" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include - #endif /* ZEPHYR_DRIVERS_SENSOR_APDS9960_APDS9960_H_*/ diff --git a/drivers/sensor/apds9960/apds9960_trigger.c b/drivers/sensor/apds9960/apds9960_trigger.c index 76d3ae10b26..90cc6424f06 100644 --- a/drivers/sensor/apds9960/apds9960_trigger.c +++ b/drivers/sensor/apds9960/apds9960_trigger.c @@ -14,6 +14,10 @@ extern struct apds9960_data apds9960_driver; +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_DECLARE(APDS9960); + void apds9960_work_cb(struct k_work *work) { struct apds9960_data *data = CONTAINER_OF(work, @@ -85,7 +89,7 @@ int apds9960_trigger_set(struct device *dev, } break; default: - SYS_LOG_ERR("Unsupported sensor trigger"); + LOG_ERR("Unsupported sensor trigger"); return -ENOTSUP; } diff --git a/drivers/sensor/bma280/bma280.c b/drivers/sensor/bma280/bma280.c index 2a30a5859cf..3f66126c078 100644 --- a/drivers/sensor/bma280/bma280.c +++ b/drivers/sensor/bma280/bma280.c @@ -8,9 +8,13 @@ #include #include #include +#include #include "bma280.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(BMA280); + static int bma280_sample_fetch(struct device *dev, enum sensor_channel chan) { struct bma280_data *drv_data = dev->driver_data; @@ -25,7 +29,7 @@ static int bma280_sample_fetch(struct device *dev, enum sensor_channel chan) */ if (i2c_burst_read(drv_data->i2c, BMA280_I2C_ADDRESS, BMA280_REG_ACCEL_X_LSB, buf, 6) < 0) { - SYS_LOG_DBG("Could not read accel axis data"); + LOG_DBG("Could not read accel axis data"); return -EIO; } @@ -41,7 +45,7 @@ static int bma280_sample_fetch(struct device *dev, enum sensor_channel chan) if (i2c_reg_read_byte(drv_data->i2c, BMA280_I2C_ADDRESS, BMA280_REG_TEMP, (u8_t *)&drv_data->temp_sample) < 0) { - SYS_LOG_DBG("Could not read temperature data"); + LOG_DBG("Could not read temperature data"); return -EIO; } @@ -115,7 +119,7 @@ int bma280_init(struct device *dev) drv_data->i2c = device_get_binding(CONFIG_BMA280_I2C_MASTER_DEV_NAME); if (drv_data->i2c == NULL) { - SYS_LOG_DBG("Could not get pointer to %s device", + LOG_DBG("Could not get pointer to %s device", CONFIG_BMA280_I2C_MASTER_DEV_NAME); return -EINVAL; } @@ -123,31 +127,31 @@ int bma280_init(struct device *dev) /* read device ID */ if (i2c_reg_read_byte(drv_data->i2c, BMA280_I2C_ADDRESS, BMA280_REG_CHIP_ID, &id) < 0) { - SYS_LOG_DBG("Could not read chip id"); + LOG_DBG("Could not read chip id"); return -EIO; } if (id != BMA280_CHIP_ID) { - SYS_LOG_DBG("Unexpected chip id (%x)", id); + LOG_DBG("Unexpected chip id (%x)", id); return -EIO; } if (i2c_reg_write_byte(drv_data->i2c, BMA280_I2C_ADDRESS, BMA280_REG_PMU_BW, BMA280_PMU_BW) < 0) { - SYS_LOG_DBG("Could not set data filter bandwidth"); + LOG_DBG("Could not set data filter bandwidth"); return -EIO; } /* set g-range */ if (i2c_reg_write_byte(drv_data->i2c, BMA280_I2C_ADDRESS, BMA280_REG_PMU_RANGE, BMA280_PMU_RANGE) < 0) { - SYS_LOG_DBG("Could not set data g-range"); + LOG_DBG("Could not set data g-range"); return -EIO; } #ifdef CONFIG_BMA280_TRIGGER if (bma280_init_interrupt(dev) < 0) { - SYS_LOG_DBG("Could not initialize interrupts"); + LOG_DBG("Could not initialize interrupts"); return -EIO; } #endif diff --git a/drivers/sensor/bma280/bma280.h b/drivers/sensor/bma280/bma280.h index 3e84717b0c0..3e7f021acd9 100644 --- a/drivers/sensor/bma280/bma280.h +++ b/drivers/sensor/bma280/bma280.h @@ -155,7 +155,4 @@ int bma280_attr_set(struct device *dev, int bma280_init_interrupt(struct device *dev); #endif -#define SYS_LOG_DOMAIN "BMA280" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include #endif /* ZEPHYR_DRIVERS_SENSOR_BMA280_BMA280_H_ */ diff --git a/drivers/sensor/bma280/bma280_trigger.c b/drivers/sensor/bma280/bma280_trigger.c index 9aa7cee2ecc..f9283efd27f 100644 --- a/drivers/sensor/bma280/bma280_trigger.c +++ b/drivers/sensor/bma280/bma280_trigger.c @@ -12,6 +12,10 @@ #include "bma280.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_DECLARE(BMA280); + int bma280_attr_set(struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, @@ -31,7 +35,7 @@ int bma280_attr_set(struct device *dev, if (i2c_reg_write_byte(drv_data->i2c, BMA280_I2C_ADDRESS, BMA280_REG_SLOPE_TH, (u8_t)slope_th) < 0) { - SYS_LOG_DBG("Could not set slope threshold"); + LOG_DBG("Could not set slope threshold"); return -EIO; } } else if (attr == SENSOR_ATTR_SLOPE_DUR) { @@ -40,7 +44,7 @@ int bma280_attr_set(struct device *dev, BMA280_SLOPE_DUR_MASK, val->val1 << BMA280_SLOPE_DUR_SHIFT) < 0) { - SYS_LOG_DBG("Could not set slope duration"); + LOG_DBG("Could not set slope duration"); return -EIO; } } else { @@ -100,7 +104,7 @@ static void bma280_thread_cb(void *arg) BMA280_BIT_INT_LATCH_RESET); if (err < 0) { - SYS_LOG_DBG("Could not update clear the interrupt"); + LOG_DBG("Could not update clear the interrupt"); return; } } @@ -144,7 +148,7 @@ int bma280_trigger_set(struct device *dev, if (i2c_reg_update_byte(drv_data->i2c, BMA280_I2C_ADDRESS, BMA280_REG_INT_EN_1, BMA280_BIT_DATA_EN, 0) < 0) { - SYS_LOG_DBG("Could not disable data ready interrupt"); + LOG_DBG("Could not disable data ready interrupt"); return -EIO; } @@ -159,7 +163,7 @@ int bma280_trigger_set(struct device *dev, BMA280_REG_INT_EN_1, BMA280_BIT_DATA_EN, BMA280_BIT_DATA_EN) < 0) { - SYS_LOG_DBG("Could not enable data ready interrupt"); + LOG_DBG("Could not enable data ready interrupt"); return -EIO; } } else if (trig->type == SENSOR_TRIG_DELTA) { @@ -167,7 +171,7 @@ int bma280_trigger_set(struct device *dev, if (i2c_reg_update_byte(drv_data->i2c, BMA280_I2C_ADDRESS, BMA280_REG_INT_EN_0, BMA280_SLOPE_EN_XYZ, 0) < 0) { - SYS_LOG_DBG("Could not disable data ready interrupt"); + LOG_DBG("Could not disable data ready interrupt"); return -EIO; } @@ -182,7 +186,7 @@ int bma280_trigger_set(struct device *dev, BMA280_REG_INT_EN_0, BMA280_SLOPE_EN_XYZ, BMA280_SLOPE_EN_XYZ) < 0) { - SYS_LOG_DBG("Could not enable data ready interrupt"); + LOG_DBG("Could not enable data ready interrupt"); return -EIO; } } else { @@ -201,14 +205,14 @@ int bma280_init_interrupt(struct device *dev) BMA280_REG_INT_RST_LATCH, BMA280_BIT_INT_LATCH_RESET | BMA280_INT_MODE_LATCH) < 0) { - SYS_LOG_DBG("Could not set latched interrupts"); + LOG_DBG("Could not set latched interrupts"); return -EIO; } /* setup data ready gpio interrupt */ drv_data->gpio = device_get_binding(CONFIG_BMA280_GPIO_DEV_NAME); if (drv_data->gpio == NULL) { - SYS_LOG_DBG("Cannot get pointer to %s device", + LOG_DBG("Cannot get pointer to %s device", CONFIG_BMA280_GPIO_DEV_NAME); return -EINVAL; } @@ -222,7 +226,7 @@ int bma280_init_interrupt(struct device *dev) BIT(CONFIG_BMA280_GPIO_PIN_NUM)); if (gpio_add_callback(drv_data->gpio, &drv_data->gpio_cb) < 0) { - SYS_LOG_DBG("Could not set gpio callback"); + LOG_DBG("Could not set gpio callback"); return -EIO; } @@ -231,7 +235,7 @@ int bma280_init_interrupt(struct device *dev) BMA280_REG_INT_MAP_1, BMA280_INT_MAP_1_BIT_DATA, BMA280_INT_MAP_1_BIT_DATA) < 0) { - SYS_LOG_DBG("Could not map data ready interrupt pin"); + LOG_DBG("Could not map data ready interrupt pin"); return -EIO; } @@ -240,14 +244,14 @@ int bma280_init_interrupt(struct device *dev) BMA280_REG_INT_MAP_0, BMA280_INT_MAP_0_BIT_SLOPE, BMA280_INT_MAP_0_BIT_SLOPE) < 0) { - SYS_LOG_DBG("Could not map any-motion interrupt pin"); + LOG_DBG("Could not map any-motion interrupt pin"); return -EIO; } if (i2c_reg_update_byte(drv_data->i2c, BMA280_I2C_ADDRESS, BMA280_REG_INT_EN_1, BMA280_BIT_DATA_EN, 0) < 0) { - SYS_LOG_DBG("Could not disable data ready interrupt"); + LOG_DBG("Could not disable data ready interrupt"); return -EIO; } @@ -255,7 +259,7 @@ int bma280_init_interrupt(struct device *dev) if (i2c_reg_update_byte(drv_data->i2c, BMA280_I2C_ADDRESS, BMA280_REG_INT_EN_0, BMA280_SLOPE_EN_XYZ, 0) < 0) { - SYS_LOG_DBG("Could not disable data ready interrupt"); + LOG_DBG("Could not disable data ready interrupt"); return -EIO; } diff --git a/drivers/sensor/bmc150_magn/bmc150_magn.c b/drivers/sensor/bmc150_magn/bmc150_magn.c index 2809ac7d675..a0697797428 100644 --- a/drivers/sensor/bmc150_magn/bmc150_magn.c +++ b/drivers/sensor/bmc150_magn/bmc150_magn.c @@ -17,9 +17,13 @@ #include #include +#include #include "bmc150_magn.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(BMC150_MAGN) + static const struct { int freq; u8_t reg_val; @@ -298,7 +302,7 @@ static int bmc150_magn_sample_fetch(struct device *dev, if (i2c_burst_read(data->i2c_master, config->i2c_slave_addr, BMC150_MAGN_REG_X_L, (u8_t *)values, sizeof(values)) < 0) { - SYS_LOG_ERR("failed to read sample"); + LOG_ERR("failed to read sample"); return -EIO; } @@ -444,7 +448,7 @@ static int bmc150_magn_attr_set(struct device *dev, } if (data->max_odr < val->val1) { - SYS_LOG_ERR("not supported with current oversampling"); + LOG_ERR("not supported with current oversampling"); return -ENOTSUP; } @@ -489,24 +493,24 @@ static int bmc150_magn_init_chip(struct device *dev) if (bmc150_magn_set_power_mode(dev, BMC150_MAGN_POWER_MODE_SUSPEND, 0) < 0) { - SYS_LOG_ERR("failed to bring up device from suspend mode"); + LOG_ERR("failed to bring up device from suspend mode"); return -EIO; } if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr, BMC150_MAGN_REG_CHIP_ID, &chip_id) < 0) { - SYS_LOG_ERR("failed reading chip id"); + LOG_ERR("failed reading chip id"); goto err_poweroff; } if (chip_id != BMC150_MAGN_CHIP_ID_VAL) { - SYS_LOG_ERR("invalid chip id 0x%x", chip_id); + LOG_ERR("invalid chip id 0x%x", chip_id); goto err_poweroff; } - SYS_LOG_ERR("chip id 0x%x", chip_id); + LOG_ERR("chip id 0x%x", chip_id); preset = bmc150_magn_presets_table[BMC150_MAGN_DEFAULT_PRESET]; if (bmc150_magn_set_odr(dev, preset.odr) < 0) { - SYS_LOG_ERR("failed to set ODR to %d", + LOG_ERR("failed to set ODR to %d", preset.odr); goto err_poweroff; } @@ -515,7 +519,7 @@ static int bmc150_magn_init_chip(struct device *dev) BMC150_MAGN_REG_REP_XY, BMC150_MAGN_REPXY_TO_REGVAL(preset.rep_xy)) < 0) { - SYS_LOG_ERR("failed to set REP XY to %d", + LOG_ERR("failed to set REP XY to %d", preset.rep_xy); goto err_poweroff; } @@ -523,21 +527,21 @@ static int bmc150_magn_init_chip(struct device *dev) if (i2c_reg_write_byte(data->i2c_master, config->i2c_slave_addr, BMC150_MAGN_REG_REP_Z, BMC150_MAGN_REPZ_TO_REGVAL(preset.rep_z)) < 0) { - SYS_LOG_ERR("failed to set REP Z to %d", + LOG_ERR("failed to set REP Z to %d", preset.rep_z); goto err_poweroff; } if (bmc150_magn_set_power_mode(dev, BMC150_MAGN_POWER_MODE_NORMAL, 1) < 0) { - SYS_LOG_ERR("failed to power on device"); + LOG_ERR("failed to power on device"); goto err_poweroff; } if (i2c_burst_read(data->i2c_master, config->i2c_slave_addr, BMC150_MAGN_REG_TRIM_START, (u8_t *)&data->tregs, sizeof(data->tregs)) < 0) { - SYS_LOG_ERR("failed to read trim regs"); + LOG_ERR("failed to read trim regs"); goto err_poweroff; } @@ -571,19 +575,19 @@ static int bmc150_magn_init(struct device *dev) data->i2c_master = device_get_binding(config->i2c_master_dev_name); if (!data->i2c_master) { - SYS_LOG_ERR("i2c master not found: %s", + LOG_ERR("i2c master not found: %s", config->i2c_master_dev_name); return -EINVAL; } if (bmc150_magn_init_chip(dev) < 0) { - SYS_LOG_ERR("failed to initialize chip"); + LOG_ERR("failed to initialize chip"); return -EIO; } #if defined(CONFIG_BMC150_MAGN_TRIGGER_DRDY) if (bmc150_magn_init_interrupt(dev) < 0) { - SYS_LOG_ERR("failed to initialize interrupts"); + LOG_ERR("failed to initialize interrupts"); return -EINVAL; } #endif diff --git a/drivers/sensor/bmc150_magn/bmc150_magn.h b/drivers/sensor/bmc150_magn/bmc150_magn.h index 248e6699d6c..15795214750 100644 --- a/drivers/sensor/bmc150_magn/bmc150_magn.h +++ b/drivers/sensor/bmc150_magn/bmc150_magn.h @@ -175,7 +175,4 @@ int bmc150_magn_trigger_set(struct device *dev, int bmc150_magn_init_interrupt(struct device *dev); #endif -#define SYS_LOG_DOMAIN "BMC150_MAGN" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include #endif /* ZEPHYR_DRIVERS_SENSOR_BMC150_MAGN_BMC150_MAGN_H_ */ diff --git a/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c b/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c index 3255d36c254..bc910e39fa8 100644 --- a/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c +++ b/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c @@ -12,6 +12,10 @@ #include "bmc150_magn.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_DECLARE(BMC150_MAGN); + int bmc150_magn_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) @@ -40,7 +44,7 @@ int bmc150_magn_trigger_set(struct device *dev, BMC150_MAGN_MASK_DRDY_EN, state << BMC150_MAGN_SHIFT_DRDY_EN) < 0) { - SYS_LOG_DBG("failed to set DRDY interrupt"); + LOG_DBG("failed to set DRDY interrupt"); return -EIO; } @@ -84,7 +88,7 @@ static void bmc150_magn_thread_main(void *arg1, void *arg2, void *arg3) config->i2c_slave_addr, BMC150_MAGN_REG_INT_STATUS, ®_val) < 0) { - SYS_LOG_DBG("failed to clear data ready interrupt"); + LOG_DBG("failed to clear data ready interrupt"); } if (data->handler_drdy) { @@ -119,7 +123,7 @@ int bmc150_magn_init_interrupt(struct device *dev) #if defined(CONFIG_BMC150_MAGN_TRIGGER_DRDY) if (bmc150_magn_set_drdy_polarity(dev, 0) < 0) { - SYS_LOG_DBG("failed to set DR polarity"); + LOG_DBG("failed to set DR polarity"); return -EIO; } @@ -127,7 +131,7 @@ int bmc150_magn_init_interrupt(struct device *dev) BMC150_MAGN_REG_INT_DRDY, BMC150_MAGN_MASK_DRDY_EN, 0 << BMC150_MAGN_SHIFT_DRDY_EN) < 0) { - SYS_LOG_DBG("failed to set data ready interrupt enabled bit"); + LOG_DBG("failed to set data ready interrupt enabled bit"); return -EIO; } #endif @@ -143,7 +147,7 @@ int bmc150_magn_init_interrupt(struct device *dev) data->gpio_drdy = device_get_binding(config->gpio_drdy_dev_name); if (!data->gpio_drdy) { - SYS_LOG_DBG("gpio controller %s not found", + LOG_DBG("gpio controller %s not found", config->gpio_drdy_dev_name); return -EINVAL; } @@ -157,7 +161,7 @@ int bmc150_magn_init_interrupt(struct device *dev) BIT(config->gpio_drdy_int_pin)); if (gpio_add_callback(data->gpio_drdy, &data->gpio_cb) < 0) { - SYS_LOG_DBG("failed to set gpio callback"); + LOG_DBG("failed to set gpio callback"); return -EIO; } diff --git a/drivers/sensor/bme280/bme280.c b/drivers/sensor/bme280/bme280.c index 77782214973..b00bcabc765 100644 --- a/drivers/sensor/bme280/bme280.c +++ b/drivers/sensor/bme280/bme280.c @@ -19,10 +19,15 @@ #elif defined CONFIG_BME280_DEV_TYPE_SPI #include #endif +#include #include "bme280.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(BME280); + static int bm280_reg_read(struct bme280_data *data, + u8_t start, u8_t *buf, int size) { #ifdef CONFIG_BME280_DEV_TYPE_I2C @@ -58,7 +63,7 @@ static int bm280_reg_read(struct bme280_data *data, ret = spi_transceive(data->spi, &data->spi_cfg, &tx, &rx); if (ret) { - SYS_LOG_DBG("spi_transceive FAIL %d\n", ret); + LOG_DBG("spi_transceive FAIL %d\n", ret); return ret; } } @@ -85,7 +90,7 @@ static int bm280_reg_write(struct bme280_data *data, u8_t reg, u8_t val) ret = spi_write(data->spi, &data->spi_cfg, &tx); if (ret) { - SYS_LOG_DBG("spi_write FAIL %d\n", ret); + LOG_DBG("spi_write FAIL %d\n", ret); return ret; } #endif @@ -293,12 +298,12 @@ static int bme280_chip_init(struct device *dev) } if (data->chip_id == BME280_CHIP_ID) { - SYS_LOG_DBG("BME280 chip detected"); + LOG_DBG("BME280 chip detected"); } else if (data->chip_id == BMP280_CHIP_ID_MP || data->chip_id == BMP280_CHIP_ID_SAMPLE_1) { - SYS_LOG_DBG("BMP280 chip detected"); + LOG_DBG("BMP280 chip detected"); } else { - SYS_LOG_DBG("bad chip id 0x%x", data->chip_id); + LOG_DBG("bad chip id 0x%x", data->chip_id); return -ENOTSUP; } @@ -333,7 +338,7 @@ static inline int bme280_spi_init(struct bme280_data *data) { data->spi = device_get_binding(CONFIG_BME280_SPI_DEV_NAME); if (!data->spi) { - SYS_LOG_DBG("spi device not found: %s", + LOG_DBG("spi device not found: %s", CONFIG_BME280_SPI_DEV_NAME); return -EINVAL; } @@ -354,7 +359,7 @@ int bme280_init(struct device *dev) #ifdef CONFIG_BME280_DEV_TYPE_I2C data->i2c_master = device_get_binding(CONFIG_BME280_I2C_MASTER_DEV_NAME); if (!data->i2c_master) { - SYS_LOG_DBG("i2c master not found: %s", + LOG_DBG("i2c master not found: %s", CONFIG_BME280_I2C_MASTER_DEV_NAME); return -EINVAL; } @@ -362,7 +367,7 @@ int bme280_init(struct device *dev) data->i2c_slave_addr = BME280_I2C_ADDR; #elif defined CONFIG_BME280_DEV_TYPE_SPI if (bme280_spi_init(data) < 0) { - SYS_LOG_DBG("spi master not found: %s", + LOG_DBG("spi master not found: %s", CONFIG_BME280_SPI_DEV_NAME); return -EINVAL; } diff --git a/drivers/sensor/bme280/bme280.h b/drivers/sensor/bme280/bme280.h index a025c6f3455..00258e02d2a 100644 --- a/drivers/sensor/bme280/bme280.h +++ b/drivers/sensor/bme280/bme280.h @@ -143,7 +143,4 @@ struct bme280_data { u8_t chip_id; }; -#define SYS_LOG_DOMAIN "BME280" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include #endif /* ZEPHYR_DRIVERS_SENSOR_BME280_BME280_H_ */ diff --git a/drivers/sensor/bmg160/bmg160.c b/drivers/sensor/bmg160/bmg160.c index d442726a847..7295d8bf835 100644 --- a/drivers/sensor/bmg160/bmg160.c +++ b/drivers/sensor/bmg160/bmg160.c @@ -12,9 +12,13 @@ #include #include #include +#include #include "bmg160.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(BMG160); + struct bmg160_device_data bmg160_data; static inline int bmg160_bus_config(struct device *dev) @@ -275,19 +279,19 @@ int bmg160_init(struct device *dev) bmg160->i2c = device_get_binding((char *)cfg->i2c_port); if (!bmg160->i2c) { - SYS_LOG_DBG("I2C master controller not found!"); + LOG_DBG("I2C master controller not found!"); return -EINVAL; } k_sem_init(&bmg160->sem, 1, UINT_MAX); if (bmg160_read_byte(dev, BMG160_REG_CHIPID, &chip_id) < 0) { - SYS_LOG_DBG("Failed to read chip id."); + LOG_DBG("Failed to read chip id."); return -EIO; } if (chip_id != BMG160_CHIP_ID) { - SYS_LOG_DBG("Unsupported chip detected (0x%x)!", chip_id); + LOG_DBG("Unsupported chip detected (0x%x)!", chip_id); return -ENODEV; } @@ -298,7 +302,7 @@ int bmg160_init(struct device *dev) if (bmg160_write_byte(dev, BMG160_REG_RANGE, BMG160_DEFAULT_RANGE) < 0) { - SYS_LOG_DBG("Failed to set range."); + LOG_DBG("Failed to set range."); return -EIO; } @@ -307,13 +311,13 @@ int bmg160_init(struct device *dev) bmg160->scale = BMG160_RANGE_TO_SCALE(range_dps); if (bmg160_write_byte(dev, BMG160_REG_BW, BMG160_DEFAULT_ODR) < 0) { - SYS_LOG_DBG("Failed to set sampling frequency."); + LOG_DBG("Failed to set sampling frequency."); return -EIO; } /* disable interrupts */ if (bmg160_write_byte(dev, BMG160_REG_INT_EN0, 0) < 0) { - SYS_LOG_DBG("Failed to disable all interrupts."); + LOG_DBG("Failed to disable all interrupts."); return -EIO; } diff --git a/drivers/sensor/bmg160/bmg160.h b/drivers/sensor/bmg160/bmg160.h index 324024840dd..ca3dc38a07e 100644 --- a/drivers/sensor/bmg160/bmg160.h +++ b/drivers/sensor/bmg160/bmg160.h @@ -227,7 +227,4 @@ int bmg160_write_byte(struct device *dev, u8_t reg_addr, u8_t data); int bmg160_slope_config(struct device *dev, enum sensor_attribute attr, const struct sensor_value *val); -#define SYS_LOG_DOMAIN "BMG160" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include #endif /* ZEPHYR_DRIVERS_SENSOR_BMG160_BMG160_H_ */ diff --git a/drivers/sensor/bmg160/bmg160_trigger.c b/drivers/sensor/bmg160/bmg160_trigger.c index 5e7b85a637a..6c2f5cb948f 100644 --- a/drivers/sensor/bmg160/bmg160_trigger.c +++ b/drivers/sensor/bmg160/bmg160_trigger.c @@ -15,6 +15,10 @@ extern struct bmg160_device_data bmg160_data; +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_DECLARE(BMG160); + static void bmg160_gpio_callback(struct device *port, struct gpio_callback *cb, u32_t pin) { @@ -196,20 +200,20 @@ int bmg160_trigger_init(struct device *dev) /* set INT1 pin to: push-pull, active low */ if (bmg160_write_byte(dev, BMG160_REG_INT_EN1, 0) < 0) { - SYS_LOG_DBG("Failed to select interrupt pins type."); + LOG_DBG("Failed to select interrupt pins type."); return -EIO; } /* set interrupt mode to non-latched */ if (bmg160_write_byte(dev, BMG160_REG_INT_RST_LATCH, 0) < 0) { - SYS_LOG_DBG("Failed to set the interrupt mode."); + LOG_DBG("Failed to set the interrupt mode."); return -EIO; } /* map anymotion and high rate interrupts to INT1 pin */ if (bmg160_write_byte(dev, BMG160_REG_INT_MAP0, BMG160_INT1_ANY | BMG160_INT1_HIGH) < 0) { - SYS_LOG_DBG("Unable to map interrupts."); + LOG_DBG("Unable to map interrupts."); return -EIO; } @@ -217,13 +221,13 @@ int bmg160_trigger_init(struct device *dev) if (bmg160_write_byte(dev, BMG160_REG_INT_MAP1, BMG160_INT1_DATA | BMG160_INT1_FIFO | BMG160_INT1_FAST_OFFSET) < 0) { - SYS_LOG_DBG("Unable to map interrupts."); + LOG_DBG("Unable to map interrupts."); return -EIO; } bmg160->gpio = device_get_binding((char *)cfg->gpio_port); if (!bmg160->gpio) { - SYS_LOG_DBG("Gpio controller %s not found", cfg->gpio_port); + LOG_DBG("Gpio controller %s not found", cfg->gpio_port); return -EINVAL; } diff --git a/drivers/sensor/bmi160/bmi160.c b/drivers/sensor/bmi160/bmi160.c index a270f637a3f..71c281d80a5 100644 --- a/drivers/sensor/bmi160/bmi160.c +++ b/drivers/sensor/bmi160/bmi160.c @@ -13,9 +13,13 @@ #include #include #include +#include #include "bmi160.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(BMI160); + struct bmi160_device_data bmi160_data; static int bmi160_transceive(struct device *dev, u8_t reg, @@ -426,7 +430,7 @@ static int bmi160_acc_config(struct device *dev, enum sensor_channel chan, return bmi160_acc_slope_config(dev, attr, val); #endif default: - SYS_LOG_DBG("Accel attribute not supported."); + LOG_DBG("Accel attribute not supported."); return -ENOTSUP; } @@ -579,7 +583,7 @@ static int bmi160_gyr_config(struct device *dev, enum sensor_channel chan, return bmi160_gyr_calibrate(dev, chan); default: - SYS_LOG_DBG("Gyro attribute not supported."); + LOG_DBG("Gyro attribute not supported."); return -ENOTSUP; } @@ -606,7 +610,7 @@ static int bmi160_attr_set(struct device *dev, enum sensor_channel chan, return bmi160_acc_config(dev, chan, attr, val); #endif default: - SYS_LOG_DBG("attr_set() not supported on this channel."); + LOG_DBG("attr_set() not supported on this channel."); return -ENOTSUP; } @@ -770,7 +774,7 @@ static int bmi160_channel_get(struct device *dev, case SENSOR_CHAN_DIE_TEMP: return bmi160_temp_channel_get(dev, val); default: - SYS_LOG_DBG("Channel not supported."); + LOG_DBG("Channel not supported."); return -ENOTSUP; } @@ -794,7 +798,7 @@ int bmi160_init(struct device *dev) bmi160->spi = device_get_binding(CONFIG_BMI160_SPI_PORT_NAME); if (!bmi160->spi) { - SYS_LOG_DBG("SPI master controller not found: %s.", + LOG_DBG("SPI master controller not found: %s.", CONFIG_BMI160_SPI_PORT_NAME); return -EINVAL; } @@ -805,7 +809,7 @@ int bmi160_init(struct device *dev) /* reboot the chip */ if (bmi160_byte_write(dev, BMI160_REG_CMD, BMI160_CMD_SOFT_RESET) < 0) { - SYS_LOG_DBG("Cannot reboot chip."); + LOG_DBG("Cannot reboot chip."); return -EIO; } @@ -813,19 +817,19 @@ int bmi160_init(struct device *dev) /* do a dummy read from 0x7F to activate SPI */ if (bmi160_byte_read(dev, 0x7F, &val) < 0) { - SYS_LOG_DBG("Cannot read from 0x7F.."); + LOG_DBG("Cannot read from 0x7F.."); return -EIO; } k_busy_wait(100); if (bmi160_byte_read(dev, BMI160_REG_CHIPID, &val) < 0) { - SYS_LOG_DBG("Failed to read chip id."); + LOG_DBG("Failed to read chip id."); return -EIO; } if (val != BMI160_CHIP_ID) { - SYS_LOG_DBG("Unsupported chip detected (0x%x)!", val); + LOG_DBG("Unsupported chip detected (0x%x)!", val); return -ENODEV; } @@ -842,14 +846,14 @@ int bmi160_init(struct device *dev) * called. */ if (bmi160_pmu_set(dev, &bmi160->pmu_sts) < 0) { - SYS_LOG_DBG("Failed to set power mode."); + LOG_DBG("Failed to set power mode."); return -EIO; } /* set accelerometer default range */ if (bmi160_byte_write(dev, BMI160_REG_ACC_RANGE, BMI160_DEFAULT_RANGE_ACC) < 0) { - SYS_LOG_DBG("Cannot set default range for accelerometer."); + LOG_DBG("Cannot set default range for accelerometer."); return -EIO; } @@ -860,7 +864,7 @@ int bmi160_init(struct device *dev) /* set gyro default range */ if (bmi160_byte_write(dev, BMI160_REG_GYR_RANGE, BMI160_DEFAULT_RANGE_GYR) < 0) { - SYS_LOG_DBG("Cannot set default range for gyroscope."); + LOG_DBG("Cannot set default range for gyroscope."); return -EIO; } @@ -872,7 +876,7 @@ int bmi160_init(struct device *dev) BMI160_ACC_CONF_ODR_POS, BMI160_ACC_CONF_ODR_MASK, BMI160_DEFAULT_ODR_ACC) < 0) { - SYS_LOG_DBG("Failed to set accel's default ODR."); + LOG_DBG("Failed to set accel's default ODR."); return -EIO; } @@ -880,13 +884,13 @@ int bmi160_init(struct device *dev) BMI160_GYR_CONF_ODR_POS, BMI160_GYR_CONF_ODR_MASK, BMI160_DEFAULT_ODR_GYR) < 0) { - SYS_LOG_DBG("Failed to set gyro's default ODR."); + LOG_DBG("Failed to set gyro's default ODR."); return -EIO; } #ifdef CONFIG_BMI160_TRIGGER if (bmi160_trigger_mode_init(dev) < 0) { - SYS_LOG_DBG("Cannot set up trigger mode."); + LOG_DBG("Cannot set up trigger mode."); return -EINVAL; } #endif @@ -903,5 +907,7 @@ const struct bmi160_device_config bmi160_config = { #endif }; + + DEVICE_INIT(bmi160, CONFIG_BMI160_NAME, bmi160_init, &bmi160_data, &bmi160_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY); diff --git a/drivers/sensor/bmi160/bmi160.h b/drivers/sensor/bmi160/bmi160.h index f5346ac78aa..31a80d1bc36 100644 --- a/drivers/sensor/bmi160/bmi160.h +++ b/drivers/sensor/bmi160/bmi160.h @@ -478,7 +478,4 @@ int bmi160_acc_slope_config(struct device *dev, enum sensor_attribute attr, s32_t bmi160_acc_reg_val_to_range(u8_t reg_val); s32_t bmi160_gyr_reg_val_to_range(u8_t reg_val); -#define SYS_LOG_DOMAIN "BMI160" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include #endif /* ZEPHYR_DRIVERS_SENSOR_BMI160_BMI160_H_ */ diff --git a/drivers/sensor/bmi160/bmi160_trigger.c b/drivers/sensor/bmi160/bmi160_trigger.c index 90d39c85e92..91111be4e62 100644 --- a/drivers/sensor/bmi160/bmi160_trigger.c +++ b/drivers/sensor/bmi160/bmi160_trigger.c @@ -11,6 +11,10 @@ #include "bmi160.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_DECLARE(BMI160); + static void bmi160_handle_anymotion(struct device *dev) { struct bmi160_device_data *bmi160 = dev->driver_data; @@ -275,7 +279,7 @@ int bmi160_trigger_mode_init(struct device *dev) bmi160->gpio = device_get_binding((char *)cfg->gpio_port); if (!bmi160->gpio) { - SYS_LOG_DBG("Gpio controller %s not found.", cfg->gpio_port); + LOG_DBG("Gpio controller %s not found.", cfg->gpio_port); return -EINVAL; } @@ -293,7 +297,7 @@ int bmi160_trigger_mode_init(struct device *dev) /* map all interrupts to INT1 pin */ if (bmi160_word_write(dev, BMI160_REG_INT_MAP0, 0xf0ff) < 0) { - SYS_LOG_DBG("Failed to map interrupts."); + LOG_DBG("Failed to map interrupts."); return -EIO; } diff --git a/drivers/sensor/bmm150/bmm150.c b/drivers/sensor/bmm150/bmm150.c index 720efef8106..42f20cd5a2b 100644 --- a/drivers/sensor/bmm150/bmm150.c +++ b/drivers/sensor/bmm150/bmm150.c @@ -6,8 +6,12 @@ * SPDX-License-Identifier: Apache-2.0 */ +#include #include "bmm150.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(BMM150); + static const struct { int freq; u8_t reg_val; @@ -298,7 +302,7 @@ static int bmm150_sample_fetch(struct device *dev, enum sensor_channel chan) if (i2c_burst_read(drv_data->i2c, config->i2c_slave_addr, BMM150_REG_X_L, (u8_t *)values, sizeof(values)) < 0) { - SYS_LOG_ERR("failed to read sample"); + LOG_ERR("failed to read sample"); return -EIO; } @@ -451,7 +455,7 @@ static int bmm150_attr_set(struct device *dev, } if (data->max_odr < val->val1) { - SYS_LOG_ERR("not supported with current oversampling"); + LOG_ERR("not supported with current oversampling"); return -ENOTSUP; } @@ -489,35 +493,35 @@ static int bmm150_init_chip(struct device *dev) struct bmm150_preset preset; if (bmm150_set_power_mode(dev, BMM150_POWER_MODE_NORMAL, 0) < 0) { - SYS_LOG_ERR("failed to bring up device from normal mode"); + LOG_ERR("failed to bring up device from normal mode"); return -EIO; } if (bmm150_set_power_mode(dev, BMM150_POWER_MODE_SUSPEND, 1) < 0) { - SYS_LOG_ERR("failed to bring up device in suspend mode"); + LOG_ERR("failed to bring up device in suspend mode"); return -EIO; } if (bmm150_set_power_mode(dev, BMM150_POWER_MODE_SUSPEND, 0) < 0) { - SYS_LOG_ERR("failed to bring up device from suspend mode"); + LOG_ERR("failed to bring up device from suspend mode"); return -EIO; } if (i2c_reg_read_byte(data->i2c, config->i2c_slave_addr, BMM150_REG_CHIP_ID, &chip_id) < 0) { - SYS_LOG_ERR("failed reading chip id"); + LOG_ERR("failed reading chip id"); goto err_poweroff; } if (chip_id != BMM150_CHIP_ID_VAL) { - SYS_LOG_ERR("invalid chip id 0x%x", chip_id); + LOG_ERR("invalid chip id 0x%x", chip_id); goto err_poweroff; } preset = bmm150_presets_table[BMM150_DEFAULT_PRESET]; if (bmm150_set_odr(dev, preset.odr) < 0) { - SYS_LOG_ERR("failed to set ODR to %d", + LOG_ERR("failed to set ODR to %d", preset.odr); goto err_poweroff; } @@ -526,7 +530,7 @@ static int bmm150_init_chip(struct device *dev) BMM150_REG_REP_XY, BMM150_REPXY_TO_REGVAL(preset.rep_xy)) < 0) { - SYS_LOG_ERR("failed to set REP XY to %d", + LOG_ERR("failed to set REP XY to %d", preset.rep_xy); goto err_poweroff; } @@ -534,20 +538,20 @@ static int bmm150_init_chip(struct device *dev) if (i2c_reg_write_byte(data->i2c, config->i2c_slave_addr, BMM150_REG_REP_Z, BMM150_REPZ_TO_REGVAL(preset.rep_z)) < 0) { - SYS_LOG_ERR("failed to set REP Z to %d", + LOG_ERR("failed to set REP Z to %d", preset.rep_z); goto err_poweroff; } if (bmm150_set_power_mode(dev, BMM150_POWER_MODE_NORMAL, 1) < 0) { - SYS_LOG_ERR("failed to power on device"); + LOG_ERR("failed to power on device"); } if (i2c_burst_read(data->i2c, config->i2c_slave_addr, BMM150_REG_TRIM_START, (u8_t *)&data->tregs, sizeof(data->tregs)) < 0) { - SYS_LOG_ERR("failed to read trim regs"); + LOG_ERR("failed to read trim regs"); goto err_poweroff; } @@ -581,13 +585,13 @@ static int bmm150_init(struct device *dev) data->i2c = device_get_binding(config->i2c_master_dev_name); if (!data->i2c) { - SYS_LOG_ERR("i2c master not found: %s", + LOG_ERR("i2c master not found: %s", config->i2c_master_dev_name); return -EINVAL; } if (bmm150_init_chip(dev) < 0) { - SYS_LOG_ERR("failed to initialize chip"); + LOG_ERR("failed to initialize chip"); return -EIO; } diff --git a/drivers/sensor/bmm150/bmm150.h b/drivers/sensor/bmm150/bmm150.h index 320288b9e9d..f6438c83d46 100644 --- a/drivers/sensor/bmm150/bmm150.h +++ b/drivers/sensor/bmm150/bmm150.h @@ -22,7 +22,6 @@ #include #include - #define BMM150_REG_CHIP_ID 0x40 #define BMM150_CHIP_ID_VAL 0x32 @@ -158,7 +157,4 @@ enum bmm150_presets { #define BMM150_DEFAULT_PRESET BMM150_HIGH_ACCURACY_PRESET #endif -#define SYS_LOG_DOMAIN "BMM150" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include #endif /* __SENSOR_BMM150_H__ */ diff --git a/drivers/sensor/ccs811/ccs811.c b/drivers/sensor/ccs811/ccs811.c index 45c49e6e2f3..ef7dd92080d 100644 --- a/drivers/sensor/ccs811/ccs811.c +++ b/drivers/sensor/ccs811/ccs811.c @@ -12,9 +12,13 @@ #include #include #include +#include #include "ccs811.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(CCS811); + static int ccs811_sample_fetch(struct device *dev, enum sensor_channel chan) { struct ccs811_data *drv_data = dev->driver_data; @@ -26,7 +30,7 @@ static int ccs811_sample_fetch(struct device *dev, enum sensor_channel chan) while (tries-- > 0) { if (i2c_reg_read_byte(drv_data->i2c, CONFIG_CCS811_I2C_ADDR, CCS811_REG_STATUS, &status) < 0) { - SYS_LOG_ERR("Failed to read Status register"); + LOG_ERR("Failed to read Status register"); return -EIO; } @@ -38,13 +42,13 @@ static int ccs811_sample_fetch(struct device *dev, enum sensor_channel chan) } if (!(status & CCS811_STATUS_DATA_READY)) { - SYS_LOG_ERR("Sensor data not available"); + LOG_ERR("Sensor data not available"); return -EIO; } if (i2c_burst_read(drv_data->i2c, CONFIG_CCS811_I2C_ADDR, CCS811_REG_ALG_RESULT_DATA, (u8_t *)buf, 8) < 0) { - SYS_LOG_ERR("Failed to read conversion data."); + LOG_ERR("Failed to read conversion data."); return -EIO; } @@ -111,40 +115,40 @@ static int switch_to_app_mode(struct device *i2c) { u8_t status, buf; - SYS_LOG_DBG("Switching to Application mode..."); + LOG_DBG("Switching to Application mode..."); if (i2c_reg_read_byte(i2c, CONFIG_CCS811_I2C_ADDR, CCS811_REG_STATUS, &status) < 0) { - SYS_LOG_ERR("Failed to read Status register"); + LOG_ERR("Failed to read Status register"); return -EIO; } /* Check for the application firmware */ if (!(status & CCS811_STATUS_APP_VALID)) { - SYS_LOG_ERR("No Application firmware loaded"); + LOG_ERR("No Application firmware loaded"); return -EINVAL; } buf = CCS811_REG_APP_START; /* Set the device to application mode */ if (i2c_write(i2c, &buf, 1, CONFIG_CCS811_I2C_ADDR) < 0) { - SYS_LOG_ERR("Failed to set Application mode"); + LOG_ERR("Failed to set Application mode"); return -EIO; } if (i2c_reg_read_byte(i2c, CONFIG_CCS811_I2C_ADDR, CCS811_REG_STATUS, &status) < 0) { - SYS_LOG_ERR("Failed to read Status register"); + LOG_ERR("Failed to read Status register"); return -EIO; } /* Check for application mode */ if (!(status & CCS811_STATUS_FW_MODE)) { - SYS_LOG_ERR("Failed to start Application firmware"); + LOG_ERR("Failed to start Application firmware"); return -EINVAL; } - SYS_LOG_DBG("CCS811 Application firmware started!"); + LOG_DBG("CCS811 Application firmware started!"); return 0; } @@ -157,7 +161,7 @@ int ccs811_init(struct device *dev) drv_data->i2c = device_get_binding(CONFIG_CCS811_I2C_MASTER_DEV_NAME); if (drv_data->i2c == NULL) { - SYS_LOG_ERR("Failed to get pointer to %s device!", + LOG_ERR("Failed to get pointer to %s device!", CONFIG_CCS811_I2C_MASTER_DEV_NAME); return -EINVAL; } @@ -165,7 +169,7 @@ int ccs811_init(struct device *dev) #if defined(CONFIG_CCS811_GPIO_WAKEUP) || defined(CONFIG_CCS811_GPIO_RESET) drv_data->gpio = device_get_binding(CONFIG_CCS811_GPIO_DEV_NAME); if (drv_data->gpio == NULL) { - SYS_LOG_ERR("Failed to get pointer to %s device!", + LOG_ERR("Failed to get pointer to %s device!", CONFIG_CCS811_GPIO_DEV_NAME); return -EINVAL; } @@ -200,12 +204,12 @@ int ccs811_init(struct device *dev) /* Check Hardware ID */ if (i2c_reg_read_byte(drv_data->i2c, CONFIG_CCS811_I2C_ADDR, CCS811_REG_HW_ID, &hw_id) < 0) { - SYS_LOG_ERR("Failed to read Hardware ID register"); + LOG_ERR("Failed to read Hardware ID register"); return -EIO; } if (hw_id != CCS881_HW_ID) { - SYS_LOG_ERR("Hardware ID mismatch!"); + LOG_ERR("Hardware ID mismatch!"); return -EINVAL; } @@ -213,19 +217,19 @@ int ccs811_init(struct device *dev) if (i2c_reg_write_byte(drv_data->i2c, CONFIG_CCS811_I2C_ADDR, CCS811_REG_MEAS_MODE, CCS811_MODE_IAQ_1SEC) < 0) { - SYS_LOG_ERR("Failed to set Measurement mode"); + LOG_ERR("Failed to set Measurement mode"); return -EIO; } /* Check for error */ if (i2c_reg_read_byte(drv_data->i2c, CONFIG_CCS811_I2C_ADDR, CCS811_REG_STATUS, &status) < 0) { - SYS_LOG_ERR("Failed to read Status register"); + LOG_ERR("Failed to read Status register"); return -EIO; } if (status & CCS811_STATUS_ERROR) { - SYS_LOG_ERR("Error occurred during sensor configuration"); + LOG_ERR("Error occurred during sensor configuration"); return -EINVAL; } diff --git a/drivers/sensor/ccs811/ccs811.h b/drivers/sensor/ccs811/ccs811.h index 9d79bd209ea..a9d225697ab 100644 --- a/drivers/sensor/ccs811/ccs811.h +++ b/drivers/sensor/ccs811/ccs811.h @@ -54,8 +54,4 @@ struct ccs811_data { u16_t resistance; }; -#define SYS_LOG_DOMAIN "CCS811" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include - #endif /* _SENSOR_CCS811_ */ diff --git a/drivers/sensor/dht/dht.c b/drivers/sensor/dht/dht.c index adf928fa15c..82aa467c123 100644 --- a/drivers/sensor/dht/dht.c +++ b/drivers/sensor/dht/dht.c @@ -11,9 +11,13 @@ #include #include #include +#include #include "dht.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(DHT); + /** * @brief Measure duration of signal send by sensor * @@ -141,7 +145,7 @@ static int dht_sample_fetch(struct device *dev, enum sensor_channel chan) /* verify checksum */ if (((buf[0] + buf[1] + buf[2] + buf[3]) & 0xFF) != buf[4]) { - SYS_LOG_DBG("Invalid checksum in fetched sample"); + LOG_DBG("Invalid checksum in fetched sample"); ret = -EIO; } else { memcpy(drv_data->sample, buf, 4); @@ -216,7 +220,7 @@ static int dht_init(struct device *dev) drv_data->gpio = device_get_binding(CONFIG_DHT_GPIO_DEV_NAME); if (drv_data->gpio == NULL) { - SYS_LOG_ERR("Failed to get GPIO device."); + LOG_ERR("Failed to get GPIO device."); return -EINVAL; } diff --git a/drivers/sensor/dht/dht.h b/drivers/sensor/dht/dht.h index a172b9098e8..c01642d8862 100644 --- a/drivers/sensor/dht/dht.h +++ b/drivers/sensor/dht/dht.h @@ -9,10 +9,6 @@ #include -#define SYS_LOG_DOMAIN "DHT" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include - #define DHT_START_SIGNAL_DURATION 18000 #define DHT_SIGNAL_MAX_WAIT_DURATION 100 #define DHT_DATA_BITS_NUM 40 diff --git a/drivers/sensor/fxas21002/fxas21002.c b/drivers/sensor/fxas21002/fxas21002.c index 0a1bc411614..5f3369275cc 100644 --- a/drivers/sensor/fxas21002/fxas21002.c +++ b/drivers/sensor/fxas21002/fxas21002.c @@ -7,6 +7,10 @@ #include "fxas21002.h" #include #include +#include + +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(FXAS21002); /* Sample period in microseconds, indexed by output data rate encoding (DR) */ static const u32_t sample_period[] = { @@ -23,7 +27,7 @@ static int fxas21002_sample_fetch(struct device *dev, enum sensor_channel chan) int i; if (chan != SENSOR_CHAN_ALL) { - SYS_LOG_ERR("Unsupported sensor channel"); + LOG_ERR("Unsupported sensor channel"); return -ENOTSUP; } @@ -32,7 +36,7 @@ static int fxas21002_sample_fetch(struct device *dev, enum sensor_channel chan) /* Read all the channels in one I2C transaction. */ if (i2c_burst_read(data->i2c, config->i2c_address, FXAS21002_REG_OUTXMSB, buffer, sizeof(buffer))) { - SYS_LOG_ERR("Could not fetch sample"); + LOG_ERR("Could not fetch sample"); ret = -EIO; goto exit; } @@ -117,7 +121,7 @@ static int fxas21002_channel_get(struct device *dev, enum sensor_channel chan, } if (ret != 0) { - SYS_LOG_ERR("Unsupported sensor channel"); + LOG_ERR("Unsupported sensor channel"); } k_sem_give(&data->sem); @@ -134,7 +138,7 @@ int fxas21002_get_power(struct device *dev, enum fxas21002_power *power) if (i2c_reg_read_byte(data->i2c, config->i2c_address, FXAS21002_REG_CTRLREG1, &val)) { - SYS_LOG_ERR("Could not get power setting"); + LOG_ERR("Could not get power setting"); return -EIO; } val &= FXAS21002_CTRLREG1_POWER_MASK; @@ -190,7 +194,7 @@ static int fxas21002_init(struct device *dev) /* Get the I2C device */ data->i2c = device_get_binding(config->i2c_name); if (data->i2c == NULL) { - SYS_LOG_ERR("Could not find I2C device"); + LOG_ERR("Could not find I2C device"); return -EINVAL; } @@ -200,12 +204,12 @@ static int fxas21002_init(struct device *dev) */ if (i2c_reg_read_byte(data->i2c, config->i2c_address, FXAS21002_REG_WHOAMI, &whoami)) { - SYS_LOG_ERR("Could not get WHOAMI value"); + LOG_ERR("Could not get WHOAMI value"); return -EIO; } if (whoami != config->whoami) { - SYS_LOG_ERR("WHOAMI value received 0x%x, expected 0x%x", + LOG_ERR("WHOAMI value received 0x%x, expected 0x%x", whoami, config->whoami); return -EIO; } @@ -222,7 +226,7 @@ static int fxas21002_init(struct device *dev) do { if (i2c_reg_read_byte(data->i2c, config->i2c_address, FXAS21002_REG_CTRLREG1, &ctrlreg1)) { - SYS_LOG_ERR("Could not get ctrlreg1 value"); + LOG_ERR("Could not get ctrlreg1 value"); return -EIO; } } while (ctrlreg1 & FXAS21002_CTRLREG1_RST_MASK); @@ -232,7 +236,7 @@ static int fxas21002_init(struct device *dev) FXAS21002_REG_CTRLREG0, FXAS21002_CTRLREG0_FS_MASK, config->range)) { - SYS_LOG_ERR("Could not set range"); + LOG_ERR("Could not set range"); return -EIO; } @@ -241,7 +245,7 @@ static int fxas21002_init(struct device *dev) FXAS21002_REG_CTRLREG1, FXAS21002_CTRLREG1_DR_MASK, config->dr << FXAS21002_CTRLREG1_DR_SHIFT)) { - SYS_LOG_ERR("Could not set output data rate"); + LOG_ERR("Could not set output data rate"); return -EIO; } @@ -249,14 +253,14 @@ static int fxas21002_init(struct device *dev) #if CONFIG_FXAS21002_TRIGGER if (fxas21002_trigger_init(dev)) { - SYS_LOG_ERR("Could not initialize interrupts"); + LOG_ERR("Could not initialize interrupts"); return -EIO; } #endif /* Set active */ if (fxas21002_set_power(dev, FXAS21002_POWER_ACTIVE)) { - SYS_LOG_ERR("Could not set active"); + LOG_ERR("Could not set active"); return -EIO; } @@ -267,7 +271,7 @@ static int fxas21002_init(struct device *dev) k_busy_wait(transition_time); k_sem_give(&data->sem); - SYS_LOG_DBG("Init complete"); + LOG_DBG("Init complete"); return 0; } diff --git a/drivers/sensor/fxas21002/fxas21002.h b/drivers/sensor/fxas21002/fxas21002.h index 1fd1dca1aaf..82bcee702ee 100644 --- a/drivers/sensor/fxas21002/fxas21002.h +++ b/drivers/sensor/fxas21002/fxas21002.h @@ -8,10 +8,6 @@ #include #include -#define SYS_LOG_DOMAIN "FXAS21002" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include - #define FXAS21002_REG_STATUS 0x00 #define FXAS21002_REG_OUTXMSB 0x01 #define FXAS21002_REG_INT_SOURCE 0x0b diff --git a/drivers/sensor/fxas21002/fxas21002_trigger.c b/drivers/sensor/fxas21002/fxas21002_trigger.c index e8bbaee4cc9..896c3ab40b6 100644 --- a/drivers/sensor/fxas21002/fxas21002_trigger.c +++ b/drivers/sensor/fxas21002/fxas21002_trigger.c @@ -4,8 +4,14 @@ * SPDX-License-Identifier: Apache-2.0 */ +#include + #include "fxas21002.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_DECLARE(FXAS21002); + static void fxas21002_gpio_callback(struct device *dev, struct gpio_callback *cb, u32_t pin_mask) @@ -54,7 +60,7 @@ static void fxas21002_handle_int(void *arg) if (i2c_reg_read_byte(data->i2c, config->i2c_address, FXAS21002_REG_INT_SOURCE, &int_source)) { - SYS_LOG_ERR("Could not read interrupt source"); + LOG_ERR("Could not read interrupt source"); int_source = 0; } @@ -112,7 +118,7 @@ int fxas21002_trigger_set(struct device *dev, data->drdy_handler = handler; break; default: - SYS_LOG_ERR("Unsupported sensor trigger"); + LOG_ERR("Unsupported sensor trigger"); ret = -ENOTSUP; goto exit; } @@ -122,14 +128,14 @@ int fxas21002_trigger_set(struct device *dev, * can restore it later. */ if (fxas21002_get_power(dev, &power)) { - SYS_LOG_ERR("Could not get power mode"); + LOG_ERR("Could not get power mode"); ret = -EIO; goto exit; } /* Put the sensor in ready mode */ if (fxas21002_set_power(dev, FXAS21002_POWER_READY)) { - SYS_LOG_ERR("Could not set ready mode"); + LOG_ERR("Could not set ready mode"); ret = -EIO; goto exit; } @@ -139,14 +145,14 @@ int fxas21002_trigger_set(struct device *dev, FXAS21002_REG_CTRLREG2, mask, handler ? mask : 0)) { - SYS_LOG_ERR("Could not configure interrupt"); + LOG_ERR("Could not configure interrupt"); ret = -EIO; goto exit; } /* Restore the previous power mode */ if (fxas21002_set_power(dev, power)) { - SYS_LOG_ERR("Could not restore power mode"); + LOG_ERR("Could not restore power mode"); ret = -EIO; goto exit; } @@ -188,14 +194,14 @@ int fxas21002_trigger_init(struct device *dev) if (i2c_reg_write_byte(data->i2c, config->i2c_address, FXAS21002_REG_CTRLREG2, ctrl_reg2)) { - SYS_LOG_ERR("Could not configure interrupt pin routing"); + LOG_ERR("Could not configure interrupt pin routing"); return -EIO; } /* Get the GPIO device */ data->gpio = device_get_binding(config->gpio_name); if (data->gpio == NULL) { - SYS_LOG_ERR("Could not find GPIO device"); + LOG_ERR("Could not find GPIO device"); return -EINVAL; } diff --git a/drivers/sensor/fxos8700/fxos8700.c b/drivers/sensor/fxos8700/fxos8700.c index 5d63eff7ee9..b3a2bd7d55e 100644 --- a/drivers/sensor/fxos8700/fxos8700.c +++ b/drivers/sensor/fxos8700/fxos8700.c @@ -7,6 +7,10 @@ #include "fxos8700.h" #include #include +#include + +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(FXOS8700); static int fxos8700_sample_fetch(struct device *dev, enum sensor_channel chan) { @@ -19,7 +23,7 @@ static int fxos8700_sample_fetch(struct device *dev, enum sensor_channel chan) int i; if (chan != SENSOR_CHAN_ALL) { - SYS_LOG_ERR("Unsupported sensor channel"); + LOG_ERR("Unsupported sensor channel"); return -ENOTSUP; } @@ -35,7 +39,7 @@ static int fxos8700_sample_fetch(struct device *dev, enum sensor_channel chan) if (i2c_burst_read(data->i2c, config->i2c_address, config->start_addr, buffer, num_bytes)) { - SYS_LOG_ERR("Could not fetch sample"); + LOG_ERR("Could not fetch sample"); ret = -EIO; goto exit; } @@ -57,7 +61,7 @@ static int fxos8700_sample_fetch(struct device *dev, enum sensor_channel chan) #ifdef CONFIG_FXOS8700_TEMP if (i2c_reg_read_byte(data->i2c, config->i2c_address, FXOS8700_REG_TEMP, &data->temp)) { - SYS_LOG_ERR("Could not fetch temperature"); + LOG_ERR("Could not fetch temperature"); ret = -EIO; goto exit; } @@ -224,7 +228,7 @@ static int fxos8700_channel_get(struct device *dev, enum sensor_channel chan, } if (ret != 0) { - SYS_LOG_ERR("Unsupported sensor channel"); + LOG_ERR("Unsupported sensor channel"); } k_sem_give(&data->sem); @@ -241,7 +245,7 @@ int fxos8700_get_power(struct device *dev, enum fxos8700_power *power) if (i2c_reg_read_byte(data->i2c, config->i2c_address, FXOS8700_REG_CTRLREG1, &val)) { - SYS_LOG_ERR("Could not get power setting"); + LOG_ERR("Could not get power setting"); return -EIO; } val &= FXOS8700_M_CTRLREG1_MODE_MASK; @@ -270,7 +274,7 @@ static int fxos8700_init(struct device *dev) /* Get the I2C device */ data->i2c = device_get_binding(config->i2c_name); if (data->i2c == NULL) { - SYS_LOG_ERR("Could not find I2C device"); + LOG_ERR("Could not find I2C device"); return -EINVAL; } @@ -280,12 +284,12 @@ static int fxos8700_init(struct device *dev) */ if (i2c_reg_read_byte(data->i2c, config->i2c_address, FXOS8700_REG_WHOAMI, &whoami)) { - SYS_LOG_ERR("Could not get WHOAMI value"); + LOG_ERR("Could not get WHOAMI value"); return -EIO; } if (whoami != config->whoami) { - SYS_LOG_ERR("WHOAMI value received 0x%x, expected 0x%x", + LOG_ERR("WHOAMI value received 0x%x, expected 0x%x", whoami, FXOS8700_REG_WHOAMI); return -EIO; } @@ -308,7 +312,7 @@ static int fxos8700_init(struct device *dev) FXOS8700_REG_M_CTRLREG1, FXOS8700_M_CTRLREG1_MODE_MASK, config->mode)) { - SYS_LOG_ERR("Could not set mode"); + LOG_ERR("Could not set mode"); return -EIO; } @@ -319,7 +323,7 @@ static int fxos8700_init(struct device *dev) FXOS8700_REG_M_CTRLREG2, FXOS8700_M_CTRLREG2_AUTOINC_MASK, FXOS8700_M_CTRLREG2_AUTOINC_MASK)) { - SYS_LOG_ERR("Could not set hybrid autoincrement"); + LOG_ERR("Could not set hybrid autoincrement"); return -EIO; } @@ -328,7 +332,7 @@ static int fxos8700_init(struct device *dev) FXOS8700_REG_XYZ_DATA_CFG, FXOS8700_XYZ_DATA_CFG_FS_MASK, config->range)) { - SYS_LOG_ERR("Could not set range"); + LOG_ERR("Could not set range"); return -EIO; } @@ -336,19 +340,19 @@ static int fxos8700_init(struct device *dev) #if CONFIG_FXOS8700_TRIGGER if (fxos8700_trigger_init(dev)) { - SYS_LOG_ERR("Could not initialize interrupts"); + LOG_ERR("Could not initialize interrupts"); return -EIO; } #endif /* Set active */ if (fxos8700_set_power(dev, FXOS8700_POWER_ACTIVE)) { - SYS_LOG_ERR("Could not set active"); + LOG_ERR("Could not set active"); return -EIO; } k_sem_give(&data->sem); - SYS_LOG_DBG("Init complete"); + LOG_DBG("Init complete"); return 0; } diff --git a/drivers/sensor/fxos8700/fxos8700.h b/drivers/sensor/fxos8700/fxos8700.h index c8b731b5a0a..f13939c86c8 100644 --- a/drivers/sensor/fxos8700/fxos8700.h +++ b/drivers/sensor/fxos8700/fxos8700.h @@ -8,10 +8,6 @@ #include #include -#define SYS_LOG_DOMAIN "FXOS8700" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include - #define FXOS8700_REG_STATUS 0x00 #define FXOS8700_REG_OUTXMSB 0x01 #define FXOS8700_REG_INT_SOURCE 0x0c diff --git a/drivers/sensor/fxos8700/fxos8700_trigger.c b/drivers/sensor/fxos8700/fxos8700_trigger.c index 0b568b1bb31..2b8a96fd2a7 100644 --- a/drivers/sensor/fxos8700/fxos8700_trigger.c +++ b/drivers/sensor/fxos8700/fxos8700_trigger.c @@ -6,6 +6,10 @@ #include "fxos8700.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_DECLARE(FXOS8700); + static void fxos8700_gpio_callback(struct device *dev, struct gpio_callback *cb, u32_t pin_mask) @@ -59,7 +63,7 @@ static int fxos8700_handle_pulse_int(struct device *dev) if (i2c_reg_read_byte(data->i2c, config->i2c_address, FXOS8700_REG_PULSE_SRC, &pulse_source)) { - SYS_LOG_ERR("Could not read pulse source"); + LOG_ERR("Could not read pulse source"); } k_sem_give(&data->sem); @@ -92,7 +96,7 @@ static void fxos8700_handle_int(void *arg) if (i2c_reg_read_byte(data->i2c, config->i2c_address, FXOS8700_REG_INT_SOURCE, &int_source)) { - SYS_LOG_ERR("Could not read interrupt source"); + LOG_ERR("Could not read interrupt source"); int_source = 0; } @@ -164,7 +168,7 @@ int fxos8700_trigger_set(struct device *dev, break; #endif default: - SYS_LOG_ERR("Unsupported sensor trigger"); + LOG_ERR("Unsupported sensor trigger"); ret = -ENOTSUP; goto exit; } @@ -174,14 +178,14 @@ int fxos8700_trigger_set(struct device *dev, * later. */ if (fxos8700_get_power(dev, &power)) { - SYS_LOG_ERR("Could not get power mode"); + LOG_ERR("Could not get power mode"); ret = -EIO; goto exit; } /* Put the sensor in standby mode */ if (fxos8700_set_power(dev, FXOS8700_POWER_STANDBY)) { - SYS_LOG_ERR("Could not set standby mode"); + LOG_ERR("Could not set standby mode"); ret = -EIO; goto exit; } @@ -191,14 +195,14 @@ int fxos8700_trigger_set(struct device *dev, FXOS8700_REG_CTRLREG4, mask, handler ? mask : 0)) { - SYS_LOG_ERR("Could not configure interrupt"); + LOG_ERR("Could not configure interrupt"); ret = -EIO; goto exit; } /* Restore the previous power mode */ if (fxos8700_set_power(dev, power)) { - SYS_LOG_ERR("Could not restore power mode"); + LOG_ERR("Could not restore power mode"); ret = -EIO; goto exit; } @@ -282,13 +286,13 @@ int fxos8700_trigger_init(struct device *dev) if (i2c_reg_write_byte(data->i2c, config->i2c_address, FXOS8700_REG_CTRLREG5, ctrl_reg5)) { - SYS_LOG_ERR("Could not configure interrupt pin routing"); + LOG_ERR("Could not configure interrupt pin routing"); return -EIO; } #ifdef CONFIG_FXOS8700_PULSE if (fxos8700_pulse_init(dev)) { - SYS_LOG_ERR("Could not configure pulse"); + LOG_ERR("Could not configure pulse"); return -EIO; } #endif @@ -296,7 +300,7 @@ int fxos8700_trigger_init(struct device *dev) /* Get the GPIO device */ data->gpio = device_get_binding(config->gpio_name); if (data->gpio == NULL) { - SYS_LOG_ERR("Could not find GPIO device"); + LOG_ERR("Could not find GPIO device"); return -EINVAL; } diff --git a/drivers/sensor/hdc1008/hdc1008.c b/drivers/sensor/hdc1008/hdc1008.c index 9730ef40c17..753b6e274f3 100644 --- a/drivers/sensor/hdc1008/hdc1008.c +++ b/drivers/sensor/hdc1008/hdc1008.c @@ -11,9 +11,13 @@ #include #include #include +#include #include "hdc1008.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(HDC1008); + static void hdc1008_gpio_callback(struct device *dev, struct gpio_callback *cb, u32_t pins) { @@ -37,14 +41,14 @@ static int hdc1008_sample_fetch(struct device *dev, enum sensor_channel chan) buf[0] = HDC1008_REG_TEMP; if (i2c_write(drv_data->i2c, buf, 1, CONFIG_HDC1008_I2C_ADDR) < 0) { - SYS_LOG_DBG("Failed to write address pointer"); + LOG_DBG("Failed to write address pointer"); return -EIO; } k_sem_take(&drv_data->data_sem, K_FOREVER); if (i2c_read(drv_data->i2c, buf, 4, CONFIG_HDC1008_I2C_ADDR) < 0) { - SYS_LOG_DBG("Failed to read sample data"); + LOG_DBG("Failed to read sample data"); return -EIO; } @@ -95,7 +99,7 @@ static u16_t read16(struct device *dev, u8_t a, u8_t d) { u8_t buf[2]; if (i2c_burst_read(dev, a, d, (u8_t *)buf, 2) < 0) { - SYS_LOG_ERR("Error reading register."); + LOG_ERR("Error reading register."); } return (buf[0] << 8 | buf[1]); } @@ -107,19 +111,19 @@ static int hdc1008_init(struct device *dev) drv_data->i2c = device_get_binding(CONFIG_HDC1008_I2C_MASTER_DEV_NAME); if (drv_data->i2c == NULL) { - SYS_LOG_DBG("Failed to get pointer to %s device!", + LOG_DBG("Failed to get pointer to %s device!", CONFIG_HDC1008_I2C_MASTER_DEV_NAME); return -EINVAL; } if (read16(drv_data->i2c, CONFIG_HDC1008_I2C_ADDR, HDC1000_MANUFID) != 0x5449) { - SYS_LOG_ERR("Failed to get correct manufacturer ID"); + LOG_ERR("Failed to get correct manufacturer ID"); return -EINVAL; } if (read16(drv_data->i2c, CONFIG_HDC1008_I2C_ADDR, HDC1000_DEVICEID) != 0x1000) { - SYS_LOG_ERR("Failed to get correct device ID"); + LOG_ERR("Failed to get correct device ID"); return -EINVAL; } @@ -128,7 +132,7 @@ static int hdc1008_init(struct device *dev) /* setup data ready gpio interrupt */ drv_data->gpio = device_get_binding(CONFIG_HDC1008_GPIO_DEV_NAME); if (drv_data->gpio == NULL) { - SYS_LOG_DBG("Failed to get pointer to %s device", + LOG_DBG("Failed to get pointer to %s device", CONFIG_HDC1008_GPIO_DEV_NAME); return -EINVAL; } @@ -145,7 +149,7 @@ static int hdc1008_init(struct device *dev) BIT(CONFIG_HDC1008_GPIO_PIN_NUM)); if (gpio_add_callback(drv_data->gpio, &drv_data->gpio_cb) < 0) { - SYS_LOG_DBG("Failed to set GPIO callback"); + LOG_DBG("Failed to set GPIO callback"); return -EIO; } diff --git a/drivers/sensor/hdc1008/hdc1008.h b/drivers/sensor/hdc1008/hdc1008.h index ef2cf164627..df068032e64 100644 --- a/drivers/sensor/hdc1008/hdc1008.h +++ b/drivers/sensor/hdc1008/hdc1008.h @@ -25,7 +25,4 @@ struct hdc1008_data { struct k_sem data_sem; }; -#define SYS_LOG_DOMAIN "HDC1008" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include #endif diff --git a/drivers/sensor/hmc5883l/hmc5883l.c b/drivers/sensor/hmc5883l/hmc5883l.c index 1c0d67424fb..47c1f801bd1 100644 --- a/drivers/sensor/hmc5883l/hmc5883l.c +++ b/drivers/sensor/hmc5883l/hmc5883l.c @@ -10,9 +10,13 @@ #include #include #include +#include #include "hmc5883l.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(HMC5883L); + static void hmc5883l_convert(struct sensor_value *val, s16_t raw_val, u16_t divider) { @@ -58,7 +62,7 @@ static int hmc5883l_sample_fetch(struct device *dev, enum sensor_channel chan) /* fetch magnetometer sample */ if (i2c_burst_read(drv_data->i2c, HMC5883L_I2C_ADDR, HMC5883L_REG_DATA_START, (u8_t *)buf, 6) < 0) { - SYS_LOG_ERR("Failed to fetch megnetometer sample."); + LOG_ERR("Failed to fetch megnetometer sample."); return -EIO; } @@ -84,7 +88,7 @@ int hmc5883l_init(struct device *dev) drv_data->i2c = device_get_binding(CONFIG_HMC5883L_I2C_MASTER_DEV_NAME); if (drv_data->i2c == NULL) { - SYS_LOG_ERR("Failed to get pointer to %s device.", + LOG_ERR("Failed to get pointer to %s device.", CONFIG_HMC5883L_I2C_MASTER_DEV_NAME); return -EINVAL; } @@ -92,13 +96,13 @@ int hmc5883l_init(struct device *dev) /* check chip ID */ if (i2c_burst_read(drv_data->i2c, HMC5883L_I2C_ADDR, HMC5883L_REG_CHIP_ID, id, 3) < 0) { - SYS_LOG_ERR("Failed to read chip ID."); + LOG_ERR("Failed to read chip ID."); return -EIO; } if (id[0] != HMC5883L_CHIP_ID_A || id[1] != HMC5883L_CHIP_ID_B || id[2] != HMC5883L_CHIP_ID_C) { - SYS_LOG_ERR("Invalid chip ID."); + LOG_ERR("Invalid chip ID."); return -EINVAL; } @@ -110,7 +114,7 @@ int hmc5883l_init(struct device *dev) } if (idx == ARRAY_SIZE(hmc5883l_fs_strings)) { - SYS_LOG_ERR("Invalid full-scale range value."); + LOG_ERR("Invalid full-scale range value."); return -EINVAL; } @@ -124,7 +128,7 @@ int hmc5883l_init(struct device *dev) } if (idx == ARRAY_SIZE(hmc5883l_odr_strings)) { - SYS_LOG_ERR("Invalid ODR value."); + LOG_ERR("Invalid ODR value."); return -EINVAL; } @@ -135,13 +139,13 @@ int hmc5883l_init(struct device *dev) if (i2c_burst_write(drv_data->i2c, HMC5883L_I2C_ADDR, HMC5883L_REG_CONFIG_A, chip_cfg, 3) < 0) { - SYS_LOG_ERR("Failed to configure chip."); + LOG_ERR("Failed to configure chip."); return -EIO; } #ifdef CONFIG_HMC5883L_TRIGGER if (hmc5883l_init_interrupt(dev) < 0) { - SYS_LOG_ERR("Failed to initialize interrupts."); + LOG_ERR("Failed to initialize interrupts."); return -EIO; } #endif diff --git a/drivers/sensor/hmc5883l/hmc5883l.h b/drivers/sensor/hmc5883l/hmc5883l.h index faa4cb11047..0e959bdabe7 100644 --- a/drivers/sensor/hmc5883l/hmc5883l.h +++ b/drivers/sensor/hmc5883l/hmc5883l.h @@ -12,10 +12,6 @@ #include #include -#define SYS_LOG_DOMAIN "HMC5883L" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include - #define HMC5883L_I2C_ADDR 0x1E #define HMC5883L_REG_CONFIG_A 0x00 diff --git a/drivers/sensor/hmc5883l/hmc5883l_trigger.c b/drivers/sensor/hmc5883l/hmc5883l_trigger.c index 7f8faf4f0e4..fcbb320313f 100644 --- a/drivers/sensor/hmc5883l/hmc5883l_trigger.c +++ b/drivers/sensor/hmc5883l/hmc5883l_trigger.c @@ -13,6 +13,10 @@ #include "hmc5883l.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_DECLARE(HMC5883L); + int hmc5883l_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) @@ -97,7 +101,7 @@ int hmc5883l_init_interrupt(struct device *dev) /* setup data ready gpio interrupt */ drv_data->gpio = device_get_binding(CONFIG_HMC5883L_GPIO_DEV_NAME); if (drv_data->gpio == NULL) { - SYS_LOG_ERR("Failed to get pointer to %s device.", + LOG_ERR("Failed to get pointer to %s device.", CONFIG_HMC5883L_GPIO_DEV_NAME); return -EINVAL; } @@ -111,7 +115,7 @@ int hmc5883l_init_interrupt(struct device *dev) BIT(CONFIG_HMC5883L_GPIO_PIN_NUM)); if (gpio_add_callback(drv_data->gpio, &drv_data->gpio_cb) < 0) { - SYS_LOG_ERR("Failed to set gpio callback."); + LOG_ERR("Failed to set gpio callback."); return -EIO; } diff --git a/drivers/sensor/hp206c/hp206c.c b/drivers/sensor/hp206c/hp206c.c index 940f46e9a63..8067d368a1b 100644 --- a/drivers/sensor/hp206c/hp206c.c +++ b/drivers/sensor/hp206c/hp206c.c @@ -14,9 +14,14 @@ #include #include #include +#include #include "hp206c.h" + +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(HP206C); + static inline int hp206c_bus_config(struct device *dev) { struct hp206c_device_data *hp206c = dev->driver_data; @@ -284,13 +289,13 @@ static int hp206c_init(struct device *dev) hp206c->i2c = device_get_binding(CONFIG_HP206C_I2C_PORT_NAME); if (!hp206c->i2c) { - SYS_LOG_ERR("I2C master controller not found!"); + LOG_ERR("I2C master controller not found!"); return -EINVAL; } /* reset the chip */ if (hp206c_cmd_send(dev, HP206C_CMD_SOFT_RST) < 0) { - SYS_LOG_ERR("Cannot reset chip."); + LOG_ERR("Cannot reset chip."); return -EIO; } @@ -299,7 +304,7 @@ static int hp206c_init(struct device *dev) k_busy_wait(500); if (hp206c_osr_set(dev, HP206C_DEFAULT_OSR) < 0) { - SYS_LOG_ERR("OSR value is not supported."); + LOG_ERR("OSR value is not supported."); return -ENOTSUP; } diff --git a/drivers/sensor/hp206c/hp206c.h b/drivers/sensor/hp206c/hp206c.h index 4568a4fc63b..277330aeae9 100644 --- a/drivers/sensor/hp206c/hp206c.h +++ b/drivers/sensor/hp206c/hp206c.h @@ -81,7 +81,4 @@ struct hp206c_device_data { u8_t osr; }; -#define SYS_LOG_DOMAIN "HP206C" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include #endif /* ZEPHYR_DRIVERS_SENSOR_HP206C_HP206C_H_ */ diff --git a/drivers/sensor/hts221/hts221.c b/drivers/sensor/hts221/hts221.c index 028c072da6d..672ead700c8 100644 --- a/drivers/sensor/hts221/hts221.c +++ b/drivers/sensor/hts221/hts221.c @@ -10,9 +10,13 @@ #include #include #include +#include #include "hts221.h" +#define LOG_LEVEL CONFIG_SENSOR_LEVEL +LOG_MODULE_REGISTER(HTS221); + static int hts221_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) @@ -61,7 +65,7 @@ static int hts221_sample_fetch(struct device *dev, enum sensor_channel chan) if (i2c_burst_read(drv_data->i2c, HTS221_I2C_ADDR, HTS221_REG_DATA_START | HTS221_AUTOINCREMENT_ADDR, buf, 4) < 0) { - SYS_LOG_ERR("Failed to fetch data sample."); + LOG_ERR("Failed to fetch data sample."); return -EIO; } @@ -78,7 +82,7 @@ static int hts221_read_conversion_data(struct hts221_data *drv_data) if (i2c_burst_read(drv_data->i2c, HTS221_I2C_ADDR, HTS221_REG_CONVERSION_START | HTS221_AUTOINCREMENT_ADDR, buf, 16) < 0) { - SYS_LOG_ERR("Failed to read conversion data."); + LOG_ERR("Failed to read conversion data."); return -EIO; } @@ -109,7 +113,7 @@ int hts221_init(struct device *dev) drv_data->i2c = device_get_binding(CONFIG_HTS221_I2C_MASTER_DEV_NAME); if (drv_data->i2c == NULL) { - SYS_LOG_ERR("Could not get pointer to %s device.", + LOG_ERR("Could not get pointer to %s device.", CONFIG_HTS221_I2C_MASTER_DEV_NAME); return -EINVAL; } @@ -117,12 +121,12 @@ int hts221_init(struct device *dev) /* check chip ID */ if (i2c_reg_read_byte(drv_data->i2c, HTS221_I2C_ADDR, HTS221_REG_WHO_AM_I, &id) < 0) { - SYS_LOG_ERR("Failed to read chip ID."); + LOG_ERR("Failed to read chip ID."); return -EIO; } if (id != HTS221_CHIP_ID) { - SYS_LOG_ERR("Invalid chip ID."); + LOG_ERR("Invalid chip ID."); return -EINVAL; } @@ -134,14 +138,14 @@ int hts221_init(struct device *dev) } if (idx == ARRAY_SIZE(hts221_odr_strings)) { - SYS_LOG_ERR("Invalid ODR value."); + LOG_ERR("Invalid ODR value."); return -EINVAL; } if (i2c_reg_write_byte(drv_data->i2c, HTS221_I2C_ADDR, HTS221_REG_CTRL1, (idx + 1) << HTS221_ODR_SHIFT | HTS221_BDU_BIT | HTS221_PD_BIT) < 0) { - SYS_LOG_ERR("Failed to configure chip."); + LOG_ERR("Failed to configure chip."); return -EIO; } @@ -152,13 +156,13 @@ int hts221_init(struct device *dev) k_sleep(3); if (hts221_read_conversion_data(drv_data) < 0) { - SYS_LOG_ERR("Failed to read conversion data."); + LOG_ERR("Failed to read conversion data."); return -EINVAL; } #ifdef CONFIG_HTS221_TRIGGER if (hts221_init_interrupt(dev) < 0) { - SYS_LOG_ERR("Failed to initialize interrupt."); + LOG_ERR("Failed to initialize interrupt."); return -EIO; } #endif diff --git a/drivers/sensor/hts221/hts221.h b/drivers/sensor/hts221/hts221.h index b95e6c8aebb..1ba75f900dd 100644 --- a/drivers/sensor/hts221/hts221.h +++ b/drivers/sensor/hts221/hts221.h @@ -12,10 +12,6 @@ #include #include -#define SYS_LOG_DOMAIN "HTS221" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include - #define HTS221_I2C_ADDR 0x5F #define HTS221_AUTOINCREMENT_ADDR BIT(7) diff --git a/drivers/sensor/hts221/hts221_trigger.c b/drivers/sensor/hts221/hts221_trigger.c index 0dcee93224c..c7995c9a3e2 100644 --- a/drivers/sensor/hts221/hts221_trigger.c +++ b/drivers/sensor/hts221/hts221_trigger.c @@ -13,6 +13,10 @@ #include "hts221.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_DECLARE(HTS221); + int hts221_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) @@ -97,7 +101,7 @@ int hts221_init_interrupt(struct device *dev) /* setup data ready gpio interrupt */ drv_data->gpio = device_get_binding(CONFIG_HTS221_GPIO_DEV_NAME); if (drv_data->gpio == NULL) { - SYS_LOG_ERR("Cannot get pointer to %s device.", + LOG_ERR("Cannot get pointer to %s device.", CONFIG_HTS221_GPIO_DEV_NAME); return -EINVAL; } @@ -111,14 +115,14 @@ int hts221_init_interrupt(struct device *dev) BIT(CONFIG_HTS221_GPIO_PIN_NUM)); if (gpio_add_callback(drv_data->gpio, &drv_data->gpio_cb) < 0) { - SYS_LOG_ERR("Could not set gpio callback."); + LOG_ERR("Could not set gpio callback."); return -EIO; } /* enable data-ready interrupt */ if (i2c_reg_write_byte(drv_data->i2c, HTS221_I2C_ADDR, HTS221_REG_CTRL3, HTS221_DRDY_EN) < 0) { - SYS_LOG_ERR("Could not enable data-ready interrupt."); + LOG_ERR("Could not enable data-ready interrupt."); return -EIO; } diff --git a/drivers/sensor/isl29035/isl29035.c b/drivers/sensor/isl29035/isl29035.c index caf61996dce..48d274da5e0 100644 --- a/drivers/sensor/isl29035/isl29035.c +++ b/drivers/sensor/isl29035/isl29035.c @@ -11,9 +11,13 @@ #include #include #include +#include #include "isl29035.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(ISL29035); + static int isl29035_sample_fetch(struct device *dev, enum sensor_channel chan) { struct isl29035_driver_data *drv_data = dev->driver_data; @@ -73,7 +77,7 @@ static int isl29035_init(struct device *dev) drv_data->i2c = device_get_binding(CONFIG_ISL29035_I2C_MASTER_DEV_NAME); if (drv_data->i2c == NULL) { - SYS_LOG_DBG("Failed to get I2C device."); + LOG_DBG("Failed to get I2C device."); return -EINVAL; } @@ -82,20 +86,20 @@ static int isl29035_init(struct device *dev) /* clear blownout status bit */ if (i2c_reg_update_byte(drv_data->i2c, ISL29035_I2C_ADDRESS, ISL29035_ID_REG, ISL29035_BOUT_MASK, 0) < 0) { - SYS_LOG_DBG("Failed to clear blownout status bit."); + LOG_DBG("Failed to clear blownout status bit."); return -EIO; } /* set command registers to set default attributes */ if (i2c_reg_write_byte(drv_data->i2c, ISL29035_I2C_ADDRESS, ISL29035_COMMAND_I_REG, 0) < 0) { - SYS_LOG_DBG("Failed to clear COMMAND-I."); + LOG_DBG("Failed to clear COMMAND-I."); return -EIO; } if (i2c_reg_write_byte(drv_data->i2c, ISL29035_I2C_ADDRESS, ISL29035_COMMAND_II_REG, 0) < 0) { - SYS_LOG_DBG("Failed to clear COMMAND-II."); + LOG_DBG("Failed to clear COMMAND-II."); return -EIO; } @@ -104,7 +108,7 @@ static int isl29035_init(struct device *dev) ISL29035_COMMAND_I_REG, ISL29035_OPMODE_MASK, ISL29035_ACTIVE_OPMODE_BITS) < 0) { - SYS_LOG_DBG("Failed to set opmode."); + LOG_DBG("Failed to set opmode."); return -EIO; } @@ -113,7 +117,7 @@ static int isl29035_init(struct device *dev) ISL29035_COMMAND_II_REG, ISL29035_LUX_RANGE_MASK, ISL29035_LUX_RANGE_BITS) < 0) { - SYS_LOG_DBG("Failed to set lux range."); + LOG_DBG("Failed to set lux range."); return -EIO; } @@ -122,13 +126,13 @@ static int isl29035_init(struct device *dev) ISL29035_COMMAND_II_REG, ISL29035_ADC_RES_MASK, ISL29035_ADC_RES_BITS) < 0) { - SYS_LOG_DBG("Failed to set ADC resolution."); + LOG_DBG("Failed to set ADC resolution."); return -EIO; } #ifdef CONFIG_ISL29035_TRIGGER if (isl29035_init_interrupt(dev) < 0) { - SYS_LOG_DBG("Failed to initialize interrupt."); + LOG_DBG("Failed to initialize interrupt."); return -EIO; } #endif diff --git a/drivers/sensor/isl29035/isl29035.h b/drivers/sensor/isl29035/isl29035.h index 25c9c30498a..2941bce1084 100644 --- a/drivers/sensor/isl29035/isl29035.h +++ b/drivers/sensor/isl29035/isl29035.h @@ -146,7 +146,4 @@ int isl29035_trigger_set(struct device *dev, int isl29035_init_interrupt(struct device *dev); #endif -#define SYS_LOG_DOMAIN "ISL29035" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include #endif /* ZEPHYR_DRIVERS_SENSOR_ISL29035_ISL29035_H_ */ diff --git a/drivers/sensor/isl29035/isl29035_trigger.c b/drivers/sensor/isl29035/isl29035_trigger.c index 85c5a2963e2..d99402e9469 100644 --- a/drivers/sensor/isl29035/isl29035_trigger.c +++ b/drivers/sensor/isl29035/isl29035_trigger.c @@ -14,6 +14,10 @@ extern struct isl29035_driver_data isl29035_data; +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_DECLARE(ISL29035); + static u16_t isl29035_lux_processed_to_raw(struct sensor_value const *val) { u64_t raw_val; @@ -50,7 +54,7 @@ int isl29035_attr_set(struct device *dev, lsb_reg, raw_val & 0xFF) < 0 || i2c_reg_write_byte(drv_data->i2c, ISL29035_I2C_ADDRESS, msb_reg, raw_val >> 8) < 0) { - SYS_LOG_DBG("Failed to set attribute."); + LOG_DBG("Failed to set attribute."); return -EIO; } @@ -142,14 +146,14 @@ int isl29035_init_interrupt(struct device *dev) ISL29035_COMMAND_I_REG, ISL29035_INT_PRST_MASK, ISL29035_INT_PRST_BITS) < 0) { - SYS_LOG_DBG("Failed to set interrupt persistence cycles."); + LOG_DBG("Failed to set interrupt persistence cycles."); return -EIO; } /* setup gpio interrupt */ drv_data->gpio = device_get_binding(CONFIG_ISL29035_GPIO_DEV_NAME); if (drv_data->gpio == NULL) { - SYS_LOG_DBG("Failed to get GPIO device."); + LOG_DBG("Failed to get GPIO device."); return -EINVAL; } @@ -162,7 +166,7 @@ int isl29035_init_interrupt(struct device *dev) BIT(CONFIG_ISL29035_GPIO_PIN_NUM)); if (gpio_add_callback(drv_data->gpio, &drv_data->gpio_cb) < 0) { - SYS_LOG_DBG("Failed to set gpio callback."); + LOG_DBG("Failed to set gpio callback."); return -EIO; } diff --git a/drivers/sensor/lis2dh/lis2dh.c b/drivers/sensor/lis2dh/lis2dh.c index 375a5ad3758..830a5e554fc 100644 --- a/drivers/sensor/lis2dh/lis2dh.c +++ b/drivers/sensor/lis2dh/lis2dh.c @@ -9,6 +9,10 @@ #include #include #include +#include + +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(lis2dh); #if defined(CONFIG_LIS2DH_BUS_SPI) int lis2dh_spi_access(struct lis2dh_data *ctx, u8_t cmd, @@ -134,7 +138,7 @@ static int lis2dh_sample_fetch(struct device *dev, enum sensor_channel chan) lis2dh->sample.raw, sizeof(lis2dh->sample.raw)); if (status < 0) { - SYS_LOG_WRN("Could not read accel axis data"); + LOG_WRN("Could not read accel axis data"); return status; } @@ -145,7 +149,7 @@ static int lis2dh_sample_fetch(struct device *dev, enum sensor_channel chan) *sample = sys_le16_to_cpu(*sample); } - SYS_LOG_INF("status=0x%x x=%d y=%d z=%d", lis2dh->sample.status, + LOG_INF("status=0x%x x=%d y=%d z=%d", lis2dh->sample.status, lis2dh->sample.xyz[0], lis2dh->sample.xyz[1], lis2dh->sample.xyz[2]); @@ -273,7 +277,7 @@ static int lis2dh_acc_config(struct device *dev, enum sensor_channel chan, return lis2dh_acc_slope_config(dev, attr, val); #endif default: - SYS_LOG_DBG("Accel attribute not supported."); + LOG_DBG("Accel attribute not supported."); return -ENOTSUP; } @@ -291,7 +295,7 @@ static int lis2dh_attr_set(struct device *dev, enum sensor_channel chan, case SENSOR_CHAN_ACCEL_XYZ: return lis2dh_acc_config(dev, chan, attr, val); default: - SYS_LOG_WRN("attr_set() not supported on this channel."); + LOG_WRN("attr_set() not supported on this channel."); return -ENOTSUP; } @@ -329,7 +333,7 @@ int lis2dh_init(struct device *dev) status = lis2dh_burst_write(dev, LIS2DH_REG_CTRL1, raw, sizeof(raw)); if (status < 0) { - SYS_LOG_ERR("Failed to reset ctrl registers."); + LOG_ERR("Failed to reset ctrl registers."); return status; } @@ -338,19 +342,19 @@ int lis2dh_init(struct device *dev) status = lis2dh_reg_write_byte(dev, LIS2DH_REG_CTRL4, LIS2DH_FS_BITS); if (status < 0) { - SYS_LOG_ERR("Failed to set full scale ctrl register."); + LOG_ERR("Failed to set full scale ctrl register."); return status; } #ifdef CONFIG_LIS2DH_TRIGGER status = lis2dh_init_interrupt(dev); if (status < 0) { - SYS_LOG_ERR("Failed to initialize interrupts."); + LOG_ERR("Failed to initialize interrupts."); return status; } #endif - SYS_LOG_INF("bus=%s fs=%d, odr=0x%x lp_en=0x%x scale=%d", + LOG_INF("bus=%s fs=%d, odr=0x%x lp_en=0x%x scale=%d", LIS2DH_BUS_DEV_NAME, 1 << (LIS2DH_FS_IDX + 1), LIS2DH_ODR_IDX, (u8_t)LIS2DH_LP_EN_BIT, lis2dh->scale); diff --git a/drivers/sensor/lis2dh/lis2dh.h b/drivers/sensor/lis2dh/lis2dh.h index 6488beec26f..815b2ac4681 100644 --- a/drivers/sensor/lis2dh/lis2dh.h +++ b/drivers/sensor/lis2dh/lis2dh.h @@ -14,7 +14,9 @@ #include #include #include +#include +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL #if defined(CONFIG_LIS2DH_BUS_SPI) #include @@ -216,15 +218,44 @@ struct lis2dh_data { #endif /* CONFIG_LIS2DH_TRIGGER */ }; -#define SYS_LOG_DOMAIN "lis2dh" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include - #if defined(CONFIG_LIS2DH_BUS_SPI) int lis2dh_spi_access(struct lis2dh_data *ctx, u8_t cmd, void *data, size_t length); #endif +static inline int lis2dh_bus_configure(struct device *dev) +{ + struct lis2dh_data *lis2dh = dev->driver_data; + + LOG_MODULE_DECLARE(lis2dh); + +#if defined(CONFIG_LIS2DH_BUS_SPI) + lis2dh->spi = device_get_binding(LIS2DH_BUS_DEV_NAME); + if (lis2dh->spi == NULL) { + LOG_ERR("Could not get pointer to %s device", + LIS2DH_BUS_DEV_NAME); + return -EINVAL; + } + + lis2dh->spi_cfg.operation = LIS2DH_SPI_CFG; + lis2dh->spi_cfg.frequency = CONFIG_LIS2DH_SPI_FREQUENCY; + lis2dh->spi_cfg.slave = LIS2DH_BUS_ADDRESS; + + return 0; +#elif defined(CONFIG_LIS2DH_BUS_I2C) + lis2dh->bus = device_get_binding(LIS2DH_BUS_DEV_NAME); + if (lis2dh->bus == NULL) { + LOG_ERR("Could not get pointer to %s device", + LIS2DH_BUS_DEV_NAME); + return -EINVAL; + } + + return 0; +#else + return -ENODEV; +#endif +} + static inline int lis2dh_burst_read(struct device *dev, u8_t start_addr, u8_t *buf, u8_t num_bytes) { @@ -297,37 +328,6 @@ static inline int lis2dh_reg_write_byte(struct device *dev, u8_t reg_addr, #endif } -static inline int lis2dh_bus_configure(struct device *dev) -{ - struct lis2dh_data *lis2dh = dev->driver_data; - -#if defined(CONFIG_LIS2DH_BUS_SPI) - lis2dh->spi = device_get_binding(LIS2DH_BUS_DEV_NAME); - if (lis2dh->spi == NULL) { - SYS_LOG_ERR("Could not get pointer to %s device", - LIS2DH_BUS_DEV_NAME); - return -EINVAL; - } - - lis2dh->spi_cfg.operation = LIS2DH_SPI_CFG; - lis2dh->spi_cfg.frequency = CONFIG_LIS2DH_SPI_FREQUENCY; - lis2dh->spi_cfg.slave = LIS2DH_BUS_ADDRESS; - - return 0; -#elif defined(CONFIG_LIS2DH_BUS_I2C) - lis2dh->bus = device_get_binding(LIS2DH_BUS_DEV_NAME); - if (lis2dh->bus == NULL) { - SYS_LOG_ERR("Could not get pointer to %s device", - LIS2DH_BUS_DEV_NAME); - return -EINVAL; - } - - return 0; -#else - return -ENODEV; -#endif -} - #ifdef CONFIG_LIS2DH_TRIGGER int lis2dh_trigger_set(struct device *dev, const struct sensor_trigger *trig, diff --git a/drivers/sensor/lis2dh/lis2dh_trigger.c b/drivers/sensor/lis2dh/lis2dh_trigger.c index ff742dd77d7..d4479b6a2dd 100644 --- a/drivers/sensor/lis2dh/lis2dh_trigger.c +++ b/drivers/sensor/lis2dh/lis2dh_trigger.c @@ -14,6 +14,10 @@ #define TRIGGED_INT1 BIT(4) #define TRIGGED_INT2 BIT(5) +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_DECLARE(lis2dh); + static int lis2dh_trigger_drdy_set(struct device *dev, enum sensor_channel chan, sensor_trigger_handler_t handler) { @@ -67,7 +71,7 @@ static int lis2dh_start_trigger_int1(struct device *dev) return status; } - SYS_LOG_DBG("ctrl1=0x%x @tick=%u", ctrl1, k_cycle_get_32()); + LOG_DBG("ctrl1=0x%x @tick=%u", ctrl1, k_cycle_get_32()); /* empty output data */ status = lis2dh_burst_read(dev, LIS2DH_REG_STATUS, raw, sizeof(raw)); @@ -134,7 +138,7 @@ static int lis2dh_start_trigger_int2(struct device *dev) status = gpio_pin_enable_callback(lis2dh->gpio, CONFIG_LIS2DH_INT2_GPIO_PIN); if (unlikely(status < 0)) { - SYS_LOG_ERR("enable callback failed err=%d", status); + LOG_ERR("enable callback failed err=%d", status); } return lis2dh_reg_write_byte(dev, LIS2DH_REG_INT2_CFG, @@ -183,7 +187,7 @@ int lis2dh_acc_slope_config(struct device *dev, enum sensor_attribute attr, /* 7 bit full range value */ reg_val = 128 / range_g * (slope_th_ums2 - 1) / SENSOR_G; - SYS_LOG_INF("int2_ths=0x%x range_g=%d ums2=%u", reg_val, + LOG_INF("int2_ths=0x%x range_g=%d ums2=%u", reg_val, range_g, slope_th_ums2 - 1); status = lis2dh_reg_write_byte(dev, LIS2DH_REG_INT2_THS, @@ -197,7 +201,7 @@ int lis2dh_acc_slope_config(struct device *dev, enum sensor_attribute attr, return -ENOTSUP; } - SYS_LOG_INF("int2_dur=0x%x", val->val1); + LOG_INF("int2_dur=0x%x", val->val1); status = lis2dh_reg_write_byte(dev, LIS2DH_REG_INT2_DUR, val->val1); @@ -250,7 +254,7 @@ static void lis2dh_thread_cb(void *arg) int status = lis2dh_start_trigger_int1(dev); if (unlikely(status < 0)) { - SYS_LOG_ERR("lis2dh_start_trigger_int1: %d", status); + LOG_ERR("lis2dh_start_trigger_int1: %d", status); } return; } @@ -260,7 +264,7 @@ static void lis2dh_thread_cb(void *arg) int status = lis2dh_start_trigger_int2(dev); if (unlikely(status < 0)) { - SYS_LOG_ERR("lis2dh_start_trigger_int2: %d", status); + LOG_ERR("lis2dh_start_trigger_int2: %d", status); } return; } @@ -294,7 +298,7 @@ static void lis2dh_thread_cb(void *arg) lis2dh->handler_anymotion(dev, &anym_trigger); } - SYS_LOG_DBG("@tick=%u int2_src=0x%x", k_cycle_get_32(), + LOG_DBG("@tick=%u int2_src=0x%x", k_cycle_get_32(), reg_val); return; @@ -342,7 +346,7 @@ int lis2dh_init_interrupt(struct device *dev) /* setup data ready gpio interrupt */ lis2dh->gpio = device_get_binding(CONFIG_LIS2DH_GPIO_DEV_NAME); if (lis2dh->gpio == NULL) { - SYS_LOG_ERR("Cannot get pointer to %s device", + LOG_ERR("Cannot get pointer to %s device", CONFIG_LIS2DH_GPIO_DEV_NAME); return -EINVAL; } @@ -351,7 +355,7 @@ int lis2dh_init_interrupt(struct device *dev) status = gpio_pin_configure(lis2dh->gpio, CONFIG_LIS2DH_INT1_GPIO_PIN, LIS2DH_INT1_CFG); if (status < 0) { - SYS_LOG_ERR("Could not configure gpio %d", + LOG_ERR("Could not configure gpio %d", CONFIG_LIS2DH_INT1_GPIO_PIN); return status; } @@ -362,7 +366,7 @@ int lis2dh_init_interrupt(struct device *dev) status = gpio_add_callback(lis2dh->gpio, &lis2dh->gpio_int1_cb); if (status < 0) { - SYS_LOG_ERR("Could not add gpio int1 callback"); + LOG_ERR("Could not add gpio int1 callback"); return status; } @@ -370,7 +374,7 @@ int lis2dh_init_interrupt(struct device *dev) status = gpio_pin_configure(lis2dh->gpio, CONFIG_LIS2DH_INT2_GPIO_PIN, LIS2DH_INT2_CFG); if (status < 0) { - SYS_LOG_ERR("Could not configure gpio %d", + LOG_ERR("Could not configure gpio %d", CONFIG_LIS2DH_INT2_GPIO_PIN); return status; } @@ -382,7 +386,7 @@ int lis2dh_init_interrupt(struct device *dev) /* callback is going to be enabled by trigger setting function */ status = gpio_add_callback(lis2dh->gpio, &lis2dh->gpio_int2_cb); if (status < 0) { - SYS_LOG_ERR("Could not add gpio int2 callback (%d)", status); + LOG_ERR("Could not add gpio int2 callback (%d)", status); return status; } @@ -400,7 +404,7 @@ int lis2dh_init_interrupt(struct device *dev) /* disable interrupt 2 in case of warm (re)boot */ status = lis2dh_reg_write_byte(dev, LIS2DH_REG_INT2_CFG, 0); if (status < 0) { - SYS_LOG_ERR("Interrupt 2 disable reg write failed (%d)", + LOG_ERR("Interrupt 2 disable reg write failed (%d)", status); return status; } @@ -408,7 +412,7 @@ int lis2dh_init_interrupt(struct device *dev) (void)memset(raw, 0, sizeof(raw)); status = lis2dh_burst_write(dev, LIS2DH_REG_INT2_THS, raw, sizeof(raw)); if (status < 0) { - SYS_LOG_ERR("Burst write to INT2 THS failed (%d)", status); + LOG_ERR("Burst write to INT2 THS failed (%d)", status); return status; } @@ -416,11 +420,11 @@ int lis2dh_init_interrupt(struct device *dev) status = lis2dh_reg_write_byte(dev, LIS2DH_REG_CTRL5, LIS2DH_EN_LIR_INT2); if (status < 0) { - SYS_LOG_ERR("INT2 latch enable reg write failed (%d)", status); + LOG_ERR("INT2 latch enable reg write failed (%d)", status); return status; } - SYS_LOG_INF("int1 on pin=%d cfg=0x%x, int2 on pin=%d cfg=0x%x", + LOG_INF("int1 on pin=%d cfg=0x%x, int2 on pin=%d cfg=0x%x", CONFIG_LIS2DH_INT1_GPIO_PIN, LIS2DH_INT1_CFG, CONFIG_LIS2DH_INT2_GPIO_PIN, LIS2DH_INT2_CFG); diff --git a/drivers/sensor/lis2mdl/lis2mdl.c b/drivers/sensor/lis2mdl/lis2mdl.c index 74d1967d40e..3d8835f8c24 100644 --- a/drivers/sensor/lis2mdl/lis2mdl.c +++ b/drivers/sensor/lis2mdl/lis2mdl.c @@ -16,6 +16,10 @@ struct lis2mdl_data lis2mdl_device_data; +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_REGISTER(LIS2MDL); + #ifdef CONFIG_LIS2MDL_MAG_ODR_RUNTIME static const struct { u16_t odr; @@ -161,7 +165,7 @@ static int lis2mdl_channel_get(struct device *dev, enum sensor_channel chan, lis2mdl_channel_get_temp(dev, val); break; default: - SYS_LOG_DBG("Channel not supported"); + LOG_DBG("Channel not supported"); return -ENOTSUP; } @@ -180,7 +184,7 @@ static int lis2mdl_config(struct device *dev, enum sensor_channel chan, case SENSOR_ATTR_OFFSET: return lis2mdl_set_hard_iron(dev, chan, val); default: - SYS_LOG_DBG("Mag attribute not supported"); + LOG_DBG("Mag attribute not supported"); return -ENOTSUP; } @@ -199,7 +203,7 @@ static int lis2mdl_attr_set(struct device *dev, case SENSOR_CHAN_MAGN_XYZ: return lis2mdl_config(dev, chan, attr, val); default: - SYS_LOG_DBG("attr_set() not supported on %d channel", chan); + LOG_DBG("attr_set() not supported on %d channel", chan); return -ENOTSUP; } @@ -221,7 +225,7 @@ static int lis2mdl_sample_fetch_mag(struct device *dev) if (i2c_burst_read(lis2mdl->i2c, lis2mdl->i2c_addr, LIS2MDL_OUT_REG, buf.raw, sizeof(buf)) < 0) { - SYS_LOG_DBG("Failed to fetch raw mag sample"); + LOG_DBG("Failed to fetch raw mag sample"); return -EIO; } @@ -244,7 +248,7 @@ static int lis2mdl_sample_fetch_temp(struct device *dev) LIS2MDL_TEMP_OUT_L_REG, (u8_t *)&temp_raw, sizeof(temp_raw)); if (ret < 0) { - SYS_LOG_DBG("Failed to fetch raw temp sample"); + LOG_DBG("Failed to fetch raw temp sample"); return -EIO; } @@ -295,7 +299,7 @@ static int lis2mdl_init_interface(struct device *dev) lis2mdl->i2c = device_get_binding(config->master_dev_name); if (!lis2mdl->i2c) { - SYS_LOG_DBG("Could not get pointer to %s device", + LOG_DBG("Could not get pointer to %s device", config->master_dev_name); return -EINVAL; } @@ -326,12 +330,12 @@ static int lis2mdl_init(struct device *dev) /* check chip ID */ if (i2c_reg_read_byte(lis2mdl->i2c, lis2mdl->i2c_addr, LIS2MDL_WHO_AM_I_REG, &wai) < 0) { - SYS_LOG_DBG("Failed to read chip ID"); + LOG_DBG("Failed to read chip ID"); return -EIO; } if (wai != LIS2MDL_WHOAMI_VAL) { - SYS_LOG_DBG("Invalid chip ID"); + LOG_DBG("Invalid chip ID"); return -EINVAL; } @@ -362,7 +366,7 @@ static int lis2mdl_init(struct device *dev) #ifdef CONFIG_LIS2MDL_TRIGGER if (lis2mdl_init_interrupt(dev) < 0) { - SYS_LOG_DBG("Failed to initialize interrupts"); + LOG_DBG("Failed to initialize interrupts"); return -EIO; } #endif diff --git a/drivers/sensor/lis2mdl/lis2mdl.h b/drivers/sensor/lis2mdl/lis2mdl.h index 2a114bbdf0e..fb82c83306a 100644 --- a/drivers/sensor/lis2mdl/lis2mdl.h +++ b/drivers/sensor/lis2mdl/lis2mdl.h @@ -13,10 +13,6 @@ #include #include -#define SYS_LOG_DOMAIN "LIS2MDL" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include - #define LIS2MDL_EN_BIT 1 #define LIS2MDL_DIS_BIT 0 #define LIS2MDL_I2C_ADDR(__x) (__x << 1) diff --git a/drivers/sensor/lis2mdl/lis2mdl_trigger.c b/drivers/sensor/lis2mdl/lis2mdl_trigger.c index 25f238ebde0..fef8745a2ce 100644 --- a/drivers/sensor/lis2mdl/lis2mdl_trigger.c +++ b/drivers/sensor/lis2mdl/lis2mdl_trigger.c @@ -12,6 +12,10 @@ #include "lis2mdl.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_DECLARE(LIS2MDL); + static int lis2mdl_enable_int(struct device *dev, int enable) { struct lis2mdl_data *lis2mdl = dev->driver_data; @@ -118,7 +122,7 @@ int lis2mdl_init_interrupt(struct device *dev) /* setup data ready gpio interrupt */ lis2mdl->gpio = device_get_binding(config->gpio_name); if (lis2mdl->gpio == NULL) { - SYS_LOG_DBG("Cannot get pointer to %s device", + LOG_DBG("Cannot get pointer to %s device", config->gpio_name); return -EINVAL; } @@ -132,7 +136,7 @@ int lis2mdl_init_interrupt(struct device *dev) BIT(config->gpio_pin)); if (gpio_add_callback(lis2mdl->gpio, &lis2mdl->gpio_cb) < 0) { - SYS_LOG_DBG("Could not set gpio callback"); + LOG_DBG("Could not set gpio callback"); return -EIO; } diff --git a/drivers/sensor/lis3dh/lis3dh.c b/drivers/sensor/lis3dh/lis3dh.c index 596d37706c4..efafd46f5e3 100644 --- a/drivers/sensor/lis3dh/lis3dh.c +++ b/drivers/sensor/lis3dh/lis3dh.c @@ -8,9 +8,13 @@ #include #include #include +#include #include "lis3dh.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(LIS3DH); + static void lis3dh_convert(struct sensor_value *val, s64_t raw_val) { /* val = raw_val * LIS3DH_ACCEL_SCALE / (10^6 * (2^16 - 1)) */ @@ -63,7 +67,7 @@ int lis3dh_sample_fetch(struct device *dev, enum sensor_channel chan) if (i2c_burst_read(drv_data->i2c, LIS3DH_I2C_ADDRESS, (LIS3DH_REG_ACCEL_X_LSB | LIS3DH_AUTOINCREMENT_ADDR), buf, 6) < 0) { - SYS_LOG_DBG("Could not read accel axis data"); + LOG_DBG("Could not read accel axis data"); return -EIO; } @@ -88,7 +92,7 @@ int lis3dh_init(struct device *dev) drv_data->i2c = device_get_binding(CONFIG_LIS3DH_I2C_MASTER_DEV_NAME); if (drv_data->i2c == NULL) { - SYS_LOG_DBG("Could not get pointer to %s device", + LOG_DBG("Could not get pointer to %s device", CONFIG_LIS3DH_I2C_MASTER_DEV_NAME); return -EINVAL; } @@ -97,19 +101,19 @@ int lis3dh_init(struct device *dev) if (i2c_reg_write_byte(drv_data->i2c, LIS3DH_I2C_ADDRESS, LIS3DH_REG_CTRL1, LIS3DH_ACCEL_EN_BITS | LIS3DH_LP_EN_BIT | LIS3DH_ODR_BITS) < 0) { - SYS_LOG_DBG("Failed to configure chip."); + LOG_DBG("Failed to configure chip."); } /* set full scale range */ if (i2c_reg_write_byte(drv_data->i2c, LIS3DH_I2C_ADDRESS, LIS3DH_REG_CTRL4, LIS3DH_FS_BITS) < 0) { - SYS_LOG_DBG("Failed to set full scale range."); + LOG_DBG("Failed to set full scale range."); return -EIO; } #ifdef CONFIG_LIS3DH_TRIGGER if (lis3dh_init_interrupt(dev) < 0) { - SYS_LOG_DBG("Failed to initialize interrupts."); + LOG_DBG("Failed to initialize interrupts."); return -EIO; } #endif diff --git a/drivers/sensor/lis3dh/lis3dh.h b/drivers/sensor/lis3dh/lis3dh.h index 8ef4509ce83..3d677042930 100644 --- a/drivers/sensor/lis3dh/lis3dh.h +++ b/drivers/sensor/lis3dh/lis3dh.h @@ -114,7 +114,4 @@ int lis3dh_sample_fetch(struct device *dev, enum sensor_channel chan); int lis3dh_init_interrupt(struct device *dev); #endif -#define SYS_LOG_DOMAIN "LIS3DH" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include #endif /* __SENSOR_LIS3DH__ */ diff --git a/drivers/sensor/lis3dh/lis3dh_trigger.c b/drivers/sensor/lis3dh/lis3dh_trigger.c index 912d7c00dbb..5ffe4a4c563 100644 --- a/drivers/sensor/lis3dh/lis3dh_trigger.c +++ b/drivers/sensor/lis3dh/lis3dh_trigger.c @@ -9,9 +9,14 @@ #include #include #include +#include #include "lis3dh.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_DECLARE(LIS3DH); + int lis3dh_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) @@ -97,7 +102,7 @@ int lis3dh_init_interrupt(struct device *dev) /* setup data ready gpio interrupt */ drv_data->gpio = device_get_binding(CONFIG_LIS3DH_GPIO_DEV_NAME); if (drv_data->gpio == NULL) { - SYS_LOG_DBG("Cannot get pointer to %s device", + LOG_DBG("Cannot get pointer to %s device", CONFIG_LIS3DH_GPIO_DEV_NAME); return -EINVAL; } @@ -111,20 +116,20 @@ int lis3dh_init_interrupt(struct device *dev) BIT(CONFIG_LIS3DH_GPIO_PIN_NUM)); if (gpio_add_callback(drv_data->gpio, &drv_data->gpio_cb) < 0) { - SYS_LOG_DBG("Could not set gpio callback"); + LOG_DBG("Could not set gpio callback"); return -EIO; } /* clear data ready interrupt line by reading sample data */ if (lis3dh_sample_fetch(dev, SENSOR_CHAN_ALL) < 0) { - SYS_LOG_DBG("Could not clear data ready interrupt line."); + LOG_DBG("Could not clear data ready interrupt line."); return -EIO; } /* enable data ready interrupt on INT1 line */ if (i2c_reg_write_byte(drv_data->i2c, LIS3DH_I2C_ADDRESS, LIS3DH_REG_CTRL3, LIS3DH_EN_DRDY1_INT1) < 0) { - SYS_LOG_DBG("Failed to enable data ready interrupt."); + LOG_DBG("Failed to enable data ready interrupt."); return -EIO; } diff --git a/drivers/sensor/lis3mdl/lis3mdl.c b/drivers/sensor/lis3mdl/lis3mdl.c index d6ba17f0184..33b6c322de7 100644 --- a/drivers/sensor/lis3mdl/lis3mdl.c +++ b/drivers/sensor/lis3mdl/lis3mdl.c @@ -10,9 +10,13 @@ #include #include #include +#include #include "lis3mdl.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(LIS3MDL); + static void lis3mdl_convert(struct sensor_value *val, s16_t raw_val, u16_t divider) { @@ -63,7 +67,7 @@ int lis3mdl_sample_fetch(struct device *dev, enum sensor_channel chan) /* fetch magnetometer sample */ if (i2c_burst_read(drv_data->i2c, CONFIG_LIS3MDL_I2C_ADDR, LIS3MDL_REG_SAMPLE_START, (u8_t *)buf, 8) < 0) { - SYS_LOG_DBG("Failed to fetch megnetometer sample."); + LOG_DBG("Failed to fetch megnetometer sample."); return -EIO; } @@ -75,7 +79,7 @@ int lis3mdl_sample_fetch(struct device *dev, enum sensor_channel chan) if (i2c_burst_read(drv_data->i2c, CONFIG_LIS3MDL_I2C_ADDR, LIS3MDL_REG_SAMPLE_START + 6, (u8_t *)(buf + 3), 2) < 0) { - SYS_LOG_DBG("Failed to fetch temperature sample."); + LOG_DBG("Failed to fetch temperature sample."); return -EIO; }; @@ -104,7 +108,7 @@ int lis3mdl_init(struct device *dev) drv_data->i2c = device_get_binding(CONFIG_LIS3MDL_I2C_MASTER_DEV_NAME); if (drv_data->i2c == NULL) { - SYS_LOG_ERR("Could not get pointer to %s device.", + LOG_ERR("Could not get pointer to %s device.", CONFIG_LIS3MDL_I2C_MASTER_DEV_NAME); return -EINVAL; } @@ -112,12 +116,12 @@ int lis3mdl_init(struct device *dev) /* check chip ID */ if (i2c_reg_read_byte(drv_data->i2c, CONFIG_LIS3MDL_I2C_ADDR, LIS3MDL_REG_WHO_AM_I, &id) < 0) { - SYS_LOG_ERR("Failed to read chip ID."); + LOG_ERR("Failed to read chip ID."); return -EIO; } if (id != LIS3MDL_CHIP_ID) { - SYS_LOG_ERR("Invalid chip ID."); + LOG_ERR("Invalid chip ID."); return -EINVAL; } @@ -129,7 +133,7 @@ int lis3mdl_init(struct device *dev) } if (idx == ARRAY_SIZE(lis3mdl_odr_strings)) { - SYS_LOG_ERR("Invalid ODR value."); + LOG_ERR("Invalid ODR value."); return -EINVAL; } @@ -145,13 +149,13 @@ int lis3mdl_init(struct device *dev) if (i2c_write(drv_data->i2c, chip_cfg, 6, CONFIG_LIS3MDL_I2C_ADDR) < 0) { - SYS_LOG_DBG("Failed to configure chip."); + LOG_DBG("Failed to configure chip."); return -EIO; } #ifdef CONFIG_LIS3MDL_TRIGGER if (lis3mdl_init_interrupt(dev) < 0) { - SYS_LOG_DBG("Failed to initialize interrupts."); + LOG_DBG("Failed to initialize interrupts."); return -EIO; } #endif diff --git a/drivers/sensor/lis3mdl/lis3mdl.h b/drivers/sensor/lis3mdl/lis3mdl.h index 667a499c6d1..1e423b07121 100644 --- a/drivers/sensor/lis3mdl/lis3mdl.h +++ b/drivers/sensor/lis3mdl/lis3mdl.h @@ -12,10 +12,6 @@ #include #include -#define SYS_LOG_DOMAIN "LIS3MDL" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include - #define LIS3MDL_I2C_ADDR_BASE 0x1C #define LIS3MDL_I2C_ADDR_MASK (~BIT(1)) diff --git a/drivers/sensor/lis3mdl/lis3mdl_trigger.c b/drivers/sensor/lis3mdl/lis3mdl_trigger.c index 6cb796e4fa4..ee9f88f9835 100644 --- a/drivers/sensor/lis3mdl/lis3mdl_trigger.c +++ b/drivers/sensor/lis3mdl/lis3mdl_trigger.c @@ -13,6 +13,10 @@ #include "lis3mdl.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_DECLARE(LIS3MDL); + int lis3mdl_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) @@ -97,7 +101,7 @@ int lis3mdl_init_interrupt(struct device *dev) /* setup data ready gpio interrupt */ drv_data->gpio = device_get_binding(CONFIG_LIS3MDL_GPIO_DEV_NAME); if (drv_data->gpio == NULL) { - SYS_LOG_DBG("Cannot get pointer to %s device.", + LOG_DBG("Cannot get pointer to %s device.", CONFIG_LIS3MDL_GPIO_DEV_NAME); return -EINVAL; } @@ -111,20 +115,20 @@ int lis3mdl_init_interrupt(struct device *dev) BIT(CONFIG_LIS3MDL_GPIO_PIN_NUM)); if (gpio_add_callback(drv_data->gpio, &drv_data->gpio_cb) < 0) { - SYS_LOG_DBG("Could not set gpio callback."); + LOG_DBG("Could not set gpio callback."); return -EIO; } /* clear data ready interrupt line by reading sample data */ if (lis3mdl_sample_fetch(dev, SENSOR_CHAN_ALL) < 0) { - SYS_LOG_DBG("Could not clear data ready interrupt line."); + LOG_DBG("Could not clear data ready interrupt line."); return -EIO; } /* enable interrupt */ if (i2c_reg_write_byte(drv_data->i2c, CONFIG_LIS3MDL_I2C_ADDR, LIS3MDL_REG_INT_CFG, LIS3MDL_INT_XYZ_EN) < 0) { - SYS_LOG_DBG("Could not enable interrupt."); + LOG_DBG("Could not enable interrupt."); return -EIO; } diff --git a/drivers/sensor/lps22hb/lps22hb.c b/drivers/sensor/lps22hb/lps22hb.c index 41019b1c8bf..09153689dbc 100644 --- a/drivers/sensor/lps22hb/lps22hb.c +++ b/drivers/sensor/lps22hb/lps22hb.c @@ -12,9 +12,13 @@ #include #include #include +#include #include "lps22hb.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(LPS22HB); + static inline int lps22hb_set_odr_raw(struct device *dev, u8_t odr) { struct lps22hb_data *data = dev->driver_data; @@ -37,7 +41,7 @@ static int lps22hb_sample_fetch(struct device *dev, if (i2c_burst_read(data->i2c_master, config->i2c_slave_addr, LPS22HB_REG_PRESS_OUT_XL, out, 5) < 0) { - SYS_LOG_DBG("Failed to read sample"); + LOG_DBG("Failed to read sample"); return -EIO; } @@ -98,17 +102,17 @@ static int lps22hb_init_chip(struct device *dev) if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr, LPS22HB_REG_WHO_AM_I, &chip_id) < 0) { - SYS_LOG_DBG("Failed reading chip id"); + LOG_DBG("Failed reading chip id"); goto err_poweroff; } if (chip_id != LPS22HB_VAL_WHO_AM_I) { - SYS_LOG_DBG("Invalid chip id 0x%x", chip_id); + LOG_DBG("Invalid chip id 0x%x", chip_id); goto err_poweroff; } if (lps22hb_set_odr_raw(dev, LPS22HB_DEFAULT_SAMPLING_RATE) < 0) { - SYS_LOG_DBG("Failed to set sampling rate"); + LOG_DBG("Failed to set sampling rate"); goto err_poweroff; } @@ -116,7 +120,7 @@ static int lps22hb_init_chip(struct device *dev) LPS22HB_REG_CTRL_REG1, LPS22HB_MASK_CTRL_REG1_BDU, (1 << LPS22HB_SHIFT_CTRL_REG1_BDU)) < 0) { - SYS_LOG_DBG("Failed to set BDU"); + LOG_DBG("Failed to set BDU"); goto err_poweroff; } @@ -134,13 +138,13 @@ static int lps22hb_init(struct device *dev) data->i2c_master = device_get_binding(config->i2c_master_dev_name); if (!data->i2c_master) { - SYS_LOG_DBG("I2c master not found: %s", + LOG_DBG("I2c master not found: %s", config->i2c_master_dev_name); return -EINVAL; } if (lps22hb_init_chip(dev) < 0) { - SYS_LOG_DBG("Failed to initialize chip"); + LOG_DBG("Failed to initialize chip"); return -EIO; } diff --git a/drivers/sensor/lps22hb/lps22hb.h b/drivers/sensor/lps22hb/lps22hb.h index 2cc25c81412..d30b1b10060 100644 --- a/drivers/sensor/lps22hb/lps22hb.h +++ b/drivers/sensor/lps22hb/lps22hb.h @@ -164,7 +164,4 @@ struct lps22hb_data { s16_t sample_temp; }; -#define SYS_LOG_DOMAIN "LPS22HB" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include #endif /* ZEPHYR_DRIVERS_SENSOR_LPS22HB_LPS22HB_H_ */ diff --git a/drivers/sensor/lps25hb/lps25hb.c b/drivers/sensor/lps25hb/lps25hb.c index 25c6df40d5a..98cdaaea2e8 100644 --- a/drivers/sensor/lps25hb/lps25hb.c +++ b/drivers/sensor/lps25hb/lps25hb.c @@ -12,9 +12,13 @@ #include #include #include +#include #include "lps25hb.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(LPS25HB); + static inline int lps25hb_power_ctrl(struct device *dev, u8_t value) { struct lps25hb_data *data = dev->driver_data; @@ -51,7 +55,7 @@ static int lps25hb_sample_fetch(struct device *dev, if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr, LPS25HB_REG_PRESS_OUT_XL + offset, out + offset) < 0) { - SYS_LOG_DBG("failed to read sample"); + LOG_DBG("failed to read sample"); return -EIO; } } @@ -116,7 +120,7 @@ static int lps25hb_init_chip(struct device *dev) k_busy_wait(50 * USEC_PER_MSEC); if (lps25hb_power_ctrl(dev, 1) < 0) { - SYS_LOG_DBG("failed to power on device"); + LOG_DBG("failed to power on device"); return -EIO; } @@ -124,19 +128,19 @@ static int lps25hb_init_chip(struct device *dev) if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr, LPS25HB_REG_WHO_AM_I, &chip_id) < 0) { - SYS_LOG_DBG("failed reading chip id"); + LOG_DBG("failed reading chip id"); goto err_poweroff; } if (chip_id != LPS25HB_VAL_WHO_AM_I) { - SYS_LOG_DBG("invalid chip id 0x%x", chip_id); + LOG_DBG("invalid chip id 0x%x", chip_id); goto err_poweroff; } - SYS_LOG_DBG("chip id 0x%x", chip_id); + LOG_DBG("chip id 0x%x", chip_id); if (lps25hb_set_odr_raw(dev, LPS25HB_DEFAULT_SAMPLING_RATE) < 0) { - SYS_LOG_DBG("failed to set sampling rate"); + LOG_DBG("failed to set sampling rate"); goto err_poweroff; } @@ -144,7 +148,7 @@ static int lps25hb_init_chip(struct device *dev) LPS25HB_REG_CTRL_REG1, LPS25HB_MASK_CTRL_REG1_BDU, (1 << LPS25HB_SHIFT_CTRL_REG1_BDU)) < 0) { - SYS_LOG_DBG("failed to set BDU"); + LOG_DBG("failed to set BDU"); goto err_poweroff; } @@ -162,13 +166,13 @@ static int lps25hb_init(struct device *dev) data->i2c_master = device_get_binding(config->i2c_master_dev_name); if (!data->i2c_master) { - SYS_LOG_DBG("i2c master not found: %s", + LOG_DBG("i2c master not found: %s", config->i2c_master_dev_name); return -EINVAL; } if (lps25hb_init_chip(dev) < 0) { - SYS_LOG_DBG("failed to initialize chip"); + LOG_DBG("failed to initialize chip"); return -EIO; } diff --git a/drivers/sensor/lps25hb/lps25hb.h b/drivers/sensor/lps25hb/lps25hb.h index dbc6e89dfce..70b29fd61e9 100644 --- a/drivers/sensor/lps25hb/lps25hb.h +++ b/drivers/sensor/lps25hb/lps25hb.h @@ -158,7 +158,4 @@ struct lps25hb_data { s16_t sample_temp; }; -#define SYS_LOG_DOMAIN "LPS25HB" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include #endif /* ZEPHYR_DRIVERS_SENSOR_LPS25HB_LPS25HB_H_ */ diff --git a/drivers/sensor/lsm6ds0/lsm6ds0.c b/drivers/sensor/lsm6ds0/lsm6ds0.c index bab31e66b56..4b9a7f9859c 100644 --- a/drivers/sensor/lsm6ds0/lsm6ds0.c +++ b/drivers/sensor/lsm6ds0/lsm6ds0.c @@ -14,9 +14,13 @@ #include #include #include +#include #include "lsm6ds0.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(LSM6DS0); + static inline int lsm6ds0_reboot(struct device *dev) { struct lsm6ds0_data *data = dev->driver_data; @@ -136,7 +140,7 @@ static int lsm6ds0_sample_fetch_accel(struct device *dev) if (i2c_burst_read(data->i2c_master, config->i2c_slave_addr, LSM6DS0_REG_OUT_X_L_XL, buf, sizeof(buf)) < 0) { - SYS_LOG_DBG("failed to read sample"); + LOG_DBG("failed to read sample"); return -EIO; } @@ -164,7 +168,7 @@ static int lsm6ds0_sample_fetch_gyro(struct device *dev) if (i2c_burst_read(data->i2c_master, config->i2c_slave_addr, LSM6DS0_REG_OUT_X_L_G, buf, sizeof(buf)) < 0) { - SYS_LOG_DBG("failed to read sample"); + LOG_DBG("failed to read sample"); return -EIO; } @@ -193,7 +197,7 @@ static int lsm6ds0_sample_fetch_temp(struct device *dev) if (i2c_burst_read(data->i2c_master, config->i2c_slave_addr, LSM6DS0_REG_OUT_TEMP_L, buf, sizeof(buf)) < 0) { - SYS_LOG_DBG("failed to read sample"); + LOG_DBG("failed to read sample"); return -EIO; } @@ -406,56 +410,56 @@ static int lsm6ds0_init_chip(struct device *dev) u8_t chip_id; if (lsm6ds0_reboot(dev) < 0) { - SYS_LOG_DBG("failed to reboot device"); + LOG_DBG("failed to reboot device"); return -EIO; } if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr, LSM6DS0_REG_WHO_AM_I, &chip_id) < 0) { - SYS_LOG_DBG("failed reading chip id"); + LOG_DBG("failed reading chip id"); return -EIO; } if (chip_id != LSM6DS0_VAL_WHO_AM_I) { - SYS_LOG_DBG("invalid chip id 0x%x", chip_id); + LOG_DBG("invalid chip id 0x%x", chip_id); return -EIO; } - SYS_LOG_DBG("chip id 0x%x", chip_id); + LOG_DBG("chip id 0x%x", chip_id); if (lsm6ds0_accel_axis_ctrl(dev, LSM6DS0_ACCEL_ENABLE_X_AXIS, LSM6DS0_ACCEL_ENABLE_Y_AXIS, LSM6DS0_ACCEL_ENABLE_Z_AXIS) < 0) { - SYS_LOG_DBG("failed to set accelerometer axis"); + LOG_DBG("failed to set accelerometer axis"); return -EIO; } if (lsm6ds0_accel_set_fs_raw(dev, LSM6DS0_DEFAULT_ACCEL_FULLSCALE) < 0) { - SYS_LOG_DBG("failed to set accelerometer full-scale"); + LOG_DBG("failed to set accelerometer full-scale"); return -EIO; } if (lsm6ds0_accel_set_odr_raw(dev, LSM6DS0_DEFAULT_ACCEL_SAMPLING_RATE) < 0) { - SYS_LOG_DBG("failed to set accelerometer sampling rate"); + LOG_DBG("failed to set accelerometer sampling rate"); return -EIO; } if (lsm6ds0_gyro_axis_ctrl(dev, LSM6DS0_GYRO_ENABLE_X_AXIS, LSM6DS0_GYRO_ENABLE_Y_AXIS, LSM6DS0_GYRO_ENABLE_Z_AXIS) < 0) { - SYS_LOG_DBG("failed to set gyroscope axis"); + LOG_DBG("failed to set gyroscope axis"); return -EIO; } if (lsm6ds0_gyro_set_fs_raw(dev, LSM6DS0_DEFAULT_GYRO_FULLSCALE) < 0) { - SYS_LOG_DBG("failed to set gyroscope full-scale"); + LOG_DBG("failed to set gyroscope full-scale"); return -EIO; } if (lsm6ds0_gyro_set_odr_raw(dev, LSM6DS0_DEFAULT_GYRO_SAMPLING_RATE) < 0) { - SYS_LOG_DBG("failed to set gyroscope sampling rate"); + LOG_DBG("failed to set gyroscope sampling rate"); return -EIO; } @@ -468,7 +472,7 @@ static int lsm6ds0_init_chip(struct device *dev) (0 << LSM6DS0_SHIFT_CTRL_REG8_BLE) | (1 << LSM6DS0_SHIFT_CTRL_REG8_IF_ADD_INC)) < 0) { - SYS_LOG_DBG("failed to set BDU, BLE and burst"); + LOG_DBG("failed to set BDU, BLE and burst"); return -EIO; } @@ -482,13 +486,13 @@ static int lsm6ds0_init(struct device *dev) data->i2c_master = device_get_binding(config->i2c_master_dev_name); if (!data->i2c_master) { - SYS_LOG_DBG("i2c master not found: %s", + LOG_DBG("i2c master not found: %s", config->i2c_master_dev_name); return -EINVAL; } if (lsm6ds0_init_chip(dev) < 0) { - SYS_LOG_DBG("failed to initialize chip"); + LOG_DBG("failed to initialize chip"); return -EIO; } diff --git a/drivers/sensor/lsm6ds0/lsm6ds0.h b/drivers/sensor/lsm6ds0/lsm6ds0.h index 70cc87c8fd5..f34302b8b80 100644 --- a/drivers/sensor/lsm6ds0/lsm6ds0.h +++ b/drivers/sensor/lsm6ds0/lsm6ds0.h @@ -492,7 +492,4 @@ struct lsm6ds0_data { #endif }; -#define SYS_LOG_DOMAIN "LSM6DS0" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include #endif /* ZEPHYR_DRIVERS_SENSOR_LSM6DS0_LSM6DS0_H_ */ diff --git a/drivers/sensor/lsm6dsl/lsm6dsl.c b/drivers/sensor/lsm6dsl/lsm6dsl.c index f7fd746c6bd..8a71f516016 100644 --- a/drivers/sensor/lsm6dsl/lsm6dsl.c +++ b/drivers/sensor/lsm6dsl/lsm6dsl.c @@ -15,9 +15,13 @@ #include #include #include +#include #include "lsm6dsl.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(LSM6DSL); + static const u16_t lsm6dsl_odr_map[] = {0, 12, 26, 52, 104, 208, 416, 833, 1660, 3330, 6660}; @@ -179,7 +183,7 @@ static int lsm6dsl_accel_odr_set(struct device *dev, u16_t freq) } if (lsm6dsl_accel_set_odr_raw(dev, odr) < 0) { - SYS_LOG_DBG("failed to set accelerometer sampling rate"); + LOG_DBG("failed to set accelerometer sampling rate"); return -EIO; } @@ -199,7 +203,7 @@ static int lsm6dsl_accel_range_set(struct device *dev, s32_t range) } if (lsm6dsl_accel_set_fs_raw(dev, fs) < 0) { - SYS_LOG_DBG("failed to set accelerometer full-scale"); + LOG_DBG("failed to set accelerometer full-scale"); return -EIO; } @@ -223,7 +227,7 @@ static int lsm6dsl_accel_config(struct device *dev, enum sensor_channel chan, return lsm6dsl_accel_odr_set(dev, val->val1); #endif default: - SYS_LOG_DBG("Accel attribute not supported."); + LOG_DBG("Accel attribute not supported."); return -ENOTSUP; } @@ -241,7 +245,7 @@ static int lsm6dsl_gyro_odr_set(struct device *dev, u16_t freq) } if (lsm6dsl_gyro_set_odr_raw(dev, odr) < 0) { - SYS_LOG_DBG("failed to set gyroscope sampling rate"); + LOG_DBG("failed to set gyroscope sampling rate"); return -EIO; } @@ -261,7 +265,7 @@ static int lsm6dsl_gyro_range_set(struct device *dev, s32_t range) } if (lsm6dsl_gyro_set_fs_raw(dev, fs) < 0) { - SYS_LOG_DBG("failed to set gyroscope full-scale"); + LOG_DBG("failed to set gyroscope full-scale"); return -EIO; } @@ -285,7 +289,7 @@ static int lsm6dsl_gyro_config(struct device *dev, enum sensor_channel chan, return lsm6dsl_gyro_odr_set(dev, val->val1); #endif default: - SYS_LOG_DBG("Gyro attribute not supported."); + LOG_DBG("Gyro attribute not supported."); return -ENOTSUP; } @@ -302,7 +306,7 @@ static int lsm6dsl_attr_set(struct device *dev, enum sensor_channel chan, case SENSOR_CHAN_GYRO_XYZ: return lsm6dsl_gyro_config(dev, chan, attr, val); default: - SYS_LOG_WRN("attr_set() not supported on this channel."); + LOG_WRN("attr_set() not supported on this channel."); return -ENOTSUP; } @@ -316,7 +320,7 @@ static int lsm6dsl_sample_fetch_accel(struct device *dev) if (data->hw_tf->read_data(data, LSM6DSL_REG_OUTX_L_XL, buf, sizeof(buf)) < 0) { - SYS_LOG_DBG("failed to read sample"); + LOG_DBG("failed to read sample"); return -EIO; } @@ -337,7 +341,7 @@ static int lsm6dsl_sample_fetch_gyro(struct device *dev) if (data->hw_tf->read_data(data, LSM6DSL_REG_OUTX_L_G, buf, sizeof(buf)) < 0) { - SYS_LOG_DBG("failed to read sample"); + LOG_DBG("failed to read sample"); return -EIO; } @@ -359,7 +363,7 @@ static int lsm6dsl_sample_fetch_temp(struct device *dev) if (data->hw_tf->read_data(data, LSM6DSL_REG_OUT_TEMP_L, buf, sizeof(buf)) < 0) { - SYS_LOG_DBG("failed to read sample"); + LOG_DBG("failed to read sample"); return -EIO; } @@ -377,7 +381,7 @@ static int lsm6dsl_sample_fetch_magn(struct device *dev) u8_t buf[6]; if (lsm6dsl_shub_read_external_chip(dev, buf, sizeof(buf)) < 0) { - SYS_LOG_DBG("failed to read ext mag sample"); + LOG_DBG("failed to read ext mag sample"); return -EIO; } @@ -398,7 +402,7 @@ static int lsm6dsl_sample_fetch_press(struct device *dev) u8_t buf[5]; if (lsm6dsl_shub_read_external_chip(dev, buf, sizeof(buf)) < 0) { - SYS_LOG_DBG("failed to read ext press sample"); + LOG_DBG("failed to read ext press sample"); return -EIO; } @@ -705,43 +709,43 @@ static int lsm6dsl_init_chip(struct device *dev) u8_t chip_id; if (lsm6dsl_reboot(dev) < 0) { - SYS_LOG_DBG("failed to reboot device"); + LOG_DBG("failed to reboot device"); return -EIO; } if (data->hw_tf->read_reg(data, LSM6DSL_REG_WHO_AM_I, &chip_id) < 0) { - SYS_LOG_DBG("failed reading chip id"); + LOG_DBG("failed reading chip id"); return -EIO; } if (chip_id != LSM6DSL_VAL_WHO_AM_I) { - SYS_LOG_DBG("invalid chip id 0x%x", chip_id); + LOG_DBG("invalid chip id 0x%x", chip_id); return -EIO; } - SYS_LOG_DBG("chip id 0x%x", chip_id); + LOG_DBG("chip id 0x%x", chip_id); if (lsm6dsl_accel_set_fs_raw(dev, LSM6DSL_DEFAULT_ACCEL_FULLSCALE) < 0) { - SYS_LOG_DBG("failed to set accelerometer full-scale"); + LOG_DBG("failed to set accelerometer full-scale"); return -EIO; } data->accel_sensitivity = LSM6DSL_DEFAULT_ACCEL_SENSITIVITY; data->accel_freq = lsm6dsl_odr_to_freq_val(CONFIG_LSM6DSL_ACCEL_ODR); if (lsm6dsl_accel_set_odr_raw(dev, CONFIG_LSM6DSL_ACCEL_ODR) < 0) { - SYS_LOG_DBG("failed to set accelerometer sampling rate"); + LOG_DBG("failed to set accelerometer sampling rate"); return -EIO; } if (lsm6dsl_gyro_set_fs_raw(dev, LSM6DSL_DEFAULT_GYRO_FULLSCALE) < 0) { - SYS_LOG_DBG("failed to set gyroscope full-scale"); + LOG_DBG("failed to set gyroscope full-scale"); return -EIO; } data->gyro_sensitivity = LSM6DSL_DEFAULT_GYRO_SENSITIVITY; data->gyro_freq = lsm6dsl_odr_to_freq_val(CONFIG_LSM6DSL_GYRO_ODR); if (lsm6dsl_gyro_set_odr_raw(dev, CONFIG_LSM6DSL_GYRO_ODR) < 0) { - SYS_LOG_DBG("failed to set gyroscope sampling rate"); + LOG_DBG("failed to set gyroscope sampling rate"); return -EIO; } @@ -749,7 +753,7 @@ static int lsm6dsl_init_chip(struct device *dev) LSM6DSL_REG_FIFO_CTRL5, LSM6DSL_MASK_FIFO_CTRL5_FIFO_MODE, 0 << LSM6DSL_SHIFT_FIFO_CTRL5_FIFO_MODE) < 0) { - SYS_LOG_DBG("failed to set FIFO mode"); + LOG_DBG("failed to set FIFO mode"); return -EIO; } @@ -761,7 +765,7 @@ static int lsm6dsl_init_chip(struct device *dev) (1 << LSM6DSL_SHIFT_CTRL3_C_BDU) | (0 << LSM6DSL_SHIFT_CTRL3_C_BLE) | (1 << LSM6DSL_SHIFT_CTRL3_C_IF_INC)) < 0) { - SYS_LOG_DBG("failed to set BDU, BLE and burst"); + LOG_DBG("failed to set BDU, BLE and burst"); return -EIO; } @@ -783,7 +787,7 @@ static int lsm6dsl_init(struct device *dev) data->comm_master = device_get_binding(config->comm_master_dev_name); if (!data->comm_master) { - SYS_LOG_DBG("master not found: %s", + LOG_DBG("master not found: %s", config->comm_master_dev_name); return -EINVAL; } @@ -796,19 +800,19 @@ static int lsm6dsl_init(struct device *dev) #ifdef CONFIG_LSM6DSL_TRIGGER if (lsm6dsl_init_interrupt(dev) < 0) { - SYS_LOG_ERR("Failed to initialize interrupt."); + LOG_ERR("Failed to initialize interrupt."); return -EIO; } #endif if (lsm6dsl_init_chip(dev) < 0) { - SYS_LOG_DBG("failed to initialize chip"); + LOG_DBG("failed to initialize chip"); return -EIO; } #ifdef CONFIG_LSM6DSL_SENSORHUB if (lsm6dsl_shub_init_external_chip(dev) < 0) { - SYS_LOG_DBG("failed to initialize external chip"); + LOG_DBG("failed to initialize external chip"); return -EIO; } #endif diff --git a/drivers/sensor/lsm6dsl/lsm6dsl.h b/drivers/sensor/lsm6dsl/lsm6dsl.h index 378dbafd461..3aee094d590 100644 --- a/drivers/sensor/lsm6dsl/lsm6dsl.h +++ b/drivers/sensor/lsm6dsl/lsm6dsl.h @@ -16,7 +16,6 @@ #include #include - #define LSM6DSL_REG_FUNC_CFG_ACCESS 0x01 #define LSM6DSL_MASK_FUNC_CFG_EN BIT(7) #define LSM6DSL_SHIFT_FUNC_CFG_EN 7 @@ -684,7 +683,4 @@ int lsm6dsl_trigger_set(struct device *dev, int lsm6dsl_init_interrupt(struct device *dev); #endif -#define SYS_LOG_DOMAIN "LSM6DSL" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include #endif /* ZEPHYR_DRIVERS_SENSOR_LSM6DSL_LSM6DSL_H_ */ diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c b/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c index 2eed0d665f1..a23b7e2e679 100644 --- a/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c +++ b/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c @@ -9,10 +9,15 @@ #include #include +#include + #include "lsm6dsl.h" static u16_t lsm6dsl_i2c_slave_addr = CONFIG_LSM6DSL_I2C_ADDR; +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_DECLARE(LSM6DSL); + static int lsm6dsl_i2c_read_data(struct lsm6dsl_data *data, u8_t reg_addr, u8_t *value, u8_t len) { diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_shub.c b/drivers/sensor/lsm6dsl/lsm6dsl_shub.c index 69d7df1c959..e9a9ccad291 100644 --- a/drivers/sensor/lsm6dsl/lsm6dsl_shub.c +++ b/drivers/sensor/lsm6dsl/lsm6dsl_shub.c @@ -10,9 +10,13 @@ #include #include #include +#include #include "lsm6dsl.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_DECLARE(LSM6DSL); + #define LSM6DSL_EMBEDDED_SLV0_ADDR 0x02 #define LSM6DSL_EMBEDDED_SLV0_SUBADDR 0x03 #define LSM6DSL_EMBEDDED_SLV0_CONFIG 0x04 @@ -168,7 +172,7 @@ static int lsm6dsl_read_embedded_reg(struct lsm6dsl_data *data, lsm6dsl_shub_embedded_en(data, true); if (data->hw_tf->read_data(data, reg_addr, value, len) < 0) { - SYS_LOG_DBG("failed to read external reg: %02x", reg_addr); + LOG_DBG("failed to read external reg: %02x", reg_addr); lsm6dsl_shub_embedded_en(data, false); return -EIO; } @@ -186,7 +190,7 @@ static int lsm6dsl_shub_write_embedded_regs(struct lsm6dsl_data *data, lsm6dsl_shub_embedded_en(data, true); if (data->hw_tf->write_data(data, reg_addr, value, len) < 0) { - SYS_LOG_DBG("failed to write external reg: %02x", reg_addr); + LOG_DBG("failed to write external reg: %02x", reg_addr); lsm6dsl_shub_embedded_en(data, false); return -EIO; } @@ -253,7 +257,7 @@ static int lsm6dsl_shub_read_slave_reg(struct lsm6dsl_data *data, if (lsm6dsl_shub_write_embedded_regs(data, LSM6DSL_EMBEDDED_SLV0_ADDR, slave, 3) < 0) { - SYS_LOG_DBG("error writing embedded reg"); + LOG_DBG("error writing embedded reg"); return -EIO; } @@ -283,7 +287,7 @@ static int lsm6dsl_shub_write_slave_reg(struct lsm6dsl_data *data, if (lsm6dsl_shub_write_embedded_regs(data, LSM6DSL_EMBEDDED_SLV0_ADDR, slv_cfg, 2) < 0) { - SYS_LOG_DBG("error writing embedded reg"); + LOG_DBG("error writing embedded reg"); return -EIO; } @@ -291,7 +295,7 @@ static int lsm6dsl_shub_write_slave_reg(struct lsm6dsl_data *data, if (lsm6dsl_shub_write_embedded_regs(data, LSM6DSL_EMBEDDED_SLV0_DATAWRITE, slv_cfg, 1) < 0) { - SYS_LOG_DBG("error writing embedded reg"); + LOG_DBG("error writing embedded reg"); return -EIO; } @@ -310,7 +314,7 @@ static int lsm6dsl_shub_write_slave_reg(struct lsm6dsl_data *data, if (lsm6dsl_shub_write_embedded_regs(data, LSM6DSL_EMBEDDED_SLV0_ADDR, slv_cfg, 3) < 0) { - SYS_LOG_DBG("error writing embedded reg"); + LOG_DBG("error writing embedded reg"); return -EIO; } @@ -336,7 +340,7 @@ static int lsm6dsl_shub_set_data_channel(struct lsm6dsl_data *data) if (lsm6dsl_shub_write_embedded_regs(data, LSM6DSL_EMBEDDED_SLV0_ADDR, slv_cfg, 3) < 0) { - SYS_LOG_DBG("error writing embedded reg"); + LOG_DBG("error writing embedded reg"); return -EIO; } @@ -347,7 +351,7 @@ static int lsm6dsl_shub_set_data_channel(struct lsm6dsl_data *data) if (lsm6dsl_shub_write_embedded_regs(data, LSM6DSL_EMBEDDED_SLV1_ADDR, slv_cfg, 3) < 0) { - SYS_LOG_DBG("error writing embedded reg"); + LOG_DBG("error writing embedded reg"); return -EIO; } @@ -390,7 +394,7 @@ int lsm6dsl_shub_init_external_chip(struct device *dev) if (lsm6dsl_shub_read_slave_reg(data, slv_i2c_addr, slv_wai_addr, &chip_id, 1) < 0) { - SYS_LOG_DBG("failed reading external chip id"); + LOG_DBG("failed reading external chip id"); return -EIO; } if (chip_id == lsm6dsl_shub_sens_list[0].wai_val) { @@ -399,10 +403,10 @@ int lsm6dsl_shub_init_external_chip(struct device *dev) } if (i >= ARRAY_SIZE(lsm6dsl_shub_sens_list[0].i2c_addr)) { - SYS_LOG_DBG("invalid chip id 0x%x", chip_id); + LOG_DBG("invalid chip id 0x%x", chip_id); return -EIO; } - SYS_LOG_DBG("Ext Device Chip Id: %02x", chip_id); + LOG_DBG("Ext Device Chip Id: %02x", chip_id); ext_i2c_addr = i; /* init external device */ diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_spi.c b/drivers/sensor/lsm6dsl/lsm6dsl_spi.c index 99fa4b72127..eba7143d2d2 100644 --- a/drivers/sensor/lsm6dsl/lsm6dsl_spi.c +++ b/drivers/sensor/lsm6dsl/lsm6dsl_spi.c @@ -10,9 +10,13 @@ #include #include #include "lsm6dsl.h" +#include #define LSM6DSL_SPI_READ (1 << 7) +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_DECLARE(LSM6DSL); + #if defined(CONFIG_LSM6DSL_SPI_GPIO_CS) static struct spi_cs_control lsm6dsl_cs_ctrl; #endif @@ -147,7 +151,7 @@ int lsm6dsl_spi_init(struct device *dev) lsm6dsl_cs_ctrl.gpio_dev = device_get_binding( CONFIG_LSM6DSL_SPI_GPIO_CS_DRV_NAME); if (!lsm6dsl_cs_ctrl.gpio_dev) { - SYS_LOG_ERR("Unable to get GPIO SPI CS device"); + LOG_ERR("Unable to get GPIO SPI CS device"); return -ENODEV; } @@ -156,7 +160,7 @@ int lsm6dsl_spi_init(struct device *dev) lsm6dsl_spi_conf.cs = &lsm6dsl_cs_ctrl; - SYS_LOG_DBG("SPI GPIO CS configured on %s:%u", + LOG_DBG("SPI GPIO CS configured on %s:%u", CONFIG_LSM6DSL_SPI_GPIO_CS_DRV_NAME, CONFIG_LSM6DSL_SPI_GPIO_CS_PIN); } diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c b/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c index a4ec4325d56..ebdb61cf9f5 100644 --- a/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c +++ b/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c @@ -13,6 +13,10 @@ #include "lsm6dsl.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_DECLARE(LSM6DSL); + int lsm6dsl_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) @@ -97,7 +101,7 @@ int lsm6dsl_init_interrupt(struct device *dev) /* setup data ready gpio interrupt */ drv_data->gpio = device_get_binding(CONFIG_LSM6DSL_GPIO_DEV_NAME); if (drv_data->gpio == NULL) { - SYS_LOG_ERR("Cannot get pointer to %s device.", + LOG_ERR("Cannot get pointer to %s device.", CONFIG_LSM6DSL_GPIO_DEV_NAME); return -EINVAL; } @@ -111,7 +115,7 @@ int lsm6dsl_init_interrupt(struct device *dev) BIT(CONFIG_LSM6DSL_GPIO_PIN_NUM)); if (gpio_add_callback(drv_data->gpio, &drv_data->gpio_cb) < 0) { - SYS_LOG_ERR("Could not set gpio callback."); + LOG_ERR("Could not set gpio callback."); return -EIO; } @@ -122,7 +126,7 @@ int lsm6dsl_init_interrupt(struct device *dev) LSM6DSL_SHIFT_INT1_CTRL_DRDY_G, (1 << LSM6DSL_SHIFT_INT1_CTRL_DRDY_XL) | (1 << LSM6DSL_SHIFT_INT1_CTRL_DRDY_G)) < 0) { - SYS_LOG_ERR("Could not enable data-ready interrupt."); + LOG_ERR("Could not enable data-ready interrupt."); return -EIO; } diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c index 8de11353de6..a14e3475fe8 100644 --- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c +++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c @@ -14,9 +14,13 @@ #include #include +#include #include "lsm9ds0_gyro.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(LSM9DS0_GYRO); + static inline int lsm9ds0_gyro_power_ctrl(struct device *dev, int power, int x_en, int y_en, int z_en) { @@ -135,7 +139,7 @@ static int lsm9ds0_gyro_sample_fetch(struct device *dev, LSM9DS0_GYRO_REG_OUT_Z_L_G, &z_l) < 0 || i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr, LSM9DS0_GYRO_REG_OUT_Z_H_G, &z_h) < 0) { - SYS_LOG_DBG("failed to read sample"); + LOG_DBG("failed to read sample"); return -EIO; } @@ -222,7 +226,7 @@ static int lsm9ds0_gyro_attr_set(struct device *dev, #if defined(CONFIG_LSM9DS0_GYRO_FULLSCALE_RUNTIME) case SENSOR_ATTR_FULL_SCALE: if (lsm9ds0_gyro_set_fs(dev, sensor_rad_to_degrees(val)) < 0) { - SYS_LOG_DBG("full-scale value not supported"); + LOG_DBG("full-scale value not supported"); return -EIO; } break; @@ -230,7 +234,7 @@ static int lsm9ds0_gyro_attr_set(struct device *dev, #if defined(CONFIG_LSM9DS0_GYRO_SAMPLING_RATE_RUNTIME) case SENSOR_ATTR_SAMPLING_FREQUENCY: if (lsm9ds0_gyro_set_odr(dev, val->val1) < 0) { - SYS_LOG_DBG("sampling frequency value not supported"); + LOG_DBG("sampling frequency value not supported"); return -EIO; } break; @@ -261,34 +265,34 @@ static int lsm9ds0_gyro_init_chip(struct device *dev) u8_t chip_id; if (lsm9ds0_gyro_power_ctrl(dev, 0, 0, 0, 0) < 0) { - SYS_LOG_DBG("failed to power off device"); + LOG_DBG("failed to power off device"); return -EIO; } if (lsm9ds0_gyro_power_ctrl(dev, 1, 1, 1, 1) < 0) { - SYS_LOG_DBG("failed to power on device"); + LOG_DBG("failed to power on device"); return -EIO; } if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr, LSM9DS0_GYRO_REG_WHO_AM_I_G, &chip_id) < 0) { - SYS_LOG_DBG("failed reading chip id"); + LOG_DBG("failed reading chip id"); goto err_poweroff; } if (chip_id != LSM9DS0_GYRO_VAL_WHO_AM_I_G) { - SYS_LOG_DBG("invalid chip id 0x%x", chip_id); + LOG_DBG("invalid chip id 0x%x", chip_id); goto err_poweroff; } - SYS_LOG_DBG("chip id 0x%x", chip_id); + LOG_DBG("chip id 0x%x", chip_id); if (lsm9ds0_gyro_set_fs_raw(dev, LSM9DS0_GYRO_DEFAULT_FULLSCALE) < 0) { - SYS_LOG_DBG("failed to set full-scale"); + LOG_DBG("failed to set full-scale"); goto err_poweroff; } if (lsm9ds0_gyro_set_odr_raw(dev, LSM9DS0_GYRO_DEFAULT_SAMPLING_RATE) < 0) { - SYS_LOG_DBG("failed to set sampling rate"); + LOG_DBG("failed to set sampling rate"); goto err_poweroff; } @@ -299,7 +303,7 @@ static int lsm9ds0_gyro_init_chip(struct device *dev) (1 << LSM9DS0_GYRO_SHIFT_CTRL_REG4_G_BDU) | (0 << LSM9DS0_GYRO_SHIFT_CTRL_REG4_G_BLE)) < 0) { - SYS_LOG_DBG("failed to set BDU and BLE"); + LOG_DBG("failed to set BDU and BLE"); goto err_poweroff; } @@ -318,19 +322,19 @@ static int lsm9ds0_gyro_init(struct device *dev) data->i2c_master = device_get_binding(config->i2c_master_dev_name); if (!data->i2c_master) { - SYS_LOG_DBG("i2c master not found: %s", + LOG_DBG("i2c master not found: %s", config->i2c_master_dev_name); return -EINVAL; } if (lsm9ds0_gyro_init_chip(dev) < 0) { - SYS_LOG_DBG("failed to initialize chip"); + LOG_DBG("failed to initialize chip"); return -EIO; } #if defined(CONFIG_LSM9DS0_GYRO_TRIGGER_DRDY) if (lsm9ds0_gyro_init_interrupt(dev) < 0) { - SYS_LOG_DBG("failed to initialize interrupts"); + LOG_DBG("failed to initialize interrupts"); return -EIO; } diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h index a29a4e13b59..ed360704108 100644 --- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h +++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h @@ -255,7 +255,4 @@ int lsm9ds0_gyro_trigger_set(struct device *dev, int lsm9ds0_gyro_init_interrupt(struct device *dev); #endif -#define SYS_LOG_DOMAIN "LSM9DS0_GYRO" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include #endif /* ZEPHYR_DRIVERS_SENSOR_LSM9DS0_GYRO_LSM9DS0_GYRO_H_ */ diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c index c222b794aa6..7d451e916c6 100644 --- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c +++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c @@ -18,6 +18,10 @@ extern struct lsm9ds0_gyro_data lsm9ds0_gyro_data; +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_DECLARE(LSM9DS0_GYRO); + int lsm9ds0_gyro_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) @@ -45,7 +49,7 @@ int lsm9ds0_gyro_trigger_set(struct device *dev, LSM9DS0_GYRO_MASK_CTRL_REG3_G_I2_DRDY, state << LSM9DS0_GYRO_SHIFT_CTRL_REG3_G_I2_DRDY) < 0) { - SYS_LOG_DBG("failed to set DRDY interrupt"); + LOG_DBG("failed to set DRDY interrupt"); return -EIO; } @@ -104,7 +108,7 @@ int lsm9ds0_gyro_init_interrupt(struct device *dev) data->gpio_drdy = device_get_binding(config->gpio_drdy_dev_name); if (!data->gpio_drdy) { - SYS_LOG_DBG("gpio controller %s not found", + LOG_DBG("gpio controller %s not found", config->gpio_drdy_dev_name); return -EINVAL; } @@ -118,7 +122,7 @@ int lsm9ds0_gyro_init_interrupt(struct device *dev) BIT(config->gpio_drdy_int_pin)); if (gpio_add_callback(data->gpio_drdy, &data->gpio_cb) < 0) { - SYS_LOG_DBG("failed to set gpio callback"); + LOG_DBG("failed to set gpio callback"); return -EINVAL; } diff --git a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c index 32c4c70d225..a92b050158e 100644 --- a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c +++ b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c @@ -14,11 +14,14 @@ #include #include #include - #include +#include #include "lsm9ds0_mfd.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(LSM9DS0_MFD); + static inline int lsm9ds0_mfd_reboot_memory(struct device *dev) { struct lsm9ds0_mfd_data *data = dev->driver_data; @@ -223,7 +226,7 @@ static inline int lsm9ds0_mfd_sample_fetch_accel(struct device *dev) LSM9DS0_MFD_REG_OUT_X_L_A, &out_l) < 0 || i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr, LSM9DS0_MFD_REG_OUT_X_H_A, &out_h) < 0) { - SYS_LOG_DBG("failed to read accel sample (X axis)"); + LOG_DBG("failed to read accel sample (X axis)"); return -EIO; } @@ -236,7 +239,7 @@ static inline int lsm9ds0_mfd_sample_fetch_accel(struct device *dev) LSM9DS0_MFD_REG_OUT_Y_L_A, &out_l) < 0 || i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr, LSM9DS0_MFD_REG_OUT_Y_H_A, &out_h) < 0) { - SYS_LOG_DBG("failed to read accel sample (Y axis)"); + LOG_DBG("failed to read accel sample (Y axis)"); return -EIO; } @@ -249,7 +252,7 @@ static inline int lsm9ds0_mfd_sample_fetch_accel(struct device *dev) LSM9DS0_MFD_REG_OUT_Z_L_A, &out_l) < 0 || i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr, LSM9DS0_MFD_REG_OUT_Z_H_A, &out_h) < 0) { - SYS_LOG_DBG("failed to read accel sample (Z axis)"); + LOG_DBG("failed to read accel sample (Z axis)"); return -EIO; } @@ -276,7 +279,7 @@ static inline int lsm9ds0_mfd_sample_fetch_magn(struct device *dev) LSM9DS0_MFD_REG_OUT_X_L_M, &out_l) < 0 || i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr, LSM9DS0_MFD_REG_OUT_X_H_M, &out_h) < 0) { - SYS_LOG_DBG("failed to read magn sample (X axis)"); + LOG_DBG("failed to read magn sample (X axis)"); return -EIO; } @@ -287,7 +290,7 @@ static inline int lsm9ds0_mfd_sample_fetch_magn(struct device *dev) LSM9DS0_MFD_REG_OUT_Y_L_M, &out_l) < 0 || i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr, LSM9DS0_MFD_REG_OUT_Y_H_M, &out_h) < 0) { - SYS_LOG_DBG("failed to read magn sample (Y axis)"); + LOG_DBG("failed to read magn sample (Y axis)"); return -EIO; } @@ -298,7 +301,7 @@ static inline int lsm9ds0_mfd_sample_fetch_magn(struct device *dev) LSM9DS0_MFD_REG_OUT_Z_L_M, &out_l) < 0 || i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr, LSM9DS0_MFD_REG_OUT_Z_H_M, &out_h) < 0) { - SYS_LOG_DBG("failed to read magn sample (Z axis)"); + LOG_DBG("failed to read magn sample (Z axis)"); return -EIO; } @@ -324,7 +327,7 @@ static inline int lsm9ds0_mfd_sample_fetch_temp(struct device *dev) LSM9DS0_MFD_REG_OUT_TEMP_L_XM, &out_l) < 0 || i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr, LSM9DS0_MFD_REG_OUT_TEMP_H_XM, &out_h) < 0) { - SYS_LOG_DBG("failed to read temperature sample\n"); + LOG_DBG("failed to read temperature sample\n"); return -EIO; } @@ -668,22 +671,22 @@ static int lsm9ds0_mfd_init_chip(struct device *dev) u8_t chip_id; if (lsm9ds0_mfd_reboot_memory(dev) < 0) { - SYS_LOG_DBG("failed to reset device"); + LOG_DBG("failed to reset device"); return -EIO; } if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr, LSM9DS0_MFD_REG_WHO_AM_I_XM, &chip_id) < 0) { - SYS_LOG_DBG("failed reading chip id"); + LOG_DBG("failed reading chip id"); return -EIO; } if (chip_id != LSM9DS0_MFD_VAL_WHO_AM_I_XM) { - SYS_LOG_DBG("invalid chip id 0x%x", chip_id); + LOG_DBG("invalid chip id 0x%x", chip_id); return -EIO; } - SYS_LOG_DBG("chip id 0x%x", chip_id); + LOG_DBG("chip id 0x%x", chip_id); #if !defined(LSM9DS0_MFD_ACCEL_DISABLED) if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, @@ -693,12 +696,12 @@ static int lsm9ds0_mfd_init_chip(struct device *dev) (1 << LSM9DS0_MFD_SHIFT_CTRL_REG1_XM_BDU) | (LSM9DS0_MFD_ACCEL_DEFAULT_AODR << LSM9DS0_MFD_SHIFT_CTRL_REG1_XM_AODR))) { - SYS_LOG_DBG("failed to set AODR and BDU"); + LOG_DBG("failed to set AODR and BDU"); return -EIO; } if (lsm9ds0_mfd_accel_set_fs_raw(dev, LSM9DS0_MFD_ACCEL_DEFAULT_FS)) { - SYS_LOG_DBG("failed to set accelerometer full-scale"); + LOG_DBG("failed to set accelerometer full-scale"); return -EIO; } @@ -713,7 +716,7 @@ static int lsm9ds0_mfd_init_chip(struct device *dev) LSM9DS0_MFD_SHIFT_CTRL_REG1_XM_AYEN) | (LSM9DS0_MFD_ACCEL_ENABLE_Z << LSM9DS0_MFD_SHIFT_CTRL_REG1_XM_AZEN)) < 0) { - SYS_LOG_DBG("failed to set accelerometer axis enable bits\n"); + LOG_DBG("failed to set accelerometer axis enable bits\n"); return -EIO; } @@ -723,7 +726,7 @@ static int lsm9ds0_mfd_init_chip(struct device *dev) LSM9DS0_MFD_MASK_CTRL_REG1_XM_BDU, 1 << LSM9DS0_MFD_SHIFT_CTRL_REG1_XM_BDU) < 0) { - SYS_LOG_DBG("failed to set BDU\n"); + LOG_DBG("failed to set BDU\n"); return -EIO; } #endif @@ -734,17 +737,17 @@ static int lsm9ds0_mfd_init_chip(struct device *dev) LSM9DS0_MFD_MASK_CTRL_REG7_XM_MD, (0 << LSM9DS0_MFD_SHIFT_CTRL_REG7_XM_MD)) < 0) { - SYS_LOG_DBG("failed to power on magnetometer"); + LOG_DBG("failed to power on magnetometer"); return -EIO; } if (lsm9ds0_mfd_magn_set_odr_raw(dev, LSM9DS0_MFD_MAGN_DEFAULT_M_ODR)) { - SYS_LOG_DBG("failed to set magnetometer sampling rate"); + LOG_DBG("failed to set magnetometer sampling rate"); return -EIO; } if (lsm9ds0_mfd_magn_set_fs_raw(dev, LSM9DS0_MFD_MAGN_DEFAULT_FS)) { - SYS_LOG_DBG("failed to set magnetometer full-scale"); + LOG_DBG("failed to set magnetometer full-scale"); return -EIO; } #endif @@ -755,7 +758,7 @@ static int lsm9ds0_mfd_init_chip(struct device *dev) LSM9DS0_MFD_MASK_CTRL_REG5_XM_TEMP_EN, 1 << LSM9DS0_MFD_SHIFT_CTRL_REG5_XM_TEMP_EN) < 0) { - SYS_LOG_DBG("failed to power on temperature sensor"); + LOG_DBG("failed to power on temperature sensor"); return -EIO; } #endif @@ -771,13 +774,13 @@ int lsm9ds0_mfd_init(struct device *dev) data->i2c_master = device_get_binding(config->i2c_master_dev_name); if (!data->i2c_master) { - SYS_LOG_DBG("i2c master not found: %s", + LOG_DBG("i2c master not found: %s", config->i2c_master_dev_name); return -EINVAL; } if (lsm9ds0_mfd_init_chip(dev) < 0) { - SYS_LOG_DBG("failed to initialize chip"); + LOG_DBG("failed to initialize chip"); return -EIO; } diff --git a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.h b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.h index b0f1350fd67..9ebdf8f5e7b 100644 --- a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.h +++ b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.h @@ -557,7 +557,4 @@ struct lsm9ds0_mfd_data { #endif }; -#define SYS_LOG_DOMAIN "LSM9DS0_MFD" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include #endif /* ZEPHYR_DRIVERS_SENSOR_LSM9DS0_MFD_LSM9DS0_MFD_H_ */ diff --git a/drivers/sensor/max30101/max30101.c b/drivers/sensor/max30101/max30101.c index 0b0d8a16ee7..89fa9ed7cf1 100644 --- a/drivers/sensor/max30101/max30101.c +++ b/drivers/sensor/max30101/max30101.c @@ -4,8 +4,13 @@ * SPDX-License-Identifier: Apache-2.0 */ +#include + #include "max30101.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(MAX30101); + static int max30101_sample_fetch(struct device *dev, enum sensor_channel chan) { struct max30101_data *data = dev->driver_data; @@ -19,7 +24,7 @@ static int max30101_sample_fetch(struct device *dev, enum sensor_channel chan) num_bytes = data->num_channels * MAX30101_BYTES_PER_CHANNEL; if (i2c_burst_read(data->i2c, MAX30101_I2C_ADDRESS, MAX30101_REG_FIFO_DATA, buffer, num_bytes)) { - SYS_LOG_ERR("Could not fetch sample"); + LOG_ERR("Could not fetch sample"); return -EIO; } @@ -58,7 +63,7 @@ static int max30101_channel_get(struct device *dev, enum sensor_channel chan, break; default: - SYS_LOG_ERR("Unsupported sensor channel"); + LOG_ERR("Unsupported sensor channel"); return -ENOTSUP; } @@ -68,7 +73,7 @@ static int max30101_channel_get(struct device *dev, enum sensor_channel chan, */ fifo_chan = data->map[led_chan]; if (fifo_chan >= MAX30101_MAX_NUM_CHANNELS) { - SYS_LOG_ERR("Inactive sensor channel"); + LOG_ERR("Inactive sensor channel"); return -ENOTSUP; } @@ -96,18 +101,18 @@ static int max30101_init(struct device *dev) /* Get the I2C device */ data->i2c = device_get_binding(CONFIG_MAX30101_I2C_NAME); if (!data->i2c) { - SYS_LOG_ERR("Could not find I2C device"); + LOG_ERR("Could not find I2C device"); return -EINVAL; } /* Check the part id to make sure this is MAX30101 */ if (i2c_reg_read_byte(data->i2c, MAX30101_I2C_ADDRESS, MAX30101_REG_PART_ID, &part_id)) { - SYS_LOG_ERR("Could not get Part ID"); + LOG_ERR("Could not get Part ID"); return -EIO; } if (part_id != MAX30101_PART_ID) { - SYS_LOG_ERR("Got Part ID 0x%02x, expected 0x%02x", + LOG_ERR("Got Part ID 0x%02x, expected 0x%02x", part_id, MAX30101_PART_ID); return -EIO; } @@ -123,7 +128,7 @@ static int max30101_init(struct device *dev) do { if (i2c_reg_read_byte(data->i2c, MAX30101_I2C_ADDRESS, MAX30101_REG_MODE_CFG, &mode_cfg)) { - SYS_LOG_ERR("Could read mode cfg after reset"); + LOG_ERR("Could read mode cfg after reset"); return -EIO; } } while (mode_cfg & MAX30101_MODE_CFG_RESET_MASK); diff --git a/drivers/sensor/max30101/max30101.h b/drivers/sensor/max30101/max30101.h index eac0f51675a..8b385a0a0c6 100644 --- a/drivers/sensor/max30101/max30101.h +++ b/drivers/sensor/max30101/max30101.h @@ -8,10 +8,6 @@ #include #include -#define SYS_LOG_DOMAIN "MAX30101" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include - #define MAX30101_I2C_ADDRESS 0x57 #define MAX30101_REG_INT_STS1 0x00 diff --git a/drivers/sensor/max44009/max44009.c b/drivers/sensor/max44009/max44009.c index a707727b4b6..a2e8a81f0d7 100644 --- a/drivers/sensor/max44009/max44009.c +++ b/drivers/sensor/max44009/max44009.c @@ -8,10 +8,15 @@ #include #include #include +#include #include "max44009.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(MAX44009); + static int max44009_reg_read(struct max44009_data *drv_data, u8_t reg, + u8_t *val, bool send_stop) { struct i2c_msg msgs[2] = { @@ -92,7 +97,7 @@ static int max44009_attr_set(struct device *dev, enum sensor_channel chan, if (max44009_reg_update(drv_data, MAX44009_REG_CONFIG, MAX44009_SAMPLING_CONTROL_BIT, value) != 0) { - SYS_LOG_DBG("Failed to set attribute!"); + LOG_DBG("Failed to set attribute!"); return -EIO; } @@ -169,7 +174,7 @@ int max44009_init(struct device *dev) drv_data->i2c = device_get_binding(CONFIG_MAX44009_I2C_DEV_NAME); if (drv_data->i2c == NULL) { - SYS_LOG_DBG("Failed to get pointer to %s device!", + LOG_DBG("Failed to get pointer to %s device!", CONFIG_MAX44009_I2C_DEV_NAME); return -EINVAL; } diff --git a/drivers/sensor/max44009/max44009.h b/drivers/sensor/max44009/max44009.h index 3deb713cef6..ded65d800c4 100644 --- a/drivers/sensor/max44009/max44009.h +++ b/drivers/sensor/max44009/max44009.h @@ -9,10 +9,6 @@ #include -#define SYS_LOG_DOMAIN "MAX44009" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include - #define MAX44009_I2C_ADDRESS CONFIG_MAX44009_I2C_ADDR #define MAX44009_SAMPLING_CONTROL_BIT BIT(7) diff --git a/drivers/sensor/mcp9808/mcp9808.c b/drivers/sensor/mcp9808/mcp9808.c index fc48e0492f3..7f31a25ea12 100644 --- a/drivers/sensor/mcp9808/mcp9808.c +++ b/drivers/sensor/mcp9808/mcp9808.c @@ -13,9 +13,12 @@ #include #include #include +#include #include "mcp9808.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(MCP9808); int mcp9808_reg_read(struct mcp9808_data *data, u8_t reg, u16_t *val) { @@ -83,7 +86,7 @@ int mcp9808_init(struct device *dev) data->i2c_master = device_get_binding(CONFIG_MCP9808_I2C_DEV_NAME); if (!data->i2c_master) { - SYS_LOG_DBG("mcp9808: i2c master not found: %s", + LOG_DBG("mcp9808: i2c master not found: %s", CONFIG_MCP9808_I2C_DEV_NAME); return -EINVAL; } diff --git a/drivers/sensor/mcp9808/mcp9808.h b/drivers/sensor/mcp9808/mcp9808.h index 4c4d578b99f..3bbc48d7949 100644 --- a/drivers/sensor/mcp9808/mcp9808.h +++ b/drivers/sensor/mcp9808/mcp9808.h @@ -86,7 +86,4 @@ static void mcp9808_setup_interrupt(struct device *dev) } #endif /* CONFIG_MCP9808_TRIGGER */ -#define SYS_LOG_DOMAIN "MCP9808" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include #endif /* ZEPHYR_DRIVERS_SENSOR_MCP9808_MCP9808_H_ */ diff --git a/drivers/sensor/mcp9808/mcp9808_trigger.c b/drivers/sensor/mcp9808/mcp9808_trigger.c index 36ee8403f94..4fb78e9b414 100644 --- a/drivers/sensor/mcp9808/mcp9808_trigger.c +++ b/drivers/sensor/mcp9808/mcp9808_trigger.c @@ -14,6 +14,10 @@ #include "mcp9808.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_DECLARE(MCP9808); + static int mcp9808_reg_write(struct mcp9808_data *data, u8_t reg, u16_t val) { u16_t be_val = sys_cpu_to_be16(val); diff --git a/drivers/sensor/mma8451q/mma8451q.c b/drivers/sensor/mma8451q/mma8451q.c index 6f525ff582f..45366cba7b9 100644 --- a/drivers/sensor/mma8451q/mma8451q.c +++ b/drivers/sensor/mma8451q/mma8451q.c @@ -10,9 +10,13 @@ #include #include #include +#include #include "mma8451q.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(MMA8451Q); + /* Data-sheet: https://www.nxp.com/docs/en/data-sheet/MMA8451Q.pdf */ static int mma8451q_sample_fetch(struct device *dev, enum sensor_channel chan) @@ -25,7 +29,7 @@ static int mma8451q_sample_fetch(struct device *dev, enum sensor_channel chan) /* Read data from all three axes at the same time. */ if (i2c_burst_read(data->i2c, config->i2c_address, MMA8451Q_OUT_X_MSB, buf, 6) < 0) { - SYS_LOG_ERR("Could not read accelerometer data"); + LOG_ERR("Could not read accelerometer data"); return -EIO; } @@ -108,7 +112,7 @@ int mma8451q_init(struct device *dev) data->i2c = device_get_binding(config->i2c_name); if (data->i2c == NULL) { - SYS_LOG_ERR("Failed to get pointer to %s device!", + LOG_ERR("Failed to get pointer to %s device!", config->i2c_name); return -EINVAL; } @@ -117,47 +121,47 @@ int mma8451q_init(struct device *dev) if (i2c_reg_read_byte(data->i2c, config->i2c_address, MMA8451Q_REG_WHOAMI, &whoami)) { - SYS_LOG_ERR("Could not get WHOAMI value"); + LOG_ERR("Could not get WHOAMI value"); return -EIO; } if (whoami != config->whoami) { - SYS_LOG_ERR("WHOAMI value received 0x%x, expected 0x%x", + LOG_ERR("WHOAMI value received 0x%x, expected 0x%x", whoami, MMA8451Q_REG_WHOAMI); return -EIO; } if (i2c_reg_write_byte(data->i2c, config->i2c_address, MMA8451Q_CTRL_REG1, 0) < 0) { - SYS_LOG_ERR("Could not set accel in config mode"); + LOG_ERR("Could not set accel in config mode"); return -EIO; } if (i2c_reg_write_byte(data->i2c, config->i2c_address, MMA8451Q_XYZ_DATA_CFG, config->range) < 0) { - SYS_LOG_ERR("Could not set range"); + LOG_ERR("Could not set range"); return -EIO; } if (i2c_reg_write_byte(data->i2c, config->i2c_address, MMA8451Q_CTRL_REG2, 0) < 0) { - SYS_LOG_ERR("Could not set to normal mode"); + LOG_ERR("Could not set to normal mode"); return -EIO; } if (i2c_reg_write_byte(data->i2c, config->i2c_address, MMA8451Q_CTRL_REG3, 0) < 0) { - SYS_LOG_ERR("Could not set to low polarity, push-pull output"); + LOG_ERR("Could not set to low polarity, push-pull output"); return -EIO; } if (i2c_reg_write_byte(data->i2c, config->i2c_address, MMA8451Q_CTRL_REG1, 0x09) < 0) { - SYS_LOG_ERR("Could not set data rate to 800Hz"); + LOG_ERR("Could not set data rate to 800Hz"); return -EIO; } - SYS_LOG_DBG("Init complete"); + LOG_DBG("Init complete"); return 0; } diff --git a/drivers/sensor/mma8451q/mma8451q.h b/drivers/sensor/mma8451q/mma8451q.h index e2cd97e1c1c..fe551dbad9f 100644 --- a/drivers/sensor/mma8451q/mma8451q.h +++ b/drivers/sensor/mma8451q/mma8451q.h @@ -52,8 +52,4 @@ struct mma8451q_data { s16_t z; }; -#define SYS_LOG_DOMAIN "MMA8451Q" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include - #endif /* _SENSOR_MMA8451Q_ */ diff --git a/drivers/sensor/mpu6050/mpu6050.c b/drivers/sensor/mpu6050/mpu6050.c index 7b7c196db06..035792ef1fb 100644 --- a/drivers/sensor/mpu6050/mpu6050.c +++ b/drivers/sensor/mpu6050/mpu6050.c @@ -8,9 +8,13 @@ #include #include #include +#include #include "mpu6050.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(MPU6050); + /* see "Accelerometer Measurements" section from register map description */ static void mpu6050_convert_accel(struct sensor_value *val, s16_t raw_val, u16_t sensitivity_shift) @@ -111,7 +115,7 @@ static int mpu6050_sample_fetch(struct device *dev, enum sensor_channel chan) if (i2c_burst_read(drv_data->i2c, CONFIG_MPU6050_I2C_ADDR, MPU6050_REG_DATA_START, (u8_t *)buf, 14) < 0) { - SYS_LOG_ERR("Failed to read data sample."); + LOG_ERR("Failed to read data sample."); return -EIO; } @@ -141,7 +145,7 @@ int mpu6050_init(struct device *dev) drv_data->i2c = device_get_binding(CONFIG_MPU6050_I2C_MASTER_DEV_NAME); if (drv_data->i2c == NULL) { - SYS_LOG_ERR("Failed to get pointer to %s device", + LOG_ERR("Failed to get pointer to %s device", CONFIG_MPU6050_I2C_MASTER_DEV_NAME); return -EINVAL; } @@ -149,12 +153,12 @@ int mpu6050_init(struct device *dev) /* check chip ID */ if (i2c_reg_read_byte(drv_data->i2c, CONFIG_MPU6050_I2C_ADDR, MPU6050_REG_CHIP_ID, &id) < 0) { - SYS_LOG_ERR("Failed to read chip ID."); + LOG_ERR("Failed to read chip ID."); return -EIO; } if (id != MPU6050_CHIP_ID) { - SYS_LOG_ERR("Invalid chip ID."); + LOG_ERR("Invalid chip ID."); return -EINVAL; } @@ -162,7 +166,7 @@ int mpu6050_init(struct device *dev) if (i2c_reg_update_byte(drv_data->i2c, CONFIG_MPU6050_I2C_ADDR, MPU6050_REG_PWR_MGMT1, MPU6050_SLEEP_EN, 0) < 0) { - SYS_LOG_ERR("Failed to wake up chip."); + LOG_ERR("Failed to wake up chip."); return -EIO; } @@ -174,14 +178,14 @@ int mpu6050_init(struct device *dev) } if (i == 4) { - SYS_LOG_ERR("Invalid value for accel full-scale range."); + LOG_ERR("Invalid value for accel full-scale range."); return -EINVAL; } if (i2c_reg_write_byte(drv_data->i2c, CONFIG_MPU6050_I2C_ADDR, MPU6050_REG_ACCEL_CFG, i << MPU6050_ACCEL_FS_SHIFT) < 0) { - SYS_LOG_ERR("Failed to write accel full-scale range."); + LOG_ERR("Failed to write accel full-scale range."); return -EIO; } @@ -195,14 +199,14 @@ int mpu6050_init(struct device *dev) } if (i == 4) { - SYS_LOG_ERR("Invalid value for gyro full-scale range."); + LOG_ERR("Invalid value for gyro full-scale range."); return -EINVAL; } if (i2c_reg_write_byte(drv_data->i2c, CONFIG_MPU6050_I2C_ADDR, MPU6050_REG_GYRO_CFG, i << MPU6050_GYRO_FS_SHIFT) < 0) { - SYS_LOG_ERR("Failed to write gyro full-scale range."); + LOG_ERR("Failed to write gyro full-scale range."); return -EIO; } @@ -210,7 +214,7 @@ int mpu6050_init(struct device *dev) #ifdef CONFIG_MPU6050_TRIGGER if (mpu6050_init_interrupt(dev) < 0) { - SYS_LOG_DBG("Failed to initialize interrupts."); + LOG_DBG("Failed to initialize interrupts."); return -EIO; } #endif diff --git a/drivers/sensor/mpu6050/mpu6050.h b/drivers/sensor/mpu6050/mpu6050.h index 94bbecb13e5..0f0a55154a3 100644 --- a/drivers/sensor/mpu6050/mpu6050.h +++ b/drivers/sensor/mpu6050/mpu6050.h @@ -12,10 +12,6 @@ #include #include -#define SYS_LOG_DOMAIN "MPU6050" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include - #define MPU6050_REG_CHIP_ID 0x75 #define MPU6050_CHIP_ID 0x68 diff --git a/drivers/sensor/mpu6050/mpu6050_trigger.c b/drivers/sensor/mpu6050/mpu6050_trigger.c index 440613b7898..bc67728f0c7 100644 --- a/drivers/sensor/mpu6050/mpu6050_trigger.c +++ b/drivers/sensor/mpu6050/mpu6050_trigger.c @@ -12,6 +12,10 @@ #include "mpu6050.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_DECLARE(MPU6050); + int mpu6050_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) @@ -98,7 +102,7 @@ int mpu6050_init_interrupt(struct device *dev) /* setup data ready gpio interrupt */ drv_data->gpio = device_get_binding(CONFIG_MPU6050_GPIO_DEV_NAME); if (drv_data->gpio == NULL) { - SYS_LOG_ERR("Failed to get pointer to %s device", + LOG_ERR("Failed to get pointer to %s device", CONFIG_MPU6050_GPIO_DEV_NAME); return -EINVAL; } @@ -112,14 +116,14 @@ int mpu6050_init_interrupt(struct device *dev) BIT(CONFIG_MPU6050_GPIO_PIN_NUM)); if (gpio_add_callback(drv_data->gpio, &drv_data->gpio_cb) < 0) { - SYS_LOG_ERR("Failed to set gpio callback"); + LOG_ERR("Failed to set gpio callback"); return -EIO; } /* enable data ready interrupt */ if (i2c_reg_write_byte(drv_data->i2c, CONFIG_MPU6050_I2C_ADDR, MPU6050_REG_INT_EN, MPU6050_DRDY_EN) < 0) { - SYS_LOG_ERR("Failed to enable data ready interrupt."); + LOG_ERR("Failed to enable data ready interrupt."); return -EIO; } diff --git a/drivers/sensor/ms5837/ms5837.c b/drivers/sensor/ms5837/ms5837.c index 572152ab4eb..02ca8bd2b4c 100644 --- a/drivers/sensor/ms5837/ms5837.c +++ b/drivers/sensor/ms5837/ms5837.c @@ -13,6 +13,10 @@ #include "ms5837.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_REGISTER(MS5837); + static int ms5837_get_measurement(struct device *i2c_master, const u8_t i2c_address, u32_t *val, u8_t cmd, const u8_t delay) @@ -187,7 +191,7 @@ static int ms5837_attr_set(struct device *dev, enum sensor_channel chan, conv_delay = 1; break; default: - SYS_LOG_ERR("invalid oversampling rate %d", val->val1); + LOG_ERR("invalid oversampling rate %d", val->val1); return -EINVAL; } @@ -255,7 +259,7 @@ static int ms5837_init(struct device *dev) data->i2c_master = device_get_binding(cfg->i2c_name); if (data->i2c_master == NULL) { - SYS_LOG_ERR("i2c master %s not found", + LOG_ERR("i2c master %s not found", CONFIG_MS5837_I2C_MASTER_DEV_NAME); return -EINVAL; } diff --git a/drivers/sensor/ms5837/ms5837.h b/drivers/sensor/ms5837/ms5837.h index 0298d7d6bc1..31a15089689 100644 --- a/drivers/sensor/ms5837/ms5837.h +++ b/drivers/sensor/ms5837/ms5837.h @@ -77,8 +77,4 @@ struct ms5837_config { u8_t i2c_address; }; -#define SYS_LOG_DOMAIN "MS5837" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include - #endif /* __SENSOR_MS5837_H__ */ diff --git a/drivers/sensor/nrf5/temp_nrf5.c b/drivers/sensor/nrf5/temp_nrf5.c index a3796ddaa1f..ca618b3c89d 100644 --- a/drivers/sensor/nrf5/temp_nrf5.c +++ b/drivers/sensor/nrf5/temp_nrf5.c @@ -7,10 +7,10 @@ #include #include #include +#include -#define SYS_LOG_DOMAIN "TEMPNRF5" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(TEMPNRF5); #include "nrf.h" #include "nrf_common.h" @@ -34,7 +34,7 @@ static int temp_nrf5_sample_fetch(struct device *dev, enum sensor_channel chan) struct temp_nrf5_data *data = dev->driver_data; int r; - SYS_LOG_DBG(""); + LOG_DBG(""); if (chan != SENSOR_CHAN_ALL && chan != SENSOR_CHAN_DIE_TEMP) { return -ENOTSUP; @@ -67,7 +67,7 @@ static int temp_nrf5_channel_get(struct device *dev, struct temp_nrf5_data *data = dev->driver_data; s32_t uval; - SYS_LOG_DBG(""); + LOG_DBG(""); if (chan != SENSOR_CHAN_DIE_TEMP) { return -ENOTSUP; @@ -109,7 +109,7 @@ static int temp_nrf5_init(struct device *dev) volatile NRF_TEMP_Type *temp = NRF_TEMP; struct temp_nrf5_data *data = dev->driver_data; - SYS_LOG_DBG(""); + LOG_DBG(""); data->clk_m16_dev = device_get_binding(CONFIG_CLOCK_CONTROL_NRF5_M16SRC_DRV_NAME); diff --git a/drivers/sensor/pms7003/pms7003.c b/drivers/sensor/pms7003/pms7003.c index be4bfadab07..9e8ad8be708 100644 --- a/drivers/sensor/pms7003/pms7003.c +++ b/drivers/sensor/pms7003/pms7003.c @@ -18,10 +18,10 @@ #include #include #include +#include -#define SYS_LOG_DOMAIN "PMS7003" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(PMS7003); /* wait serial output with 1000ms timeout */ #define CFG_PMS7003_SERIAL_TIMEOUT 1000 @@ -116,7 +116,7 @@ static int pms7003_sample_fetch(struct device *dev, enum sensor_channel chan) if (uart_wait_for(drv_data->uart_dev, pms7003_start_bytes, sizeof(pms7003_start_bytes), CFG_PMS7003_SERIAL_TIMEOUT) < 0) { - SYS_LOG_WRN("waiting for start bytes is timeout"); + LOG_WRN("waiting for start bytes is timeout"); return -ETIME; } @@ -132,9 +132,9 @@ static int pms7003_sample_fetch(struct device *dev, enum sensor_channel chan) drv_data->pm_10 = (pms7003_receive_buffer[12] << 8) + pms7003_receive_buffer[13]; - 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("pm10 = %d", drv_data->pm_10); + LOG_DBG("pm1.0 = %d", drv_data->pm_1_0); + LOG_DBG("pm2.5 = %d", drv_data->pm_2_5); + LOG_DBG("pm10 = %d", drv_data->pm_10); return 0; } @@ -170,7 +170,7 @@ static int pms7003_init(struct device *dev) drv_data->uart_dev = device_get_binding(CONFIG_PMS7003_UART_DEVICE); if (!drv_data->uart_dev) { - SYS_LOG_DBG("uart device is not found: %s", + LOG_DBG("uart device is not found: %s", CONFIG_PMS7003_UART_DEVICE); return -EINVAL; } diff --git a/drivers/sensor/sht3xd/sht3xd.c b/drivers/sensor/sht3xd/sht3xd.c index 572587f0cb6..45d4b3ba6ea 100644 --- a/drivers/sensor/sht3xd/sht3xd.c +++ b/drivers/sensor/sht3xd/sht3xd.c @@ -9,9 +9,13 @@ #include #include #include +#include #include "sht3xd.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(SHT3XD); + /* * CRC algorithm parameters were taken from the * "Checksum Calculation" section of the datasheet. @@ -87,19 +91,19 @@ static int sht3xd_sample_fetch(struct device *dev, enum sensor_channel chan) }; if (i2c_transfer(drv_data->i2c, msgs, 2, SHT3XD_I2C_ADDRESS) < 0) { - SYS_LOG_DBG("Failed to read data sample!"); + LOG_DBG("Failed to read data sample!"); return -EIO; } t_sample = (rx_buf[0] << 8) | rx_buf[1]; if (sht3xd_compute_crc(t_sample) != rx_buf[2]) { - SYS_LOG_DBG("Received invalid temperature CRC!"); + LOG_DBG("Received invalid temperature CRC!"); return -EIO; } rh_sample = (rx_buf[3] << 8) | rx_buf[4]; if (sht3xd_compute_crc(rh_sample) != rx_buf[5]) { - SYS_LOG_DBG("Received invalid relative humidity CRC!"); + LOG_DBG("Received invalid relative humidity CRC!"); return -EIO; } @@ -153,14 +157,14 @@ static int sht3xd_init(struct device *dev) drv_data->i2c = device_get_binding(CONFIG_SHT3XD_I2C_MASTER_DEV_NAME); if (drv_data->i2c == NULL) { - SYS_LOG_DBG("Failed to get pointer to %s device!", + LOG_DBG("Failed to get pointer to %s device!", CONFIG_SHT3XD_I2C_MASTER_DEV_NAME); return -EINVAL; } /* clear status register */ if (sht3xd_write_command(drv_data, SHT3XD_CMD_CLEAR_STATUS) < 0) { - SYS_LOG_DBG("Failed to clear status register!"); + LOG_DBG("Failed to clear status register!"); return -EIO; } @@ -170,7 +174,7 @@ static int sht3xd_init(struct device *dev) if (sht3xd_write_command(drv_data, sht3xd_measure_cmd[SHT3XD_MPS_IDX][SHT3XD_REPEATABILITY_IDX]) < 0) { - SYS_LOG_DBG("Failed to set measurement mode!"); + LOG_DBG("Failed to set measurement mode!"); return -EIO; } @@ -178,7 +182,7 @@ static int sht3xd_init(struct device *dev) #ifdef CONFIG_SHT3XD_TRIGGER if (sht3xd_init_interrupt(dev) < 0) { - SYS_LOG_DBG("Failed to initialize interrupt"); + LOG_DBG("Failed to initialize interrupt"); return -EIO; } #endif diff --git a/drivers/sensor/sht3xd/sht3xd.h b/drivers/sensor/sht3xd/sht3xd.h index de95e77156e..8695b782ceb 100644 --- a/drivers/sensor/sht3xd/sht3xd.h +++ b/drivers/sensor/sht3xd/sht3xd.h @@ -104,7 +104,4 @@ int sht3xd_trigger_set(struct device *dev, int sht3xd_init_interrupt(struct device *dev); #endif -#define SYS_LOG_DOMAIN "SHT3XD" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include #endif /* ZEPHYR_DRIVERS_SENSOR_SHT3XD_SHT3XD_H_ */ diff --git a/drivers/sensor/sht3xd/sht3xd_trigger.c b/drivers/sensor/sht3xd/sht3xd_trigger.c index d7b7a02d2de..262a3224b68 100644 --- a/drivers/sensor/sht3xd/sht3xd_trigger.c +++ b/drivers/sensor/sht3xd/sht3xd_trigger.c @@ -11,6 +11,10 @@ #include "sht3xd.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_DECLARE(SHT3XD); + static u16_t sht3xd_temp_processed_to_raw(const struct sensor_value *val) { u64_t uval; @@ -71,7 +75,7 @@ int sht3xd_attr_set(struct device *dev, if (sht3xd_write_reg(drv_data, set_cmd, reg_val) < 0 || sht3xd_write_reg(drv_data, clear_cmd, reg_val) < 0) { - SYS_LOG_DBG("Failed to write threshold value!"); + LOG_DBG("Failed to write threshold value!"); return -EIO; } @@ -162,30 +166,30 @@ int sht3xd_init_interrupt(struct device *dev) /* set alert thresholds to match reamsurement ranges */ if (sht3xd_write_reg(drv_data, SHT3XD_CMD_WRITE_TH_HIGH_SET, 0xFFFF) < 0) { - SYS_LOG_DBG("Failed to write threshold high set value!"); + LOG_DBG("Failed to write threshold high set value!"); return -EIO; } if (sht3xd_write_reg(drv_data, SHT3XD_CMD_WRITE_TH_HIGH_CLEAR, 0xFFFF) < 0) { - SYS_LOG_DBG("Failed to write threshold high clear value!"); + LOG_DBG("Failed to write threshold high clear value!"); return -EIO; } if (sht3xd_write_reg(drv_data, SHT3XD_CMD_WRITE_TH_LOW_SET, 0) < 0) { - SYS_LOG_DBG("Failed to write threshold low set value!"); + LOG_DBG("Failed to write threshold low set value!"); return -EIO; } if (sht3xd_write_reg(drv_data, SHT3XD_CMD_WRITE_TH_LOW_SET, 0) < 0) { - SYS_LOG_DBG("Failed to write threshold low clear value!"); + LOG_DBG("Failed to write threshold low clear value!"); return -EIO; } /* setup gpio interrupt */ drv_data->gpio = device_get_binding(CONFIG_SHT3XD_GPIO_DEV_NAME); if (drv_data->gpio == NULL) { - SYS_LOG_DBG("Failed to get pointer to %s device!", + LOG_DBG("Failed to get pointer to %s device!", CONFIG_SHT3XD_GPIO_DEV_NAME); return -EINVAL; } @@ -199,7 +203,7 @@ int sht3xd_init_interrupt(struct device *dev) BIT(CONFIG_SHT3XD_GPIO_PIN_NUM)); if (gpio_add_callback(drv_data->gpio, &drv_data->gpio_cb) < 0) { - SYS_LOG_DBG("Failed to set gpio callback!"); + LOG_DBG("Failed to set gpio callback!"); return -EIO; } diff --git a/drivers/sensor/sx9500/sx9500.c b/drivers/sensor/sx9500/sx9500.c index b2d195591f6..702b1bcc909 100644 --- a/drivers/sensor/sx9500/sx9500.c +++ b/drivers/sensor/sx9500/sx9500.c @@ -14,9 +14,13 @@ #include #include #include +#include #include "sx9500.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(SX9500); + static u8_t sx9500_reg_defaults[] = { /* * First number is register address to write to. The chip @@ -109,7 +113,7 @@ int sx9500_init(struct device *dev) data->i2c_master = device_get_binding(CONFIG_SX9500_I2C_DEV_NAME); if (!data->i2c_master) { - SYS_LOG_DBG("sx9500: i2c master not found: %s", + LOG_DBG("sx9500: i2c master not found: %s", CONFIG_SX9500_I2C_DEV_NAME); return -EINVAL; } @@ -117,12 +121,12 @@ int sx9500_init(struct device *dev) data->i2c_slave_addr = CONFIG_SX9500_I2C_ADDR; if (sx9500_init_chip(dev) < 0) { - SYS_LOG_DBG("sx9500: failed to initialize chip"); + LOG_DBG("sx9500: failed to initialize chip"); return -EINVAL; } if (sx9500_setup_interrupt(dev) < 0) { - SYS_LOG_DBG("sx9500: failed to setup interrupt"); + LOG_DBG("sx9500: failed to setup interrupt"); return -EINVAL; } diff --git a/drivers/sensor/sx9500/sx9500.h b/drivers/sensor/sx9500/sx9500.h index a1a2819dc2d..9cf30a6e804 100644 --- a/drivers/sensor/sx9500/sx9500.h +++ b/drivers/sensor/sx9500/sx9500.h @@ -61,7 +61,4 @@ static inline int sx9500_setup_interrupt(struct device *dev) } #endif -#define SYS_LOG_DOMAIN "SX9500" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include #endif /* ZEPHYR_DRIVERS_SENSOR_SX9500_SX9500_H_ */ diff --git a/drivers/sensor/sx9500/sx9500_trigger.c b/drivers/sensor/sx9500/sx9500_trigger.c index 417cb2d53aa..48b54c2aad3 100644 --- a/drivers/sensor/sx9500/sx9500_trigger.c +++ b/drivers/sensor/sx9500/sx9500_trigger.c @@ -11,8 +11,13 @@ #include #include #include + #include "sx9500.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_DECLARE(SX9500); + #ifdef CONFIG_SX9500_TRIGGER_OWN_THREAD static K_THREAD_STACK_DEFINE(sx9500_thread_stack, CONFIG_SX9500_THREAD_STACK_SIZE); static struct k_thread sx9500_thread; @@ -82,7 +87,7 @@ static void sx9500_thread_main(int arg1, int unused) if (i2c_reg_read_byte(data->i2c_master, data->i2c_slave_addr, SX9500_REG_IRQ_SRC, ®_val) < 0) { - SYS_LOG_DBG("sx9500: error reading IRQ source register"); + LOG_DBG("sx9500: error reading IRQ source register"); continue; } @@ -117,7 +122,7 @@ static void sx9500_gpio_thread_cb(void *arg) if (i2c_reg_read_byte(data->i2c_master, data->i2c_slave_addr, SX9500_REG_IRQ_SRC, ®_val) < 0) { - SYS_LOG_DBG("sx9500: error reading IRQ source register"); + LOG_DBG("sx9500: error reading IRQ source register"); return; } @@ -155,7 +160,7 @@ int sx9500_setup_interrupt(struct device *dev) gpio = device_get_binding(CONFIG_SX9500_GPIO_CONTROLLER); if (!gpio) { - SYS_LOG_DBG("sx9500: gpio controller %s not found", + LOG_DBG("sx9500: gpio controller %s not found", CONFIG_SX9500_GPIO_CONTROLLER); return -EINVAL; } diff --git a/drivers/sensor/th02/th02.c b/drivers/sensor/th02/th02.c index 533d893d9f4..5c2196dc3ee 100644 --- a/drivers/sensor/th02/th02.c +++ b/drivers/sensor/th02/th02.c @@ -11,15 +11,19 @@ #include #include #include +#include #include "th02.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(TH02); + static u8_t read8(struct device *dev, u8_t d) { u8_t buf; if (i2c_reg_read_byte(dev, TH02_I2C_DEV_ID, d, &buf) < 0) { - SYS_LOG_ERR("Error reading register."); + LOG_ERR("Error reading register."); } return buf; } @@ -31,7 +35,7 @@ static int is_ready(struct device *dev) if (i2c_reg_read_byte(dev, TH02_I2C_DEV_ID, TH02_REG_STATUS, &status) < 0) { - SYS_LOG_ERR("error reading status register"); + LOG_ERR("error reading status register"); } if (status & TH02_STATUS_RDY_MASK) { @@ -47,7 +51,7 @@ static u16_t get_humi(struct device *dev) if (i2c_reg_write_byte(dev, TH02_I2C_DEV_ID, TH02_REG_CONFIG, TH02_CMD_MEASURE_HUMI) < 0) { - SYS_LOG_ERR("Error writing register"); + LOG_ERR("Error writing register"); return 0; } while (!is_ready(dev)) { @@ -67,7 +71,7 @@ u16_t get_temp(struct device *dev) if (i2c_reg_write_byte(dev, TH02_I2C_DEV_ID, TH02_REG_CONFIG, TH02_CMD_MEASURE_TEMP) < 0) { - SYS_LOG_ERR("Error writing register"); + LOG_ERR("Error writing register"); return 0; } while (!is_ready(dev)) { @@ -88,9 +92,9 @@ static int th02_sample_fetch(struct device *dev, enum sensor_channel chan) __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL || chan == SENSOR_CHAN_AMBIENT_TEMP); drv_data->t_sample = get_temp(drv_data->i2c); - SYS_LOG_INF("temp: %u", drv_data->t_sample); + LOG_INF("temp: %u", drv_data->t_sample); drv_data->rh_sample = get_humi(drv_data->i2c); - SYS_LOG_INF("rh: %u", drv_data->rh_sample); + LOG_INF("rh: %u", drv_data->rh_sample); return 0; } @@ -127,7 +131,7 @@ static int th02_init(struct device *dev) drv_data->i2c = device_get_binding(CONFIG_TH02_I2C_MASTER_DEV_NAME); if (drv_data->i2c == NULL) { - SYS_LOG_ERR("Failed to get pointer to %s device!", + LOG_ERR("Failed to get pointer to %s device!", CONFIG_TH02_I2C_MASTER_DEV_NAME); return -EINVAL; } diff --git a/drivers/sensor/th02/th02.h b/drivers/sensor/th02/th02.h index 5916aebfe2a..52fa85b8806 100644 --- a/drivers/sensor/th02/th02.h +++ b/drivers/sensor/th02/th02.h @@ -31,7 +31,4 @@ struct th02_data { u16_t rh_sample; }; -#define SYS_LOG_DOMAIN "TH02" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include #endif /* _SENSOR_TH02_ */ diff --git a/drivers/sensor/tmp007/tmp007.c b/drivers/sensor/tmp007/tmp007.c index 4908c207c30..26001283e3e 100644 --- a/drivers/sensor/tmp007/tmp007.c +++ b/drivers/sensor/tmp007/tmp007.c @@ -12,9 +12,13 @@ #include #include #include +#include #include "tmp007.h" +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(TMP007); + int tmp007_reg_read(struct tmp007_data *drv_data, u8_t reg, u16_t *val) { struct i2c_msg msgs[2] = { @@ -116,14 +120,14 @@ int tmp007_init(struct device *dev) drv_data->i2c = device_get_binding(CONFIG_TMP007_I2C_MASTER_DEV_NAME); if (drv_data->i2c == NULL) { - SYS_LOG_DBG("Failed to get pointer to %s device!", + LOG_DBG("Failed to get pointer to %s device!", CONFIG_TMP007_I2C_MASTER_DEV_NAME); return -EINVAL; } #ifdef CONFIG_TMP007_TRIGGER if (tmp007_init_interrupt(dev) < 0) { - SYS_LOG_DBG("Failed to initialize interrupt!"); + LOG_DBG("Failed to initialize interrupt!"); return -EIO; } #endif diff --git a/drivers/sensor/tmp007/tmp007.h b/drivers/sensor/tmp007/tmp007.h index 9234c0c648b..e9d87e7fcbc 100644 --- a/drivers/sensor/tmp007/tmp007.h +++ b/drivers/sensor/tmp007/tmp007.h @@ -79,7 +79,4 @@ int tmp007_trigger_set(struct device *dev, int tmp007_init_interrupt(struct device *dev); #endif -#define SYS_LOG_DOMAIN "TMP007" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include #endif /* _SENSOR_TMP007_ */ diff --git a/drivers/sensor/tmp007/tmp007_trigger.c b/drivers/sensor/tmp007/tmp007_trigger.c index ee89c6d669a..4662a7a18d6 100644 --- a/drivers/sensor/tmp007/tmp007_trigger.c +++ b/drivers/sensor/tmp007/tmp007_trigger.c @@ -14,6 +14,10 @@ extern struct tmp007_data tmp007_driver; +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +#include +LOG_MODULE_DECLARE(TMP007); + int tmp007_attr_set(struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, @@ -39,7 +43,7 @@ int tmp007_attr_set(struct device *dev, value = (value / TMP007_TEMP_TH_SCALE) << 6; if (tmp007_reg_write(drv_data, reg, value) < 0) { - SYS_LOG_DBG("Failed to set attribute!"); + LOG_DBG("Failed to set attribute!"); return -EIO; } @@ -136,14 +140,14 @@ int tmp007_init_interrupt(struct device *dev) if (tmp007_reg_update(drv_data, TMP007_REG_CONFIG, TMP007_ALERT_EN_BIT, TMP007_ALERT_EN_BIT) < 0) { - SYS_LOG_DBG("Failed to enable interrupt pin!"); + LOG_DBG("Failed to enable interrupt pin!"); return -EIO; } /* setup gpio interrupt */ drv_data->gpio = device_get_binding(CONFIG_TMP007_GPIO_DEV_NAME); if (drv_data->gpio == NULL) { - SYS_LOG_DBG("Failed to get pointer to %s device!", + LOG_DBG("Failed to get pointer to %s device!", CONFIG_TMP007_GPIO_DEV_NAME); return -EINVAL; } @@ -157,7 +161,7 @@ int tmp007_init_interrupt(struct device *dev) BIT(CONFIG_TMP007_GPIO_PIN_NUM)); if (gpio_add_callback(drv_data->gpio, &drv_data->gpio_cb) < 0) { - SYS_LOG_DBG("Failed to set gpio callback!"); + LOG_DBG("Failed to set gpio callback!"); return -EIO; } diff --git a/drivers/sensor/tmp112/tmp112.c b/drivers/sensor/tmp112/tmp112.c index 5e982ea042d..61c390b82fa 100644 --- a/drivers/sensor/tmp112/tmp112.c +++ b/drivers/sensor/tmp112/tmp112.c @@ -11,10 +11,10 @@ #include #include #include +#include -#define SYS_LOG_DOMAIN "TMP112" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(TMP112); #define TMP112_I2C_ADDRESS CONFIG_TMP112_I2C_ADDR @@ -99,7 +99,7 @@ static int tmp112_attr_set(struct device *dev, if (tmp112_reg_update(drv_data, TMP112_REG_CONFIG, TMP112_EM_BIT, value) < 0) { - SYS_LOG_DBG("Failed to set attribute!"); + LOG_DBG("Failed to set attribute!"); return -EIO; } @@ -135,7 +135,7 @@ static int tmp112_attr_set(struct device *dev, if (tmp112_reg_update(drv_data, TMP112_REG_CONFIG, TMP112_CR0_BIT | TMP112_CR1_BIT, value) < 0) { - SYS_LOG_DBG("Failed to set attribute!"); + LOG_DBG("Failed to set attribute!"); return -EIO; } @@ -198,7 +198,7 @@ int tmp112_init(struct device *dev) drv_data->i2c = device_get_binding(CONFIG_TMP112_I2C_MASTER_DEV_NAME); if (drv_data->i2c == NULL) { - SYS_LOG_DBG("Failed to get pointer to %s device!", + LOG_DBG("Failed to get pointer to %s device!", CONFIG_TMP112_I2C_MASTER_DEV_NAME); return -EINVAL; } diff --git a/drivers/sensor/vl53l0x/vl53l0x.c b/drivers/sensor/vl53l0x/vl53l0x.c index 79d86004ee3..efeda843d4d 100644 --- a/drivers/sensor/vl53l0x/vl53l0x.c +++ b/drivers/sensor/vl53l0x/vl53l0x.c @@ -16,12 +16,13 @@ #include #include #include +#include + #include "vl53l0x_api.h" #include "vl53l0x_platform.h" -#define SYS_LOG_DOMAIN "VL53L0X" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_REGISTER(VL53L0X); /* All the values used in this driver are coming from ST datasheet and examples. * It can be found here: @@ -55,7 +56,7 @@ static int vl53l0x_sample_fetch(struct device *dev, enum sensor_channel chan) ret = VL53L0X_PerformSingleRangingMeasurement(&drv_data->vl53l0x, &drv_data->RangingMeasurementData); if (ret < 0) { - SYS_LOG_ERR("Could not perform measurment (error=%d)", ret); + LOG_ERR("Could not perform measurment (error=%d)", ret); return -EINVAL; } @@ -104,7 +105,7 @@ static int vl53l0x_setup_single_shot(struct device *dev) ret = VL53L0X_StaticInit(&drv_data->vl53l0x); if (ret) { - SYS_LOG_ERR("VL53L0X_StaticInit failed"); + LOG_ERR("VL53L0X_StaticInit failed"); goto exit; } @@ -112,7 +113,7 @@ static int vl53l0x_setup_single_shot(struct device *dev) &VhvSettings, &PhaseCal); if (ret) { - SYS_LOG_ERR("VL53L0X_PerformRefCalibration failed"); + LOG_ERR("VL53L0X_PerformRefCalibration failed"); goto exit; } @@ -120,14 +121,14 @@ static int vl53l0x_setup_single_shot(struct device *dev) (uint32_t *)&refSpadCount, &isApertureSpads); if (ret) { - SYS_LOG_ERR("VL53L0X_PerformRefSpadManagement failed"); + LOG_ERR("VL53L0X_PerformRefSpadManagement failed"); goto exit; } ret = VL53L0X_SetDeviceMode(&drv_data->vl53l0x, VL53L0X_DEVICEMODE_SINGLE_RANGING); if (ret) { - SYS_LOG_ERR("VL53L0X_SetDeviceMode failed"); + LOG_ERR("VL53L0X_SetDeviceMode failed"); goto exit; } @@ -135,7 +136,7 @@ static int vl53l0x_setup_single_shot(struct device *dev) VL53L0X_CHECKENABLE_SIGMA_FINAL_RANGE, 1); if (ret) { - SYS_LOG_ERR("VL53L0X_SetLimitCheckEnable sigma failed"); + LOG_ERR("VL53L0X_SetLimitCheckEnable sigma failed"); goto exit; } @@ -143,7 +144,7 @@ static int vl53l0x_setup_single_shot(struct device *dev) VL53L0X_CHECKENABLE_SIGNAL_RATE_FINAL_RANGE, 1); if (ret) { - SYS_LOG_ERR("VL53L0X_SetLimitCheckEnable signal rate failed"); + LOG_ERR("VL53L0X_SetLimitCheckEnable signal rate failed"); goto exit; } @@ -152,7 +153,7 @@ static int vl53l0x_setup_single_shot(struct device *dev) VL53L0X_SETUP_SIGNAL_LIMIT); if (ret) { - SYS_LOG_ERR("VL53L0X_SetLimitCheckValue signal rate failed"); + LOG_ERR("VL53L0X_SetLimitCheckValue signal rate failed"); goto exit; } @@ -160,14 +161,14 @@ static int vl53l0x_setup_single_shot(struct device *dev) VL53L0X_CHECKENABLE_SIGMA_FINAL_RANGE, VL53L0X_SETUP_SIGMA_LIMIT); if (ret) { - SYS_LOG_ERR("VL53L0X_SetLimitCheckValue sigma failed"); + LOG_ERR("VL53L0X_SetLimitCheckValue sigma failed"); goto exit; } ret = VL53L0X_SetMeasurementTimingBudgetMicroSeconds(&drv_data->vl53l0x, VL53L0X_SETUP_MAX_TIME_FOR_RANGING); if (ret) { - SYS_LOG_ERR( + LOG_ERR( "VL53L0X_SetMeasurementTimingBudgetMicroSeconds failed"); goto exit; } @@ -176,7 +177,7 @@ static int vl53l0x_setup_single_shot(struct device *dev) VL53L0X_VCSEL_PERIOD_PRE_RANGE, VL53L0X_SETUP_PRE_RANGE_VCSEL_PERIOD); if (ret) { - SYS_LOG_ERR("VL53L0X_SetVcselPulsePeriod pre range failed"); + LOG_ERR("VL53L0X_SetVcselPulsePeriod pre range failed"); goto exit; } @@ -184,7 +185,7 @@ static int vl53l0x_setup_single_shot(struct device *dev) VL53L0X_VCSEL_PERIOD_FINAL_RANGE, VL53L0X_SETUP_FINAL_RANGE_VCSEL_PERIOD); if (ret) { - SYS_LOG_ERR("VL53L0X_SetVcselPulsePeriod final range failed"); + LOG_ERR("VL53L0X_SetVcselPulsePeriod final range failed"); goto exit; } @@ -200,7 +201,7 @@ static int vl53l0x_init(struct device *dev) u16_t vl53l0x_id = 0; VL53L0X_DeviceInfo_t vl53l0x_dev_info; - SYS_LOG_DBG("enter in %s", __func__); + LOG_DBG("enter in %s", __func__); #ifdef CONFIG_VL53L0X_XSHUT_CONTROL_ENABLE struct device *gpio; @@ -208,7 +209,7 @@ static int vl53l0x_init(struct device *dev) /* configure and set VL53L0X_XSHUT_Pin */ gpio = device_get_binding(CONFIG_VL53L0X_XSHUT_GPIO_DEV_NAME); if (gpio == NULL) { - SYS_LOG_ERR("Could not get pointer to %s device.", + LOG_ERR("Could not get pointer to %s device.", CONFIG_VL53L0X_XSHUT_GPIO_DEV_NAME); return -EINVAL; } @@ -216,7 +217,7 @@ static int vl53l0x_init(struct device *dev) if (gpio_pin_configure(gpio, CONFIG_VL53L0X_XSHUT_GPIO_PIN_NUM, GPIO_DIR_OUT | GPIO_PUD_PULL_UP) < 0) { - SYS_LOG_ERR("Could not configure GPIO %s %d).", + LOG_ERR("Could not configure GPIO %s %d).", CONFIG_VL53L0X_XSHUT_GPIO_DEV_NAME, CONFIG_VL53L0X_XSHUT_GPIO_PIN_NUM); return -EINVAL; @@ -228,7 +229,7 @@ static int vl53l0x_init(struct device *dev) drv_data->i2c = device_get_binding(CONFIG_VL53L0X_I2C_MASTER_DEV_NAME); if (drv_data->i2c == NULL) { - SYS_LOG_ERR("Could not get pointer to %s device.", + LOG_ERR("Could not get pointer to %s device.", CONFIG_VL53L0X_I2C_MASTER_DEV_NAME); return -EINVAL; } @@ -241,31 +242,31 @@ static int vl53l0x_init(struct device *dev) ret = VL53L0X_GetDeviceInfo(&drv_data->vl53l0x, &vl53l0x_dev_info); if (ret < 0) { - SYS_LOG_ERR("Could not get info from device."); + LOG_ERR("Could not get info from device."); return -ENODEV; } - SYS_LOG_DBG("VL53L0X_GetDeviceInfo = %d", ret); - SYS_LOG_DBG(" Device Name : %s", vl53l0x_dev_info.Name); - SYS_LOG_DBG(" Device Type : %s", vl53l0x_dev_info.Type); - SYS_LOG_DBG(" Device ID : %s", vl53l0x_dev_info.ProductId); - SYS_LOG_DBG(" ProductRevisionMajor : %d", + LOG_DBG("VL53L0X_GetDeviceInfo = %d", ret); + LOG_DBG(" Device Name : %s", vl53l0x_dev_info.Name); + LOG_DBG(" Device Type : %s", vl53l0x_dev_info.Type); + LOG_DBG(" Device ID : %s", vl53l0x_dev_info.ProductId); + LOG_DBG(" ProductRevisionMajor : %d", vl53l0x_dev_info.ProductRevisionMajor); - SYS_LOG_DBG(" ProductRevisionMinor : %d", + LOG_DBG(" ProductRevisionMinor : %d", vl53l0x_dev_info.ProductRevisionMinor); ret = VL53L0X_RdWord(&drv_data->vl53l0x, VL53L0X_REG_WHO_AM_I, (uint16_t *) &vl53l0x_id); if ((ret < 0) || (vl53l0x_id != VL53L0X_CHIP_ID)) { - SYS_LOG_ERR("Issue on device identification"); + LOG_ERR("Issue on device identification"); return -ENOTSUP; } /* sensor init */ ret = VL53L0X_DataInit(&drv_data->vl53l0x); if (ret < 0) { - SYS_LOG_ERR("VL53L0X_DataInit return error (%d)", ret); + LOG_ERR("VL53L0X_DataInit return error (%d)", ret); return -ENOTSUP; } diff --git a/drivers/sensor/vl53l0x/vl53l0x_platform.c b/drivers/sensor/vl53l0x/vl53l0x_platform.c index 5ab666ca298..fe5db6daf0b 100644 --- a/drivers/sensor/vl53l0x/vl53l0x_platform.c +++ b/drivers/sensor/vl53l0x/vl53l0x_platform.c @@ -15,11 +15,10 @@ #include #include #include +#include -#define SYS_LOG_DOMAIN "VL53L0X" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL -#include - +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL +LOG_MODULE_DECLARE(VL53L0X); VL53L0X_Error VL53L0X_WriteMulti(VL53L0X_DEV Dev, uint8_t index, uint8_t *pdata, uint32_t count) @@ -36,7 +35,7 @@ VL53L0X_Error VL53L0X_WriteMulti(VL53L0X_DEV Dev, uint8_t index, uint8_t *pdata, if (status_int < 0) { Status = VL53L0X_ERROR_CONTROL_INTERFACE; - SYS_LOG_ERR("Failed to write"); + LOG_ERR("Failed to write"); } return Status; @@ -51,7 +50,7 @@ VL53L0X_Error VL53L0X_ReadMulti(VL53L0X_DEV Dev, uint8_t index, uint8_t *pdata, status_int = i2c_burst_read(Dev->i2c, Dev->I2cDevAddr, index, pdata, count); if (status_int < 0) { - SYS_LOG_ERR("Failed to read"); + LOG_ERR("Failed to read"); return -EIO; } @@ -68,7 +67,7 @@ VL53L0X_Error VL53L0X_WrByte(VL53L0X_DEV Dev, uint8_t index, uint8_t data) if (status_int < 0) { Status = VL53L0X_ERROR_CONTROL_INTERFACE; - SYS_LOG_ERR("i2c_reg_write_byte failed (%d)", Status); + LOG_ERR("i2c_reg_write_byte failed (%d)", Status); } return Status; @@ -87,7 +86,7 @@ VL53L0X_Error VL53L0X_WrWord(VL53L0X_DEV Dev, uint8_t index, uint16_t data) status_int = i2c_write(Dev->i2c, I2CBuffer, 3, Dev->I2cDevAddr); if (status_int < 0) { Status = VL53L0X_ERROR_CONTROL_INTERFACE; - SYS_LOG_ERR("i2c_write failed (%d)", Status); + LOG_ERR("i2c_write failed (%d)", Status); } return Status; @@ -108,7 +107,7 @@ VL53L0X_Error VL53L0X_WrDWord(VL53L0X_DEV Dev, uint8_t index, uint32_t data) status_int = i2c_write(Dev->i2c, I2CBuffer, 5, Dev->I2cDevAddr); if (status_int < 0) { Status = VL53L0X_ERROR_CONTROL_INTERFACE; - SYS_LOG_ERR("i2c_write failed (%d)", Status); + LOG_ERR("i2c_write failed (%d)", Status); } return Status; @@ -127,7 +126,7 @@ VL53L0X_Error VL53L0X_UpdateByte(VL53L0X_DEV Dev, uint8_t index, status_int = VL53L0X_RdByte(Dev, index, &data); if (status_int < 0) { Status = VL53L0X_ERROR_CONTROL_INTERFACE; - SYS_LOG_ERR("VL53L0X_RdByte failed (%d)", Status); + LOG_ERR("VL53L0X_RdByte failed (%d)", Status); } if (Status == VL53L0X_ERROR_NONE) { @@ -135,7 +134,7 @@ VL53L0X_Error VL53L0X_UpdateByte(VL53L0X_DEV Dev, uint8_t index, status_int = VL53L0X_WrByte(Dev, index, data); if (status_int != 0) { Status = VL53L0X_ERROR_CONTROL_INTERFACE; - SYS_LOG_DBG("VL53L0X_WrByte failed.(%d)", Status); + LOG_DBG("VL53L0X_WrByte failed.(%d)", Status); } } @@ -150,7 +149,7 @@ VL53L0X_Error VL53L0X_RdByte(VL53L0X_DEV Dev, uint8_t index, uint8_t *data) status_int = i2c_reg_read_byte(Dev->i2c, Dev->I2cDevAddr, index, data); if (status_int < 0) { Status = VL53L0X_ERROR_CONTROL_INTERFACE; - SYS_LOG_ERR("i2c_reg_read_byte failed (%d)", Status); + LOG_ERR("i2c_reg_read_byte failed (%d)", Status); } return Status; @@ -164,7 +163,7 @@ VL53L0X_Error VL53L0X_RdWord(VL53L0X_DEV Dev, uint8_t index, uint16_t *data) status_int = i2c_burst_read(Dev->i2c, Dev->I2cDevAddr, index, buf, 2); if (status_int < 0) { - SYS_LOG_ERR("i2c_burst_read failed"); + LOG_ERR("i2c_burst_read failed"); return -EIO; } *data = ((uint16_t)buf[0]<<8) + (uint16_t)buf[1]; @@ -180,7 +179,7 @@ VL53L0X_Error VL53L0X_RdDWord(VL53L0X_DEV Dev, uint8_t index, uint32_t *data) status_int = i2c_burst_read(Dev->i2c, Dev->I2cDevAddr, index, buf, 4); if (status_int < 0) { - SYS_LOG_ERR("i2c_burst_read failed"); + LOG_ERR("i2c_burst_read failed"); return -EIO; } *data = ((uint32_t)buf[0]<<24) + ((uint32_t)buf[1]<<16) + diff --git a/samples/sensor/adxl372/prj.conf b/samples/sensor/adxl372/prj.conf index 8f11f20e93f..780f68da34a 100644 --- a/samples/sensor/adxl372/prj.conf +++ b/samples/sensor/adxl372/prj.conf @@ -1,8 +1,8 @@ CONFIG_STDOUT_CONSOLE=y -CONFIG_SYS_LOG=y +CONFIG_LOG=y CONFIG_SPI=y CONFIG_SENSOR=y CONFIG_ADXL372=y CONFIG_ADXL372_SPI=y -CONFIG_SYS_LOG_SENSOR_LEVEL=3 +CONFIG_SENSOR_LOG_LEVEL_WRN=y diff --git a/samples/sensor/adxl372/prj_i2c.conf b/samples/sensor/adxl372/prj_i2c.conf index d83003c8ac8..da27a521e05 100644 --- a/samples/sensor/adxl372/prj_i2c.conf +++ b/samples/sensor/adxl372/prj_i2c.conf @@ -1,8 +1,8 @@ CONFIG_STDOUT_CONSOLE=y -CONFIG_SYS_LOG=y +CONFIG_LOG=y CONFIG_I2C=y CONFIG_SENSOR=y CONFIG_ADXL372=y CONFIG_ADXL372_I2C=y -CONFIG_SYS_LOG_SENSOR_LEVEL=3 +CONFIG_SENSOR_LOG_LEVEL_WRN=y diff --git a/samples/sensor/amg88xx/prj.conf b/samples/sensor/amg88xx/prj.conf index f7f5e9ff66f..24dfc9c7590 100644 --- a/samples/sensor/amg88xx/prj.conf +++ b/samples/sensor/amg88xx/prj.conf @@ -1,6 +1,6 @@ CONFIG_STDOUT_CONSOLE=y -CONFIG_SYS_LOG_SENSOR_LEVEL=1 -CONFIG_SYS_LOG=y +CONFIG_SENSOR_LOG_LEVEL_INF=y +CONFIG_LOG=y CONFIG_I2C=y CONFIG_SENSOR=y CONFIG_AMG88XX=y diff --git a/samples/sensor/apds9960/prj.conf b/samples/sensor/apds9960/prj.conf index fe5f098c287..98cca5cebc2 100644 --- a/samples/sensor/apds9960/prj.conf +++ b/samples/sensor/apds9960/prj.conf @@ -4,8 +4,8 @@ CONFIG_I2C=y CONFIG_PRINTK=y CONFIG_SENSOR=y -CONFIG_SYS_LOG=y -CONFIG_SYS_LOG_SENSOR_LEVEL=1 +CONFIG_LOG=y +CONFIG_SENSOR_LOG_LEVEL_INF=y CONFIG_I2C_LOG_LEVEL_INF=y CONFIG_APDS9960=y diff --git a/samples/sensor/bmg160/prj.conf b/samples/sensor/bmg160/prj.conf index 493b0accbf8..245d0565e41 100644 --- a/samples/sensor/bmg160/prj.conf +++ b/samples/sensor/bmg160/prj.conf @@ -1,7 +1,7 @@ CONFIG_PRINTK=y CONFIG_GPIO=y CONFIG_I2C=y -CONFIG_SYS_LOG=y -CONFIG_SYS_LOG_SENSOR_LEVEL=4 +CONFIG_LOG=y +CONFIG_SENSOR_LOG_LEVEL_DBG=y CONFIG_SENSOR=y CONFIG_BMG160=y diff --git a/samples/sensor/fxas21002/prj.conf b/samples/sensor/fxas21002/prj.conf index 860dc5db8dc..b6065b89119 100644 --- a/samples/sensor/fxas21002/prj.conf +++ b/samples/sensor/fxas21002/prj.conf @@ -1,7 +1,7 @@ CONFIG_STDOUT_CONSOLE=y -CONFIG_SYS_LOG=y +CONFIG_LOG=y CONFIG_I2C=y CONFIG_SENSOR=y CONFIG_FXAS21002=y -CONFIG_SYS_LOG_SENSOR_LEVEL=4 +CONFIG_SENSOR_LOG_LEVEL_DBG=y CONFIG_FXAS21002_TRIGGER_OWN_THREAD=y diff --git a/samples/sensor/fxos8700/prj.conf b/samples/sensor/fxos8700/prj.conf index 91b51d40bec..f266690c7c0 100644 --- a/samples/sensor/fxos8700/prj.conf +++ b/samples/sensor/fxos8700/prj.conf @@ -1,9 +1,9 @@ CONFIG_STDOUT_CONSOLE=y -CONFIG_SYS_LOG=y +CONFIG_LOG=y CONFIG_I2C=y CONFIG_SENSOR=y CONFIG_FXOS8700=y -CONFIG_SYS_LOG_SENSOR_LEVEL=4 +CONFIG_SENSOR_LOG_LEVEL_DBG=y CONFIG_FXOS8700_MODE_HYBRID=y CONFIG_FXOS8700_TEMP=y CONFIG_FXOS8700_TRIGGER_OWN_THREAD=y diff --git a/samples/sensor/max30101/prj.conf b/samples/sensor/max30101/prj.conf index 8fd4c989ec6..466f00ed4fa 100644 --- a/samples/sensor/max30101/prj.conf +++ b/samples/sensor/max30101/prj.conf @@ -1,6 +1,6 @@ CONFIG_STDOUT_CONSOLE=y -CONFIG_SYS_LOG=y +CONFIG_LOG=y CONFIG_I2C=y CONFIG_SENSOR=y -CONFIG_SYS_LOG_SENSOR_LEVEL=4 +CONFIG_SENSOR_LOG_LEVEL_DBG=y CONFIG_MAX30101=y diff --git a/samples/sensor/mma8451q/prj.conf b/samples/sensor/mma8451q/prj.conf index f938395943c..949ae9672f2 100644 --- a/samples/sensor/mma8451q/prj.conf +++ b/samples/sensor/mma8451q/prj.conf @@ -1,6 +1,6 @@ CONFIG_STDOUT_CONSOLE=y -CONFIG_SYS_LOG_SENSOR_LEVEL=1 -CONFIG_SYS_LOG=y +CONFIG_LOG=y +CONFIG_SENSOR_LOG_LEVEL_INF=y CONFIG_I2C=y CONFIG_SENSOR=y -CONFIG_MMA8451Q=y \ No newline at end of file +CONFIG_MMA8451Q=y diff --git a/samples/sensor/ms5837/prj.conf b/samples/sensor/ms5837/prj.conf index 3e1a4a7b52d..a94dc59d9ed 100644 --- a/samples/sensor/ms5837/prj.conf +++ b/samples/sensor/ms5837/prj.conf @@ -1,11 +1,9 @@ CONFIG_STDOUT_CONSOLE=y -CONFIG_SYS_LOG=y -CONFIG_SYS_LOG_SHOW_TAGS=y -CONFIG_SYS_LOG_SHOW_COLOR=y -CONFIG_SYS_LOG_DEFAULT_LEVEL=1 -CONFIG_SYS_LOG_OVERRIDE_LEVEL=1 - +CONFIG_LOG=y +CONFIG_LOG_BACKEND_SHOW_COLOR=y +CONFIG_LOG_DEFAULT_LEVEL=1 +CONFIG_LOG_OVERRIDE_LEVEL=1 CONFIG_I2C=y CONFIG_I2C_1=y CONFIG_I2C_NRFX=y diff --git a/samples/sensor/th02/prj.conf b/samples/sensor/th02/prj.conf index fbeac9becdb..b47b432578b 100644 --- a/samples/sensor/th02/prj.conf +++ b/samples/sensor/th02/prj.conf @@ -2,7 +2,7 @@ CONFIG_STDOUT_CONSOLE=y CONFIG_I2C=y CONFIG_SENSOR=y CONFIG_TH02=y -CONFIG_SYS_LOG=n -CONFIG_SYS_LOG_SENSOR_LEVEL=4 +CONFIG_LOG=n +CONFIG_SENSOR_LOG_LEVEL_DBG=y CONFIG_GROVE=y CONFIG_GROVE_LCD_RGB=y diff --git a/samples/sensor/vl53l0x/prj.conf b/samples/sensor/vl53l0x/prj.conf index b4d3b7e4712..f185dbc5231 100644 --- a/samples/sensor/vl53l0x/prj.conf +++ b/samples/sensor/vl53l0x/prj.conf @@ -7,5 +7,5 @@ CONFIG_VL53L0X_PROXIMITY_THRESHOLD=100 #debug #CONFIG_DEBUG=y -#CONFIG_SYS_LOG=y -#CONFIG_SYS_LOG_SENSOR_LEVEL=4 +#CONFIG_LOG=y +#CONFIG_SENSOR_LOG_LEVEL_DBG=y diff --git a/tests/drivers/build_all/sensors_a_h.conf b/tests/drivers/build_all/sensors_a_h.conf index 1172ca3b92f..a5fdf220422 100644 --- a/tests/drivers/build_all/sensors_a_h.conf +++ b/tests/drivers/build_all/sensors_a_h.conf @@ -3,8 +3,8 @@ CONFIG_GPIO=y CONFIG_I2C=y CONFIG_SENSOR=y CONFIG_SPI=y -CONFIG_SYS_LOG=y -CONFIG_SYS_LOG_SENSOR_LEVEL=4 +CONFIG_LOG=y +CONFIG_SENSOR_LOG_LEVEL_DBG=y # Some sensor drivers (notably HP206C) demand high tick rates: CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000 diff --git a/tests/drivers/build_all/sensors_i_z.conf b/tests/drivers/build_all/sensors_i_z.conf index d0299a9dc04..8d53495fa63 100644 --- a/tests/drivers/build_all/sensors_i_z.conf +++ b/tests/drivers/build_all/sensors_i_z.conf @@ -3,9 +3,8 @@ CONFIG_GPIO=y CONFIG_I2C=y CONFIG_SENSOR=y CONFIG_SPI=y -CONFIG_SYS_LOG=y -CONFIG_SYS_LOG_SENSOR_LEVEL=4 - +CONFIG_LOG=y +CONFIG_SENSOR_LOG_LEVEL_DBG=y CONFIG_ISL29035=y CONFIG_LIS2DH=y CONFIG_LIS2MDL=y