Add Comparator and DAC #74
Conversation
examples/comp_w_dac.rs
Outdated
| let mut delay = cp.SYST.delay(&rcc.clocks); | ||
|
|
||
| let gpioa = dp.GPIOA.split(&mut rcc); | ||
| let dac1ch1 = dp.DAC1.constrain((gpioa.pa4, Dac1IntSig1), &mut rcc); |
There was a problem hiding this comment.
Not sure how this should best be done.. There is no way for the user to know whether to specify Dac1IntSig1 or Dac1IntSig2(besides a not too nice compile error) in order to create a dac in with a mode compatible with the comparator.
Suggestions welcome :)
src/comparator.rs
Outdated
| /* | ||
| pub fn power_mode(mut self, power_mode: PowerMode) -> Self { | ||
| self.power_mode = power_mode; | ||
| self | ||
| }*/ | ||
|
|
||
| /* | ||
| /// Sets the output to be Comparator 1 XOR Comparator 2. | ||
| /// Used to implement window comparator mode. | ||
| pub fn output_xor(mut self) -> Self { | ||
| self.output_xor = true; | ||
| self | ||
| }*/ |
There was a problem hiding this comment.
AFAIK this is not supported by stm32g4 processors. Should this be removed?
There was a problem hiding this comment.
Yes we should. We don't need to store code in comments.
src/comparator.rs
Outdated
| /* | ||
| /// Uses two comparators to implement a window comparator. | ||
| /// See Figure 69 in RM0444 Rev 5. | ||
| pub struct WindowComparator<U, L, ED> { |
There was a problem hiding this comment.
Same thing with window mode, not supported
There was a problem hiding this comment.
Also remove every inapplicable code.
src/dac.rs
Outdated
| /*pub fn enable_unbuffered(self) -> $CX<MODE_BITS, EnabledUnbuffered> { | ||
| let dac = unsafe { &(*<$DAC>::ptr()) }; | ||
|
|
||
| dac.dac_mcr.modify(|_, w| unsafe { w.$mode().bits(2) }); | ||
| dac.dac_cr.modify(|_, w| w.$en().set_bit()); | ||
|
|
||
| $CX { | ||
| _enabled: PhantomData, | ||
| } | ||
| }*/ |
There was a problem hiding this comment.
Buffered vs unbuffered is pretty much chosen by MODE_BITS. Not sure how we want to handle that
There was a problem hiding this comment.
Use input argument as selector between modes
|
@usbalbin please update the PR if it still needed. |
src/opamp.rs
Outdated
| @@ -45,6 +45,8 @@ | |||
| //! } | |||
| //! ``` | |||
|
|
|||
| // TODO: Add support for locking using the `LOCK` bit in `OPAMPx_CSR` | |||
There was a problem hiding this comment.
Needs to update to current main branch
src/dac.rs
Outdated
| /*pub fn enable_unbuffered(self) -> $CX<MODE_BITS, EnabledUnbuffered> { | ||
| let dac = unsafe { &(*<$DAC>::ptr()) }; | ||
|
|
||
| dac.dac_mcr.modify(|_, w| unsafe { w.$mode().bits(2) }); | ||
| dac.dac_cr.modify(|_, w| w.$en().set_bit()); | ||
|
|
||
| $CX { | ||
| _enabled: PhantomData, | ||
| } | ||
| }*/ |
There was a problem hiding this comment.
Use input argument as selector between modes
src/comparator.rs
Outdated
| /* | ||
| pub fn power_mode(mut self, power_mode: PowerMode) -> Self { | ||
| self.power_mode = power_mode; | ||
| self | ||
| }*/ | ||
|
|
||
| /* | ||
| /// Sets the output to be Comparator 1 XOR Comparator 2. | ||
| /// Used to implement window comparator mode. | ||
| pub fn output_xor(mut self) -> Self { | ||
| self.output_xor = true; | ||
| self | ||
| }*/ |
There was a problem hiding this comment.
Yes we should. We don't need to store code in comments.
src/comparator.rs
Outdated
| /* | ||
| /// Uses two comparators to implement a window comparator. | ||
| /// See Figure 69 in RM0444 Rev 5. | ||
| pub struct WindowComparator<U, L, ED> { |
There was a problem hiding this comment.
Also remove every inapplicable code.
src/comparator.rs
Outdated
| } | ||
|
|
||
| // TODO: look up alternate functions for more devices than g474 | ||
| // https://www.mouser.se/datasheet/2/389/stm32g474cb-1600828.pdf#page=73 |
There was a problem hiding this comment.
please use the documents from ST site only. also use their public id like as ANxxx, RMxxx, etc.
src/comparator.rs
Outdated
| fn setup(&self, comp: &C); | ||
| } | ||
|
|
||
| /* |
There was a problem hiding this comment.
Please remove the unused or inapplicable code.
* Add support for comparator to take signal from dac as input * Added example for using dac as input to comparator
usbalbin
force-pushed
the
comp_and_dac
branch
from
45652a8
to
78d4075
Compare
|
I believe I have resolved your comments. Btw thanks a lot :) |
|
@usbalbin thank you so much. I've to merge it. |
Add modified src/dac.rs and src/comparator.rs from g0xx-hal. Also added support for internal connection between DAC and comparator.
Tested on nucleo-g474re (stm32g474re)