riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pkg/u8g2: migrate to ztimer

Browse Source
This commit is contained in:
Alexandre Abadie 2021-12-01 15:07:26 +01:00
parent 25d1e2daa2
commit 4f3a61c7dc
No known key found for this signature in database
GPG Key ID: 1C919A403CAE1405
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/u8g2/Kconfig
View File

@ -10,7 +10,8 @@ config PACKAGE_U8G2
depends on TEST_KCONFIG depends on TEST_KCONFIG
depends on HAS_PERIPH_GPIO depends on HAS_PERIPH_GPIO
select MODULE_PERIPH_GPIO select MODULE_PERIPH_GPIO
select MODULE_XTIMER select MODULE_ZTIMER
select MODULE_ZTIMER_USEC
select MODULE_U8G2_RIOT select MODULE_U8G2_RIOT
select MODULE_U8G2_CSRC select MODULE_U8G2_CSRC

3
pkg/u8g2/Makefile.dep
View File

@ -1,4 +1,5 @@
USEMODULE += xtimer USEMODULE += ztimer
USEMODULE += ztimer_usec
FEATURES_REQUIRED += periph_gpio FEATURES_REQUIRED += periph_gpio

8
pkg/u8g2/contrib/u8x8_riotos.c
View File

@ -24,7 +24,7 @@
#include "u8x8_riotos.h" #include "u8x8_riotos.h"
#include "xtimer.h" #include "ztimer.h"
#ifdef MODULE_PERIPH_SPI #ifdef MODULE_PERIPH_SPI
#include "periph/spi.h" #include "periph/spi.h"
@ -97,14 +97,14 @@ uint8_t u8x8_gpio_and_delay_riotos(u8x8_t *u8g2, uint8_t msg, uint8_t arg_int, v
_enable_pins(u8x8_riot_ptr); _enable_pins(u8x8_riot_ptr);
break; break;
case U8X8_MSG_DELAY_MILLI: case U8X8_MSG_DELAY_MILLI:
xtimer_usleep(arg_int * 1000); ztimer_sleep(ZTIMER_USEC, arg_int * 1000);
break; break;
case U8X8_MSG_DELAY_10MICRO: case U8X8_MSG_DELAY_10MICRO:
xtimer_usleep(arg_int * 10); ztimer_sleep(ZTIMER_USEC, arg_int * 10);
break; break;
case U8X8_MSG_DELAY_100NANO: case U8X8_MSG_DELAY_100NANO:
/* not used in upstream so approximating to 1us should be fine */ /* not used in upstream so approximating to 1us should be fine */
xtimer_usleep(1); ztimer_sleep(ZTIMER_USEC, 1);
break; break;
case U8X8_MSG_GPIO_CS: case U8X8_MSG_GPIO_CS:
if (u8x8_riot_ptr != NULL && gpio_is_valid(u8x8_riot_ptr->pin_cs)) { if (u8x8_riot_ptr != NULL && gpio_is_valid(u8x8_riot_ptr->pin_cs)) {

3
tests/pkg_u8g2/Makefile
View File

@ -1,6 +1,7 @@
include ../Makefile.tests_common include ../Makefile.tests_common
USEMODULE += xtimer USEMODULE += ztimer
USEMODULE += ztimer_usec
USEPKG += u8g2 USEPKG += u8g2

5
tests/pkg_u8g2/main.c
View File

@ -70,7 +70,8 @@
#include "periph/i2c.h" #include "periph/i2c.h"
#endif #endif
#include "xtimer.h" #include "timex.h"
#include "ztimer.h"
#include "u8g2.h" #include "u8g2.h"
#include "u8x8_riotos.h" #include "u8x8_riotos.h"
@ -200,7 +201,7 @@ int main(void)
screen = (screen + 1) % 3; screen = (screen + 1) % 3;
/* sleep a little */ /* sleep a little */
xtimer_sleep(1); ztimer_sleep(ZTIMER_USEC, US_PER_SEC);
} }
return 0; return 0;