diff options
| -rw-r--r-- | embassy-stm32/src/adc/v4.rs | 12 | ||||
| -rw-r--r-- | embassy-stm32/src/rcc/g4.rs | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/embassy-stm32/src/adc/v4.rs b/embassy-stm32/src/adc/v4.rs index d03f2550d..2ff5c8f9e 100644 --- a/embassy-stm32/src/adc/v4.rs +++ b/embassy-stm32/src/adc/v4.rs | |||
| @@ -107,20 +107,20 @@ macro_rules! rcc_peripheral { | |||
| 107 | 107 | ||
| 108 | #[cfg(stm32g4)] | 108 | #[cfg(stm32g4)] |
| 109 | foreach_peripheral!( | 109 | foreach_peripheral!( |
| 110 | (adc, ADC1) => { rcc_peripheral!(ADC1, adc12, ahb2, adc12, ADC12_ENABLE_COUNTER); }; | 110 | (adc, ADC1) => { rcc_peripheral!(ADC1, adc, ahb2, adc12, ADC12_ENABLE_COUNTER); }; |
| 111 | (adc, ADC2) => { rcc_peripheral!(ADC2, adc12, ahb2, adc12, ADC12_ENABLE_COUNTER); }; | 111 | (adc, ADC2) => { rcc_peripheral!(ADC2, adc, ahb2, adc12, ADC12_ENABLE_COUNTER); }; |
| 112 | ); | 112 | ); |
| 113 | 113 | ||
| 114 | #[cfg(stm32g4x1)] | 114 | #[cfg(stm32g4x1)] |
| 115 | foreach_peripheral!( | 115 | foreach_peripheral!( |
| 116 | (adc, ADC3) => { rcc_peripheral!(ADC3, adc345, ahb2, adc345); }; | 116 | (adc, ADC3) => { rcc_peripheral!(ADC3, adc34, ahb2, adc345); }; |
| 117 | ); | 117 | ); |
| 118 | 118 | ||
| 119 | #[cfg(any(stm32g4x3, stm32g4x4))] | 119 | #[cfg(any(stm32g4x3, stm32g4x4))] |
| 120 | foreach_peripheral!( | 120 | foreach_peripheral!( |
| 121 | (adc, ADC3) => { rcc_peripheral!(ADC3, adc345, ahb2, adc345, ADC345_ENABLE_COUNTER); }; | 121 | (adc, ADC3) => { rcc_peripheral!(ADC3, adc34, ahb2, adc345, ADC345_ENABLE_COUNTER); }; |
| 122 | (adc, ADC4) => { rcc_peripheral!(ADC4, adc345, ahb2, adc345, ADC345_ENABLE_COUNTER); }; | 122 | (adc, ADC4) => { rcc_peripheral!(ADC4, adc34, ahb2, adc345, ADC345_ENABLE_COUNTER); }; |
| 123 | (adc, ADC5) => { rcc_peripheral!(ADC5, adc345, ahb2, adc345, ADC345_ENABLE_COUNTER); }; | 123 | (adc, ADC5) => { rcc_peripheral!(ADC5, adc34, ahb2, adc345, ADC345_ENABLE_COUNTER); }; |
| 124 | ); | 124 | ); |
| 125 | 125 | ||
| 126 | #[cfg(stm32h7)] | 126 | #[cfg(stm32h7)] |
diff --git a/embassy-stm32/src/rcc/g4.rs b/embassy-stm32/src/rcc/g4.rs index 4c95bb154..2359f39c1 100644 --- a/embassy-stm32/src/rcc/g4.rs +++ b/embassy-stm32/src/rcc/g4.rs | |||
| @@ -612,7 +612,7 @@ pub(crate) unsafe fn init(config: Config) { | |||
| 612 | apb1_tim: Hertz(apb1_tim_freq), | 612 | apb1_tim: Hertz(apb1_tim_freq), |
| 613 | apb2: Hertz(apb2_freq), | 613 | apb2: Hertz(apb2_freq), |
| 614 | apb2_tim: Hertz(apb2_tim_freq), | 614 | apb2_tim: Hertz(apb2_tim_freq), |
| 615 | adc12: adc12_ck, | 615 | adc: adc12_ck, |
| 616 | adc345: adc345_ck, | 616 | adc34: adc345_ck, |
| 617 | }); | 617 | }); |
| 618 | } | 618 | } |
