drivers/xbee: migrate to ztimer_msec#17114
Merged
fjmolinas merged 3 commits intoRIOT-OS:masterfrom Nov 3, 2021
Merged
Conversation
fjmolinas
requested review from
MichelRottleuthner,
haukepetersen,
leandrolanzieri,
miri64 and
smlng
as code owners
fjmolinas
added
the
CI: ready for build
github-actions
bot
added
Area: drivers
This was referenced Nov 2, 2021
Member
|
The CI failure can be fixed with this: diff --git a/drivers/include/xbee.h b/drivers/include/xbee.h
index 15551163eb..50b9d59392 100644
--- a/drivers/include/xbee.h
+++ b/drivers/include/xbee.h
@@ -26,7 +26,6 @@
#include <stdint.h>
#include "mutex.h"
-#include "xtimer.h"
#include "periph/uart.h"
#include "periph/gpio.h"
#include "net/netdev.h"
diff --git a/drivers/xbee/xbee.c b/drivers/xbee/xbee.c
index 6ef0aaa517..930b670057 100644
--- a/drivers/xbee/xbee.c
+++ b/drivers/xbee/xbee.c
@@ -23,12 +23,13 @@
#include <string.h>
#include <errno.h>
-#include "xbee.h"
#include "assert.h"
-#include "ztimer.h"
#include "net/eui64.h"
-#include "net/netdev.h"
#include "net/ieee802154.h"
+#include "net/netdev.h"
+#include "timex.h"
+#include "xbee.h"
+#include "ztimer.h"
#ifdef MODULE_GNRC
#include "net/gnrc.h"
#endif(I couldn't help myself but to sort the headers alphabetically. Actually, only the xtimer included needs to be dropped and the timex.h include (which was previously included indirectly from xtimer.h) needs to be added.) |
fjmolinas
force-pushed
the
pr_xbee_ztimer_msec
branch
from
42bb5f1 to
3dd0829
Compare
maribu
approved these changes
Nov 2, 2021
Member
maribu
left a comment
maribu
left a comment
There was a problem hiding this comment.
I code-reviewed the commit doing the actual migration, as I trust that uncrustify doesn't change the code. Testing output was given in the PR description.
Contributor
Author
|
Go! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Contribution description
This PR makes
xbeeuseztimer_msecinstead ofxtimer.Testing procedure
I ran the release test spec between
arduino_zero+xbeeandsamr21-xproIssues/PRs references
Ticks items off #17111 and #13667