Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add port F for Arduino Leonardo #73

Merged
merged 6 commits into from
Sep 19, 2020
Merged

Add port F for Arduino Leonardo #73

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e78e351
Initial commit
cecton Sep 19, 2020
e79f729
Add port F for Arduino Leonardo
cecton Sep 19, 2020
b3b2315
fixup! Add port F for Arduino Leonardo
cecton Sep 19, 2020
761bf67
Update boards/arduino-leonardo/src/pins.rs
cecton Sep 19, 2020
20e39aa
Revert changes on pro-micro
cecton Sep 19, 2020
8488773
Move F ports to the end
cecton Sep 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions boards/arduino-leonardo/examples/leonardo-adc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use panic_halt as _;
fn main() -> ! {
let dp = arduino_leonardo::Peripherals::take().unwrap();

let mut pins = arduino_leonardo::Pins::new(dp.PORTB, dp.PORTC, dp.PORTD, dp.PORTE);
let mut pins = arduino_leonardo::Pins::new(dp.PORTB, dp.PORTC, dp.PORTD, dp.PORTE, dp.PORTF);

let mut serial = arduino_leonardo::Serial::new(
dp.USART1,
Expand All @@ -32,13 +32,12 @@ fn main() -> ! {
ufmt::uwriteln!(&mut serial, "GND: {}\r", gnd).void_unwrap();
ufmt::uwriteln!(&mut serial, "Temperature Sensor: {}\r", temp).void_unwrap();

let portf = dp.PORTF.split();
let mut a0 = portf.pf7.into_analog_input(&mut adc);
let mut a1 = portf.pf6.into_analog_input(&mut adc);
let mut a2 = portf.pf5.into_analog_input(&mut adc);
let mut a3 = portf.pf4.into_analog_input(&mut adc);
let mut a4 = portf.pf1.into_analog_input(&mut adc);
let mut a5 = portf.pf0.into_analog_input(&mut adc);
let mut a0 = pins.a0.into_analog_input(&mut adc);
let mut a1 = pins.a1.into_analog_input(&mut adc);
let mut a2 = pins.a2.into_analog_input(&mut adc);
let mut a3 = pins.a3.into_analog_input(&mut adc);
let mut a4 = pins.a4.into_analog_input(&mut adc);
let mut a5 = pins.a5.into_analog_input(&mut adc);

loop {
let values: [u16; 6] = [
Expand Down
2 changes: 1 addition & 1 deletion boards/arduino-leonardo/examples/leonardo-blink.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use panic_halt as _;
fn main() -> ! {
let dp = arduino_leonardo::Peripherals::take().unwrap();

let mut pins = arduino_leonardo::Pins::new(dp.PORTB, dp.PORTC, dp.PORTD, dp.PORTE);
let mut pins = arduino_leonardo::Pins::new(dp.PORTB, dp.PORTC, dp.PORTD, dp.PORTE, dp.PORTF);

let mut led0 = pins.led_rx.into_output(&mut pins.ddr);
let mut led1 = pins.led_tx.into_output(&mut pins.ddr);
Expand Down
2 changes: 1 addition & 1 deletion boards/arduino-leonardo/examples/leonardo-i2cdetect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use panic_halt as _;
fn main() -> ! {
let dp = arduino_leonardo::Peripherals::take().unwrap();

let mut pins = arduino_leonardo::Pins::new(dp.PORTB, dp.PORTC, dp.PORTD, dp.PORTE);
let mut pins = arduino_leonardo::Pins::new(dp.PORTB, dp.PORTC, dp.PORTD, dp.PORTE, dp.PORTF);
let mut serial = arduino_leonardo::Serial::new(
dp.USART1,
pins.d0,
Expand Down
2 changes: 1 addition & 1 deletion boards/arduino-leonardo/examples/leonardo-interrupt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ static mut PIN: Option<port::portc::PC7<port::mode::Output>> = None;
fn main() -> ! {
let dp = arduino_leonardo::Peripherals::take().unwrap();

let mut pins = arduino_leonardo::Pins::new(dp.PORTB, dp.PORTC, dp.PORTD, dp.PORTE);
let mut pins = arduino_leonardo::Pins::new(dp.PORTB, dp.PORTC, dp.PORTD, dp.PORTE, dp.PORTF);

let mut led0 = pins.led_rx.into_output(&mut pins.ddr);
let mut led1 = pins.led_tx.into_output(&mut pins.ddr);
Expand Down
2 changes: 1 addition & 1 deletion boards/arduino-leonardo/examples/leonardo-panic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ fn panic(info: &core::panic::PanicInfo) -> ! {
fn main() -> ! {
let dp = arduino_leonardo::Peripherals::take().unwrap();

let mut pins = arduino_leonardo::Pins::new(dp.PORTB, dp.PORTC, dp.PORTD, dp.PORTE);
let mut pins = arduino_leonardo::Pins::new(dp.PORTB, dp.PORTC, dp.PORTD, dp.PORTE, dp.PORTF);

let mut serial = arduino_leonardo::Serial::new(
dp.USART1,
Expand Down
2 changes: 1 addition & 1 deletion boards/arduino-leonardo/examples/leonardo-pwm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use panic_halt as _;
fn main() -> ! {
let dp = arduino_leonardo::Peripherals::take().unwrap();

let mut pins = arduino_leonardo::Pins::new(dp.PORTB, dp.PORTC, dp.PORTD, dp.PORTE);
let mut pins = arduino_leonardo::Pins::new(dp.PORTB, dp.PORTC, dp.PORTD, dp.PORTE, dp.PORTF);

let mut timer4 = pwm::Timer4Pwm::new(dp.TC4, pwm::Prescaler::Prescale64);

Expand Down
2 changes: 1 addition & 1 deletion boards/arduino-leonardo/examples/leonardo-serial.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use panic_halt as _;
fn main() -> ! {
let dp = arduino_leonardo::Peripherals::take().unwrap();

let mut pins = arduino_leonardo::Pins::new(dp.PORTB, dp.PORTC, dp.PORTD, dp.PORTE);
let mut pins = arduino_leonardo::Pins::new(dp.PORTB, dp.PORTC, dp.PORTD, dp.PORTE, dp.PORTF);

let mut serial = arduino_leonardo::Serial::new(
dp.USART1,
Expand Down
2 changes: 1 addition & 1 deletion boards/arduino-leonardo/examples/leonardo-spi-feedback.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use panic_halt as _;
fn main() -> ! {
let dp = arduino_leonardo::Peripherals::take().unwrap();

let mut pins = arduino_leonardo::Pins::new(dp.PORTB, dp.PORTC, dp.PORTD, dp.PORTE);
let mut pins = arduino_leonardo::Pins::new(dp.PORTB, dp.PORTC, dp.PORTD, dp.PORTE, dp.PORTF);

let mut serial = arduino_leonardo::Serial::new(
dp.USART1,
Expand Down
2 changes: 1 addition & 1 deletion boards/arduino-leonardo/examples/leonardo-watchdog.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use panic_halt as _;
fn main() -> ! {
let dp = arduino_leonardo::Peripherals::take().unwrap();

let mut pins = arduino_leonardo::Pins::new(dp.PORTB, dp.PORTC, dp.PORTD, dp.PORTE);
let mut pins = arduino_leonardo::Pins::new(dp.PORTB, dp.PORTC, dp.PORTD, dp.PORTE, dp.PORTF);

let mut led = pins.d13.into_output(&mut pins.ddr);

Expand Down
15 changes: 13 additions & 2 deletions boards/arduino-leonardo/src/pins.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,23 @@ avr_hal_generic::impl_board_pins! {
portc: crate::atmega32u4::PORTC,
portd: crate::atmega32u4::PORTD,
porte: crate::atmega32u4::PORTE,
// Not used yet
// portf: crate::atmega32u4::PORTF,
portf: crate::atmega32u4::PORTF,
}

/// Reexport of the Leonardo's pins, with the names they have on the board
pub struct Pins {
/// `A0`
pub a0: portf::pf7::PF7,
/// `A1`
pub a1: portf::pf6::PF6,
/// `A2`
pub a2: portf::pf5::PF5,
/// `A3`
pub a3: portf::pf4::PF4,
/// `A4`
pub a4: portf::pf1::PF1,
/// `A5`
pub a5: portf::pf0::PF0,
Rahix marked this conversation as resolved.
Show resolved Hide resolved
/// `D0` / `RX`
///
/// * `RX` (UART)
Expand Down
5 changes: 3 additions & 2 deletions boards/sparkfun-pro-micro/examples/pro-micro-adc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#![no_std]
#![no_main]

extern crate panic_halt;
use sparkfun_pro_micro::adc;
use sparkfun_pro_micro::prelude::*;
use panic_halt as _;

#[sparkfun_pro_micro::entry]
fn main() -> ! {
Expand All @@ -19,7 +20,7 @@ fn main() -> ! {

ufmt::uwriteln!(&mut serial, "Reading analog inputs ...\r").void_unwrap();

let mut adc = sparkfun_pro_micro::adc::Adc::new(dp.ADC, Default::default());
let mut adc = adc::Adc::new(dp.ADC, Default::default());
Rahix marked this conversation as resolved.
Show resolved Hide resolved

let (vbg, gnd, temp): (u16, u16, u16) = (
nb::block!(adc.read(&mut sparkfun_pro_micro::adc::channel::Vbg)).void_unwrap(),
Expand Down