Skip to content

Commit 6f34046

Browse files
committed
Fixed code formatting
Fixed adc_dma example Removed Embed.toml
1 parent f7ba5f8 commit 6f34046

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

examples/adc_dma.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ const APP: () = {
7272
adc.configure_sequence(&mut temp_pin, Sequence::Three, SampleTime::Cycles640_5);
7373

7474
// Heapless boxes also work very well as buffers for DMA transfers
75-
let transfer = Transfer::from_adc(adc, dma1_channel, MEMORY, DmaMode::Oneshot, true);
75+
let transfer = Transfer::from_adc(adc, dma1_channel, MEMORY, DmaMode::Oneshot, true, false);
7676

7777
init::LateResources {
7878
transfer: Some(transfer),
@@ -97,6 +97,7 @@ const APP: () = {
9797
buffer,
9898
DmaMode::Oneshot,
9999
true,
100+
false,
100101
));
101102
}
102103
}

examples/adc_dma_trigger_tim2.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ use stm32l4xx_hal::{
77
adc::{config, DmaMode, SampleTime, Sequence, ADC},
88
delay::DelayCM,
99
dma::{dma1, RxDma, Transfer, W},
10-
timer::{Timer, Event, MasterMode},
10+
pac::TIM2,
1111
prelude::*,
12-
pac::{TIM2},
12+
timer::{Event, MasterMode, Timer},
1313
};
1414

1515
use rtic::app;

src/timer.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ impl Into<u8> for MasterMode {
101101
MasterMode::CompareOC1REF => 4,
102102
MasterMode::CompareOC2REF => 5,
103103
MasterMode::CompareOC3REF => 6,
104-
MasterMode::CompareOC4REF => 7
104+
MasterMode::CompareOC4REF => 7,
105105
}
106106
}
107107
}
@@ -279,7 +279,7 @@ macro_rules! hal {
279279
self.tim.cr1.modify(|_, w| w.cen().clear_bit());
280280
self.tim
281281
}
282-
}
282+
}
283283
)+
284284
}
285285
}
@@ -307,7 +307,7 @@ hal! {
307307
}
308308

309309
// no impl for TIM1, TIM7, TIM8, TIM15
310-
master_mode!(TIM2, TIM6, );
310+
master_mode!(TIM2, TIM6,);
311311

312312
// missing PAC support
313313
// RCC_APB1RSTR1->TIM3RST not defined

0 commit comments

Comments
 (0)