Fix rebase fallout, improve docs

Author: Jonas Schievink

examples/dac_sine.rs

@@ -8,11 +8,7 @@ use panic_semihosting as _;
 
 use cortex_m_rt::entry;
 
-use stm32f3xx_hal::{
-    dac::{Dac, DacChannel},
-    pac,
-    prelude::*,
-};
+use stm32f3xx_hal::{dac::Dac, pac, prelude::*};
 
 const LUT_LEN: usize = 256;
 
@@ -49,15 +45,12 @@ fn main() -> ! {
     let _dac1_out1 = gpioa.pa4.into_analog(&mut gpioa.moder, &mut gpioa.pupdr);
 
     // set up led for blinking loop
-    let mut gpioe = dp.GPIOE.split(&mut rcc.ahb);
-    let mut ok_led = gpioe
-        .pe15
-        .into_push_pull_output(&mut gpioe.moder, &mut gpioe.otyper);
+    let mut ok_led = gpioa
+        .pa15
+        .into_push_pull_output(&mut gpioa.moder, &mut gpioa.otyper);
 
     // set up dac1, data is twelve bits, alighned right
     let mut dac1 = Dac::new(dp.DAC1, &mut rcc.apb1);
-    // enable channel one for single channel mode
-    dac1.enable_channel(DacChannel::One);
 
     let mut led = true;
 

src/dac.rs

@@ -1,58 +1,40 @@
-//Based on stm32hal by David-OConnor
+//! Digital-to-Analog Converter
+
+// Based on stm32hal by David-OConnor
 
 use cortex_m::asm;
 
 use crate::{
     gpio::{self, Analog},
     pac::{dac1, DAC1},
-    rcc::{Rcc, Clocks, AHB, APB1},
+    rcc::{Clocks, Enable, Rcc, Reset, AHB, APB1},
 };
 
-#[cfg(any(
-    feature = "stm32f303xb",
-    feature = "stm32f303xc",
-    feature = "stm32f303xd",
-    feature = "stm32f303xe",
-))]
-use crate::pac::DMA1::{self};
+use crate::pac::DMA1;
 
 use crate::pac::{self, rcc, RCC};
 
-pub enum DacChannel {
-    One,
-    Two,
-}
-
 /// Represents a Digital to Analog Converter (DAC) peripheral.
 pub struct Dac {
     regs: DAC1,
 }
 
-// todo: Calculate the VDDA vref, as you do with onboard ADCs!
 impl Dac {
-    /// Initialize a DAC peripheral, including  enabling and resetting
+    /// Initializes the DAC peripheral.
+    pub fn new(regs: DAC1, apb1: &mut APB1) -> Self {
+        DAC1::enable(apb1);
+        DAC1::reset(apb1);
 
-    pub fn new(regs: DAC1, abp1: &mut APB1) -> Self {
-    
-        abp1.enr().modify(|_, w| w.dac1en().set_bit());
-        abp1.rstr().modify(|_, w| w.dac1rst().set_bit());
-        abp1.rstr().modify(|_, w| w.dac1rst().clear_bit());
+        // Enable channel 1.
+        regs.cr.modify(|_, w| w.en1().set_bit());
 
         Self { regs }
     }
 
-    pub fn enable_channel(&mut self, channel: DacChannel) {
-        let cr = &self.regs.cr;
-
-        cr.modify(|_, w| match channel {
-            DacChannel::One => w.en1().set_bit(),
-            DacChannel::Two => w.en2().set_bit(),
-        });
-    }
-
-    /// the data parameter MUST be a 12-bit value -- values outside that range will result in misbehavior
+    /// Writes a sample to the Channel 1 output register.
+    ///
+    /// Only the low 12 bits of `data` will be used, the rest is ignored.
     pub fn write_data(&mut self, data: u16) {
-        
         self.regs.dhr12r1.write(|w| w.dacc1dhr().bits(data))
     }
 }

src/rcc/enable.rs

@@ -154,7 +154,7 @@ bus! {
     feature = "svd-f3x4"
 ))]
 bus! {
-    DAC1 => (APB1, dac1en,), // 29
+    DAC1 => (APB1, dac1en, dac1rst), // 29
 }
 
 #[cfg(any(feature = "svd-f303", feature = "svd-f373", feature = "svd-f3x4"))]