diff --git a/tests/driver_lis3mdl/Makefile b/tests/driver_lis3mdl/Makefile index a5b1b84777..301b1fd379 100644 --- a/tests/driver_lis3mdl/Makefile +++ b/tests/driver_lis3mdl/Makefile @@ -1,25 +1,7 @@ BOARD ?= limifrog-v1 include ../Makefile.tests_common -# only this board is known (yet) to provide the sensor LIS3MDL -BOARD_WHITELIST = limifrog-v1 - -FEATURES_REQUIRED = periph_i2c periph_gpio - USEMODULE += lis3mdl USEMODULE += xtimer -ifneq (,$(TEST_LIS3MDL_I2C)) - CFLAGS += -DTEST_LIS3MDL_I2C=$(TEST_LIS3MDL_I2C) -else - # set random default - CFLAGS += -DTEST_LIS3MDL_I2C=I2C_DEV\(1\) -endif -ifneq (,$(TEST_LIS3MDL_MAG_ADDR)) - CFLAGS += -DTEST_LIS3MDL_MAG_ADDR=$(TEST_LIS3MDL_MAG_ADDR) -else - # set random default 7 bit address - CFLAGS += -DTEST_LIS3MDL_MAG_ADDR=28 -endif - include $(RIOTBASE)/Makefile.include diff --git a/tests/driver_lis3mdl/main.c b/tests/driver_lis3mdl/main.c index f74af6b05e..f31da84a31 100644 --- a/tests/driver_lis3mdl/main.c +++ b/tests/driver_lis3mdl/main.c @@ -18,33 +18,23 @@ * * @} */ -#ifndef TEST_LIS3MDL_I2C -#error "TEST_LIS3MDL_I2C not defined" -#endif -#ifndef TEST_LIS3MDL_MAG_ADDR -#error "TEST_LIS3MDL_MAG_ADDR not defined" -#endif #include #include "xtimer.h" #include "lis3mdl.h" +#include "lis3mdl_params.h" #define SLEEP (800 * 800U) int main(void) { lis3mdl_t dev; - lis3mdl_3d_data_t mag_value; - int16_t temp_value = 0; - puts("\nLIS3MDL test application"); - printf("Initializing LIS3MDL sensor at I2C_%i ... \n", TEST_LIS3MDL_I2C); + puts("LIS3MDL test application"); + puts("Initializing LIS3MDL sensor"); - if (lis3mdl_init(&dev, TEST_LIS3MDL_I2C, TEST_LIS3MDL_MAG_ADDR, - LIS3MDL_XY_MODE_MEDIUM, - LIS3MDL_Z_MODE_MEDIUM, LIS3MDL_ODR_10Hz, - LIS3MDL_SCALE_4G, LIS3MDL_OP_CONT_CONV) == 0) { + if (lis3mdl_init(&dev, &lis3mdl_params[0]) == 0) { puts("[ OK ]\n"); } else { @@ -52,11 +42,15 @@ int main(void) return 1; } - while(1){ + while(1) { + lis3mdl_3d_data_t mag_value; lis3mdl_read_mag(&dev, &mag_value); - printf("Magnetometer [G]:\tX: %2d\tY: %2d\tZ: %2d\n", mag_value.x_axis, - mag_value.y_axis, - mag_value.z_axis); + printf("Magnetometer [G]:\tX: %2d\tY: %2d\tZ: %2d\n", + mag_value.x_axis, + mag_value.y_axis, + mag_value.z_axis); + + int16_t temp_value; lis3mdl_read_temp(&dev, &temp_value); printf("Temperature:\t\t%i°C\n", temp_value);