-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
165 additions
and
154 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| //! board | ||
| #[allow(unused)] | ||
| use crate::log; | ||
| use crate::{hal, led, sys}; | ||
| use core::sync::atomic::{AtomicBool, Ordering}; | ||
| pub use hal::usb_hs::{UsbBus, USB1_ULPI as USB}; | ||
| use hal::{gpio::PinState, pac, prelude::*, rcc, time::Hertz, usb_hs::USB1_ULPI}; | ||
|
|
||
| pub const CORE_FREQUENCY: Hertz = Hertz::from_raw(480_000_000); | ||
|
|
||
| pub struct Board { | ||
| pub led_red: led::user::Red, | ||
| pub led_green: led::user::Green, | ||
| pub led_blue: led::user::Blue, | ||
| pub usb: USB1_ULPI, | ||
| } | ||
|
|
||
| impl Board { | ||
| pub fn take() -> Self { | ||
| static TAKEN: AtomicBool = AtomicBool::new(false); | ||
| debug_assert!(!TAKEN.swap(true, Ordering::SeqCst)); | ||
| Self::setup() | ||
| } | ||
|
|
||
| fn setup() -> Self { | ||
| #[cfg(debug_assertions)] | ||
| log!("Board init"); | ||
|
|
||
| // Reset previous configuration and enable external oscillator as HSE source (25 MHz) | ||
| sys::Clk::new().reset().enable_ext_clock(); | ||
| let dp = pac::Peripherals::take().unwrap(); | ||
|
|
||
| // Configure power domains and clock tree | ||
| let pwrcfg = dp.PWR.constrain().vos0(&dp.SYSCFG).freeze(); | ||
| let ccdr = dp | ||
| .RCC | ||
| .constrain() | ||
| .use_hse(25.MHz()) | ||
| .bypass_hse() | ||
| .sys_ck(CORE_FREQUENCY) | ||
| .hclk(240.MHz()) | ||
| .pll1_strategy(rcc::PllConfigStrategy::Iterative) | ||
| .freeze(pwrcfg, &dp.SYSCFG); | ||
|
|
||
| debug_assert_eq!(sys::Clk::get_source(), Some(sys::ClkSource::Pll1)); | ||
| debug_assert_eq!(sys::Clk::get_pll_source(), sys::PllSourceVariant::Hse); | ||
|
|
||
| // USB | ||
| let (gpioa, gpiob, gpioc, gpioh, gpioi, gpioj) = { | ||
| ( | ||
| dp.GPIOA.split(ccdr.peripheral.GPIOA), | ||
| dp.GPIOB.split(ccdr.peripheral.GPIOB), | ||
| dp.GPIOC.split(ccdr.peripheral.GPIOC), | ||
| dp.GPIOH.split_without_reset(ccdr.peripheral.GPIOH), // Do not do a reset since external oscillator is enabled by GPIOH1 | ||
| dp.GPIOI.split(ccdr.peripheral.GPIOI), | ||
| dp.GPIOJ.split(ccdr.peripheral.GPIOJ), | ||
| ) | ||
| }; | ||
| // Enable ULPI transceiver (GPIOJ4) | ||
| let mut ulpi_reset = gpioj.pj4.into_push_pull_output(); | ||
| ulpi_reset.set_high(); | ||
|
|
||
| let usb = USB1_ULPI::new( | ||
| dp.OTG1_HS_GLOBAL, | ||
| dp.OTG1_HS_DEVICE, | ||
| dp.OTG1_HS_PWRCLK, | ||
| gpioa.pa5.into_alternate(), | ||
| gpioi.pi11.into_alternate(), | ||
| gpioh.ph4.into_alternate(), | ||
| gpioc.pc0.into_alternate(), | ||
| gpioa.pa3.into_alternate(), | ||
| gpiob.pb0.into_alternate(), | ||
| gpiob.pb1.into_alternate(), | ||
| gpiob.pb10.into_alternate(), | ||
| gpiob.pb11.into_alternate(), | ||
| gpiob.pb12.into_alternate(), | ||
| gpiob.pb13.into_alternate(), | ||
| gpiob.pb5.into_alternate(), | ||
| ccdr.peripheral.USB1OTG, | ||
| &ccdr.clocks, | ||
| ); | ||
|
|
||
| // User LEDs | ||
| let gpiok = dp.GPIOK.split(ccdr.peripheral.GPIOK); | ||
| let (led_red, led_green, led_blue) = ( | ||
| gpiok.pk5.into_push_pull_output_in_state(PinState::High), | ||
| gpiok.pk6.into_push_pull_output_in_state(PinState::High), | ||
| gpiok.pk7.into_push_pull_output_in_state(PinState::High), | ||
| ); | ||
|
|
||
| Board { | ||
| led_red, | ||
| led_green, | ||
| led_blue, | ||
| usb, | ||
| } | ||
| } | ||
| } |
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| //! led | ||
| pub use crate::hal::gpio::{gpiok::*, Output, Pin, PinState, PushPull}; | ||
| type DigitalOutputPin<const P: char, const N: u8> = Pin<P, N, Output<PushPull>>; | ||
|
|
||
| pub trait Led { | ||
| fn on(&mut self); | ||
| fn off(&mut self); | ||
| fn toggle(&mut self); | ||
| } | ||
|
|
||
| pub mod user { | ||
| use super::*; | ||
|
|
||
| pub type Red = DigitalOutputPin<'K', 5>; | ||
| pub type Green = DigitalOutputPin<'K', 6>; | ||
| pub type Blue = DigitalOutputPin<'K', 7>; | ||
|
|
||
| // Marker trait | ||
| trait BoardLed {} | ||
| impl BoardLed for Red {} | ||
| impl BoardLed for Green {} | ||
| impl BoardLed for Blue {} | ||
|
|
||
| impl<const P: char, const N: u8> Led for DigitalOutputPin<P, N> | ||
| where | ||
| DigitalOutputPin<P, N>: BoardLed, | ||
| { | ||
| #[inline] | ||
| fn on(&mut self) { | ||
| self.set_low(); | ||
| } | ||
|
|
||
| #[inline] | ||
| fn off(&mut self) { | ||
| self.set_high(); | ||
| } | ||
|
|
||
| #[inline] | ||
| fn toggle(&mut self) { | ||
| self.toggle(); | ||
| } | ||
| } | ||
| } |
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,107 +1,11 @@ | ||
| #![no_std] | ||
|
|
||
| pub mod board; | ||
| pub mod interrupt; | ||
| pub mod led; | ||
| pub mod panic; | ||
| mod sys; | ||
| pub mod user_led; | ||
|
|
||
| use core::sync::atomic::{AtomicBool, Ordering}; | ||
| pub use cortex_m_rt::entry; | ||
| pub use hal::usb_hs::{UsbBus, USB1_ULPI as USB}; | ||
| use hal::{gpio::PinState, pac, prelude::*, rcc, time::Hertz, usb_hs::USB1_ULPI}; | ||
| #[allow(unused_imports)] | ||
| pub use rtt_target::{rprintln as log, rtt_init_print as log_init}; | ||
| pub use stm32h7xx_hal as hal; | ||
|
|
||
| pub type CorePeripherals = cortex_m::Peripherals; | ||
|
|
||
| pub const CORE_FREQUENCY: Hertz = Hertz::from_raw(480_000_000); | ||
|
|
||
| pub struct Board { | ||
| pub led_red: user_led::Red, | ||
| pub led_green: user_led::Green, | ||
| pub led_blue: user_led::Blue, | ||
| pub usb: USB1_ULPI, | ||
| } | ||
|
|
||
| impl Board { | ||
| pub fn take() -> Self { | ||
| static TAKEN: AtomicBool = AtomicBool::new(false); | ||
| debug_assert!(!TAKEN.swap(true, Ordering::SeqCst)); | ||
| Self::setup() | ||
| } | ||
|
|
||
| fn setup() -> Self { | ||
| #[cfg(debug_assertions)] | ||
| log!("Board init"); | ||
|
|
||
| // Reset previous configuration and enable external oscillator as HSE source (25 MHz) | ||
| sys::Clk::new().reset().enable_ext_clock(); | ||
| let dp = pac::Peripherals::take().unwrap(); | ||
|
|
||
| // Configure power domains and clock tree | ||
| let pwrcfg = dp.PWR.constrain().vos0(&dp.SYSCFG).freeze(); | ||
| let ccdr = dp | ||
| .RCC | ||
| .constrain() | ||
| .use_hse(25.MHz()) | ||
| .bypass_hse() | ||
| .sys_ck(CORE_FREQUENCY) | ||
| .hclk(240.MHz()) | ||
| .pll1_strategy(rcc::PllConfigStrategy::Iterative) | ||
| .freeze(pwrcfg, &dp.SYSCFG); | ||
|
|
||
| debug_assert_eq!(sys::Clk::get_source(), Some(sys::ClkSource::Pll1)); | ||
| debug_assert_eq!(sys::Clk::get_pll_source(), sys::PllSourceVariant::Hse); | ||
|
|
||
| // USB | ||
| let (gpioa, gpiob, gpioc, gpioh, gpioi, gpioj) = { | ||
| ( | ||
| dp.GPIOA.split(ccdr.peripheral.GPIOA), | ||
| dp.GPIOB.split(ccdr.peripheral.GPIOB), | ||
| dp.GPIOC.split(ccdr.peripheral.GPIOC), | ||
| dp.GPIOH.split_without_reset(ccdr.peripheral.GPIOH), // Do not do a reset since external oscillator is enabled by GPIOH1 | ||
| dp.GPIOI.split(ccdr.peripheral.GPIOI), | ||
| dp.GPIOJ.split(ccdr.peripheral.GPIOJ), | ||
| ) | ||
| }; | ||
| // Enable ULPI transceiver (GPIOJ4) | ||
| let mut ulpi_reset = gpioj.pj4.into_push_pull_output(); | ||
| ulpi_reset.set_high(); | ||
|
|
||
| let usb = USB1_ULPI::new( | ||
| dp.OTG1_HS_GLOBAL, | ||
| dp.OTG1_HS_DEVICE, | ||
| dp.OTG1_HS_PWRCLK, | ||
| gpioa.pa5.into_alternate(), | ||
| gpioi.pi11.into_alternate(), | ||
| gpioh.ph4.into_alternate(), | ||
| gpioc.pc0.into_alternate(), | ||
| gpioa.pa3.into_alternate(), | ||
| gpiob.pb0.into_alternate(), | ||
| gpiob.pb1.into_alternate(), | ||
| gpiob.pb10.into_alternate(), | ||
| gpiob.pb11.into_alternate(), | ||
| gpiob.pb12.into_alternate(), | ||
| gpiob.pb13.into_alternate(), | ||
| gpiob.pb5.into_alternate(), | ||
| ccdr.peripheral.USB1OTG, | ||
| &ccdr.clocks, | ||
| ); | ||
|
|
||
| // User LEDs | ||
| let gpiok = dp.GPIOK.split(ccdr.peripheral.GPIOK); | ||
| let (led_red, led_green, led_blue) = ( | ||
| gpiok.pk5.into_push_pull_output_in_state(PinState::High), | ||
| gpiok.pk6.into_push_pull_output_in_state(PinState::High), | ||
| gpiok.pk7.into_push_pull_output_in_state(PinState::High), | ||
| ); | ||
|
|
||
| Board { | ||
| led_red, | ||
| led_green, | ||
| led_blue, | ||
| usb, | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.