diff --git a/drivers/bme680/Kconfig b/drivers/bme680/Kconfig index a6d53458b3..623c1ee8bc 100644 --- a/drivers/bme680/Kconfig +++ b/drivers/bme680/Kconfig @@ -9,7 +9,8 @@ menuconfig MODULE_BME680 bool "BME680 Temperature/Humidity/Pressure/Gas sensor" depends on TEST_KCONFIG select PACKAGE_DRIVER_BME680 - select MODULE_XTIMER if MODULE_SAUL + select MODULE_ZTIMER if MODULE_SAUL + select MODULE_ZTIMER_MSEC if MODULE_SAUL if MODULE_BME680 diff --git a/drivers/bme680/Makefile.dep b/drivers/bme680/Makefile.dep index 651ee40a84..69968ce08a 100644 --- a/drivers/bme680/Makefile.dep +++ b/drivers/bme680/Makefile.dep @@ -1,7 +1,8 @@ USEPKG += driver_bme680 ifneq (,$(filter saul%,$(USEMODULE))) - USEMODULE += xtimer + USEMODULE += ztimer + USEMODULE += ztimer_msec endif ifneq (,$(filter bme680_i2c,$(USEMODULE))) diff --git a/drivers/bme680/bme680_saul.c b/drivers/bme680/bme680_saul.c index 31d77d05fc..fecb824e55 100644 --- a/drivers/bme680/bme680_saul.c +++ b/drivers/bme680/bme680_saul.c @@ -21,7 +21,7 @@ #include "saul.h" #include "bme680.h" #include "bme680_params.h" -#include "xtimer.h" +#include "ztimer.h" extern bme680_t bme680_devs_saul[BME680_NUMOF]; @@ -65,7 +65,7 @@ static int _read(int dev) if ((drt = bme680_get_duration(&bme680_devs_saul[dev])) < 0) { return BME680_INVALID; } - xtimer_msleep(drt); + ztimer_sleep(ZTIMER_MSEC, drt); bme680_field_data_t data; if ((res = bme680_get_data(&bme680_devs_saul[dev], &data)) != BME680_OK) { diff --git a/pkg/driver_bme680/Kconfig b/pkg/driver_bme680/Kconfig index d3e5d9b212..d155801192 100644 --- a/pkg/driver_bme680/Kconfig +++ b/pkg/driver_bme680/Kconfig @@ -9,6 +9,8 @@ config PACKAGE_DRIVER_BME680 bool "BME680 sensor driver package" depends on TEST_KCONFIG select MODULE_DRIVER_BME680_CONTRIB + select MODULE_ZTIMER + select MODULE_ZTIMER_MSEC config MODULE_DRIVER_BME680_CONTRIB bool diff --git a/pkg/driver_bme680/Makefile.dep b/pkg/driver_bme680/Makefile.dep index 0567ee2f56..a7661f3ade 100644 --- a/pkg/driver_bme680/Makefile.dep +++ b/pkg/driver_bme680/Makefile.dep @@ -1 +1,3 @@ +USEMODULE += ztimer +USEMODULE += ztimer_msec USEMODULE += driver_bme680_contrib diff --git a/pkg/driver_bme680/contrib/bme680_hal.c b/pkg/driver_bme680/contrib/bme680_hal.c index 26c16523ac..ec3f2a2436 100644 --- a/pkg/driver_bme680/contrib/bme680_hal.c +++ b/pkg/driver_bme680/contrib/bme680_hal.c @@ -33,7 +33,7 @@ #include "periph/spi.h" #endif -#include "xtimer.h" +#include "ztimer.h" #ifndef BME680_SPI_SPEED #define BME680_SPI_SPEED (SPI_CLK_1MHZ) @@ -45,7 +45,7 @@ void bme680_ms_sleep(uint32_t msleep) { - xtimer_msleep(msleep); + ztimer_sleep(ZTIMER_MSEC, msleep); } #ifdef MODULE_PERIPH_I2C diff --git a/tests/driver_bme680/Makefile b/tests/driver_bme680/Makefile index b0a7023834..2419840ecf 100644 --- a/tests/driver_bme680/Makefile +++ b/tests/driver_bme680/Makefile @@ -3,7 +3,8 @@ include ../Makefile.tests_common DRIVER ?= bme680_i2c USEMODULE += $(DRIVER) -USEMODULE += xtimer +USEMODULE += ztimer +USEMODULE += ztimer_msec ifeq ($(ENABLE_FP),1) USEMODULE += bme680_fp diff --git a/tests/driver_bme680/app.config.test b/tests/driver_bme680/app.config.test index 325e73a745..e183d82598 100644 --- a/tests/driver_bme680/app.config.test +++ b/tests/driver_bme680/app.config.test @@ -1,4 +1,5 @@ # this file enables modules defined in Kconfig. Do not use this file for # application configuration. This is only needed during migration. CONFIG_MODULE_BME680=y -CONFIG_MODULE_XTIMER=y +CONFIG_MODULE_ZTIMER=y +CONFIG_MODULE_ZTIMER_MSEC=y diff --git a/tests/driver_bme680/main.c b/tests/driver_bme680/main.c index a8cd454407..e7d8e5c155 100644 --- a/tests/driver_bme680/main.c +++ b/tests/driver_bme680/main.c @@ -25,15 +25,16 @@ #include "bme680.h" #include "bme680_params.h" #include "mutex.h" -#include "xtimer.h" +#include "timex.h" +#include "ztimer.h" -#define BME680_TEST_PERIOD_US (5 * US_PER_SEC) +#define BME680_TEST_PERIOD_MS (5 * MS_PER_SEC) /* 5s */ -xtimer_t timer; +ztimer_t timer; static void _timer_cb(void *arg) { - xtimer_set(&timer, BME680_TEST_PERIOD_US); + ztimer_set(ZTIMER_MSEC, &timer, BME680_TEST_PERIOD_MS); mutex_unlock(arg); } @@ -64,7 +65,7 @@ int main(void) timer.callback = _timer_cb; timer.arg = &timer_mtx; - xtimer_set(&timer, BME680_TEST_PERIOD_US); + ztimer_set(ZTIMER_MSEC, &timer, BME680_TEST_PERIOD_MS); while (1) { @@ -76,7 +77,7 @@ int main(void) /* get the duration for the measurement */ int duration = bme680_get_duration(&dev[i]); /* wait for the duration */ - xtimer_msleep(duration); + ztimer_sleep(ZTIMER_MSEC, duration); /* read the data */ int res = bme680_get_data(&dev[i], &data);