diff --git a/board-tests/Cargo.toml b/board-tests/Cargo.toml index dbee352..bcfc493 100644 --- a/board-tests/Cargo.toml +++ b/board-tests/Cargo.toml @@ -12,7 +12,7 @@ panic-probe = { version = "1", features = ["print-defmt"] } embedded-hal = "1" [dependencies.va108xx-hal] -version = "0.11" +version = "0.12" features = ["rt"] path = "../va108xx-hal" diff --git a/bootloader/Cargo.toml b/bootloader/Cargo.toml index fc646a3..c8f6ffb 100644 --- a/bootloader/Cargo.toml +++ b/bootloader/Cargo.toml @@ -15,7 +15,7 @@ num_enum = { version = "0.7", default-features = false } static_assertions = "1" [dependencies.va108xx-hal] -version = "0.11" +version = "0.12" path = "../va108xx-hal" features = ["defmt"] diff --git a/bootloader/src/main.rs b/bootloader/src/main.rs index 885432d..a17bfae 100644 --- a/bootloader/src/main.rs +++ b/bootloader/src/main.rs @@ -10,7 +10,7 @@ use num_enum::TryFromPrimitive; use panic_probe as _; // Import logger. use defmt_rtt as _; -use va108xx_hal::{pac, spi::SpiClkConfig, time::Hertz, timer::CountdownTimer}; +use va108xx_hal::{pac, spi::SpiClockConfig, time::Hertz, timer::CountdownTimer}; use vorago_reb1::m95m01::M95M01; // Useful for debugging and see what the bootloader is doing. Enabled currently, because @@ -106,7 +106,7 @@ fn main() -> ! { let cp = cortex_m::Peripherals::take().unwrap(); let mut timer = CountdownTimer::new(dp.tim0, CLOCK_FREQ); - let clk_config = SpiClkConfig::new(2, 4); + let clk_config = SpiClockConfig::new(2, 4); let mut nvm = M95M01::new(dp.spic, clk_config); if FLASH_SELF { diff --git a/examples/embassy/Cargo.toml b/examples/embassy/Cargo.toml index 72f9710..d2b81b8 100644 --- a/examples/embassy/Cargo.toml +++ b/examples/embassy/Cargo.toml @@ -26,7 +26,7 @@ embassy-executor = { version = "0.9", features = [ "executor-interrupt" ]} -va108xx-hal = { version = "0.11", path = "../../va108xx-hal", features = ["defmt"] } +va108xx-hal = { version = "0.12", path = "../../va108xx-hal", features = ["defmt"] } va108xx-embassy = { version = "0.2", path = "../../va108xx-embassy" } [features] diff --git a/examples/rtic/Cargo.toml b/examples/rtic/Cargo.toml index 74e5b73..6d4f049 100644 --- a/examples/rtic/Cargo.toml +++ b/examples/rtic/Cargo.toml @@ -13,5 +13,5 @@ rtic = { version = "2", features = ["thumbv6-backend"] } rtic-monotonics = { version = "2", features = ["cortex-m-systick"] } ringbuf = { version = "0.4.7", default-features = false, features = ["portable-atomic"] } -va108xx-hal = { version = "0.11", path = "../../va108xx-hal" } +va108xx-hal = { version = "0.12", path = "../../va108xx-hal" } vorago-reb1 = { version = "0.8", path = "../../vorago-reb1" } diff --git a/examples/rtic/src/bin/blinky-button-rtic.rs b/examples/rtic/src/bin/blinky-button-rtic.rs index c927327..b12a692 100644 --- a/examples/rtic/src/bin/blinky-button-rtic.rs +++ b/examples/rtic/src/bin/blinky-button-rtic.rs @@ -10,7 +10,7 @@ mod app { // Import global logger. use defmt_rtt as _; use va108xx_hal::{ - clock::{set_clk_div_register, FilterClkSel}, + clock::{set_clk_div_register, FilterClockSelect}, gpio::{FilterType, InterruptEdge}, pac, pins::PinsA, @@ -60,8 +60,8 @@ mod app { if mode == PressMode::Toggle { // This filter debounces the switch for edge based interrupts - button.configure_filter_type(FilterType::FilterFourCycles, FilterClkSel::Clk1); - set_clk_div_register(&mut dp.sysconfig, FilterClkSel::Clk1, 50_000); + button.configure_filter_type(FilterType::FilterFourCycles, FilterClockSelect::Clk1); + set_clk_div_register(&mut dp.sysconfig, FilterClockSelect::Clk1, 50_000); } button.configure_and_enable_edge_interrupt( edge_irq, diff --git a/examples/simple/Cargo.toml b/examples/simple/Cargo.toml index bed4e88..2264c24 100644 --- a/examples/simple/Cargo.toml +++ b/examples/simple/Cargo.toml @@ -16,6 +16,6 @@ embedded-io = "0.6" portable-atomic = { version = "1", features = ["unsafe-assume-single-core"] } [dependencies.va108xx-hal] -version = "0.11" +version = "0.12" path = "../../va108xx-hal" features = ["defmt"] diff --git a/flashloader/Cargo.toml b/flashloader/Cargo.toml index f005ee6..3c0827f 100644 --- a/flashloader/Cargo.toml +++ b/flashloader/Cargo.toml @@ -23,12 +23,13 @@ rtic = { version = "2", features = ["thumbv6-backend"] } rtic-monotonics = { version = "2", features = ["cortex-m-systick"] } [dependencies.va108xx-hal] -version = "0.11" +version = "0.12" path = "../va108xx-hal" features = ["defmt"] [dependencies.vorago-reb1] version = "0.8" +path = "../vorago-reb1" [package.metadata.cargo-machete] ignored = ["portable-atomic", "cortex-m-rt"] diff --git a/flashloader/src/main.rs b/flashloader/src/main.rs index 0648fda..f93c657 100644 --- a/flashloader/src/main.rs +++ b/flashloader/src/main.rs @@ -69,7 +69,8 @@ mod app { tc::PusTcReader, tm::PusTmCreator, EcssEnumU8, PusPacket, WritablePusPacket, }; use va108xx_hal::pins::PinsA; - use va108xx_hal::uart::IrqContextTimeoutOrMaxSize; + use va108xx_hal::spi::SpiClockConfig; + use va108xx_hal::uart::InterruptContextTimeoutOrMaxSize; use va108xx_hal::{pac, uart, InterruptConfig}; use vorago_reb1::m95m01::M95M01; @@ -85,7 +86,7 @@ mod app { struct Local { uart_rx: uart::RxWithInterrupt, uart_tx: uart::Tx, - rx_context: IrqContextTimeoutOrMaxSize, + rx_context: InterruptContextTimeoutOrMaxSize, verif_reporter: VerificationReportCreator, nvm: M95M01, } @@ -105,8 +106,9 @@ mod app { Mono::start(cx.core.SYST, SYSCLK_FREQ.raw()); - let mut dp = cx.device; - let nvm = M95M01::new(&mut dp.sysconfig, SYSCLK_FREQ, dp.spic); + let dp = cx.device; + let spi_clock_config = SpiClockConfig::new(2, 4); + let nvm = M95M01::new(dp.spic, spi_clock_config); let gpioa = PinsA::new(dp.porta); let tx = gpioa.pa9; @@ -127,7 +129,7 @@ mod app { let verif_reporter = VerificationReportCreator::new(0).unwrap(); - let mut rx_context = IrqContextTimeoutOrMaxSize::new(MAX_TC_FRAME_SIZE); + let mut rx_context = InterruptContextTimeoutOrMaxSize::new(MAX_TC_FRAME_SIZE); rx.read_fixed_len_or_timeout_based_using_irq(&mut rx_context) .expect("initiating UART RX failed"); pus_tc_handler::spawn().unwrap(); diff --git a/va108xx-embassy/Cargo.toml b/va108xx-embassy/Cargo.toml index f8ed4ae..8069124 100644 --- a/va108xx-embassy/Cargo.toml +++ b/va108xx-embassy/Cargo.toml @@ -11,7 +11,7 @@ keywords = ["no-std", "hal", "cortex-m", "vorago", "va108xx"] categories = ["aerospace", "embedded", "no-std", "hardware-support"] [dependencies] -vorago-shared-periphs = { git = "https://egit.irs.uni-stuttgart.de/rust/vorago-shared-periphs.git", features = ["vor1x"] } +vorago-shared-hal = { git = "https://egit.irs.uni-stuttgart.de/rust/vorago-shared-hal.git", features = ["vor1x"] } va108xx-hal = { path = "../va108xx-hal" } [features] diff --git a/va108xx-embassy/src/lib.rs b/va108xx-embassy/src/lib.rs index 098e00c..66785a1 100644 --- a/va108xx-embassy/src/lib.rs +++ b/va108xx-embassy/src/lib.rs @@ -36,8 +36,8 @@ #[cfg(feature = "irqs-in-lib")] use va108xx_hal::pac::{self, interrupt}; use va108xx_hal::time::Hertz; -use va108xx_hal::timer::TimMarker; -use vorago_shared_periphs::embassy::time_driver; +use va108xx_hal::timer::TimInstance; +use vorago_shared_hal::embassy::time_driver; /// Macro to define the IRQ handlers for the time driver. /// @@ -87,7 +87,7 @@ embassy_time_driver_irqs!(timekeeper_irq = OC29, alarm_irq = OC28); /// This should be used if the interrupt handler is provided by the library, which is the /// default case. #[cfg(feature = "irqs-in-lib")] -pub fn init( +pub fn init( timekeeper_tim: TimekeeperTim, alarm_tim: AlarmTim, sysclk: Hertz, @@ -98,7 +98,7 @@ pub fn init( /// Initialization method for embassy when using custom IRQ handlers. /// /// Requires an explicit [pac::Interrupt] argument for the timekeeper and alarm IRQs. -pub fn init_with_custom_irqs( +pub fn init_with_custom_irqs( timekeeper_tim: TimekeeperTim, alarm_tim: AlarmTim, sysclk: Hertz, diff --git a/va108xx-hal/CHANGELOG.md b/va108xx-hal/CHANGELOG.md index 6c76033..4605419 100644 --- a/va108xx-hal/CHANGELOG.md +++ b/va108xx-hal/CHANGELOG.md @@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## Changed -- Move most library components to new [`vorago-shared-periphs`](https://egit.irs.uni-stuttgart.de/rust/vorago-shared-periphs) +- Move most library components to new [`vorago-shared-hal`](https://egit.irs.uni-stuttgart.de/rust/vorago-shared-hal) which is mostly re-exported in this crate. - Overhaul and simplification of several HAL APIs. The system configuration and IRQ router peripheral instance generally does not need to be passed to HAL API anymore. diff --git a/va108xx-hal/Cargo.toml b/va108xx-hal/Cargo.toml index 74ddb1d..2f866b4 100644 --- a/va108xx-hal/Cargo.toml +++ b/va108xx-hal/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "va108xx-hal" -version = "0.11.1" +version = "0.12.0" authors = ["Robin Mueller "] edition = "2021" description = "HAL for the Vorago VA108xx family of microcontrollers" @@ -12,10 +12,10 @@ categories = ["aerospace", "embedded", "no-std", "hardware-support"] [dependencies] cortex-m = { version = "0.7", features = ["critical-section-single-core"]} -vorago-shared-periphs = { git = "https://egit.irs.uni-stuttgart.de/rust/vorago-shared-periphs.git", features = ["vor1x"] } +vorago-shared-hal = { git = "https://egit.irs.uni-stuttgart.de/rust/vorago-shared-hal.git", features = ["vor1x"] } fugit = "0.3" thiserror = { version = "2", default-features = false } -va108xx = { version = "0.5", default-features = false, features = ["critical-section", "defmt"] } +va108xx = { version = "0.6", default-features = false, features = ["critical-section", "defmt"] } defmt = { version = "1", optional = true } [target.'cfg(all(target_arch = "arm", target_os = "none"))'.dependencies] @@ -26,7 +26,7 @@ portable-atomic = "1" [features] default = ["rt"] rt = ["va108xx/rt"] -defmt = ["dep:defmt", "vorago-shared-periphs/defmt"] +defmt = ["dep:defmt", "vorago-shared-hal/defmt"] [package.metadata.docs.rs] all-features = true diff --git a/va108xx-hal/src/clock.rs b/va108xx-hal/src/clock.rs index 6f28b49..643f95f 100644 --- a/va108xx-hal/src/clock.rs +++ b/va108xx-hal/src/clock.rs @@ -1,31 +1,31 @@ //! # API for clock related functionality //! //! This also includes functionality to enable the peripheral clocks -pub use vorago_shared_periphs::gpio::FilterClkSel; -pub use vorago_shared_periphs::sysconfig::{disable_peripheral_clock, enable_peripheral_clock}; +pub use vorago_shared_hal::gpio::FilterClockSelect; +pub use vorago_shared_hal::sysconfig::{disable_peripheral_clock, enable_peripheral_clock}; -pub fn set_clk_div_register(syscfg: &mut va108xx::Sysconfig, clk_sel: FilterClkSel, div: u32) { +pub fn set_clk_div_register(syscfg: &mut va108xx::Sysconfig, clk_sel: FilterClockSelect, div: u32) { match clk_sel { - FilterClkSel::SysClk => (), - FilterClkSel::Clk1 => { + FilterClockSelect::SysClk => (), + FilterClockSelect::Clk1 => { syscfg.ioconfig_clkdiv1().write(|w| unsafe { w.bits(div) }); } - FilterClkSel::Clk2 => { + FilterClockSelect::Clk2 => { syscfg.ioconfig_clkdiv2().write(|w| unsafe { w.bits(div) }); } - FilterClkSel::Clk3 => { + FilterClockSelect::Clk3 => { syscfg.ioconfig_clkdiv3().write(|w| unsafe { w.bits(div) }); } - FilterClkSel::Clk4 => { + FilterClockSelect::Clk4 => { syscfg.ioconfig_clkdiv4().write(|w| unsafe { w.bits(div) }); } - FilterClkSel::Clk5 => { + FilterClockSelect::Clk5 => { syscfg.ioconfig_clkdiv5().write(|w| unsafe { w.bits(div) }); } - FilterClkSel::Clk6 => { + FilterClockSelect::Clk6 => { syscfg.ioconfig_clkdiv6().write(|w| unsafe { w.bits(div) }); } - FilterClkSel::Clk7 => { + FilterClockSelect::Clk7 => { syscfg.ioconfig_clkdiv7().write(|w| unsafe { w.bits(div) }); } } diff --git a/va108xx-hal/src/gpio/mod.rs b/va108xx-hal/src/gpio/mod.rs index f26a5a9..428cd93 100644 --- a/va108xx-hal/src/gpio/mod.rs +++ b/va108xx-hal/src/gpio/mod.rs @@ -17,4 +17,4 @@ //! //! - [Blinky example](https://egit.irs.uni-stuttgart.de/rust/va108xx-rs/src/branch/main/examples/simple/examples/blinky.rs) //! - [Async GPIO example](https://egit.irs.uni-stuttgart.de/rust/va108xx-rs/src/branch/main/examples/embassy/src/bin/async-gpio.rs) -pub use vorago_shared_periphs::gpio::*; +pub use vorago_shared_hal::gpio::*; diff --git a/va108xx-hal/src/i2c.rs b/va108xx-hal/src/i2c.rs index eef3838..f620edd 100644 --- a/va108xx-hal/src/i2c.rs +++ b/va108xx-hal/src/i2c.rs @@ -3,4 +3,4 @@ //! ## Examples //! //! - [REB1 I2C temperature sensor example](https://egit.irs.uni-stuttgart.de/rust/va108xx-rs/src/branch/main/vorago-reb1/examples/adt75-temp-sensor.rs) -pub use vorago_shared_periphs::i2c::*; +pub use vorago_shared_hal::i2c::*; diff --git a/va108xx-hal/src/lib.rs b/va108xx-hal/src/lib.rs index 6eefe87..5da9b3e 100644 --- a/va108xx-hal/src/lib.rs +++ b/va108xx-hal/src/lib.rs @@ -17,8 +17,9 @@ pub mod time; pub mod timer; pub mod uart; -pub use vorago_shared_periphs::{ - disable_nvic_interrupt, enable_nvic_interrupt, FunSel, InterruptConfig, PeripheralSelect, +pub use vorago_shared_hal::{ + disable_nvic_interrupt, enable_nvic_interrupt, FunctionSelect, InterruptConfig, + PeripheralSelect, }; /// This is the NONE destination reigster value for the IRQSEL peripheral. @@ -38,7 +39,7 @@ pub fn port_function_select( ioconfig: &mut pac::Ioconfig, port: Port, pin: u8, - funsel: FunSel, + funsel: FunctionSelect, ) -> Result<(), InvalidPinError> { if (port == Port::A && pin >= 32) || (port == Port::B && pin >= 24) { return Err(InvalidPinError(pin)); @@ -46,7 +47,7 @@ pub fn port_function_select( let reg_block = match port { Port::A => ioconfig.porta(pin as usize), - Port::B => ioconfig.portb0(pin as usize), + Port::B => ioconfig.portb(pin as usize), }; reg_block.modify(|_, w| unsafe { w.funsel().bits(funsel as u8) }); diff --git a/va108xx-hal/src/pins.rs b/va108xx-hal/src/pins.rs index 8500714..1c46616 100644 --- a/va108xx-hal/src/pins.rs +++ b/va108xx-hal/src/pins.rs @@ -3,4 +3,4 @@ //! This module contains the pin singletons. It allows creating those singletons //! to access the [Pin] structures of individual ports in a safe way with checked ownership //! rules. -pub use vorago_shared_periphs::pins::*; +pub use vorago_shared_hal::pins::*; diff --git a/va108xx-hal/src/pwm.rs b/va108xx-hal/src/pwm.rs index 22ad292..f8662c0 100644 --- a/va108xx-hal/src/pwm.rs +++ b/va108xx-hal/src/pwm.rs @@ -5,4 +5,4 @@ //! ## Examples //! //! - [PWM example](https://egit.irs.uni-stuttgart.de/rust/va108xx-rs/src/branch/main/examples/simple/examples/pwm.rs) -pub use vorago_shared_periphs::pwm::*; +pub use vorago_shared_hal::pwm::*; diff --git a/va108xx-hal/src/spi/mod.rs b/va108xx-hal/src/spi/mod.rs index 5cd653f..a3e9cd2 100644 --- a/va108xx-hal/src/spi/mod.rs +++ b/va108xx-hal/src/spi/mod.rs @@ -9,4 +9,4 @@ //! - [Blocking SPI example](https://egit.irs.uni-stuttgart.de/rust/va108xx-rs/src/branch/main/examples/simple/examples/spi.rs) //! - [REB1 ADC example](https://egit.irs.uni-stuttgart.de/rust/va108xx-rs/src/branch/main/vorago-reb1/examples/max11519-adc.rs) //! - [REB1 EEPROM library](https://egit.irs.uni-stuttgart.de/rust/va108xx-rs/src/branch/main/vorago-reb1/src/m95m01.rs) -pub use vorago_shared_periphs::spi::*; +pub use vorago_shared_hal::spi::*; diff --git a/va108xx-hal/src/sysconfig.rs b/va108xx-hal/src/sysconfig.rs index b664761..bf70601 100644 --- a/va108xx-hal/src/sysconfig.rs +++ b/va108xx-hal/src/sysconfig.rs @@ -38,6 +38,6 @@ pub fn disable_ram_scrubbing() { syscfg.ram_scrub().write(|w| unsafe { w.bits(0) }); } -pub use vorago_shared_periphs::sysconfig::{ +pub use vorago_shared_hal::sysconfig::{ assert_peripheral_reset, disable_peripheral_clock, enable_peripheral_clock, }; diff --git a/va108xx-hal/src/time.rs b/va108xx-hal/src/time.rs index 1663b95..148f3ee 100644 --- a/va108xx-hal/src/time.rs +++ b/va108xx-hal/src/time.rs @@ -1,2 +1,2 @@ //! Time units -pub use vorago_shared_periphs::time::*; +pub use vorago_shared_hal::time::*; diff --git a/va108xx-hal/src/timer.rs b/va108xx-hal/src/timer.rs index 6092f48..e39d18d 100644 --- a/va108xx-hal/src/timer.rs +++ b/va108xx-hal/src/timer.rs @@ -4,4 +4,4 @@ //! //! - [MS and second tick implementation](https://egit.irs.uni-stuttgart.de/rust/va108xx-rs/src/branch/main/examples/simple/examples/timer-ticks.rs) //! - [Cascade feature example](https://egit.irs.uni-stuttgart.de/rust/va108xx-rs/src/branch/main/examples/simple/examples/cascade.rs) -pub use vorago_shared_periphs::timer::*; +pub use vorago_shared_hal::timer::*; diff --git a/va108xx-hal/src/uart/mod.rs b/va108xx-hal/src/uart/mod.rs index b8b0eba..33e4fb0 100644 --- a/va108xx-hal/src/uart/mod.rs +++ b/va108xx-hal/src/uart/mod.rs @@ -14,4 +14,4 @@ //! - [Flashloader exposing a CCSDS interface via UART](https://egit.irs.uni-stuttgart.de/rust/va108xx-rs/src/branch/main/flashloader) //! - [Async UART RX example](https://egit.irs.uni-stuttgart.de/rust/va108xx-rs/src/branch/main/examples/embassy/src/bin/async-uart-rx.rs) //! - [Async UART TX example](https://egit.irs.uni-stuttgart.de/rust/va108xx-rs/src/branch/main/examples/embassy/src/bin/async-uart-tx.rs) -pub use vorago_shared_periphs::uart::*; +pub use vorago_shared_hal::uart::*; diff --git a/vorago-reb1/CHANGELOG.md b/vorago-reb1/CHANGELOG.md index 863f283..4dc51ad 100644 --- a/vorago-reb1/CHANGELOG.md +++ b/vorago-reb1/CHANGELOG.md @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [unreleased] +## [v0.8.2] 2025-09-03 + +- Bumped allowed `va108xx-hal` dependency to 0.12 + ## [v0.8.1] 2025-03-07 - Bumped allowed `va108xx-hal` dependency to 0.11 @@ -62,7 +66,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/). it provides a starting point - Added ADC base library and example building on the new max116xx-10bit device driver crate -[unreleased]: https://egit.irs.uni-stuttgart.de/rust/va108xx-rs/compare/vorago-reb1-v0.8.1...HEAD +[unreleased]: https://egit.irs.uni-stuttgart.de/rust/va108xx-rs/compare/vorago-reb1-v0.8.2...HEAD +[v0.8.2]: https://egit.irs.uni-stuttgart.de/rust/va108xx-rs/compare/vorago-reb1-v0.8.1...vorago-reb1-v0.8.2 [v0.8.1]: https://egit.irs.uni-stuttgart.de/rust/va108xx-rs/compare/vorago-reb1-v0.8.0...vorago-reb1-v0.8.1 [v0.8.0]: https://egit.irs.uni-stuttgart.de/rust/va108xx-rs/compare/vorago-reb1-v0.7.0...vorago-reb1-v0.8.0 [v0.7.0]: https://egit.irs.uni-stuttgart.de/rust/va108xx-rs/compare/vorago-reb1-v0.6.0...vorago-reb1-v0.7.0 diff --git a/vorago-reb1/Cargo.toml b/vorago-reb1/Cargo.toml index c32c151..faacafd 100644 --- a/vorago-reb1/Cargo.toml +++ b/vorago-reb1/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "vorago-reb1" -version = "0.8.1" +version = "0.8.2" authors = ["Robin Mueller "] edition = "2021" description = "Board Support Crate for the Vorago REB1 development board" @@ -16,10 +16,10 @@ cortex-m-rt = "0.7" embedded-hal = "1" nb = "1" bitbybit = "1.3" -arbitrary-int = "1.3" +arbitrary-int = "2" max116xx-10bit = "0.3" -va108xx-hal = { version = ">=0.10, <=0.11", path = "../va108xx-hal", features = ["rt"] } +va108xx-hal = { version = ">=0.10, <=0.12", path = "../va108xx-hal", features = ["rt"] } [features] rt = ["va108xx-hal/rt"] diff --git a/vorago-reb1/src/button.rs b/vorago-reb1/src/button.rs index 1d261f7..f4bd487 100644 --- a/vorago-reb1/src/button.rs +++ b/vorago-reb1/src/button.rs @@ -5,7 +5,7 @@ //! - [Button Blinky with IRQs](https://egit.irs.uni-stuttgart.de/rust/va108xx-rs/src/branch/main/vorago-reb1/examples/blinky-button-irq.rs) //! - [Button Blinky with IRQs and RTIC](https://egit.irs.uni-stuttgart.de/rust/va108xx-rs/src/branch/main/vorago-reb1/examples/blinky-button-rtic.rs) use va108xx_hal::{ - clock::FilterClkSel, + clock::FilterClockSelect, gpio::{FilterType, Input, InterruptEdge, InterruptLevel, Pin}, pins::Pa11, InterruptConfig, @@ -53,7 +53,7 @@ impl Button { /// /// Please note that you still have to set a clock divisor yourself using the /// [`va108xx_hal::clock::set_clk_div_register`] function in order for this to work. - pub fn configure_filter_type(&mut self, filter: FilterType, clksel: FilterClkSel) { + pub fn configure_filter_type(&mut self, filter: FilterType, clksel: FilterClockSelect) { self.0.configure_filter_type(filter, clksel); } } diff --git a/vorago-reb1/src/m95m01.rs b/vorago-reb1/src/m95m01.rs index d129058..eb3778d 100644 --- a/vorago-reb1/src/m95m01.rs +++ b/vorago-reb1/src/m95m01.rs @@ -47,7 +47,7 @@ pub mod regs { use regs::*; use va108xx_hal::{ pac, - spi::{Spi, SpiClkConfig, SpiConfig, SpiLowLevel, BMSTART_BMSTOP_MASK}, + spi::{Spi, SpiClockConfig, SpiConfig, SpiLowLevel, BMSTART_BMSTOP_MASK}, }; pub type RomSpi = Spi; @@ -63,7 +63,7 @@ pub struct M95M01 { pub struct PageBoundaryExceededError; impl M95M01 { - pub fn new(spi: pac::Spic, clk_config: SpiClkConfig) -> Self { + pub fn new(spi: pac::Spic, clk_config: SpiClockConfig) -> Self { let spi = RomSpi::new_for_rom(spi, SpiConfig::default().clk_cfg(clk_config)).unwrap(); let mut spi_dev = Self { spi }; spi_dev.clear_block_protection().unwrap();