Skip to content

Commit a7f0d66

Browse files
committed
fmt
1 parent 827a416 commit a7f0d66

File tree

8 files changed

+15
-17
lines changed

8 files changed

+15
-17
lines changed

examples/adc-continious-dma.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use crate::hal::{
1010
AdcClaim, ClockSource, Temperature, Vref,
1111
},
1212
delay::SYSTDelayExt,
13-
dma::{config::DmaConfig, channel::DMAExt, TransferExt},
13+
dma::{channel::DMAExt, config::DmaConfig, TransferExt},
1414
gpio::GpioExt,
1515
pwr::PwrExt,
1616
rcc::{Config, RccExt},

examples/adc-one-shot-dma.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use crate::hal::{
99
AdcClaim, ClockSource, Temperature,
1010
},
1111
delay::SYSTDelayExt,
12-
dma::{config::DmaConfig, channel::DMAExt, TransferExt},
12+
dma::{channel::DMAExt, config::DmaConfig, TransferExt},
1313
gpio::GpioExt,
1414
pwr::PwrExt,
1515
rcc::{Config, RccExt},

examples/spi-dma.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ use crate::hal::{
2222

2323
use cortex_m_rt::entry;
2424
use stm32g4xx_hal as hal;
25-
use stm32g4xx_hal::dma::config::DmaConfig;
2625
use stm32g4xx_hal::dma::channel::DMAExt;
26+
use stm32g4xx_hal::dma::config::DmaConfig;
2727
use stm32g4xx_hal::dma::TransferExt;
2828

2929
#[macro_use]
@@ -62,10 +62,11 @@ fn main() -> ! {
6262
*item = index as u8;
6363
}
6464
let dma_buf = cortex_m::singleton!(: [u8; BUFFER_SIZE] = buf).unwrap();
65-
let mut transfer_dma =
66-
channels
67-
.0
68-
.into_memory_to_peripheral_transfer(spi.enable_tx_dma(), &mut dma_buf[..], config);
65+
let mut transfer_dma = channels.0.into_memory_to_peripheral_transfer(
66+
spi.enable_tx_dma(),
67+
&mut dma_buf[..],
68+
config,
69+
);
6970
transfer_dma.start(|_spi| {});
7071
loop {
7172
delay_tim2.delay_ms(1000_u16);

examples/uart-dma-rx.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
extern crate cortex_m_rt as rt;
77

8-
use hal::dma::{config::DmaConfig, channel::DMAExt, TransferExt};
8+
use hal::dma::{channel::DMAExt, config::DmaConfig, TransferExt};
99
use hal::prelude::*;
1010
use hal::pwr::PwrExt;
1111
use hal::serial::*;

examples/uart-dma-tx.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ extern crate cortex_m_rt as rt;
77

88
use core::fmt::Write;
99

10-
use hal::dma::{config::DmaConfig, channel::DMAExt, TransferExt};
10+
use hal::dma::{channel::DMAExt, config::DmaConfig, TransferExt};
1111
use hal::prelude::*;
1212
use hal::pwr::PwrExt;
1313
use hal::serial::*;

src/dma.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
1818
use core::fmt::Debug;
1919

20+
pub mod channel; // DMA MUX // DMA1 and DMA2
2021
pub mod config;
2122
pub(crate) mod mux;
22-
pub mod channel; // DMA MUX // DMA1 and DMA2
2323
pub mod traits;
2424
pub mod transfer;
2525

26-
use traits::{sealed::Bits, Direction, Channel, TargetAddress};
26+
use traits::{sealed::Bits, Channel, Direction, TargetAddress};
2727
pub use transfer::{Transfer, TransferExt};
2828

2929
/// Errors.

src/dma/channel.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,4 @@ dma_channel!(
492492
feature = "stm32g491",
493493
feature = "stm32g4a1",
494494
))]
495-
dma_channel!(
496-
(Channel7, 7),
497-
(Channel8, 8),
498-
);
495+
dma_channel!((Channel7, 7), (Channel8, 8),);

src/dma/transfer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::dma::{
2-
traits, Direction, DmaDirection, MemoryToMemory, MemoryToPeripheral, PeripheralToMemory,
3-
Channel, TargetAddress,
2+
traits, Channel, Direction, DmaDirection, MemoryToMemory, MemoryToPeripheral,
3+
PeripheralToMemory, TargetAddress,
44
};
55
use core::{
66
marker::PhantomData,

0 commit comments

Comments
 (0)