Skip to content

Commit ce2d3d8

Browse files
committed
Fixed code formatting
1 parent f7ba5f8 commit ce2d3d8

File tree

3 files changed

+65
-5
lines changed

3 files changed

+65
-5
lines changed

Embed.toml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
[default.probe]
2+
# USB vendor ID
3+
# usb_vid = "1366"
4+
# USB product ID
5+
# usb_pid = "0105"
6+
# Serial number
7+
# serial = "12345678"
8+
# The protocol to be used for communicating with the target.
9+
protocol = "Swd"
10+
# The speed in kHz of the data link to the target.
11+
speed = 600
12+
13+
[default.flashing]
14+
# Whether or not the target should be flashed.
15+
enabled = true
16+
# Whether or not bytes erased but not rewritten with data from the ELF
17+
# should be restored with their contents before erasing.
18+
restore_unwritten_bytes = false
19+
# The path where an SVG of the assembled flash layout should be written to.
20+
# flash_layout_output_path = "out.svg"
21+
22+
[default.reset]
23+
# Whether or not the target should be reset.
24+
# When flashing is enabled as well, the target will be reset after flashing.
25+
enabled = true
26+
# Whether or not the target should be halted after reset.
27+
halt_afterwards = false
28+
29+
[default.general]
30+
# The chip name of the chip to be debugged.
31+
# chip = "STM32L452RETx" # STM32L4
32+
# A list of chip descriptions to be loaded during runtime.
33+
chip_descriptions = []
34+
# The default log level to be used. Possible values are one of:
35+
# "OFF", "ERROR", "WARN", "INFO", "DEBUG", "TRACE"
36+
log_level = "INFO"
37+
38+
[default.rtt]
39+
# Whether or not an RTTUI should be opened after flashing.
40+
# This is exclusive and cannot be used with GDB at the moment.
41+
enabled = true
42+
# A list of channel associations to be displayed. If left empty, all channels are displayed.
43+
channels = [
44+
# { up = 0, down = 0, name = "name" }
45+
]
46+
# The duration in ms for which the logger should retry to attach to RTT.
47+
timeout = 3000
48+
# Whether timestamps in the RTTUI are enabled
49+
show_timestamps = true
50+
# Whether to save rtt history buffer on exit.
51+
log_enabled = true
52+
# Where to save rtt history buffer relative to manifest path.
53+
log_path = "./rtt_debug_logs"
54+
55+
[default.gdb]
56+
# Whether or not a GDB server should be opened after flashing.
57+
# This is exclusive and cannot be used with RTT at the moment.
58+
enabled = false
59+
# The connection string in host:port format wher the GDB server will open a socket.
60+
gdb_connection_string = "localhost:3333"

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)