Comparator: Fix DAC inputs

Author: mattico

src/analog/dac.rs

@@ -111,7 +111,7 @@ macro_rules! dac {
                 pub fn enable(self) -> $CX<Enabled> {
                     let dac = unsafe { &(*DAC::ptr()) };
 
-                    dac.dac_mcr.modify(|_, w| unsafe { w.$mode().bits(0) });
+                    dac.dac_mcr.modify(|_, w| unsafe { w.$mode().bits(1) });
                     dac.dac_cr.modify(|_, w| w.$en().set_bit());
 
                     $CX {
@@ -122,7 +122,7 @@ macro_rules! dac {
                 pub fn enable_unbuffered(self) -> $CX<EnabledUnbuffered> {
                     let dac = unsafe { &(*DAC::ptr()) };
 
-                    dac.dac_mcr.modify(|_, w| unsafe { w.$mode().bits(2) });
+                    dac.dac_mcr.modify(|_, w| unsafe { w.$mode().bits(3) });
                     dac.dac_cr.modify(|_, w| w.$en().set_bit());
 
                     $CX {
@@ -133,7 +133,7 @@ macro_rules! dac {
                 pub fn enable_generator(self, config: GeneratorConfig) -> $CX<WaveGenerator> {
                     let dac = unsafe { &(*DAC::ptr()) };
 
-                    dac.dac_mcr.modify(|_, w| unsafe { w.$mode().bits(0) });
+                    dac.dac_mcr.modify(|_, w| unsafe { w.$mode().bits(1) });
                     dac.dac_cr.modify(|_, w| unsafe {
                         w.$wave().bits(config.mode);
                         w.$ten().set_bit();

src/comparator.rs

@@ -221,7 +221,7 @@ refint_input!(COMP2);
 
 macro_rules! dac_input {
     ($COMP:ident, $channel:ty, $bits:expr) => {
-        impl NegativeInput<$COMP> for &$channel {
+        impl<ED> NegativeInput<$COMP> for &$channel {
             fn setup(&self, comp: &$COMP) {
                 comp.csr().modify(|_, w| unsafe { w.inmsel().bits($bits) })
             }
@@ -230,14 +230,14 @@ macro_rules! dac_input {
 }
 
 #[cfg(any(feature = "stm32g071", feature = "stm32g081"))]
-dac_input!(COMP1, dac::Channel1<dac::Enabled>, 0b0100);
+dac_input!(COMP1, dac::Channel1<ED>, 0b0100);
 #[cfg(any(feature = "stm32g071", feature = "stm32g081"))]
-dac_input!(COMP1, dac::Channel2<dac::Enabled>, 0b0101);
+dac_input!(COMP1, dac::Channel2<ED>, 0b0101);
 
 #[cfg(any(feature = "stm32g071", feature = "stm32g081"))]
-dac_input!(COMP2, dac::Channel1<dac::Enabled>, 0b0100);
+dac_input!(COMP2, dac::Channel1<ED>, 0b0100);
 #[cfg(any(feature = "stm32g071", feature = "stm32g081"))]
-dac_input!(COMP2, dac::Channel2<dac::Enabled>, 0b0101);
+dac_input!(COMP2, dac::Channel2<ED>, 0b0101);
 
 pub struct Comparator<C, ED> {
     regs: C,