Merge pull request #36 from stm32-rs/internal-signals

Rename generator config

Author: dotcypress

examples/dac.rs

@@ -1,4 +1,4 @@
-#![deny(warnings)]
+// #![deny(warnings)]
 #![deny(unsafe_code)]
 #![no_main]
 #![no_std]
@@ -11,7 +11,7 @@ extern crate cortex_m_rt as rt;
 extern crate panic_halt;
 extern crate stm32g0xx_hal as hal;
 
-use hal::analog::dac::GeneratorMode;
+use hal::analog::dac::GeneratorConfig;
 use hal::hal::Direction;
 use hal::prelude::*;
 use hal::rcc::Config;
@@ -30,7 +30,7 @@ fn main() -> ! {
     let (dac0, dac1) = dp.DAC.constrain((gpioa.pa4, gpioa.pa5), &mut rcc);
 
     let mut dac = dac0.calibrate_buffer(&mut delay).enable();
-    let mut generator = dac1.enable_generator(GeneratorMode::triangle(11));
+    let mut generator = dac1.enable_generator(GeneratorConfig::noise(11));
 
     let mut dir = Direction::Upcounting;
     let mut val = 0;

src/analog/dac.rs

@@ -14,12 +14,12 @@ pub trait DacOut<V> {
     fn get_value(&mut self) -> V;
 }
 
-pub struct GeneratorMode {
+pub struct GeneratorConfig {
     mode: u8,
     amp: u8,
 }
 
-impl GeneratorMode {
+impl GeneratorConfig {
     pub fn triangle(amplitude: u8) -> Self {
         Self {
             mode: 0b10,
@@ -130,14 +130,14 @@ macro_rules! dac {
                     }
                 }
 
-                pub fn enable_generator(self, mode: GeneratorMode) -> $CX<WaveGenerator> {
+                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_cr.modify(|_, w| unsafe {
-                        w.$wave().bits(mode.mode);
+                        w.$wave().bits(config.mode);
                         w.$ten().set_bit();
-                        w.$mamp().bits(mode.amp);
+                        w.$mamp().bits(config.amp);
                         w.$en().set_bit()
                     });