MYNEWT-744 Sensor imp, lsm303 fix

Author: vrahane

apps/sensors_test/src/main.c

@@ -29,25 +29,6 @@
 #include <log/log.h>
 #include <config/config.h>
 #include <sensor/sensor.h>
-#if ARCH_sim
-#include <sim/sim_accel.h>
-#endif
-#if MYNEWT_VAL(LSM303DLHC_OFB)
-#include <lsm303dlhc/lsm303dlhc.h>
-#endif
-#if MYNEWT_VAL(TSL2561_OFB)
-#include <tsl2561/tsl2561.h>
-#endif
-#if MYNEWT_VAL(TCS34725_OFB)
-#include <tcs34725/tcs34725.h>
-#endif
-#if MYNEWT_VAL(BNO055_OFB)
-#include <bno055/bno055.h>
-#endif
-#if MYNEWT_VAL(BME280_ONB)||MYNEWT_VAL(BME280_OFB)
-#include <bme280/bme280.h>
-#endif
-
 #include "flash_map/flash_map.h"
 #include <hal/hal_system.h>
 #include <assert.h>

hw/drivers/sensors/lsm303dlhc/include/lsm303dlhc/lsm303dlhc.h

@@ -68,6 +68,9 @@ enum lsm303dlhc_mag_rate {
     LSM303DLHC_MAG_RATE_220             = 0x07 << 2   /* 220 Hz  */
 };
 
+#define LSM303DLHC_ADDR_ACCEL                  0x19  /* 0011001 */
+#define LSM303DLHC_ADDR_MAG                    0x1E  /* 0011110 */
+
 struct lsm303dlhc_cfg {
     enum lsm303dlhc_accel_range accel_range;
     enum lsm303dlhc_accel_rate accel_rate;

hw/drivers/sensors/lsm303dlhc/src/lsm303dlhc.c

@@ -382,6 +382,8 @@ lsm303dlhc_config(struct lsm303dlhc *lsm, struct lsm303dlhc_cfg *cfg)
     }
 
     lsm->cfg.mask = cfg->mask;
+    lsm->cfg.mag_addr = cfg->mag_addr;
+    lsm->cfg.acc_addr = cfg->acc_addr;
 
     return 0;
 err:

hw/sensor/creator/src/sensor_creator.c

@@ -255,10 +255,11 @@ config_lsm303dlhc_sensor(void)
     lsmcfg.accel_rate = LSM303DLHC_ACCEL_RATE_1;
     lsmcfg.accel_range = LSM303DLHC_ACCEL_RANGE_2;
     /* Device I2C addr for accelerometer */
-    lsmcfg.acc_addr = 0x1E;
+    lsmcfg.acc_addr = LSM303DLHC_ADDR_ACCEL;
     /* Device I2C addr for magnetometer */
-    lsmcfg.mag_addr = 0x19;
-    lsmcfg.mask = SENSOR_TYPE_ACCELEROMETER|
+    lsmcfg.mag_addr = LSM303DLHC_ADDR_MAG;
+
+    lsmcfg.mask = SENSOR_TYPE_LINEAR_ACCEL|
                   SENSOR_TYPE_MAGNETIC_FIELD;
 
     rc = lsm303dlhc_config((struct lsm303dlhc *) dev, &lsmcfg);