Pinout for esp32s2 and esp32c3; mini-HAL for ULP RiscV esp32s2 coproc

This commit is contained in:
imarkov 2021-07-26 23:32:46 +03:00
parent a194b65b1f
commit 9fc1b78add
12 changed files with 704 additions and 212 deletions

View File

@ -1,6 +1,6 @@
[package]
name = "esp-idf-hal"
version = "0.16.2"
version = "0.17.0"
authors = ["sapir <yasapir@gmail.com>", "Ivan Markov <ivan.markov@gmail.com>"]
edition = "2018"
categories = ["embedded", "hardware-support"]
@ -19,11 +19,11 @@ default = ["std", "esp-idf-sys"]
std = ["esp-idf-sys/std"]
ulp = [] # Early experiment, not working yet
ulp = []
[dependencies]
cfg-if = "1"
nb = "0.1.2"
mutex-trait = "0.2"
embedded-hal = { version = "0.2", features = ["unproven"] }
esp-idf-sys = { version = "0.16", optional = true, default-features = false }
esp-idf-sys = { version = "0.16.3", optional = true, default-features = false }

View File

@ -10,10 +10,7 @@
//! The advantage of using the dedicated traits in peripherals is that the configuration of the
//! IO can be done inside the peripheral instead of having to be done upfront.
use {
core::marker::PhantomData,
embedded_hal::digital::v2::{OutputPin as _, StatefulOutputPin as _},
};
use core::marker::PhantomData;
#[cfg(not(feature = "ulp"))]
use esp_idf_sys::*;
@ -21,6 +18,8 @@ use esp_idf_sys::*;
#[cfg(feature = "ulp")]
use crate::ulp::sys::*;
pub use chip::*;
/// Extension trait to split a GPIO peripheral into independent pins and registers
pub trait GpioExt {
/// The type to split the GPIO into
@ -164,7 +163,7 @@ macro_rules! impl_hal_input_pin {
type Error = EspError;
fn is_high(&self) -> Result<bool, Self::Error> {
Ok(unsafe { gpio_get_level($pxi::<$mode>::pin()) } != 0)
Ok(unsafe { gpio_get_level($pxi::<$mode>::runtime_pin()) } != 0)
}
fn is_low(&self) -> Result<bool, Self::Error> {
@ -180,17 +179,23 @@ macro_rules! impl_hal_output_pin {
type Error = EspError;
fn set_high(&mut self) -> Result<(), Self::Error> {
esp_result!(unsafe { gpio_set_level($pxi::<$mode>::pin(), 1) }, ())
esp_result!(
unsafe { gpio_set_level($pxi::<$mode>::runtime_pin(), 1) },
()
)
}
fn set_low(&mut self) -> Result<(), Self::Error> {
esp_result!(unsafe { gpio_set_level($pxi::<$mode>::pin(), 0) }, ())
esp_result!(
unsafe { gpio_set_level($pxi::<$mode>::runtime_pin(), 0) },
()
)
}
}
impl embedded_hal::digital::v2::StatefulOutputPin for $pxi<$mode> {
fn is_set_high(&self) -> Result<bool, Self::Error> {
Ok(unsafe { gpio_get_level($pxi::<$mode>::pin()) } != 0)
Ok(unsafe { gpio_get_level($pxi::<$mode>::runtime_pin()) } != 0)
}
fn is_set_low(&self) -> Result<bool, Self::Error> {
@ -220,7 +225,10 @@ macro_rules! impl_pull {
fn set_pull_up(&mut self) -> Result<&mut Self, Self::Error> {
esp_result!(
unsafe {
gpio_set_pull_mode($pxi::<$mode>::pin(), gpio_pull_mode_t_GPIO_PULLUP_ONLY)
gpio_set_pull_mode(
$pxi::<$mode>::runtime_pin(),
gpio_pull_mode_t_GPIO_PULLUP_ONLY,
)
},
self
)
@ -230,7 +238,7 @@ macro_rules! impl_pull {
esp_result!(
unsafe {
gpio_set_pull_mode(
$pxi::<$mode>::pin(),
$pxi::<$mode>::runtime_pin(),
gpio_pull_mode_t_GPIO_PULLDOWN_ONLY,
)
},
@ -242,7 +250,7 @@ macro_rules! impl_pull {
esp_result!(
unsafe {
gpio_set_pull_mode(
$pxi::<$mode>::pin(),
$pxi::<$mode>::runtime_pin(),
gpio_pull_mode_t_GPIO_PULLUP_PULLDOWN,
)
},
@ -253,7 +261,10 @@ macro_rules! impl_pull {
fn set_floating(&mut self) -> Result<&mut Self, Self::Error> {
esp_result!(
unsafe {
gpio_set_pull_mode($pxi::<$mode>::pin(), gpio_pull_mode_t_GPIO_FLOATING)
gpio_set_pull_mode(
$pxi::<$mode>::runtime_pin(),
gpio_pull_mode_t_GPIO_FLOATING,
)
},
self
)
@ -268,6 +279,14 @@ macro_rules! impl_input_base {
_mode: PhantomData<MODE>,
}
#[cfg(not(feature = "ulp"))]
impl<MODE> $pxi<MODE> {
#[inline(always)]
fn runtime_pin() -> i32 {
$pin
}
}
impl<MODE> Pin for $pxi<MODE> {
type Error = EspError;
@ -287,6 +306,7 @@ macro_rules! impl_input_base {
};
}
#[allow(unused)]
macro_rules! impl_input_only {
($pxi:ident: $pin:expr) => {
impl_input_base!($pxi: $pin);
@ -299,7 +319,10 @@ macro_rules! impl_input_only {
pub fn into_disabled(self) -> Result<$pxi<Disabled>, EspError> {
esp_result!(
unsafe {
gpio_set_direction($pxi::<MODE>::pin(), gpio_mode_t_GPIO_MODE_DISABLE)
gpio_set_direction(
$pxi::<MODE>::runtime_pin(),
gpio_mode_t_GPIO_MODE_DISABLE,
)
},
$pxi { _mode: PhantomData }
)
@ -307,7 +330,9 @@ macro_rules! impl_input_only {
pub fn into_input(self) -> Result<$pxi<Input>, EspError> {
esp_result!(
unsafe { gpio_set_direction($pxi::<MODE>::pin(), gpio_mode_t_GPIO_MODE_INPUT) },
unsafe {
gpio_set_direction($pxi::<MODE>::runtime_pin(), gpio_mode_t_GPIO_MODE_INPUT)
},
$pxi { _mode: PhantomData }
)
}
@ -335,7 +360,10 @@ macro_rules! impl_input_output {
pub fn into_disabled(self) -> Result<$pxi<Disabled>, EspError> {
esp_result!(
unsafe {
gpio_set_direction($pxi::<MODE>::pin(), gpio_mode_t_GPIO_MODE_DISABLE)
gpio_set_direction(
$pxi::<MODE>::runtime_pin(),
gpio_mode_t_GPIO_MODE_DISABLE,
)
},
$pxi { _mode: PhantomData }
)
@ -343,7 +371,9 @@ macro_rules! impl_input_output {
pub fn into_input(self) -> Result<$pxi<Input>, EspError> {
esp_result!(
unsafe { gpio_set_direction($pxi::<MODE>::pin(), gpio_mode_t_GPIO_MODE_INPUT) },
unsafe {
gpio_set_direction($pxi::<MODE>::runtime_pin(), gpio_mode_t_GPIO_MODE_INPUT)
},
$pxi { _mode: PhantomData }
)
}
@ -351,7 +381,10 @@ macro_rules! impl_input_output {
pub fn into_input_output(self) -> Result<$pxi<InputOutput>, EspError> {
esp_result!(
unsafe {
gpio_set_direction($pxi::<MODE>::pin(), gpio_mode_t_GPIO_MODE_INPUT_OUTPUT)
gpio_set_direction(
$pxi::<MODE>::runtime_pin(),
gpio_mode_t_GPIO_MODE_INPUT_OUTPUT,
)
},
$pxi { _mode: PhantomData }
)
@ -361,7 +394,7 @@ macro_rules! impl_input_output {
esp_result!(
unsafe {
gpio_set_direction(
$pxi::<MODE>::pin(),
$pxi::<MODE>::runtime_pin(),
gpio_mode_t_GPIO_MODE_INPUT_OUTPUT_OD,
)
},
@ -372,7 +405,10 @@ macro_rules! impl_input_output {
pub fn into_output(self) -> Result<$pxi<Output>, EspError> {
esp_result!(
unsafe {
gpio_set_direction($pxi::<MODE>::pin(), gpio_mode_t_GPIO_MODE_OUTPUT)
gpio_set_direction(
$pxi::<MODE>::runtime_pin(),
gpio_mode_t_GPIO_MODE_OUTPUT,
)
},
$pxi { _mode: PhantomData }
)
@ -381,7 +417,10 @@ macro_rules! impl_input_output {
pub fn into_output_od(self) -> Result<$pxi<Output>, EspError> {
esp_result!(
unsafe {
gpio_set_direction($pxi::<MODE>::pin(), gpio_mode_t_GPIO_MODE_OUTPUT_OD)
gpio_set_direction(
$pxi::<MODE>::runtime_pin(),
gpio_mode_t_GPIO_MODE_OUTPUT_OD,
)
},
$pxi { _mode: PhantomData }
)
@ -391,7 +430,15 @@ macro_rules! impl_input_output {
}
macro_rules! impl_rtc {
($pxi:ident: $pin:expr, RTC:$rtc:expr) => {
($pxi:ident: $pin:expr, RTC: $rtc:expr) => {
#[cfg(feature = "ulp")]
impl<MODE> $pxi<MODE> {
#[inline(always)]
fn runtime_pin() -> i32 {
$rtc
}
}
impl<MODE> RTCPin for $pxi<MODE> {
fn rtc_pin() -> i32 {
$rtc
@ -399,11 +446,11 @@ macro_rules! impl_rtc {
}
};
($pxi:ident: $pin:expr, NORTC:$rtc:expr) => {};
($pxi:ident: $pin:expr, NORTC: $rtc:expr) => {};
}
macro_rules! impl_adc {
($pxi:ident: $pin:expr, ADC1:$adc:expr) => {
($pxi:ident: $pin:expr, ADC1: $adc:expr) => {
impl<MODE> ADCPin for $pxi<MODE> {
fn adc_unit() -> adc_unit_t {
adc_unit_t_ADC_UNIT_1
@ -415,7 +462,7 @@ macro_rules! impl_adc {
}
};
($pxi:ident: $pin:expr, ADC2:$adc:expr) => {
($pxi:ident: $pin:expr, ADC2: $adc:expr) => {
impl<MODE> ADCPin for $pxi<MODE> {
fn adc_unit() -> adc_unit_t {
adc_unit_t_ADC_UNIT_2
@ -427,11 +474,11 @@ macro_rules! impl_adc {
}
};
($pxi:ident: $pin:expr, NOADC:$adc:expr) => {};
($pxi:ident: $pin:expr, NOADC: $adc:expr) => {};
}
macro_rules! impl_dac {
($pxi:ident: $pin:expr, DAC:$dac:expr) => {
($pxi:ident: $pin:expr, DAC: $dac:expr) => {
#[cfg(not(esp32c3))]
impl<MODE> DACPin for $pxi<MODE> {
fn dac_channel() -> dac_channel_t {
@ -440,11 +487,11 @@ macro_rules! impl_dac {
}
};
($pxi:ident: $pin:expr, NODAC:$dac:expr) => {};
($pxi:ident: $pin:expr, NODAC: $dac:expr) => {};
}
macro_rules! impl_touch {
($pxi:ident: $pin:expr, TOUCH:$touch:expr) => {
($pxi:ident: $pin:expr, TOUCH: $touch:expr) => {
#[cfg(not(esp32c3))]
impl<MODE> TouchPin for $pxi<MODE> {
fn touch_channel() -> touch_pad_t {
@ -453,11 +500,11 @@ macro_rules! impl_touch {
}
};
($pxi:ident: $pin:expr, NOTOUCH:$touch:expr) => {};
($pxi:ident: $pin:expr, NOTOUCH: $touch:expr) => {};
}
macro_rules! pin {
($pxi:ident: $pin:expr, Input, $rtc:ident:$rtcno:expr, $adc:ident:$adcno:expr, $dac:ident:$dacno:expr, $touch:ident:$touchno:expr) => {
($pxi:ident: $pin:expr, Input, $rtc:ident: $rtcno:expr, $adc:ident: $adcno:expr, $dac:ident: $dacno:expr, $touch:ident: $touchno:expr) => {
impl_input_only!($pxi: $pin);
impl_rtc!($pxi: $pin, $rtc: $rtcno);
impl_adc!($pxi: $pin, $adc: $adcno);
@ -465,7 +512,7 @@ macro_rules! pin {
impl_touch!($pxi: $pin, $touch: $touchno);
};
($pxi:ident: $pin:expr, IO, $rtc:ident:$rtcno:expr, $adc:ident:$adcno:expr, $dac:ident:$dacno:expr, $touch:ident:$touchno:expr) => {
($pxi:ident: $pin:expr, IO, $rtc:ident: $rtcno:expr, $adc:ident: $adcno:expr, $dac:ident: $dacno:expr, $touch:ident: $touchno:expr) => {
impl_input_output!($pxi: $pin);
impl_rtc!($pxi: $pin, $rtc: $rtcno);
impl_adc!($pxi: $pin, $adc: $adcno);
@ -474,112 +521,429 @@ macro_rules! pin {
};
}
// TODO: Separate pin layout for esp32s2, esp32s3 and esp32c3
pin!(Gpio0:0, IO, RTC:11, ADC2:1, NODAC:0, TOUCH:1);
pin!(Gpio1:1, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio2:2, IO, RTC:12, ADC2:2, NODAC:0, TOUCH:2);
pin!(Gpio3:3, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio4:4, IO, RTC:10, ADC2:0, NODAC:0, TOUCH:0);
pin!(Gpio5:5, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio6:6, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio7:7, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio8:8, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio9:9, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio10:10, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio11:11, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio12:12, IO, RTC:15, ADC2:5, NODAC:0, TOUCH:5);
pin!(Gpio13:13, IO, RTC:14, ADC2:4, NODAC:0, TOUCH:4);
pin!(Gpio14:14, IO, RTC:16, ADC2:6, NODAC:0, TOUCH:6);
pin!(Gpio15:15, IO, RTC:13, ADC2:3, NODAC:0, TOUCH:3);
pin!(Gpio16:16, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio17:17, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio18:18, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio19:19, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio21:21, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio22:22, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio23:23, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio25:25, IO, RTC:6, ADC2:8, DAC:1, NOTOUCH:0);
pin!(Gpio26:26, IO, RTC:7, ADC2:9, DAC:2, NOTOUCH:0);
pin!(Gpio27:27, IO, RTC:17, ADC2:7, NODAC:0, TOUCH:7);
pin!(Gpio32:32, IO, RTC:9, ADC1:4, NODAC:0, TOUCH:9);
pin!(Gpio33:33, IO, RTC:8, ADC1:5, NODAC:0, TOUCH:8);
pin!(Gpio34:34, Input, RTC:4, ADC1:6, NODAC:0, NOTOUCH:0);
pin!(Gpio35:35, Input, RTC:5, ADC1:7, NODAC:0, NOTOUCH:0);
pin!(Gpio36:36, Input, RTC:0, ADC1:0, NODAC:0, NOTOUCH:0);
pin!(Gpio39:39, Input, RTC:3, ADC1:3, NODAC:0, NOTOUCH:0);
#[cfg(esp32)]
mod chip {
use {
core::marker::PhantomData,
embedded_hal::digital::v2::{OutputPin as _, StatefulOutputPin as _},
};
// Not mapped: 20, 24, 28, 29, 30, 31, 37, 38
#[cfg(not(feature = "ulp"))]
use esp_idf_sys::*;
pub struct Pins {
pub gpio0: Gpio0<Unknown>,
pub gpio1: Gpio1<Unknown>,
pub gpio2: Gpio2<Unknown>,
pub gpio3: Gpio3<Unknown>,
pub gpio4: Gpio4<Unknown>,
pub gpio5: Gpio5<Unknown>,
pub gpio6: Gpio6<Unknown>,
pub gpio7: Gpio7<Unknown>,
pub gpio8: Gpio8<Unknown>,
pub gpio9: Gpio9<Unknown>,
pub gpio10: Gpio10<Unknown>,
pub gpio11: Gpio11<Unknown>,
pub gpio12: Gpio12<Unknown>,
pub gpio13: Gpio13<Unknown>,
pub gpio14: Gpio14<Unknown>,
pub gpio15: Gpio15<Unknown>,
pub gpio16: Gpio16<Unknown>,
pub gpio17: Gpio17<Unknown>,
pub gpio18: Gpio18<Unknown>,
pub gpio19: Gpio19<Unknown>,
pub gpio21: Gpio21<Unknown>,
pub gpio22: Gpio22<Unknown>,
pub gpio23: Gpio23<Unknown>,
pub gpio25: Gpio25<Unknown>,
pub gpio26: Gpio26<Unknown>,
pub gpio27: Gpio27<Unknown>,
pub gpio32: Gpio32<Unknown>,
pub gpio33: Gpio33<Unknown>,
pub gpio34: Gpio34<Unknown>,
pub gpio35: Gpio35<Unknown>,
pub gpio36: Gpio36<Unknown>,
pub gpio39: Gpio39<Unknown>,
}
#[cfg(feature = "ulp")]
use crate::ulp::sys::*;
impl Pins {
pub unsafe fn new() -> Self {
Self {
gpio0: Gpio0::<Unknown>::new(),
gpio1: Gpio1::<Unknown>::new(),
gpio2: Gpio2::<Unknown>::new(),
gpio3: Gpio3::<Unknown>::new(),
gpio4: Gpio4::<Unknown>::new(),
gpio5: Gpio5::<Unknown>::new(),
gpio6: Gpio6::<Unknown>::new(),
gpio7: Gpio7::<Unknown>::new(),
gpio8: Gpio8::<Unknown>::new(),
gpio9: Gpio9::<Unknown>::new(),
gpio10: Gpio10::<Unknown>::new(),
gpio11: Gpio11::<Unknown>::new(),
gpio12: Gpio12::<Unknown>::new(),
gpio13: Gpio13::<Unknown>::new(),
gpio14: Gpio14::<Unknown>::new(),
gpio15: Gpio15::<Unknown>::new(),
gpio16: Gpio16::<Unknown>::new(),
gpio17: Gpio17::<Unknown>::new(),
gpio18: Gpio18::<Unknown>::new(),
gpio19: Gpio19::<Unknown>::new(),
gpio21: Gpio21::<Unknown>::new(),
gpio22: Gpio22::<Unknown>::new(),
gpio23: Gpio23::<Unknown>::new(),
gpio25: Gpio25::<Unknown>::new(),
gpio26: Gpio26::<Unknown>::new(),
gpio27: Gpio27::<Unknown>::new(),
gpio32: Gpio32::<Unknown>::new(),
gpio33: Gpio33::<Unknown>::new(),
gpio34: Gpio34::<Unknown>::new(),
gpio35: Gpio35::<Unknown>::new(),
gpio36: Gpio36::<Unknown>::new(),
gpio39: Gpio39::<Unknown>::new(),
use super::*;
// Not mapped: 20, 24, 28, 29, 30, 31, 37, 38
pin!(Gpio0:0, IO, RTC:11, ADC2:1, NODAC:0, TOUCH:1);
#[cfg(not(feature = "ulp"))]
pin!(Gpio1:1, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio2:2, IO, RTC:12, ADC2:2, NODAC:0, TOUCH:2);
#[cfg(not(feature = "ulp"))]
pin!(Gpio3:3, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio4:4, IO, RTC:10, ADC2:0, NODAC:0, TOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio5:5, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio6:6, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio7:7, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio8:8, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio9:9, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio10:10, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio11:11, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio12:12, IO, RTC:15, ADC2:5, NODAC:0, TOUCH:5);
pin!(Gpio13:13, IO, RTC:14, ADC2:4, NODAC:0, TOUCH:4);
pin!(Gpio14:14, IO, RTC:16, ADC2:6, NODAC:0, TOUCH:6);
pin!(Gpio15:15, IO, RTC:13, ADC2:3, NODAC:0, TOUCH:3);
#[cfg(not(feature = "ulp"))]
pin!(Gpio16:16, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio17:17, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio18:18, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio19:19, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio21:21, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio22:22, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio23:23, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio25:25, IO, RTC:6, ADC2:8, DAC:1, NOTOUCH:0);
pin!(Gpio26:26, IO, RTC:7, ADC2:9, DAC:2, NOTOUCH:0);
pin!(Gpio27:27, IO, RTC:17, ADC2:7, NODAC:0, TOUCH:7);
pin!(Gpio32:32, IO, RTC:9, ADC1:4, NODAC:0, TOUCH:9);
pin!(Gpio33:33, IO, RTC:8, ADC1:5, NODAC:0, TOUCH:8);
pin!(Gpio34:34, Input, RTC:4, ADC1:6, NODAC:0, NOTOUCH:0);
pin!(Gpio35:35, Input, RTC:5, ADC1:7, NODAC:0, NOTOUCH:0);
pin!(Gpio36:36, Input, RTC:0, ADC1:0, NODAC:0, NOTOUCH:0);
pin!(Gpio39:39, Input, RTC:3, ADC1:3, NODAC:0, NOTOUCH:0);
pub struct Pins {
pub gpio0: Gpio0<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio1: Gpio1<Unknown>,
pub gpio2: Gpio2<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio3: Gpio3<Unknown>,
pub gpio4: Gpio4<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio5: Gpio5<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio6: Gpio6<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio7: Gpio7<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio8: Gpio8<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio9: Gpio9<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio10: Gpio10<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio11: Gpio11<Unknown>,
pub gpio12: Gpio12<Unknown>,
pub gpio13: Gpio13<Unknown>,
pub gpio14: Gpio14<Unknown>,
pub gpio15: Gpio15<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio16: Gpio16<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio17: Gpio17<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio18: Gpio18<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio19: Gpio19<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio21: Gpio21<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio22: Gpio22<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio23: Gpio23<Unknown>,
pub gpio25: Gpio25<Unknown>,
pub gpio26: Gpio26<Unknown>,
pub gpio27: Gpio27<Unknown>,
pub gpio32: Gpio32<Unknown>,
pub gpio33: Gpio33<Unknown>,
pub gpio34: Gpio34<Unknown>,
pub gpio35: Gpio35<Unknown>,
pub gpio36: Gpio36<Unknown>,
pub gpio39: Gpio39<Unknown>,
}
impl Pins {
pub unsafe fn new() -> Self {
Self {
gpio0: Gpio0::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio1: Gpio1::<Unknown>::new(),
gpio2: Gpio2::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio3: Gpio3::<Unknown>::new(),
gpio4: Gpio4::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio5: Gpio5::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio6: Gpio6::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio7: Gpio7::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio8: Gpio8::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio9: Gpio9::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio10: Gpio10::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio11: Gpio11::<Unknown>::new(),
gpio12: Gpio12::<Unknown>::new(),
gpio13: Gpio13::<Unknown>::new(),
gpio14: Gpio14::<Unknown>::new(),
gpio15: Gpio15::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio16: Gpio16::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio17: Gpio17::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio18: Gpio18::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio19: Gpio19::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio21: Gpio21::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio22: Gpio22::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio23: Gpio23::<Unknown>::new(),
gpio25: Gpio25::<Unknown>::new(),
gpio26: Gpio26::<Unknown>::new(),
gpio27: Gpio27::<Unknown>::new(),
gpio32: Gpio32::<Unknown>::new(),
gpio33: Gpio33::<Unknown>::new(),
gpio34: Gpio34::<Unknown>::new(),
gpio35: Gpio35::<Unknown>::new(),
gpio36: Gpio36::<Unknown>::new(),
gpio39: Gpio39::<Unknown>::new(),
}
}
}
}
#[cfg(any(esp32s2, esp32s3))]
mod chip {
use {
core::marker::PhantomData,
embedded_hal::digital::v2::{OutputPin as _, StatefulOutputPin as _},
};
#[cfg(not(feature = "ulp"))]
use esp_idf_sys::*;
#[cfg(feature = "ulp")]
use crate::ulp::sys::*;
use super::*;
// Not mapped: 22 - 25, 27 - 32
pin!(Gpio0:0, IO, RTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio1:1, IO, RTC:1, ADC1:0, NODAC:0, TOUCH:1);
pin!(Gpio2:2, IO, RTC:2, ADC1:1, NODAC:0, TOUCH:2);
pin!(Gpio3:3, IO, RTC:3, ADC1:2, NODAC:0, TOUCH:3);
pin!(Gpio4:4, IO, RTC:4, ADC1:3, NODAC:0, TOUCH:4);
pin!(Gpio5:5, IO, RTC:5, ADC1:4, NODAC:0, TOUCH:5);
pin!(Gpio6:6, IO, RTC:6, ADC1:5, NODAC:0, TOUCH:6);
pin!(Gpio7:7, IO, RTC:7, ADC1:6, NODAC:0, TOUCH:7);
pin!(Gpio8:8, IO, RTC:8, ADC1:7, NODAC:0, TOUCH:8);
pin!(Gpio9:9, IO, RTC:9, ADC1:8, NODAC:0, TOUCH:9);
pin!(Gpio10:10, IO, RTC:10, ADC1:9, NODAC:0, TOUCH:10);
pin!(Gpio11:11, IO, RTC:11, ADC2:0, NODAC:0, TOUCH:11);
pin!(Gpio12:12, IO, RTC:12, ADC2:1, NODAC:0, TOUCH:12);
pin!(Gpio13:13, IO, RTC:13, ADC2:2, NODAC:0, TOUCH:13);
pin!(Gpio14:14, IO, RTC:14, ADC2:3, NODAC:0, TOUCH:14);
pin!(Gpio15:15, IO, RTC:15, ADC2:4, NODAC:0, TOUCH:15);
pin!(Gpio16:16, IO, RTC:16, ADC2:5, NODAC:0, NOTOUCH:0);
pin!(Gpio17:17, IO, RTC:17, ADC2:6, NODAC:0, NOTOUCH:0);
pin!(Gpio18:18, IO, RTC:18, ADC2:7, NODAC:0, NOTOUCH:0);
pin!(Gpio19:19, IO, RTC:19, ADC2:8, NODAC:0, NOTOUCH:0);
pin!(Gpio20:20, IO, RTC:20, ADC2:9, NODAC:0, NOTOUCH:0);
pin!(Gpio21:21, IO, RTC:21, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio26:26, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio33:33, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio34:34, Input, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio35:35, Input, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio36:36, Input, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio37:37, Input, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio38:38, Input, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio39:39, Input, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio40:40, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio41:41, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio42:42, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio43:43, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio44:44, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio45:45, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
#[cfg(not(feature = "ulp"))]
pin!(Gpio46:46, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pub struct Pins {
pub gpio0: Gpio0<Unknown>,
pub gpio1: Gpio1<Unknown>,
pub gpio2: Gpio2<Unknown>,
pub gpio3: Gpio3<Unknown>,
pub gpio4: Gpio4<Unknown>,
pub gpio5: Gpio5<Unknown>,
pub gpio6: Gpio6<Unknown>,
pub gpio7: Gpio7<Unknown>,
pub gpio8: Gpio8<Unknown>,
pub gpio9: Gpio9<Unknown>,
pub gpio10: Gpio10<Unknown>,
pub gpio11: Gpio11<Unknown>,
pub gpio12: Gpio12<Unknown>,
pub gpio13: Gpio13<Unknown>,
pub gpio14: Gpio14<Unknown>,
pub gpio15: Gpio15<Unknown>,
pub gpio16: Gpio16<Unknown>,
pub gpio17: Gpio17<Unknown>,
pub gpio18: Gpio18<Unknown>,
pub gpio19: Gpio19<Unknown>,
pub gpio20: Gpio20<Unknown>,
pub gpio21: Gpio21<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio26: Gpio26<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio33: Gpio33<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio34: Gpio34<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio35: Gpio35<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio36: Gpio36<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio37: Gpio37<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio38: Gpio38<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio39: Gpio39<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio40: Gpio40<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio41: Gpio41<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio42: Gpio42<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio43: Gpio43<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio44: Gpio44<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio45: Gpio45<Unknown>,
#[cfg(not(feature = "ulp"))]
pub gpio46: Gpio46<Unknown>,
}
impl Pins {
pub unsafe fn new() -> Self {
Self {
gpio0: Gpio0::<Unknown>::new(),
gpio1: Gpio1::<Unknown>::new(),
gpio2: Gpio2::<Unknown>::new(),
gpio3: Gpio3::<Unknown>::new(),
gpio4: Gpio4::<Unknown>::new(),
gpio5: Gpio5::<Unknown>::new(),
gpio6: Gpio6::<Unknown>::new(),
gpio7: Gpio7::<Unknown>::new(),
gpio8: Gpio8::<Unknown>::new(),
gpio9: Gpio9::<Unknown>::new(),
gpio10: Gpio10::<Unknown>::new(),
gpio11: Gpio11::<Unknown>::new(),
gpio12: Gpio12::<Unknown>::new(),
gpio13: Gpio13::<Unknown>::new(),
gpio14: Gpio14::<Unknown>::new(),
gpio15: Gpio15::<Unknown>::new(),
gpio16: Gpio16::<Unknown>::new(),
gpio17: Gpio17::<Unknown>::new(),
gpio18: Gpio18::<Unknown>::new(),
gpio19: Gpio19::<Unknown>::new(),
gpio20: Gpio20::<Unknown>::new(),
gpio21: Gpio21::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio26: Gpio26::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio33: Gpio33::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio34: Gpio34::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio35: Gpio35::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio36: Gpio36::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio37: Gpio37::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio38: Gpio38::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio39: Gpio39::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio40: Gpio40::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio41: Gpio41::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio42: Gpio42::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio43: Gpio43::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio44: Gpio44::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio45: Gpio45::<Unknown>::new(),
#[cfg(not(feature = "ulp"))]
gpio46: Gpio46::<Unknown>::new(),
}
}
}
}
#[cfg(esp32c3)]
#[cfg(not(feature = "ulp"))]
mod chip {
use {
core::marker::PhantomData,
embedded_hal::digital::v2::{OutputPin as _, StatefulOutputPin as _},
};
#[cfg(not(feature = "ulp"))]
use esp_idf_sys::*;
use super::*;
// Not mapped: 11 - 17
pin!(Gpio0:0, IO, RTC:0, ADC1:0, NODAC:0, TOUCH:0);
pin!(Gpio1:1, IO, RTC:1, ADC1:1, NODAC:0, TOUCH:1);
pin!(Gpio2:2, IO, RTC:2, ADC1:2, NODAC:0, TOUCH:2);
pin!(Gpio3:3, IO, RTC:3, ADC1:3, NODAC:0, TOUCH:3);
pin!(Gpio4:4, IO, RTC:4, ADC1:4, NODAC:0, TOUCH:4);
pin!(Gpio5:5, IO, RTC:5, ADC2:0, NODAC:0, TOUCH:5);
pin!(Gpio6:6, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio7:7, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio8:8, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio9:9, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio10:10, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio18:18, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio19:19, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio20:20, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pin!(Gpio21:21, IO, NORTC:0, NOADC:0, NODAC:0, NOTOUCH:0);
pub struct Pins {
pub gpio0: Gpio0<Unknown>,
pub gpio1: Gpio1<Unknown>,
pub gpio2: Gpio2<Unknown>,
pub gpio3: Gpio3<Unknown>,
pub gpio4: Gpio4<Unknown>,
pub gpio5: Gpio5<Unknown>,
pub gpio6: Gpio6<Unknown>,
pub gpio7: Gpio7<Unknown>,
pub gpio8: Gpio8<Unknown>,
pub gpio9: Gpio9<Unknown>,
pub gpio10: Gpio10<Unknown>,
pub gpio18: Gpio18<Unknown>,
pub gpio19: Gpio19<Unknown>,
pub gpio20: Gpio20<Unknown>,
pub gpio21: Gpio21<Unknown>,
}
impl Pins {
pub unsafe fn new() -> Self {
Self {
gpio0: Gpio0::<Unknown>::new(),
gpio1: Gpio1::<Unknown>::new(),
gpio2: Gpio2::<Unknown>::new(),
gpio3: Gpio3::<Unknown>::new(),
gpio4: Gpio4::<Unknown>::new(),
gpio5: Gpio5::<Unknown>::new(),
gpio6: Gpio6::<Unknown>::new(),
gpio7: Gpio7::<Unknown>::new(),
gpio8: Gpio8::<Unknown>::new(),
gpio9: Gpio9::<Unknown>::new(),
gpio10: Gpio10::<Unknown>::new(),
gpio18: Gpio18::<Unknown>::new(),
gpio19: Gpio19::<Unknown>::new(),
gpio20: Gpio20::<Unknown>::new(),
gpio21: Gpio21::<Unknown>::new(),
}
}
}
}

View File

@ -1,5 +1,4 @@
#![feature(llvm_asm)]
#![cfg_attr(not(feature = "std"), no_std)]
cfg_if::cfg_if! {
@ -8,7 +7,6 @@ cfg_if::cfg_if! {
}
}
#[cfg(feature = "ulp")]
#[macro_use]
pub mod ulp;
#[cfg(not(feature = "ulp"))]

View File

@ -6,6 +6,7 @@ use esp_idf_sys::EspMutex;
#[cfg(feature = "ulp")]
use crate::ulp::sys::EspMutex;
#[cfg(any(not(esp32c3), not(feature = "ulp")))]
use crate::gpio;
#[cfg(not(feature = "ulp"))]
use crate::i2c;
@ -15,12 +16,13 @@ use crate::serial;
use crate::spi;
pub struct Peripherals {
#[cfg(any(not(esp32c3), not(feature = "ulp")))]
pub pins: gpio::Pins,
#[cfg(not(feature = "ulp"))]
pub uart0: serial::UART0,
#[cfg(not(feature = "ulp"))]
pub uart1: serial::UART1,
#[cfg(any(esp32, not(feature = "ulp")))]
#[cfg(all(esp32, not(feature = "ulp")))]
pub uart2: serial::UART2,
#[cfg(not(feature = "ulp"))]
pub i2c0: i2c::I2C0,
@ -52,12 +54,13 @@ impl Peripherals {
pub unsafe fn new() -> Self {
Self {
#[cfg(any(not(esp32c3), not(feature = "ulp")))]
pins: gpio::Pins::new(),
#[cfg(not(feature = "ulp"))]
uart0: serial::UART0::new(),
#[cfg(not(feature = "ulp"))]
uart1: serial::UART1::new(),
#[cfg(any(esp32, not(feature = "ulp")))]
#[cfg(all(esp32, not(feature = "ulp")))]
uart2: serial::UART2::new(),
#[cfg(not(feature = "ulp"))]
i2c0: i2c::I2C0::new(),

View File

@ -256,8 +256,8 @@ pub struct Pins<
TX: OutputPin,
RX: InputPin,
// default pins to allow type inference
CTS: InputPin = crate::gpio::Gpio19<crate::gpio::Input>,
RTS: OutputPin = crate::gpio::Gpio22<crate::gpio::Output>,
CTS: InputPin = crate::gpio::Gpio1<crate::gpio::Input>,
RTS: OutputPin = crate::gpio::Gpio2<crate::gpio::Output>,
> {
pub tx: TX,
pub rx: RX,
@ -276,8 +276,8 @@ pub struct Serial<
TX: OutputPin,
RX: InputPin,
// default pins to allow type inference
CTS: InputPin = crate::gpio::Gpio19<crate::gpio::Input>,
RTS: OutputPin = crate::gpio::Gpio22<crate::gpio::Output>,
CTS: InputPin = crate::gpio::Gpio1<crate::gpio::Input>,
RTS: OutputPin = crate::gpio::Gpio2<crate::gpio::Output>,
> {
uart: UART,
pins: Pins<TX, RX, CTS, RTS>,

View File

@ -1,6 +1,35 @@
mod reg;
#[cfg(feature = "ulp")]
mod pac;
#[cfg(feature = "ulp")]
mod reg;
#[cfg(feature = "ulp")]
#[macro_use]
pub mod sys;
#[cfg(feature = "ulp")]
pub mod delay;
#[cfg(not(feature = "ulp"))]
#[cfg(any(esp32, esp32s2, esp32s3))]
pub fn enable_timer(enable: bool) {
use core::ptr::{read_volatile, write_volatile};
// TODO: Get rid of these hard-codings
const DR_REG_RTCCNTL_BASE: u32 = 0x3f408000;
const RTC_CNTL_STATE0_REG: u32 = DR_REG_RTCCNTL_BASE + 0x0018;
const RTC_CNTL_ULP_CP_SLP_TIMER_EN: u32 = 1 << 31;
unsafe {
if enable {
write_volatile(
RTC_CNTL_STATE0_REG as *mut u32,
read_volatile(RTC_CNTL_STATE0_REG as *const u32) | RTC_CNTL_ULP_CP_SLP_TIMER_EN,
);
} else {
write_volatile(
RTC_CNTL_STATE0_REG as *mut u32,
read_volatile(RTC_CNTL_STATE0_REG as *const u32) & !RTC_CNTL_ULP_CP_SLP_TIMER_EN,
);
}
}
}

View File

@ -2,7 +2,7 @@ use embedded_hal::blocking::delay::{DelayMs, DelayUs};
use super::sys::*;
/// ESP-IDF busy-loop based delay for the risc-v ULP coprocessor
/// Busy-loop based delay for the RiscV ULP coprocessor
pub struct Ulp;
impl DelayUs<u32> for Ulp {
@ -33,7 +33,5 @@ impl DelayMs<u16> for Ulp {
fn delay_cycles(cycles: u32) {
let start = get_ccount();
while get_ccount() - start < cycles {
/* Wait */
}
while get_ccount() - start < cycles { /* Wait */ }
}

View File

@ -4,7 +4,6 @@
/// - https://github.com/espressif/esp-idf/blob/master/components/soc/esp32s2/include/soc/soc.h (a subset)
/// - https://github.com/espressif/esp-idf/blob/master/components/soc/esp32s2/include/soc/sens_reg.h (a subset)
/// - https://github.com/espressif/esp-idf/blob/master/components/soc/esp32s2/include/soc/rtc_io_reg.h (a subset)
use super::reg::bit;
pub const DR_REG_SENS_BASE: u32 = 0x3f408800;
@ -16,39 +15,52 @@ pub const RTC_CNTL_COCPU_DONE: u32 = bit(25);
pub const RTC_CNTL_COCPU_SHUT_RESET_EN: u32 = bit(22);
pub const RTC_CNTL_COCPU_SHUT_2_CLK_DIS: u32 = 0x000000FF;
pub const RTC_CNTL_COCPU_SHUT_2_CLK_DIS_V: u32 = 0xFF;
pub const RTC_CNTL_SW_CPU_INT: u32 = bit(0);
pub const RTC_CNTL_COCPU_SHUT_2_CLK_DIS_S: u32 = 14;
pub const RTC_CNTL_STATE0_REG: u32 = DR_REG_RTCCNTL_BASE + 0x0018;
pub const RTC_CNTL_SW_CPU_INT: u32 = bit(0);
pub const RTC_CNTL_ULP_CP_SLP_TIMER_EN: u32 = bit(31);
pub const RTC_CNTL_ULP_CP_SLP_TIMER_EN_V: u32 = 0x1;
pub const RTC_CNTL_ULP_CP_SLP_TIMER_EN_S: u32 = 31;
pub const SENS_SAR_IO_MUX_CONF_REG: u32 = DR_REG_SENS_BASE + 0x0144;
pub const SENS_IOMUX_CLK_GATE_EN_M: u32 = bit(31);
pub const RTC_IO_TOUCH_PAD0_REG: u32 = DR_REG_RTCIO_BASE + 0x94;
pub const RTC_IO_TOUCH_PAD0_REG: u32 = DR_REG_RTCIO_BASE + 0x84;
pub const RTC_IO_TOUCH_PAD0_DRV: u32 = 0x00000003;
pub const RTC_IO_TOUCH_PAD0_DRV_V: u32 = 0x3;
pub const RTC_IO_TOUCH_PAD0_DRV_S: u32 = 29;
pub const RTC_IO_TOUCH_PAD0_MUX_SEL: u32 = bit(19);
pub const RTC_IO_TOUCH_PAD0_FUN_SEL: u32 = 0x00000003;
pub const RTC_IO_TOUCH_PAD0_FUN_SEL_V: u32 = 0x3;
pub const RTC_IO_TOUCH_PAD0_FUN_SEL_S: u32 = 17;
pub const RTC_IO_TOUCH_PAD0_FUN_IE: u32 = bit(13);
pub const RTC_IO_TOUCH_PAD0_FUN_IE_V: u32 = 0x01;
pub const RTC_IO_TOUCH_PAD0_FUN_IE_S: u32 = 13;
pub const RTC_IO_TOUCH_PAD0_RUE: u32 = bit(27);
pub const RTC_IO_TOUCH_PAD0_RDE: u32 = bit(28);
pub const RTC_GPIO_ENABLE_W1TS_REG: u32 = DR_REG_RTCIO_BASE + 0x10;
pub const RTC_GPIO_ENABLE_W1TS: u32 = 0x0003FFFF;
pub const RTC_GPIO_ENABLE_W1TS_V: u32 = 0x3FFFF;
pub const RTC_GPIO_ENABLE_W1TS_S: u32 = 10;
pub const RTC_GPIO_ENABLE_W1TC_REG: u32 = DR_REG_RTCIO_BASE + 0x14;
pub const RTC_GPIO_ENABLE_W1TC: u32 = 0x0003FFFF;
pub const RTC_GPIO_ENABLE_W1TC_V: u32 = 0x3FFFF;
pub const RTC_GPIO_ENABLE_W1TC_S: u32 = 10;
pub const RTC_GPIO_IN_REG: u32 = DR_REG_RTCIO_BASE + 0x24;
pub const RTC_GPIO_IN_NEXT: u32 = 0x0003FFFF;
pub const RTC_GPIO_IN_NEXT_V: u32 = 0x3FFFF;
pub const RTC_GPIO_IN_NEXT_S: u32 = 10;
pub const RTC_GPIO_OUT_W1TS_REG: u32 = DR_REG_RTCIO_BASE + 0x4;
pub const RTC_GPIO_OUT_DATA_W1TS: u32 = 0x0003FFFF;
pub const RTC_GPIO_OUT_DATA_W1TS_V: u32 = 0x3FFFF;
pub const RTC_GPIO_OUT_DATA_W1TS_S: u32 = 10;
pub const RTC_GPIO_OUT_W1TC_REG: u32 = DR_REG_RTCIO_BASE + 0x8;
pub const RTC_GPIO_OUT_DATA_W1TC: u32 = 0x0003FFFF;
pub const RTC_GPIO_OUT_DATA_W1TC_V: u32 = 0x3FFFF;
pub const RTC_GPIO_OUT_DATA_W1TC_S: u32 = 10;

View File

@ -2,30 +2,29 @@
/// This module is a manual translation of the following C file from current ESP-IDF master:
/// - https://github.com/espressif/esp-idf/blob/master/components/ulp/ulp_riscv/include/ulp_riscv/ulp_riscv_register_ops.h
use core::ptr::{read_volatile, write_volatile};
/*
* When COCPU accesses the RTC register, it needs to convert the access address.
* When COCPU accesses the RTC memory, dont need to convert the access address.
*/
#[inline(always)]
pub unsafe fn write_rtc_mem(addr: u32, val: i32) {
write_volatile(addr as *mut i32, val);
}
#[inline(always)]
pub unsafe fn write_rtc_mem(addr: u32, val: i32) {
write_volatile(addr as *mut i32, val);
}
#[inline(always)]
pub unsafe fn read_rtc_mem(addr: u32) -> i32 {
read_volatile(addr as *const i32)
}
#[inline(always)]
pub unsafe fn read_rtc_mem(addr: u32) -> i32 {
read_volatile(addr as *const i32)
}
/*
* When COCPU accesses the RTC register, it needs to convert the access address.
* When COCPU accesses the RTC memory, dont need to convert the access address.
*/
/*
* When COCPU accesses the RTC register, it needs to convert the access address.
* When COCPU accesses the RTC memory, dont need to convert the access address.
*/
#[inline(always)]
pub const fn riscv_reg_conv(addr: u32) -> u32 {
((addr & 0xffff) << 3 & 0xe000) | addr & 0x1fff | 0x8000
((addr & 0xffff) << 3) & 0xe000 | addr & 0x1fff | 0x8000
}
#[inline(always)]
@ -67,14 +66,14 @@ pub unsafe fn reg_set_bit(r: u32, b: u32) {
#[inline(always)]
pub unsafe fn reg_clr_bit(r: u32, b: u32) {
let addr = riscv_reg_conv(r) as *mut u32;
write_volatile(addr, read_volatile(addr) & (!b));
write_volatile(addr, read_volatile(addr) & !b);
}
// Set bits of register controlled by mask
#[inline(always)]
pub unsafe fn reg_set_bits(r: u32, b: u32, m: u32) {
let addr = riscv_reg_conv(r) as *mut u32;
write_volatile(addr, read_volatile(addr) & (!m) | b & m);
write_volatile(addr, read_volatile(addr) & !m | b & m);
}
// Get field from register, uses field _S & _V to determine mask
@ -162,7 +161,10 @@ pub unsafe fn get_peri_reg_bits(addr: u32, bit_map: u32, shift: u8) -> u32 {
// Set bits of register controlled by mask and shift
pub unsafe fn set_peri_reg_bits(addr: u32, bit_map: u32, value: u32, shift: u8) {
write_peri_reg(addr, read_peri_reg(addr) & !(bit_map << shift) | ((value & bit_map) << shift));
write_peri_reg(
addr,
read_peri_reg(addr) & !(bit_map << shift) | ((value & bit_map) << shift),
);
}
// Get field of register

View File

@ -1,6 +1,5 @@
/// A mini "esp-idf-ulp-sys" module exposing stuff on top of which the ULP HAL support is implemented
/// (currently, only GPIO) + some utilities for the riscv ULP processor
use mutex_trait::*;
pub use self::cpu::*;

View File

@ -4,12 +4,13 @@
/// - https://github.com/espressif/esp-idf/blob/master/components/ulp/ulp_riscv/include/ulp_riscv/ulp_utils.h
/// - https://github.com/espressif/esp-idf/blob/master/components/ulp/ulp_riscv/ulp_utils.c
pub const ULP_RISCV_CYCLES_PER_US_NUM: u32 = 80;
pub const ULP_RISCV_CYCLES_PER_US_DENUM: u32 = 5;
pub const ULP_RISCV_CYCLES_PER_MS: u32 = ULP_RISCV_CYCLES_PER_US_NUM * (1000 / ULP_RISCV_CYCLES_PER_US_DENUM);
pub const ULP_RISCV_CYCLES_PER_US_NUM: u32 = 85;
pub const ULP_RISCV_CYCLES_PER_US_DENUM: u32 = 10;
pub const ULP_RISCV_CYCLES_PER_MS: u32 =
ULP_RISCV_CYCLES_PER_US_NUM * (1000 / ULP_RISCV_CYCLES_PER_US_DENUM);
use crate::ulp::reg::*;
use crate::ulp::pac::*;
use crate::ulp::reg::*;
#[inline(always)]
pub fn get_ccount() -> u32 {
@ -23,24 +24,46 @@ pub fn get_ccount() -> u32 {
ccount
}
pub unsafe fn wakeup_main_processor() {
set_peri_reg_mask(RTC_CNTL_STATE0_REG, RTC_CNTL_SW_CPU_INT);
pub fn wakeup_main_processor() {
unsafe { set_peri_reg_mask(RTC_CNTL_STATE0_REG, RTC_CNTL_SW_CPU_INT) };
}
pub unsafe fn rescue_from_monitor() {
pub fn rescue_from_monitor() {
// Rescue RISCV from monitor state
clear_peri_reg_mask(RTC_CNTL_COCPU_CTRL_REG, RTC_CNTL_COCPU_DONE | RTC_CNTL_COCPU_SHUT_RESET_EN);
unsafe {
clear_peri_reg_mask(
RTC_CNTL_COCPU_CTRL_REG,
RTC_CNTL_COCPU_DONE | RTC_CNTL_COCPU_SHUT_RESET_EN,
)
};
}
pub unsafe fn shutdown() -> ! {
// Setting the delay time after RISCV recv `DONE` signal, Ensure that action `RESET` can be executed in time.
reg_set_field(RTC_CNTL_COCPU_CTRL_REG, RTC_CNTL_COCPU_SHUT_2_CLK_DIS, RTC_CNTL_COCPU_SHUT_2_CLK_DIS_V, 0x3F);
// Suspends the ulp operation
set_peri_reg_mask(RTC_CNTL_COCPU_CTRL_REG, RTC_CNTL_COCPU_DONE);
// Resets the processor
set_peri_reg_mask(RTC_CNTL_COCPU_CTRL_REG, RTC_CNTL_COCPU_SHUT_RESET_EN);
loop { }
pub fn enable_timer(enable: bool) {
unsafe {
if enable {
set_peri_reg_mask(RTC_CNTL_STATE0_REG, RTC_CNTL_ULP_CP_SLP_TIMER_EN);
} else {
clear_peri_reg_mask(RTC_CNTL_STATE0_REG, RTC_CNTL_ULP_CP_SLP_TIMER_EN);
}
}
}
pub fn shutdown() -> ! {
unsafe {
// Setting the delay time after RISCV recv `DONE` signal, Ensure that action `RESET` can be executed in time.
reg_set_field(
RTC_CNTL_COCPU_CTRL_REG,
RTC_CNTL_COCPU_SHUT_2_CLK_DIS_S,
RTC_CNTL_COCPU_SHUT_2_CLK_DIS_V,
0x3F,
);
// Suspends the ulp operation
set_peri_reg_mask(RTC_CNTL_COCPU_CTRL_REG, RTC_CNTL_COCPU_DONE);
// Resets the processor
set_peri_reg_mask(RTC_CNTL_COCPU_CTRL_REG, RTC_CNTL_COCPU_SHUT_RESET_EN);
}
loop {}
}

View File

@ -1,10 +1,9 @@
use crate::ulp::pac::*;
/// A mini "esp-idf-ulp-sys" module exposing stuff on top of which the ULP HAL support is implemented
/// (currently, only GPIO)
/// Implemented as a manual transation of a few C fiels from current ESP-IDF S2 master:
/// - https://github.com/espressif/esp-idf/blob/master/components/ulp/ulp_riscv/include/ulp_riscv/ulp_riscv_gpio.h
use crate::ulp::reg::*;
use crate::ulp::pac::*;
#[allow(non_camel_case_types)]
pub type adc_unit_t = i32;
@ -46,54 +45,109 @@ pub const gpio_pull_mode_t_GPIO_FLOATING: u8 = 3;
pub unsafe fn gpio_set_direction(gpio_num: i32, direction: u8) {
if direction == gpio_mode_t_GPIO_MODE_DISABLE {
// Deinit
clear_peri_reg_mask(RTC_IO_TOUCH_PAD0_REG + gpio_num as u32 * 4, RTC_IO_TOUCH_PAD0_MUX_SEL);
clear_peri_reg_mask(
RTC_IO_TOUCH_PAD0_REG + gpio_num as u32 * 4,
RTC_IO_TOUCH_PAD0_MUX_SEL,
);
return;
} else {
// Init
set_peri_reg_mask(SENS_SAR_IO_MUX_CONF_REG, SENS_IOMUX_CLK_GATE_EN_M);
set_peri_reg_mask(RTC_IO_TOUCH_PAD0_REG + gpio_num as u32 * 4, RTC_IO_TOUCH_PAD0_MUX_SEL);
reg_set_field(RTC_IO_TOUCH_PAD0_REG + gpio_num as u32 * 4, RTC_IO_TOUCH_PAD0_FUN_SEL, RTC_IO_TOUCH_PAD0_FUN_SEL_V, 0);
set_peri_reg_mask(
RTC_IO_TOUCH_PAD0_REG + gpio_num as u32 * 4,
RTC_IO_TOUCH_PAD0_MUX_SEL,
);
reg_set_field(
RTC_IO_TOUCH_PAD0_REG + gpio_num as u32 * 4,
RTC_IO_TOUCH_PAD0_FUN_SEL_S,
RTC_IO_TOUCH_PAD0_FUN_SEL_V,
0,
);
}
let input = direction == gpio_mode_t_GPIO_MODE_INPUT || direction == gpio_mode_t_GPIO_MODE_INPUT_OUTPUT || direction == gpio_mode_t_GPIO_MODE_INPUT_OUTPUT_OD;
let output = direction == gpio_mode_t_GPIO_MODE_OUTPUT || direction == gpio_mode_t_GPIO_MODE_OUTPUT_OD || direction == gpio_mode_t_GPIO_MODE_INPUT_OUTPUT || direction == gpio_mode_t_GPIO_MODE_INPUT_OUTPUT_OD;
let od = direction == gpio_mode_t_GPIO_MODE_OUTPUT_OD || direction == gpio_mode_t_GPIO_MODE_INPUT_OUTPUT_OD;
let input = direction == gpio_mode_t_GPIO_MODE_INPUT
|| direction == gpio_mode_t_GPIO_MODE_INPUT_OUTPUT
|| direction == gpio_mode_t_GPIO_MODE_INPUT_OUTPUT_OD;
let output = direction == gpio_mode_t_GPIO_MODE_OUTPUT
|| direction == gpio_mode_t_GPIO_MODE_OUTPUT_OD
|| direction == gpio_mode_t_GPIO_MODE_INPUT_OUTPUT
|| direction == gpio_mode_t_GPIO_MODE_INPUT_OUTPUT_OD;
let od = direction == gpio_mode_t_GPIO_MODE_OUTPUT_OD
|| direction == gpio_mode_t_GPIO_MODE_INPUT_OUTPUT_OD;
if input {
set_peri_reg_mask(RTC_IO_TOUCH_PAD0_REG + gpio_num as u32 * 4, RTC_IO_TOUCH_PAD0_FUN_IE);
set_peri_reg_mask(
RTC_IO_TOUCH_PAD0_REG + gpio_num as u32 * 4,
RTC_IO_TOUCH_PAD0_FUN_IE,
);
} else {
clear_peri_reg_mask(RTC_IO_TOUCH_PAD0_REG + gpio_num as u32 * 4, RTC_IO_TOUCH_PAD0_FUN_IE);
clear_peri_reg_mask(
RTC_IO_TOUCH_PAD0_REG + gpio_num as u32 * 4,
RTC_IO_TOUCH_PAD0_FUN_IE,
);
}
if output {
reg_set_field(RTC_GPIO_ENABLE_W1TS_REG, RTC_GPIO_ENABLE_W1TS, RTC_GPIO_ENABLE_W1TS_V, bit(gpio_num as u32));
reg_set_field(RTC_IO_TOUCH_PAD0_REG + gpio_num as u32 * 4, RTC_IO_TOUCH_PAD0_DRV, RTC_IO_TOUCH_PAD0_DRV_V, if od { 1 } else { 0 });
reg_set_field(
RTC_GPIO_ENABLE_W1TS_REG,
RTC_GPIO_ENABLE_W1TS_S,
RTC_GPIO_ENABLE_W1TS_V,
bit(gpio_num as u32),
);
reg_set_field(
RTC_IO_TOUCH_PAD0_REG + gpio_num as u32 * 4,
RTC_IO_TOUCH_PAD0_DRV_S,
RTC_IO_TOUCH_PAD0_DRV_V,
if od { 1 } else { 0 },
);
} else {
reg_set_field(RTC_GPIO_ENABLE_W1TC_REG, RTC_GPIO_ENABLE_W1TC, RTC_GPIO_ENABLE_W1TC_V, bit(gpio_num as u32));
reg_set_field(
RTC_GPIO_ENABLE_W1TC_REG,
RTC_GPIO_ENABLE_W1TC_S,
RTC_GPIO_ENABLE_W1TC_V,
bit(gpio_num as u32),
);
}
}
#[inline(always)]
pub unsafe fn gpio_set_pull_mode(gpio_num: i32, mode: u8) {
let pullup = mode == gpio_pull_mode_t_GPIO_PULLUP_ONLY || mode == gpio_pull_mode_t_GPIO_PULLUP_PULLDOWN;
let pulldown = mode == gpio_pull_mode_t_GPIO_PULLDOWN_ONLY || mode == gpio_pull_mode_t_GPIO_PULLUP_PULLDOWN;
let pullup =
mode == gpio_pull_mode_t_GPIO_PULLUP_ONLY || mode == gpio_pull_mode_t_GPIO_PULLUP_PULLDOWN;
let pulldown = mode == gpio_pull_mode_t_GPIO_PULLDOWN_ONLY
|| mode == gpio_pull_mode_t_GPIO_PULLUP_PULLDOWN;
if pullup {
set_peri_reg_mask(RTC_IO_TOUCH_PAD0_REG + gpio_num as u32 * 4, RTC_IO_TOUCH_PAD0_RUE);
set_peri_reg_mask(
RTC_IO_TOUCH_PAD0_REG + gpio_num as u32 * 4,
RTC_IO_TOUCH_PAD0_RUE,
);
} else {
clear_peri_reg_mask(RTC_IO_TOUCH_PAD0_REG + gpio_num as u32 * 4, RTC_IO_TOUCH_PAD0_RUE);
clear_peri_reg_mask(
RTC_IO_TOUCH_PAD0_REG + gpio_num as u32 * 4,
RTC_IO_TOUCH_PAD0_RUE,
);
}
if pulldown {
set_peri_reg_mask(RTC_IO_TOUCH_PAD0_REG + gpio_num as u32 * 4, RTC_IO_TOUCH_PAD0_RDE);
set_peri_reg_mask(
RTC_IO_TOUCH_PAD0_REG + gpio_num as u32 * 4,
RTC_IO_TOUCH_PAD0_RDE,
);
} else {
clear_peri_reg_mask(RTC_IO_TOUCH_PAD0_REG + gpio_num as u32 * 4, RTC_IO_TOUCH_PAD0_RDE);
clear_peri_reg_mask(
RTC_IO_TOUCH_PAD0_REG + gpio_num as u32 * 4,
RTC_IO_TOUCH_PAD0_RDE,
);
}
}
#[inline(always)]
pub unsafe fn gpio_get_level(gpio_num: i32) -> u8 {
if (reg_get_field(RTC_GPIO_IN_REG, RTC_GPIO_IN_NEXT, RTC_GPIO_IN_NEXT_V) & bit(gpio_num as u32)) != 0 {
if (reg_get_field(RTC_GPIO_IN_REG, RTC_GPIO_IN_NEXT_S, RTC_GPIO_IN_NEXT_V)
& bit(gpio_num as u32))
!= 0
{
1
} else {
0
@ -103,8 +157,18 @@ pub unsafe fn gpio_get_level(gpio_num: i32) -> u8 {
#[inline(always)]
pub unsafe fn gpio_set_level(gpio_num: i32, level: u8) {
if level != 0 {
reg_set_field(RTC_GPIO_OUT_W1TS_REG, RTC_GPIO_OUT_DATA_W1TS, RTC_GPIO_OUT_DATA_W1TS_V, bit(gpio_num as u32));
reg_set_field(
RTC_GPIO_OUT_W1TS_REG,
RTC_GPIO_OUT_DATA_W1TS_S,
RTC_GPIO_OUT_DATA_W1TS_V,
bit(gpio_num as u32),
);
} else {
reg_set_field(RTC_GPIO_OUT_W1TC_REG, RTC_GPIO_OUT_DATA_W1TC, RTC_GPIO_OUT_DATA_W1TC_V, bit(gpio_num as u32));
reg_set_field(
RTC_GPIO_OUT_W1TC_REG,
RTC_GPIO_OUT_DATA_W1TC_S,
RTC_GPIO_OUT_DATA_W1TC_V,
bit(gpio_num as u32),
);
}
}