@@ -158,21 +158,21 @@ macro_rules! adc_pins {
158
158
159
159
#[ cfg( feature = "stm32f303" ) ]
160
160
adc_pins ! ( ADC1 ,
161
- gpioa:: PA0 <Analog > => 1_u8 ,
162
- gpioa:: PA1 <Analog > => 2_u8 ,
163
- gpioa:: PA2 <Analog > => 3_u8 ,
164
- gpioa:: PA3 <Analog > => 4_u8 ,
165
- gpioc:: PC0 <Analog > => 6_u8 ,
166
- gpioc:: PC1 <Analog > => 7_u8 ,
167
- gpioc:: PC2 <Analog > => 8_u8 ,
168
- gpioc:: PC3 <Analog > => 9_u8 ,
161
+ gpioa:: PA0 <Analog > => 1 ,
162
+ gpioa:: PA1 <Analog > => 2 ,
163
+ gpioa:: PA2 <Analog > => 3 ,
164
+ gpioa:: PA3 <Analog > => 4 ,
165
+ gpioc:: PC0 <Analog > => 6 ,
166
+ gpioc:: PC1 <Analog > => 7 ,
167
+ gpioc:: PC2 <Analog > => 8 ,
168
+ gpioc:: PC3 <Analog > => 9 ,
169
169
) ;
170
170
171
171
#[ cfg( any( feature = "stm32f303x6" , feature = "stm32f303x8" ) ) ]
172
172
adc_pins ! ( ADC1 ,
173
- gpiob:: PB0 <Analog > => 11_u8 ,
174
- gpiob:: PB1 <Analog > => 12_u8 ,
175
- gpiob:: PB13 <Analog > => 13_u8 ,
173
+ gpiob:: PB0 <Analog > => 11 ,
174
+ gpiob:: PB1 <Analog > => 12 ,
175
+ gpiob:: PB13 <Analog > => 13 ,
176
176
) ;
177
177
178
178
#[ cfg( any(
@@ -182,33 +182,33 @@ adc_pins!(ADC1,
182
182
feature = "stm32f303xe" ,
183
183
) ) ]
184
184
adc_pins ! ( ADC1 ,
185
- gpiof:: PF4 <Analog > => 5_u8 ,
186
- gpiof:: PF2 <Analog > => 10_u8 ,
185
+ gpiof:: PF4 <Analog > => 5 ,
186
+ gpiof:: PF2 <Analog > => 10 ,
187
187
) ;
188
188
189
189
// # ADC2 Pin/Channel mapping
190
190
// ## f303
191
191
192
192
#[ cfg( feature = "stm32f303" ) ]
193
193
adc_pins ! ( ADC2 ,
194
- gpioa:: PA4 <Analog > => 1_u8 ,
195
- gpioa:: PA5 <Analog > => 2_u8 ,
196
- gpioa:: PA6 <Analog > => 3_u8 ,
197
- gpioa:: PA7 <Analog > => 4_u8 ,
198
- gpioc:: PC4 <Analog > => 5_u8 ,
199
- gpioc:: PC5 <Analog > => 11_u8 ,
200
- gpiob:: PB2 <Analog > => 12_u8 ,
201
- gpioc:: PC0 <Analog > => 6_u8 ,
202
- gpioc:: PC1 <Analog > => 7_u8 ,
203
- gpioc:: PC2 <Analog > => 8_u8 ,
204
- gpioc:: PC3 <Analog > => 9_u8 ,
194
+ gpioa:: PA4 <Analog > => 1 ,
195
+ gpioa:: PA5 <Analog > => 2 ,
196
+ gpioa:: PA6 <Analog > => 3 ,
197
+ gpioa:: PA7 <Analog > => 4 ,
198
+ gpioc:: PC4 <Analog > => 5 ,
199
+ gpioc:: PC5 <Analog > => 11 ,
200
+ gpiob:: PB2 <Analog > => 12 ,
201
+ gpioc:: PC0 <Analog > => 6 ,
202
+ gpioc:: PC1 <Analog > => 7 ,
203
+ gpioc:: PC2 <Analog > => 8 ,
204
+ gpioc:: PC3 <Analog > => 9 ,
205
205
) ;
206
206
207
207
#[ cfg( any( feature = "stm32f303x6" , feature = "stm32f303x8" ) ) ]
208
208
adc_pins ! ( ADC2 ,
209
- gpiob:: PB12 <Analog > => 13_u8 ,
210
- gpiob:: PB14 <Analog > => 14_u8 ,
211
- gpiob:: PB15 <Analog > => 15_u8 ,
209
+ gpiob:: PB12 <Analog > => 13 ,
210
+ gpiob:: PB14 <Analog > => 14 ,
211
+ gpiob:: PB15 <Analog > => 15 ,
212
212
) ;
213
213
214
214
#[ cfg( any(
@@ -218,7 +218,7 @@ adc_pins!(ADC2,
218
218
feature = "stm32f303xe" ,
219
219
) ) ]
220
220
adc_pins ! ( ADC2 ,
221
- gpiof:: PF2 <Analog > => 10_u8 ,
221
+ gpiof:: PF2 <Analog > => 10 ,
222
222
) ;
223
223
224
224
// # ADC3 Pin/Channel mapping
@@ -231,22 +231,22 @@ adc_pins!(ADC2,
231
231
feature = "stm32f303xe" ,
232
232
) ) ]
233
233
adc_pins ! ( ADC3 ,
234
- gpiob:: PB1 <Analog > => 1_u8 ,
235
- gpioe:: PE9 <Analog > => 2_u8 ,
236
- gpioe:: PE13 <Analog > => 3_u8 ,
237
- gpiob:: PB13 <Analog > => 5_u8 ,
238
- gpiob:: PB0 <Analog > => 12_u8 ,
239
- gpioe:: PE7 <Analog > => 13_u8 ,
240
- gpioe:: PE10 <Analog > => 14_u8 ,
241
- gpioe:: PE11 <Analog > => 15_u8 ,
242
- gpioe:: PE12 <Analog > => 16_u8 ,
234
+ gpiob:: PB1 <Analog > => 1 ,
235
+ gpioe:: PE9 <Analog > => 2 ,
236
+ gpioe:: PE13 <Analog > => 3 ,
237
+ gpiob:: PB13 <Analog > => 5 ,
238
+ gpiob:: PB0 <Analog > => 12 ,
239
+ gpioe:: PE7 <Analog > => 13 ,
240
+ gpioe:: PE10 <Analog > => 14 ,
241
+ gpioe:: PE11 <Analog > => 15 ,
242
+ gpioe:: PE12 <Analog > => 16 ,
243
243
// Shared channels (i.e. ADC34_INx)
244
- gpioe:: PE8 <Analog > => 6_u8 ,
245
- gpiod:: PD10 <Analog > => 7_u8 ,
246
- gpiod:: PD11 <Analog > => 8_u8 ,
247
- gpiod:: PD12 <Analog > => 9_u8 ,
248
- gpiod:: PD13 <Analog > => 10_u8 ,
249
- gpiod:: PD14 <Analog > => 11_u8 ,
244
+ gpioe:: PE8 <Analog > => 6 ,
245
+ gpiod:: PD10 <Analog > => 7 ,
246
+ gpiod:: PD11 <Analog > => 8 ,
247
+ gpiod:: PD12 <Analog > => 9 ,
248
+ gpiod:: PD13 <Analog > => 10 ,
249
+ gpiod:: PD14 <Analog > => 11 ,
250
250
) ;
251
251
252
252
// # ADC4 Pin/Channel mapping
@@ -259,20 +259,20 @@ adc_pins!(ADC3,
259
259
feature = "stm32f303xe" ,
260
260
) ) ]
261
261
adc_pins ! ( ADC4 ,
262
- gpioe:: PE14 <Analog > => 1_u8 ,
263
- gpioe:: PE15 <Analog > => 2_u8 ,
264
- gpiob:: PB12 <Analog > => 3_u8 ,
265
- gpiob:: PB14 <Analog > => 4_u8 ,
266
- gpiob:: PB15 <Analog > => 5_u8 ,
267
- gpiob:: PB8 <Analog > => 12_u8 ,
268
- gpiob:: PB9 <Analog > => 13_u8 ,
262
+ gpioe:: PE14 <Analog > => 1 ,
263
+ gpioe:: PE15 <Analog > => 2 ,
264
+ gpiob:: PB12 <Analog > => 3 ,
265
+ gpiob:: PB14 <Analog > => 4 ,
266
+ gpiob:: PB15 <Analog > => 5 ,
267
+ gpiob:: PB8 <Analog > => 12 ,
268
+ gpiob:: PB9 <Analog > => 13 ,
269
269
// Shared channels (i.e. ADC34_INx)
270
- gpioe:: PE8 <Analog > => 6_u8 ,
271
- gpiod:: PD10 <Analog > => 7_u8 ,
272
- gpiod:: PD11 <Analog > => 8_u8 ,
273
- gpiod:: PD12 <Analog > => 9_u8 ,
274
- gpiod:: PD13 <Analog > => 10_u8 ,
275
- gpiod:: PD14 <Analog > => 11_u8 ,
270
+ gpioe:: PE8 <Analog > => 6 ,
271
+ gpiod:: PD10 <Analog > => 7 ,
272
+ gpiod:: PD11 <Analog > => 8 ,
273
+ gpiod:: PD12 <Analog > => 9 ,
274
+ gpiod:: PD13 <Analog > => 10 ,
275
+ gpiod:: PD14 <Analog > => 11 ,
276
276
) ;
277
277
278
278
// Abstract implementation of ADC functionality
0 commit comments