Skip to content

Switch to micros instead of millis in set_periodic #686

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.

Sign up for GitHub

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

Merged
jessebraham merged 2 commits into from
Jul 31, 2023
Merged

Switch to micros instead of millis in set_periodic #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4c5373
Switch to micros instead of millis
MabezDev Jul 25, 2023
058c9ed
Add changelog entry
MabezDev Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- USB device support is working again (#656)
- Add missing interrupt status read for esp32s3, which fixes USB-SERIAL-JTAG interrupts (#664)
- GPIO interrupt status bits are now properly cleared (#670)
- Increase frequency resolution in `set_periodic` (#686)

### Removed

Expand Down
8 changes: 4 additions & 4 deletions esp-hal-common/src/systimer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use core::{intrinsics::transmute, marker::PhantomData};

use fugit::MillisDurationU32;
use fugit::MicrosDurationU32;

use crate::{
peripheral::{Peripheral, PeripheralRef},
Expand Down Expand Up @@ -202,14 +202,14 @@ impl<const CHANNEL: u8> Alarm<Target, CHANNEL> {

impl<const CHANNEL: u8> Alarm<Periodic, CHANNEL> {
pub fn set_period(&self, period: fugit::HertzU32) {
let time_period: MillisDurationU32 = period.into_duration();
let cycles = time_period.ticks();
let time_period: MicrosDurationU32 = period.into_duration();
let us = time_period.ticks();
self.configure(|tconf, hi, lo| unsafe {
tconf.write(|w| {
w.target0_period_mode()
.set_bit()
.target0_period()
.bits(cycles * (SystemTimer::TICKS_PER_SECOND as u32 / 1000))
.bits(us * (SystemTimer::TICKS_PER_SECOND as u32 / 1000_000))
});
hi.write(|w| w.timer_target0_hi().bits(0));
lo.write(|w| w.timer_target0_lo().bits(0));
Expand Down