Added DAC, low-power, alternate clocks, interrupts module. Added seri…

Cargo.toml

@@ -13,7 +13,7 @@ name = "stm32f3xx-hal"
 readme = "README.md"
 repository = "https://github.com/stm32-rs/stm32f3xx-hal"
 documentation = "https://docs.rs/stm32f3xx-hal"
-version = "0.6.0"
+version = "0.6.1"
 exclude = [
     "codegen",
     ".markdownlint.yml"
@@ -25,11 +25,12 @@ targets = ["thumbv7em-none-eabihf"]
 
 [dependencies]
 cfg-if = "1.0"
-cortex-m = "0.6"
-cortex-m-rt = "0.6"
+cortex-m = "0.7.1"
+cortex-m-rt = "0.6.13"
 embedded-dma = "0.1"
-embedded-hal = "0.2"
+embedded-hal = "0.2.4"
 nb = "0.1"
+num-traits = { version = "0.2.11", default-features = false, features=["libm"] }  # For sqrt in timers
 paste = "1"
 rtcc = "0.2"
 stm32f3 = "0.12"
@@ -43,6 +44,10 @@ optional = true
 version = "0.2"
 features = ["const-fn"]
 
+[dependencies.cast]
+version  = "0.2.3"
+default-features = false
+
 [dependencies.stm32-usbd]
 version = "0.5"
 optional = true
@@ -65,7 +70,7 @@ defmt-rtt = "0.1.0"
 defmt-test = "0.1.0"
 
 [features]
-default = ["unproven"]
+default = ["unproven", "rt"]
 unproven = ["embedded-hal/unproven"]
 device-selected = []
 direct-call-deprecated = []
@@ -119,6 +124,10 @@ debug = true
 lto = true
 opt-level = "s"
 
+[[example]]
+name = "clocks"
+required-features = ["stm32f303xc"]
+
 [[example]]
 name = "pwm"
 required-features = ["stm32f303xc"]
@@ -139,6 +148,10 @@ required-features = ["stm32f303"]
 name = "can"
 required-features = ["rt", "can", "stm32f303"]
 
+[[example]]
+name = "serial"
+required-features = ["stm32f303"]
+
 [[example]]
 name = "serial_dma"
 required-features = ["stm32f303"]

examples/clocks.rs

@@ -0,0 +1,61 @@
+//! Example of using a number of timer channels in PWM mode.
+//! Target board: STM32F3DISCOVERY
+#![no_std]
+#![no_main]
+
+use panic_semihosting as _;
+
+use stm32f3xx_hal::{clocks, pac};
+
+use cortex_m_rt::entry;
+
+use cortex_m_semihosting::hprintln;
+
+#[entry]
+fn main() -> ! {
+    // Get our peripherals
+    let mut dp = pac::Peripherals::take().unwrap();
+
+    // Initialize to 48Mhz sys clock, and 24Mhz peripheral clocks. Settings don't take
+    // effect until we run the `setup` method below.
+    let mut clocks = clocks::Clocks::default();
+
+    // Setting HSE bypass, to save power and free up a pin, if using a compatible oscillator.
+    clocks.hse_bypass = true;
+
+    // We'll set the system clock frequency to 72 Mhz, while keeping a 48Mhz USB
+    // frequency. We do this by increasing the PLL multiplier from it's default of
+    // 6×, to 9×, and increasing the amount we divide by for the USB clock.
+    clocks.pll_mul = clocks::PllMul::Mul9;
+    clocks.usb_pre = clocks::UsbPrescaler::Div1_5;
+
+    // Some further functionality examples:
+
+    // If you wish to use the internal (HSI) oscillator:
+    // clocks.input_src = clocks::InputSrc::Hsi;
+
+    // Setting the HCLK (AHB) prescaler:
+    // clocks.hclk_prescaler = clocks::HclkPrescaler::Div2;
+
+    // Setting the APB1 peripheral clock prescaler:
+    // clocks.apb1_prescaler = clocks::ApbPrescaler::Div1;
+
+    // The `setup` method validates our clock speeds, and if validated, writes
+    // to the clock registers.
+    if clocks.setup(&mut dp.RCC, &mut dp.FLASH).is_err() {
+        hprintln!("Unable to configure clocks due to a speed error.").ok();
+    };
+
+    // Display the calculated speeds.
+    hprintln!("Speeds: {:#?}", clocks.calc_speeds()).ok();
+
+    // Existing modules expect an `rcc::Clocks` struct to be passed, to use
+    // speeds during configuration. We can make one using the `make_rcc_clocks` method.
+    // `rcc.rs` clock config we pass to other fns that need the speeds.
+    let _rcc_clocks = clocks.make_rcc_clocks();
+
+    // Eg, we could use it in the commented-out line below, in a timer, spi etc.
+    // let i2c = I2c::i2c1(dp.I2C1, (scl, sda), 100.khz(), rcc_clocks, &mut rcc.apb1);
+
+    loop {}
+}

examples/serial.rs

@@ -0,0 +1,47 @@
+//! Example of transmitting data over serial interface using UART.
+//! For this to work, the PA9 and PA10 pins must be connected.
+//! Target board: STM32F3DISCOVERY
+
+#![no_std]
+#![no_main]
+
+use panic_semihosting as _;
+
+use cortex_m_rt::entry;
+use stm32f3xx_hal::{pac, prelude::*, serial::Serial};
+
+#[entry]
+fn main() -> ! {
+    let dp = pac::Peripherals::take().unwrap();
+
+    let mut flash = dp.FLASH.constrain();
+    let mut rcc = dp.RCC.constrain();
+    let clocks = rcc.cfgr.freeze(&mut flash.acr);
+
+    let mut gpioa = dp.GPIOA.split(&mut rcc.ahb);
+
+    // Setup UART pins.
+    let uart_pins = (
+        gpioa.pa9.into_af7(&mut gpioa.moder, &mut gpioa.afrh),
+        gpioa.pa10.into_af7(&mut gpioa.moder, &mut gpioa.afrh),
+    );
+
+    let serial = Serial::usart1(dp.USART1, uart_pins, 9600.bps(), clocks, &mut rcc.apb2);
+    let (mut tx, mut rx) = serial.split();
+
+    loop {
+        // Send a single byte.
+        let single_byte_to_send = 8;
+        tx.write(single_byte_to_send).ok();
+
+        // Send multiple bytes over the U[S]ART pins.
+        let data_to_send = [2, 3, 4, 5];
+        tx.bwrite_all(&data_to_send).ok();
+
+        // Send a string
+        // tx.write_str("Don't panic.");
+
+        // Receive multiple bytes as an array.
+        let _data_recieved = rx.read();
+    }
+}

src/adc.rs

@@ -329,7 +329,7 @@ macro_rules! adc_hal {
                         crate::panic!("Clock already enabled with a different setting");
                     }
                     this_adc.set_align(Align::default());
-                    this_adc.calibrate();
+                    this_adc.calibrate();   // todo: Cal causes freeze! TS commented out.
                     // ADEN bit cannot be set during ADCAL=1
                     // and 4 ADC clock cycle after the ADCAL
                     // bit is cleared by hardware
@@ -413,7 +413,13 @@ macro_rules! adc_hal {
                 ///
                 /// This is based on the MAX_ADVREGEN_STARTUP_US of the device.
                 fn wait_advregen_startup(&self) {
-                    asm::delay((MAX_ADVREGEN_STARTUP_US * 1_000_000) / self.clocks.sysclk().0);
+                    // Prevents crashes. Not sure why / when it started showing up.
+                    // https://github.com/rust-embedded/cortex-m/pull/328
+                    let mut delay = (MAX_ADVREGEN_STARTUP_US * 1_000_000) / self.clocks.sysclk().0;
+                    if delay < 2 {
+                        delay = 2;
+                    }
+                    asm::delay(delay);
                 }
 
                 /// busy ADC read