kai
/
pounder_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

deps: bump hal and smoltcp, adapt

This commit is contained in:
Robert Jördens 2021-02-03 13:16:22 +01:00
parent a8c5502441
commit c5fde8563c
4 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Cargo.lock generated
View File

@ -954,17 +954,6 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "smoltcp"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fe46639fd2ec79eadf8fe719f237a7a0bd4dac5d957f1ca5bbdbc1c3c39e53a"
dependencies = [
"bitflags",
"byteorder",
"managed",
]
[[package]] [[package]]
name = "smoltcp" name = "smoltcp"
version = "0.7.0" version = "0.7.0"
@ -998,7 +987,7 @@ dependencies = [
"paste", "paste",
"serde", "serde",
"serde-json-core", "serde-json-core",
"smoltcp 0.7.0", "smoltcp",
"stm32h7xx-hal", "stm32h7xx-hal",
] ]
@ -1033,7 +1022,7 @@ dependencies = [
"embedded-hal", "embedded-hal",
"nb 1.0.0", "nb 1.0.0",
"paste", "paste",
"smoltcp 0.7.0", "smoltcp",
"stm32h7", "stm32h7",
"void", "void",
] ]

7
src/hardware/adc.rs
View File

@ -180,18 +180,21 @@ macro_rules! adc_input {
hal::spi::Spi<hal::stm32::$spi, hal::spi::Disabled, u16>, hal::spi::Spi<hal::stm32::$spi, hal::spi::Disabled, u16>,
PeripheralToMemory, PeripheralToMemory,
&'static mut [u16; SAMPLE_BUFFER_SIZE], &'static mut [u16; SAMPLE_BUFFER_SIZE],
hal::dma::DBTransfer,
>, >,
trigger_transfer: Transfer< trigger_transfer: Transfer<
hal::dma::dma::$trigger_stream<hal::stm32::DMA1>, hal::dma::dma::$trigger_stream<hal::stm32::DMA1>,
[< $spi CR >], [< $spi CR >],
MemoryToPeripheral, MemoryToPeripheral,
&'static mut [u32; 1], &'static mut [u32; 1],
hal::dma::DBTransfer,
>, >,
clear_transfer: Transfer< clear_transfer: Transfer<
hal::dma::dma::$clear_stream<hal::stm32::DMA1>, hal::dma::dma::$clear_stream<hal::stm32::DMA1>,
[< $spi IFCR >], [< $spi IFCR >],
MemoryToPeripheral, MemoryToPeripheral,
&'static mut [u32; 1], &'static mut [u32; 1],
hal::dma::DBTransfer,
>, >,
} }
@ -239,6 +242,7 @@ macro_rules! adc_input {
_, _,
MemoryToPeripheral, MemoryToPeripheral,
_, _,
_,
> = Transfer::init( > = Transfer::init(
clear_stream, clear_stream,
[< $spi IFCR >]::new(clear_channel), [< $spi IFCR >]::new(clear_channel),
@ -276,6 +280,7 @@ macro_rules! adc_input {
_, _,
MemoryToPeripheral, MemoryToPeripheral,
_, _,
_,
> = Transfer::init( > = Transfer::init(
trigger_stream, trigger_stream,
[< $spi CR >]::new(trigger_channel), [< $spi CR >]::new(trigger_channel),
@ -306,7 +311,7 @@ macro_rules! adc_input {
// The data transfer is always a transfer of data from the peripheral to a RAM // The data transfer is always a transfer of data from the peripheral to a RAM
// buffer. // buffer.
let data_transfer: Transfer<_, _, PeripheralToMemory, _> = let data_transfer: Transfer<_, _, PeripheralToMemory, _, _> =
Transfer::init( Transfer::init(
data_stream, data_stream,
spi, spi,

3
src/hardware/dac.rs
View File

@ -122,6 +122,7 @@ macro_rules! dac_output {
$spi, $spi,
MemoryToPeripheral, MemoryToPeripheral,
&'static mut [u16; SAMPLE_BUFFER_SIZE], &'static mut [u16; SAMPLE_BUFFER_SIZE],
hal::dma::DBTransfer,
>, >,
} }
@ -164,7 +165,7 @@ macro_rules! dac_output {
} }
// Construct the trigger stream to write from memory to the peripheral. // Construct the trigger stream to write from memory to the peripheral.
let transfer: Transfer<_, _, MemoryToPeripheral, _> = let transfer: Transfer<_, _, MemoryToPeripheral, _, _> =
Transfer::init( Transfer::init(
stream, stream,
$spi::new(trigger_channel, spi), $spi::new(trigger_channel, spi),

2
src/hardware/mod.rs
View File

@ -37,8 +37,6 @@ pub type AFE1 = afe::ProgrammableGainAmplifier<
// Type alias for the ethernet interface on Stabilizer. // Type alias for the ethernet interface on Stabilizer.
pub type Ethernet = smoltcp::iface::EthernetInterface< pub type Ethernet = smoltcp::iface::EthernetInterface<
'static,
'static,
'static, 'static,
hal::ethernet::EthernetDMA<'static>, hal::ethernet::EthernetDMA<'static>,
>; >;