GetLitFam/esp-hal
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use both timers in TIMG0 for embassy time driver when able (#609)

Browse Source 
* Use both timers in `TIMG0` for embassy time driver when able

* Update CHANGELOG
This commit is contained in:
Jesse Braham 2023-06-21 06:55:18 -07:00 committed by Scott Mabin
parent 8a958e92bc
commit b51a5ed1fa
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -50,6 +50,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Move core interrupt handling from Flash to RAM for RISC-V chips (ESP32-H2, ESP32-C2, ESP32-C3, ESP32-C6) (#541)
- Change LED pin to GPIO2 in ESP32 blinky example (#581)
- Udpate ESP32-H2 and C6 ESP32-clocks and remove i2c_clock for all chips but ESP32 (#592)
- Use both timers in `TIMG0` for embassy time driver when able (#609)
### Fixed

16
esp-hal-common/src/embassy/time_driver_timg.rs
View File

@ -9,7 +9,10 @@ use crate::{
timer::{Timer, Timer0},
};
#[cfg(not(any(esp32, esp32s2, esp32s3)))]
pub const ALARM_COUNT: usize = 1;
#[cfg(any(esp32, esp32s2, esp32s3))]
pub const ALARM_COUNT: usize = 2;
pub type TimerInner = Timer0<TIMG0>;
pub type TimerType = Timer<TimerInner>;
@ -49,16 +52,25 @@ impl EmbassyTimer {
pub fn init(clocks: &Clocks, mut timer: TimerType) {
use crate::{interrupt, interrupt::Priority};
// set divider to get a 1mhz clock. abp (80mhz) / 80 = 1mhz... // TODO assert
// abp clock is the source and its at the correct speed for the divider
// set divider to get a 1mhz clock. APB (80mhz) / 80 = 1mhz...
// TODO: assert APB clock is the source and its at the correct speed for the
// divider
timer.set_divider(clocks.apb_clock.to_MHz() as u16);
interrupt::enable(peripherals::Interrupt::TG0_T0_LEVEL, Priority::max()).unwrap();
#[cfg(any(esp32, esp32s2, esp32s3))]
interrupt::enable(peripherals::Interrupt::TG0_T1_LEVEL, Priority::max()).unwrap();
#[interrupt]
fn TG0_T0_LEVEL() {
DRIVER.on_interrupt(0);
}
#[cfg(any(esp32, esp32s2, esp32s3))]
#[interrupt]
fn TG0_T1_LEVEL() {
DRIVER.on_interrupt(1);
}
}
pub(crate) fn set_alarm(