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

Preparations for v0.3.0 #2

Merged
muellerr merged 4 commits from mueller/relicensing into main 2021-12-13 11:35:42 +01:00
Conversation 0 Commits 4 Files Changed 8 +2 -9
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a2a824cfcf - Show all commits

8
examples/max11619-adc.rs
View File

@ -14,7 +14,6 @@ use va108xx_hal::{
prelude::*, prelude::*,
spi::{Spi, SpiBase, SpiConfig, TransferConfig}, 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},
utility::*,
}; };
use vorago_reb1::max11619::{ use vorago_reb1::max11619::{
max11619_externally_clocked, max11619_internally_clocked, EocPin, AN2_CHANNEL, max11619_externally_clocked, max11619_internally_clocked, EocPin, AN2_CHANNEL,
@ -56,18 +55,13 @@ fn main() -> ! {
} }
let pinsa = PinsA::new(&mut dp.SYSCONFIG, None, dp.PORTA); let pinsa = PinsA::new(&mut dp.SYSCONFIG, None, dp.PORTA);
let mut spi_cfg = SpiConfig::default(); let spi_cfg = SpiConfig::default();
spi_cfg.scrdv = 0x07;
let (sck, mosi, miso) = ( let (sck, mosi, miso) = (
pinsa.pa20.into_funsel_2(), pinsa.pa20.into_funsel_2(),
pinsa.pa19.into_funsel_2(), pinsa.pa19.into_funsel_2(),
pinsa.pa18.into_funsel_2(), pinsa.pa18.into_funsel_2(),
); );
port_mux(&mut dp.IOCONFIG, PortSel::PortB, 16, Funsel::Funsel1).ok();
// port_mux(&mut dp.IOCONFIG, PortSel::PortB, 17, Funsel::Funsel1).ok();
port_mux(&mut dp.IOCONFIG, PortSel::PortB, 18, Funsel::Funsel1).ok();
port_mux(&mut dp.IOCONFIG, PortSel::PortB, 19, Funsel::Funsel1).ok();
// Set the accelerometer chip select low in case the board slot is populated // Set the accelerometer chip select low in case the board slot is populated
let mut accel_cs = pinsa.pa16.into_push_pull_output(); let mut accel_cs = pinsa.pa16.into_push_pull_output();
accel_cs accel_cs

3
src/max11619.rs
View File

@ -1,9 +1,8 @@
use embedded_hal::{blocking::spi::Transfer, spi::FullDuplex};
use max116xx_10bit::{ use max116xx_10bit::{
Error, ExternallyClocked, InternallyClockedInternallyTimedSerialInterface, Max11619, Error, ExternallyClocked, InternallyClockedInternallyTimedSerialInterface, Max11619,
Max116xx10Bit, RefMode, WithoutWakeupDelay, Max116xx10Bit, RefMode, WithoutWakeupDelay,
}; };
use embedded_hal::blocking::spi::Transfer;
use embedded_hal::spi::FullDuplex;
use va108xx_hal::gpio::{Floating, Input, Pin, PA14}; use va108xx_hal::gpio::{Floating, Input, Pin, PA14};
pub type Max11619ExternallyClocked<SPI> = pub type Max11619ExternallyClocked<SPI> =