@@ -18,21 +18,21 @@ use nb;
18
18
/// struct Analog(()); // marker type to denote a pin in "analog" mode
19
19
///
20
20
/// // GPIO 1 pin 1 can supply an ADC channel when it is configured in Analog mode
21
- /// impl Channel for Gpio1Pin1<Analog> {
21
+ /// impl Channel<Adc1> for Gpio1Pin1<Analog> {
22
22
/// type ID = u8; // ADC channels are identified numerically
23
23
///
24
- /// const CHANNEL: u8 = 7; // GPIO pin 1 is connected to ADC channel 7
24
+ /// fn channel() -> u8 { 7_u8 } // GPIO pin 1 is connected to ADC channel 7
25
25
/// }
26
26
///
27
27
/// struct Adc2; // ADC with two banks of 16 channels
28
28
/// struct Gpio2PinA<MODE>(PhantomData<MODE>);
29
29
/// struct AltFun(()); // marker type to denote some alternate function mode for the pin
30
30
///
31
31
/// // GPIO 2 pin A can supply an ADC channel when it's configured in some alternate function mode
32
- /// impl Channel for Gpio2PinA<AltFun> {
32
+ /// impl Channel<Adc2> for Gpio2PinA<AltFun> {
33
33
/// type ID = (u8, u8); // ADC channels are identified by bank number and channel number
34
34
///
35
- /// const CHANNEL: (u8, u8) = (0, 3);
35
+ /// fn channel() -> (u8, u8) { (0, 3) } // bank 0 channel 3
36
36
/// }
37
37
/// ```
38
38
#[ cfg( feature = "unproven" ) ]
@@ -72,12 +72,12 @@ pub trait Channel<ADC> {
72
72
/// impl<WORD, PIN> OneShot<MyAdc, WORD, PIN> for MyAdc
73
73
/// where
74
74
/// WORD: From<u16>,
75
- /// PIN: Channel<ID=u8>,
75
+ /// PIN: Channel<MyAdc, ID=u8>,
76
76
/// {
77
77
/// type Error = ();
78
78
///
79
79
/// fn read(&mut self, _pin: &mut PIN) -> nb::Result<WORD, Self::Error> {
80
- /// let chan = 1 << PIN::CHANNEL ;
80
+ /// let chan = 1 << PIN::channel() ;
81
81
/// self.power_up();
82
82
/// let result = self.do_conversion(chan);
83
83
/// self.power_down();
0 commit comments