rust/vorago-reb1
Archived
6
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

bump to v0.3.2, update HAL dependency #4

Merged
muellerr merged 1 commits from hal-update into main 2021-12-21 00:00:51 +01:00
Conversation 0 Commits 1 Files Changed 9 +48 -107
9 changed files with 48 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
## [unreleased]
## [v0.3.2]
- Bump HAL dependency to v0.5.0. Changed API, especially for IRQ handling
## [v0.3.1]
- Updated ADC code and dependency

4
Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "vorago-reb1"
version = "0.3.1"
version = "0.3.2"
authors = ["Robin Mueller <robin.mueller.m@gmail.com>"]
edition = "2021"
description = "Board Support Crate for the Vorago REB1 development board"
@ -18,7 +18,7 @@ dummy-pin = "0.1.1"
max116xx-10bit = "0.2.1"
[dependencies.va108xx-hal]
version = "0.4.3"
version = "0.5.0"
features = ["rt"]
[features]

22
examples/adt75-temp-sensor.rs
View File

@ -3,11 +3,7 @@
use cortex_m_rt::entry;
use panic_rtt_target as _;
use rtt_target::{rprintln, rtt_init_print};
use va108xx_hal::{
pac::{self, interrupt},
prelude::*,
timer::{default_ms_irq_handler, set_up_ms_timer, Delay},
};
use va108xx_hal::{pac, prelude::*, timer::set_up_ms_delay_provider};
use vorago_reb1::temp_sensor::Adt75TempSensor;
#[entry]
@ -15,14 +11,7 @@ fn main() -> ! {
rtt_init_print!();
rprintln!("-- Vorago Temperature Sensor and I2C Example --");
let mut dp = pac::Peripherals::take().unwrap();
let tim0 = set_up_ms_timer(
&mut dp.SYSCONFIG,
&mut dp.IRQSEL,
50.mhz().into(),
dp.TIM0,
interrupt::OC0,
);
let mut delay = Delay::new(tim0);
let mut delay = set_up_ms_delay_provider(&mut dp.SYSCONFIG, 50.mhz(), dp.TIM0);
unsafe {
cortex_m::peripheral::NVIC::unmask(pac::Interrupt::OC0);
}
@ -34,11 +23,6 @@ fn main() -> ! {
.read_temperature()
.expect("Failed reading temperature");
rprintln!("Temperature in Celcius: {}", temp);
delay.delay_ms(500);
delay.delay_ms(500_u16);
}
}
#[interrupt]
fn OC0() {
default_ms_irq_handler();
}

24
examples/adxl343-accelerometer.rs
View File

@ -10,10 +10,10 @@ use panic_rtt_target as _;
use rtt_target::{rprintln, rtt_init_print};
use va108xx_hal::{
gpio::PinsA,
pac::{self, interrupt},
pac,
prelude::*,
spi::{Spi, SpiConfig, TransferConfig},
timer::{default_ms_irq_handler, set_up_ms_timer, Delay},
timer::set_up_ms_delay_provider,
};
const READ_MASK: u8 = 1 << 7;
@ -28,18 +28,7 @@ fn main() -> ! {
rtt_init_print!();
rprintln!("-- Vorago Accelerometer Example --");
let mut dp = pac::Peripherals::take().unwrap();
let tim0 = set_up_ms_timer(
&mut dp.SYSCONFIG,
&mut dp.IRQSEL,
50.mhz().into(),
dp.TIM0,
interrupt::OC0,
);
let mut delay = Delay::new(tim0);
unsafe {
cortex_m::peripheral::NVIC::unmask(pac::Interrupt::OC0);
}
let mut delay = set_up_ms_delay_provider(&mut dp.SYSCONFIG, 50.mhz(), dp.TIM0);
let pinsa = PinsA::new(&mut dp.SYSCONFIG, None, dp.PORTA);
let spi_cfg = SpiConfig::default();
let (sck, mosi, miso) = (
@ -78,12 +67,7 @@ fn main() -> ! {
.expect("Enabling measurement mode failed");
loop {
delay.delay_ms(500);
delay.delay_ms(500_u16);
unimplemented!("Not implemented for now, is not populated on the board..");
}
}
#[interrupt]
fn OC0() {
default_ms_irq_handler();
}

21
examples/blinky-button-irq.rs
View File

@ -14,7 +14,7 @@ use va108xx_hal::{
pac::{self, interrupt},
prelude::*,
time::Hertz,
timer::{default_ms_irq_handler, set_up_ms_timer},
timer::{default_ms_irq_handler, set_up_ms_timer, IrqCfg},
};
use vorago_reb1::button::Button;
use vorago_reb1::leds::Leds;
@ -45,9 +45,9 @@ fn main() -> ! {
// Configure an edge interrupt on the button and route it to interrupt vector 15
let mut button = Button::new(pinsa.pa11.into_floating_input()).edge_irq(
edge_irq,
IrqCfg::new(pac::interrupt::OC15, true, true),
Some(&mut dp.SYSCONFIG),
&mut dp.IRQSEL,
pac::interrupt::OC15,
Some(&mut dp.IRQSEL),
);
if PRESS_MODE == PressMode::Toggle {
@ -61,11 +61,11 @@ fn main() -> ! {
}
set_up_ms_timer(
IrqCfg::new(pac::Interrupt::OC0, true, true),
&mut dp.SYSCONFIG,
&mut dp.IRQSEL,
50.mhz().into(),
Some(&mut dp.IRQSEL),
50.mhz(),
dp.TIM0,
interrupt::OC0,
);
let mut leds = Leds::new(
pinsa.pa10.into_push_pull_output(),
@ -75,8 +75,6 @@ fn main() -> ! {
for led in leds.iter_mut() {
led.off();
}
// Activate the IRQs so the processors sees them as well
unmask_irqs();
// Make both button and LEDs accessible from the IRQ handler as well
cortex_m::interrupt::free(|cs| {
LEDS.borrow(cs).replace(Some(leds));
@ -85,13 +83,6 @@ fn main() -> ! {
loop {}
}
fn unmask_irqs() {
unsafe {
cortex_m::peripheral::NVIC::unmask(pac::Interrupt::OC0);
cortex_m::peripheral::NVIC::unmask(pac::Interrupt::OC15);
}
}
#[interrupt]
fn OC0() {
default_ms_irq_handler();

32
examples/blinky-button-rtic.rs
View File

@ -9,10 +9,10 @@ mod app {
use va108xx_hal::{
clock::{set_clk_div_register, FilterClkSel},
gpio::{FilterType, InterruptEdge, PinsA},
pac::{self, interrupt},
pac,
prelude::*,
time::Hertz,
timer::{default_ms_irq_handler, set_up_ms_timer},
timer::{default_ms_irq_handler, set_up_ms_timer, IrqCfg},
};
use vorago_reb1::button::Button;
use vorago_reb1::leds::Leds;
@ -66,9 +66,9 @@ mod app {
// Configure an edge interrupt on the button and route it to interrupt vector 15
let mut button = Button::new(pinsa.pa11.into_floating_input()).edge_irq(
edge_irq,
IrqCfg::new(pac::interrupt::OC15, true, true),
Some(&mut dp.SYSCONFIG),
&mut dp.IRQSEL,
pac::interrupt::OC15,
Some(&mut dp.IRQSEL),
);
if mode == PressMode::Toggle {
@ -80,14 +80,6 @@ mod app {
Hertz::from(50.khz()).0,
);
}
set_up_ms_timer(
&mut dp.SYSCONFIG,
&mut dp.IRQSEL,
50.mhz().into(),
dp.TIM0,
interrupt::OC0,
);
let mut leds = Leds::new(
pinsa.pa10.into_push_pull_output(),
pinsa.pa7.into_push_pull_output(),
@ -96,8 +88,13 @@ mod app {
for led in leds.iter_mut() {
led.off();
}
// Activate the IRQs so the processors sees them as well
unmask_irqs();
set_up_ms_timer(
IrqCfg::new(pac::Interrupt::OC0, true, true),
&mut dp.SYSCONFIG,
Some(&mut dp.IRQSEL),
50.mhz(),
dp.TIM0,
);
(Shared {}, Local { leds, button, mode }, init::Monotonics())
}
@ -128,13 +125,6 @@ mod app {
default_ms_irq_handler();
}
fn unmask_irqs() {
unsafe {
cortex_m::peripheral::NVIC::unmask(pac::Interrupt::OC0);
cortex_m::peripheral::NVIC::unmask(pac::Interrupt::OC15);
}
}
fn prompt_mode(mut down_channel: rtt_target::DownChannel) -> PressMode {
rprintln!("Using prompt mode");
rprintln!("Please enter the mode [0: Toggle, 1: Keep]");

18
examples/blinky-leds.rs
View File

@ -9,7 +9,7 @@
use cortex_m_rt::entry;
use embedded_hal::digital::v2::ToggleableOutputPin;
use panic_halt as _;
use va108xx_hal::{gpio::pins::PinsA, pac, prelude::*, timer::set_up_ms_timer};
use va108xx_hal::{gpio::pins::PinsA, pac, prelude::*, timer::set_up_ms_delay_provider};
use vorago_reb1::leds::Leds;
// REB LED pin definitions. All on port A
@ -64,13 +64,7 @@ fn main() -> ! {
let mut led1 = pins.pa10.into_push_pull_output();
let mut led2 = pins.pa7.into_push_pull_output();
let mut led3 = pins.pa6.into_push_pull_output();
let mut delay = set_up_ms_timer(
&mut dp.SYSCONFIG,
&mut dp.IRQSEL,
50.mhz().into(),
dp.TIM0,
pac::Interrupt::OC0,
);
let mut delay = set_up_ms_delay_provider(&mut dp.SYSCONFIG, 50.mhz(), dp.TIM0);
for _ in 0..10 {
led1.set_low().ok();
led2.set_low().ok();
@ -97,13 +91,7 @@ fn main() -> ! {
pinsa.pa7.into_push_pull_output(),
pinsa.pa6.into_push_pull_output(),
);
let mut delay = set_up_ms_timer(
&mut dp.SYSCONFIG,
&mut dp.IRQSEL,
50.mhz().into(),
dp.TIM0,
pac::Interrupt::OC0,
);
let mut delay = set_up_ms_delay_provider(&mut dp.SYSCONFIG, 50.mhz(), dp.TIM0);
loop {
for _ in 0..10 {
// Blink all LEDs quickly

11
examples/max11619-adc.rs
View File

@ -1,6 +1,7 @@
//! MAX11619 ADC example applikcation
#![no_main]
#![no_std]
use cortex_m_rt::entry;
use embedded_hal::{blocking::delay::DelayUs, spi};
use max116xx_10bit::VoltageRefMode;
@ -13,7 +14,7 @@ use va108xx_hal::{
pac::{self, interrupt, SPIB},
prelude::*,
spi::{Spi, SpiBase, SpiConfig, TransferConfig},
timer::{default_ms_irq_handler, set_up_ms_timer, Delay},
timer::{default_ms_irq_handler, set_up_ms_timer, Delay, IrqCfg},
utility::{port_mux, Funsel, PortSel},
};
use vorago_reb1::max11619::{
@ -44,7 +45,7 @@ pub enum MuxMode {
const EXAMPLE_MODE: ExampleMode = ExampleMode::NotUsingEoc;
const READ_MODE: ReadMode = ReadMode::Multiple;
const MUX_MODE: MuxMode = MuxMode::PortB19to17;
const MUX_MODE: MuxMode = MuxMode::None;
#[entry]
fn main() -> ! {
@ -53,11 +54,11 @@ fn main() -> ! {
let mut dp = pac::Peripherals::take().unwrap();
let tim0 = set_up_ms_timer(
IrqCfg::new(pac::Interrupt::OC0, true, true),
&mut dp.SYSCONFIG,
&mut dp.IRQSEL,
50.mhz().into(),
Some(&mut dp.IRQSEL),
50.mhz(),
dp.TIM0,
interrupt::OC0,
);
let delay = Delay::new(tim0);
unsafe {

19
src/button.rs
View File

@ -8,6 +8,7 @@ use va108xx_hal::{
gpio::{FilterClkSel, FilterType, InputFloating, InterruptEdge, InterruptLevel, Pin, PA11},
pac,
prelude::*,
utility::IrqCfg,
};
pub struct Button {
@ -28,30 +29,28 @@ impl Button {
}
/// Configures an IRQ on edge.
///
/// Please note that you still have to unpend the Cortex-M interrupt yourself
pub fn edge_irq(
mut self,
edge_type: InterruptEdge,
irq_cfg: IrqCfg,
syscfg: Option<&mut pac::SYSCONFIG>,
irqsel: &mut pac::IRQSEL,
irq: pac::interrupt,
irqsel: Option<&mut pac::IRQSEL>,
) -> Self {
self.button = self.button.interrupt_edge(edge_type, syscfg, irqsel, irq);
self.button = self
.button
.interrupt_edge(edge_type, irq_cfg, syscfg, irqsel);
self
}
/// Configures an IRQ on level.
///
/// Please note that you still have to unpend the Cortex-M interrupt yourself
pub fn level_irq(
mut self,
level: InterruptLevel,
irq_cfg: IrqCfg,
syscfg: Option<&mut pac::SYSCONFIG>,
irqsel: &mut pac::IRQSEL,
irq: pac::interrupt,
irqsel: Option<&mut pac::IRQSEL>,
) -> Self {
self.button = self.button.interrupt_level(level, syscfg, irqsel, irq);
self.button = self.button.interrupt_level(level, irq_cfg, syscfg, irqsel);
self
}