Repository: incubator-mynewt-core Updated Branches: refs/heads/sensors_branch b6bd73b45 -> 6247b5afa
Fixed accel/mag driver registration Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/d0ded5a3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/d0ded5a3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/d0ded5a3 Branch: refs/heads/sensors_branch Commit: d0ded5a333aa7c68881d3b50396c2e994efc7adb Parents: b6bd73b Author: microbuilder <cont...@microbuilder.eu> Authored: Thu Jan 5 16:33:28 2017 +0100 Committer: microbuilder <cont...@microbuilder.eu> Committed: Thu Jan 5 16:33:28 2017 +0100 ---------------------------------------------------------------------- hw/drivers/sensors/lsm303dlhc/src/lsm303dlhc.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d0ded5a3/hw/drivers/sensors/lsm303dlhc/src/lsm303dlhc.c ---------------------------------------------------------------------- diff --git a/hw/drivers/sensors/lsm303dlhc/src/lsm303dlhc.c b/hw/drivers/sensors/lsm303dlhc/src/lsm303dlhc.c index b3821e1..1d5af6c 100644 --- a/hw/drivers/sensors/lsm303dlhc/src/lsm303dlhc.c +++ b/hw/drivers/sensors/lsm303dlhc/src/lsm303dlhc.c @@ -273,15 +273,9 @@ lsm303dlhc_init(struct os_dev *dev, void *arg) goto err; } - /* Add the accelerometer */ - rc = sensor_set_driver(sensor, SENSOR_TYPE_ACCELEROMETER, - (struct sensor_driver *) &g_lsm303dlhc_sensor_driver); - if (rc != 0) { - goto err; - } - - /* Add the magnetometer */ - rc = sensor_set_driver(sensor, SENSOR_TYPE_MAGNETIC_FIELD, + /* Add the accelerometer/magnetometer driver */ + rc = sensor_set_driver(sensor, SENSOR_TYPE_ACCELEROMETER | + SENSOR_TYPE_MAGNETIC_FIELD, (struct sensor_driver *) &g_lsm303dlhc_sensor_driver); if (rc != 0) { goto err;