Skip to content

Commit 4f73885

Browse files
authored
Merge pull request #595 from stm32-rs/dma-clean
Dma & features clean
2 parents 01c6afb + 3f35e2f commit 4f73885

File tree

6 files changed

+530
-1359
lines changed

6 files changed

+530
-1359
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1111
- Added missing U(S)ART DMA traits for HAL serial types [#593]
1212
- Improve SPI::new* docs [#587]
1313
- Add advanced timer dead time insertion example [#585]
14+
- Cleanups
1415

1516
## [v0.15.0] - 2023-03-13
1617

Cargo.toml

Lines changed: 36 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -97,53 +97,47 @@ device-selected = []
9797
rt = [] # deprecated
9898
# Note: stm32f4 has only one feature for some very similar device families,
9999
# so it's intended for e.g. stm32f405/415 to both enable stm32f4/stm32f405.
100-
stm32f401 = ["stm32f4/stm32f401", "device-selected", "gpio-f401",
100+
stm32f401 = ["stm32f4/stm32f401", "device-selected", "gpio-f401",]
101+
stm32f405 = ["stm32f4/stm32f405", "device-selected", "gpio-f417"]
102+
stm32f407 = ["stm32f4/stm32f407", "device-selected", "gpio-f417"]
103+
stm32f415 = ["stm32f4/stm32f405", "device-selected", "gpio-f417"]
104+
stm32f417 = ["stm32f4/stm32f407", "device-selected", "gpio-f417"]
105+
stm32f410 = ["stm32f4/stm32f410", "device-selected", "gpio-f410"]
106+
stm32f411 = ["stm32f4/stm32f411", "device-selected", "gpio-f411"]
107+
stm32f412 = ["stm32f4/stm32f412", "device-selected", "gpio-f412"]
108+
stm32f413 = ["stm32f4/stm32f413", "device-selected", "gpio-f413"]
109+
stm32f423 = ["stm32f4/stm32f413", "device-selected", "gpio-f413"]
110+
stm32f427 = ["stm32f4/stm32f427", "device-selected", "gpio-f427", "fsmc"]
111+
stm32f429 = ["stm32f4/stm32f429", "device-selected", "gpio-f427", "fmc"]
112+
stm32f437 = ["stm32f4/stm32f427", "device-selected", "gpio-f427", "fsmc"]
113+
stm32f439 = ["stm32f4/stm32f429", "device-selected", "gpio-f427", "fmc"]
114+
stm32f446 = ["stm32f4/stm32f446", "device-selected", "gpio-f446"]
115+
stm32f469 = ["stm32f4/stm32f469", "device-selected", "gpio-f469"]
116+
stm32f479 = ["stm32f4/stm32f469", "device-selected", "gpio-f469"]
117+
118+
gpio-f401 = [
119+
"gpiod", "gpioe",
101120
"i2c3",
102121
"otg-fs",
103122
"sdio",
104123
"spi3", "spi4",
105124
"tim2",
106125
]
107-
stm32f405 = ["stm32f4/stm32f405", "device-selected", "gpio-f417",
108-
"adc2", "adc3",
109-
"can1", "can2",
110-
"dac",
111-
"fsmc",
112-
"i2c3",
113-
"otg-fs",
114-
"otg-hs",
115-
"rng",
116-
"sdio",
117-
"spi3",
118-
"tim2", "tim8",
119-
"usart3", "uart4", "uart5",
120-
]
121-
stm32f407 = ["stm32f4/stm32f407", "device-selected", "gpio-f417",
122-
"adc2", "adc3",
123-
"can1", "can2",
124-
"dac",
125-
"fsmc",
126-
"i2c3",
127-
"otg-fs",
128-
"otg-hs",
129-
"rng",
130-
"sdio",
131-
"spi3",
132-
"tim2", "tim8",
133-
"usart3", "uart4", "uart5",
134-
]
135-
stm32f410 = ["stm32f4/stm32f410", "device-selected", "gpio-f410",
126+
gpio-f410 = [
136127
"dac",
137128
"spi5",
138129
]
139-
stm32f411 = ["stm32f4/stm32f411", "device-selected", "gpio-f411",
130+
gpio-f411 = [
131+
"gpiod", "gpioe", # "gpioi",
140132
"i2c3",
141133
"otg-fs",
142134
"sdio",
143135
"tim2",
144136
"spi3", "spi4", "spi5",
137+
145138
]
146-
stm32f412 = ["stm32f4/stm32f412", "device-selected", "gpio-f412",
139+
gpio-f412 = [
140+
"gpiod", "gpioe", "gpiof", "gpiog",
147141
"can1", "can2",
148142
"fsmc",
149143
"i2c3",
@@ -154,7 +148,8 @@ stm32f412 = ["stm32f4/stm32f412", "device-selected", "gpio-f412",
154148
"tim2", "tim8",
155149
"usart3",
156150
]
157-
stm32f413 = ["stm32f4/stm32f413", "device-selected", "gpio-f413",
151+
gpio-f413 = [
152+
"gpiod", "gpioe", "gpiof", "gpiog",
158153
"can1", "can2", "can3",
159154
"dac",
160155
"fsmc",
@@ -168,21 +163,8 @@ stm32f413 = ["stm32f4/stm32f413", "device-selected", "gpio-f413",
168163
"tim2", "tim8",
169164
"usart3", "uart4", "uart5", "uart7", "uart8", "uart9", "uart10",
170165
]
171-
stm32f415 = ["stm32f4/stm32f405", "device-selected", "gpio-f417",
172-
"adc2", "adc3",
173-
"can1", "can2",
174-
"dac",
175-
"fsmc",
176-
"i2c3",
177-
"otg-fs",
178-
"otg-hs",
179-
"rng",
180-
"sdio",
181-
"spi3",
182-
"tim2", "tim8",
183-
"usart3", "uart4", "uart5",
184-
]
185-
stm32f417 = ["stm32f4/stm32f407", "device-selected", "gpio-f417",
166+
gpio-f417 = [
167+
"gpiod", "gpioe", "gpiof", "gpiog", "gpioi",
186168
"adc2", "adc3",
187169
"can1", "can2",
188170
"dac",
@@ -196,25 +178,11 @@ stm32f417 = ["stm32f4/stm32f407", "device-selected", "gpio-f417",
196178
"tim2", "tim8",
197179
"usart3", "uart4", "uart5",
198180
]
199-
stm32f423 = ["stm32f4/stm32f413", "device-selected", "gpio-f413",
200-
"can1", "can2", "can3",
201-
"dac",
202-
"fsmc",
203-
"fmpi2c1",
204-
"i2c3",
205-
"otg-fs",
206-
"rng",
207-
"sai",
208-
"sdio",
209-
"spi3", "spi4", "spi5",
210-
"tim2", "tim8",
211-
"usart3", "uart4", "uart5", "uart7", "uart8", "uart9", "uart10",
212-
]
213-
stm32f427 = ["stm32f4/stm32f427", "device-selected", "gpio-f427",
181+
gpio-f427 = [
182+
"gpiod", "gpioe", "gpiof", "gpiog", "gpioi", "gpioj", "gpiok",
214183
"adc2", "adc3",
215184
"can1", "can2",
216185
"dac",
217-
"fsmc",
218186
"i2c3",
219187
"otg-fs",
220188
"otg-hs",
@@ -225,52 +193,8 @@ stm32f427 = ["stm32f4/stm32f427", "device-selected", "gpio-f427",
225193
"tim2", "tim8",
226194
"usart3", "uart4", "uart5", "uart7", "uart8",
227195
]
228-
stm32f429 = ["stm32f4/stm32f429", "device-selected", "gpio-f427",
229-
"adc2", "adc3",
230-
"can1", "can2",
231-
"dac",
232-
"fmc",
233-
"i2c3",
234-
"otg-fs",
235-
"otg-hs",
236-
"rng",
237-
"sai",
238-
"sdio",
239-
"spi3", "spi4", "spi5", "spi6",
240-
"tim2", "tim8",
241-
"usart3", "uart4", "uart5", "uart7", "uart8",
242-
]
243-
stm32f437 = ["stm32f4/stm32f427", "device-selected", "gpio-f427",
244-
"adc2", "adc3",
245-
"can1", "can2",
246-
"dac",
247-
"fsmc",
248-
"i2c3",
249-
"otg-fs",
250-
"otg-hs",
251-
"rng",
252-
"sai",
253-
"sdio",
254-
"spi3", "spi4", "spi5", "spi6",
255-
"tim2", "tim8",
256-
"usart3", "uart4", "uart5", "uart7", "uart8",
257-
]
258-
stm32f439 = ["stm32f4/stm32f429", "device-selected", "gpio-f427",
259-
"adc2", "adc3",
260-
"can1", "can2",
261-
"dac",
262-
"fmc",
263-
"i2c3",
264-
"otg-fs",
265-
"otg-hs",
266-
"rng",
267-
"sai",
268-
"sdio",
269-
"spi3", "spi4", "spi5", "spi6",
270-
"tim2", "tim8",
271-
"usart3", "uart4", "uart5", "uart7", "uart8",
272-
]
273-
stm32f446 = ["stm32f4/stm32f446", "device-selected", "gpio-f446",
196+
gpio-f446 = [
197+
"gpiod", "gpioe", "gpiof", "gpiog",
274198
"adc2", "adc3",
275199
"can1", "can2",
276200
"dac",
@@ -284,7 +208,8 @@ stm32f446 = ["stm32f4/stm32f446", "device-selected", "gpio-f446",
284208
"tim2", "tim8",
285209
"usart3", "uart4", "uart5",
286210
]
287-
stm32f469 = ["stm32f4/stm32f469", "device-selected", "gpio-f469",
211+
gpio-f469 = [
212+
"gpiod", "gpioe", "gpiof", "gpiog", "gpioi", "gpioj", "gpiok",
288213
"adc2", "adc3",
289214
"can1", "can2",
290215
"dac",
@@ -299,31 +224,6 @@ stm32f469 = ["stm32f4/stm32f469", "device-selected", "gpio-f469",
299224
"tim2", "tim8",
300225
"usart3", "uart4", "uart5", "uart7", "uart8",
301226
]
302-
stm32f479 = ["stm32f4/stm32f469", "device-selected", "gpio-f469",
303-
"adc2", "adc3",
304-
"can1", "can2",
305-
"dac",
306-
"fmc",
307-
"i2c3",
308-
"otg-fs",
309-
"otg-hs",
310-
"rng",
311-
"sai",
312-
"sdio",
313-
"spi3", "spi4", "spi5", "spi6",
314-
"tim2", "tim8",
315-
"usart3", "uart4", "uart5", "uart7", "uart8",
316-
]
317-
318-
gpio-f401 = ["gpiod", "gpioe"]
319-
gpio-f410 = []
320-
gpio-f411 = ["gpiod", "gpioe"] #, "gpioi"
321-
gpio-f412 = ["gpiod", "gpioe", "gpiof", "gpiog"]
322-
gpio-f413 = ["gpiod", "gpioe", "gpiof", "gpiog"]
323-
gpio-f417 = ["gpiod", "gpioe", "gpiof", "gpiog", "gpioi"]
324-
gpio-f427 = ["gpiod", "gpioe", "gpiof", "gpiog", "gpioi", "gpioj", "gpiok"]
325-
gpio-f446 = ["gpiod", "gpioe", "gpiof", "gpiog"]
326-
gpio-f469 = ["gpiod", "gpioe", "gpiof", "gpiog", "gpioi", "gpioj", "gpiok"]
327227

328228
usb_fs = ["synopsys-usb-otg", "synopsys-usb-otg/fs"]
329229
usb_hs = ["synopsys-usb-otg", "synopsys-usb-otg/hs"]

0 commit comments

Comments
 (0)