From aa29646c0eb4ffc97c8004e9b501f8b1869e02b9 Mon Sep 17 00:00:00 2001 From: Koen Zandberg Date: Tue, 14 Mar 2023 15:59:33 +0100 Subject: [PATCH 1/2] doxygen: Point to contributing.md document Shortcuts a referral on the wiki --- doc/doxygen/src/mainpage.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/doxygen/src/mainpage.md b/doc/doxygen/src/mainpage.md index fcccf6d22b..1a62f23d9d 100644 --- a/doc/doxygen/src/mainpage.md +++ b/doc/doxygen/src/mainpage.md @@ -33,8 +33,8 @@ Contribute to RIOT {#contribute-to-riot} RIOT is developed by an open community that anyone is welcome to join: - Download and contribute your code on [GitHub](https://github.com/RIOT-OS/RIOT). You can read about how to - contribute [in our GitHub - Wiki](https://github.com/RIOT-OS/RIOT/wiki/Contributing-to-RIOT). + contribute [in our contributing + document](https://github.com/RIOT-OS/RIOT/blob/master/CONTRIBUTING.md). - Sign-up to our [forum](https://forum.riot-os.org/) to ask for help using RIOT or writing an application for RIOT, discuss kernel and network stack development as well as hardware support, or to show-case your latest project. From 5205151876c8762ee93e4f3585baa1530829aa1d Mon Sep 17 00:00:00 2001 From: Koen Zandberg Date: Tue, 14 Mar 2023 18:13:09 +0100 Subject: [PATCH 2/2] cord: convert to ztimer --- sys/Makefile.dep | 2 +- sys/net/application_layer/cord/ep/cord_ep_standalone.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/Makefile.dep b/sys/Makefile.dep index 739b844c15..896156eb99 100644 --- a/sys/Makefile.dep +++ b/sys/Makefile.dep @@ -810,7 +810,7 @@ endif ifneq (,$(filter cord_ep_standalone,$(USEMODULE))) USEMODULE += cord_ep - USEMODULE += xtimer + USEMODULE += ztimer_msec endif ifneq (,$(filter cord_lc,$(USEMODULE))) diff --git a/sys/net/application_layer/cord/ep/cord_ep_standalone.c b/sys/net/application_layer/cord/ep/cord_ep_standalone.c index c671db3941..bbdc3650f2 100644 --- a/sys/net/application_layer/cord/ep/cord_ep_standalone.c +++ b/sys/net/application_layer/cord/ep/cord_ep_standalone.c @@ -23,7 +23,7 @@ #include "log.h" #include "assert.h" #include "thread.h" -#include "xtimer.h" +#include "ztimer.h" #include "net/cord/ep.h" #include "net/cord/config.h" #include "net/cord/ep_standalone.h" @@ -38,11 +38,11 @@ #define UPDATE_TIMEOUT (0xe537) -#define TIMEOUT_US ((uint64_t)(CONFIG_CORD_UPDATE_INTERVAL * US_PER_SEC)) +#define TIMEOUT_MS (CONFIG_CORD_UPDATE_INTERVAL * MS_PER_SEC) static char _stack[STACKSIZE]; -static xtimer_t _timer; +static ztimer_t _timer; static kernel_pid_t _runner_pid; static msg_t _msg; @@ -50,7 +50,7 @@ static cord_ep_standalone_cb_t _cb = NULL; static void _set_timer(void) { - xtimer_set_msg64(&_timer, TIMEOUT_US, &_msg, _runner_pid); + ztimer_set_msg(ZTIMER_MSEC, &_timer, TIMEOUT_MS, &_msg, _runner_pid); } static void _notify(cord_ep_standalone_event_t event) @@ -94,7 +94,7 @@ void cord_ep_standalone_run(void) void cord_ep_standalone_signal(bool connected) { /* clear timer in any case */ - xtimer_remove(&_timer); + ztimer_remove(ZTIMER_MSEC, &_timer); /* reset the update timer in case a connection was established or updated */ if (connected) { _set_timer();