-
Notifications
You must be signed in to change notification settings - Fork 2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
cpu/esp: migrate to ztimer #17386
cpu/esp: migrate to ztimer #17386
Conversation
I'll run tests to see if somethin breaks.... |
1c6a12f
to
f23ed15
Compare
needs rebase |
f23ed15
to
8f5363d
Compare
@fjmolinas I will take a look later today. |
Sorry, when I pushed you to change everything back to Line 9 in 8f5363d
xtimer was enabled herd by default also before your changes and usec resolution is required. However, this wasn't the case.
The only place where it was enabled before and used usec resolution was here. RIOT/cpu/esp_common/Makefile.dep Line 71 in ab0e118
RIOT/cpu/esp_common/freertos/task.c Lines 133 to 140 in e20f3e5
RIOT/cpu/esp_common/freertos/portable.c Lines 24 to 26 in e20f3e5
ztimer_usec added by this PR.
|
Since you touch this file, please correct RIOT/cpu/esp_common/esp-now/esp_now_netdev.c Line 120 in c706a6f
- DEBUG("wifi_scan_get_ap_num ret=%d num=%d\n", ret ,ap_num);
+ DEBUG("wifi_scan_get_ap_num ret=%d num=%d\n", ret, ap_num); |
@fjmolinas It seems that we have a dependencies problem in
Without
where With |
This is because |
@gschorcht I conditionally included the |
But I can also revert if you prefer, I also realize this is turning into one big blob commit with many chances, I can split them up when squashing if you prefer. |
You can squash your last changes directly to have a single commit. |
9f919da
to
b805821
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, lets see what Murdock says.
b805821
to
4e6151b
Compare
Yeiii! All green! |
Nice one! |
Thanks for the review and suggestions @gschorcht! |
@fjmolinas Great work. Thanks. |
@fjmolinas Unfortunatly, it seems that this PR has side effects on |
@@ -242,7 +242,7 @@ SECTIONS | |||
*freertos/*(.literal .text .literal.* .text.*) | |||
*freertos_common/*(.literal .text .literal.* .text.*) | |||
*periph/*(.literal .text .literal.* .text.*) | |||
*xtimer/*(.literal .text .literal.* .text.*) | |||
*ztimer/*(.literal .text .literal.* .text.*) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This would have to be:
- *ztimer/*(.literal .text .literal.* .text.*)
+ *ztimer_core/*(.literal .text .literal.* .text.*)
When I was reviewing it, I didn't know that objects are not stored in ztimer
but in ztimer_core
although the module is called ztimer
. But this alone doesn't solve the problem, unfortunatly 😟
@fjmolinas PR #17427 solves the problem with |
Contribution description
esp
has a couple of uses ofxtimer
that can't be directly translated toztimer
, so it seems better to do it in its own PR. I also don't have hardware to tests so would appreciate if maybe @gschorcht could complement murdock's testing.The most delicate change is https://github.com/fjmolinas/RIOT/blob/6a736e4cdfb57ee446050d8fd0c455f120dd381c/cpu/esp32/esp_ztimer.c#L153-L157 since this is not a direct translation, so depending on how sensitive this value is some adjustment might be needed, thougts @gschorcht?
Testing procedure
esp
tests should passIssues/PRs references
depends on #17385
part of #16903