From d9fe3a74e59e749b802d86aaa31e1835f632c74b Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 10 Dec 2021 13:57:29 +0100 Subject: [PATCH] drivers/lis2dh12: migrate to ztimer --- drivers/lis2dh12/lis2dh12.c | 6 +++--- tests/driver_lis2dh12/Makefile | 3 ++- tests/driver_lis2dh12/app.config.test | 3 ++- tests/driver_lis2dh12/main.c | 1 - 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/lis2dh12/lis2dh12.c b/drivers/lis2dh12/lis2dh12.c index 6612418e32..56d6cd493c 100644 --- a/drivers/lis2dh12/lis2dh12.c +++ b/drivers/lis2dh12/lis2dh12.c @@ -23,7 +23,7 @@ #include "byteorder.h" #include "mutex.h" #include "timex.h" -#include "xtimer.h" +#include "ztimer.h" #include "lis2dh12.h" #include "lis2dh12_internal.h" @@ -595,8 +595,8 @@ int lis2dh12_read_temperature(const lis2dh12_t *dev, int16_t *temp) if (!_read(dev, REG_TEMP_CFG_REG)) { uint8_t odr = _read(dev, REG_CTRL_REG1) >> 4; _write(dev, REG_TEMP_CFG_REG, LIS2DH12_TEMP_CFG_REG_ENABLE); - if (IS_USED(MODULE_XTIMER)) { - xtimer_msleep(MS_PER_SEC / hz_per_dr[odr]); + if (IS_USED(MODULE_ZTIMER)) { + ztimer_sleep(ZTIMER_MSEC, MS_PER_SEC / hz_per_dr[odr]); } } diff --git a/tests/driver_lis2dh12/Makefile b/tests/driver_lis2dh12/Makefile index d47e568630..0fcc4a30c8 100644 --- a/tests/driver_lis2dh12/Makefile +++ b/tests/driver_lis2dh12/Makefile @@ -4,7 +4,8 @@ include ../Makefile.tests_common DRIVER ?= lis2dh12_spi USEMODULE += fmt -USEMODULE += xtimer +USEMODULE += ztimer +USEMODULE += ztimer_msec USEMODULE += shell USEMODULE += shell_commands USEMODULE += $(DRIVER) diff --git a/tests/driver_lis2dh12/app.config.test b/tests/driver_lis2dh12/app.config.test index 98d38424d2..414f43613c 100644 --- a/tests/driver_lis2dh12/app.config.test +++ b/tests/driver_lis2dh12/app.config.test @@ -1,7 +1,8 @@ # this file enables modules defined in Kconfig. Do not use this file for # application configuration. This is only needed during migration. CONFIG_MODULE_FMT=y -CONFIG_MODULE_XTIMER=y +CONFIG_MODULE_ZTIMER=y +CONFIG_MODULE_ZTIMER_MSEC=y CONFIG_MODULE_SHELL=y CONFIG_MODULE_SHELL_COMMANDS=y CONFIG_MODULE_LIS2DH12=y diff --git a/tests/driver_lis2dh12/main.c b/tests/driver_lis2dh12/main.c index 2daa98a210..e9fafaa0ce 100644 --- a/tests/driver_lis2dh12/main.c +++ b/tests/driver_lis2dh12/main.c @@ -23,7 +23,6 @@ #include #include #include -#include "xtimer.h" #include "fmt.h" #include "thread.h" #include "shell.h"