Merge branch 'master' into canbus-with-crate

Author: zklapow

.github/workflows/ci.yml

@@ -0,0 +1,87 @@
+# Note: The checkout@v2 action sometimes checks out the wrong commit:
+#   https://github.com/actions/checkout/issues/237
+# Until that is fixed we use checkout@v1 here instead.
+
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+
+jobs:
+  check:
+    name: Check
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        mcu:
+          - stm32f301
+          - stm32f318
+          - stm32f302xb
+          - stm32f302xc
+          - stm32f302xd
+          - stm32f302xe
+          - stm32f303xb
+          - stm32f303xc
+          - stm32f303xd
+          - stm32f303xe
+          - stm32f303x6
+          - stm32f303x8
+          - stm32f373
+          - stm32f378
+          - stm32f334
+          - stm32f328
+          - stm32f358
+          - stm32f398
+        features: ["rt"]
+        include:
+          - mcu: stm32f303xc
+            features: rt,stm32-usbd
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: thumbv7em-none-eabihf
+          override: true
+          profile: minimal
+      - uses: actions-rs/cargo@v1
+        with:
+          command: check
+          args: --features=${{ matrix.mcu }},${{ matrix.features }} --examples
+
+  clippy:
+    name: Clippy
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          target: thumbv7em-none-eabihf
+          override: true
+          profile: minimal
+          components: clippy
+      - uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: >
+            --features=stm32f303xc,rt,stm32-usbd --examples
+            -- -D warnings
+
+  rustfmt:
+    name: Rustfmt
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+          profile: minimal
+          components: rustfmt
+      - uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check

.travis.yml

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Added
+- SPI support for reclock after initialization ([#98](https://github.com/stm32-rs/stm32f3xx-hal/pull/98))
+
+## [v0.5.0] - 2020-07-21
+
+### Added
+
+- Implement `InputPin` for `Output<OpenDrain>` pins ([#114](https://github.com/stm32-rs/stm32f3xx-hal/pull/114))
+- Support for safe one-shot DMA transfers ([#86](https://github.com/stm32-rs/stm32f3xx-hal/pull/86))
+- DMA support for serial reception and transmission ([#86](https://github.com/stm32-rs/stm32f3xx-hal/pull/86))
+- ADC support for `stm32f303` devices ([#47](https://github.com/stm32-rs/stm32f3xx-hal/pull/47))
+
 ### Fixed
 
 - `PLL` was calculated wrong for devices, which do not divide `HSI` ([#67](https://github.com/stm32-rs/stm32f3xx-hal/pull/67))
@@ -28,7 +40,7 @@ let clocks = rcc
     .use_hse(32.mhz())
     .sysclk(72.mhz())
 ```
-  This is possible through utilizing the divider, which can devide the
+  This is possible through utilizing the divider, which can divide the
   external oscillator clock on most devices. Some devices have even the
   possibility to divide the internal oscillator clock.
 
@@ -37,6 +49,10 @@ let clocks = rcc
 - The feature gate requires you to select a subvariant if possible. ([#75](https://github.com/stm32-rs/stm32f3xx-hal/pull/75))
 - Split up `stm32f302` into sub-targets `stm32f302xb`,`stm32f302xc`,`stm32f302xd`,`stm32f302xe`
 - Bump `stm32f3` dependency to `0.11.0` ([#97](https://github.com/stm32-rs/stm32f3xx-hal/pull/97))
+- The `stm32f3` reexport is now renamed from `stm32` to `pac` ([#101](https://github.com/stm32-rs/stm32f3xx-hal/pull/101))
+- The correct `stm32f3` modules are now used for the `stm32f318` and `stm32f738`
+  targets. As a result, some previously (wrongly) supported peripherals have
+  been removed from these targets. ([#116](https://github.com/stm32-rs/stm32f3xx-hal/pull/116))
 
 ## [v0.4.3] - 2020-04-11
 
@@ -178,7 +194,8 @@ let clocks = rcc
 
 - Support `stm32f303` device
 
-[Unreleased]: https://github.com/stm32-rs/stm32f3xx-hal/compare/v0.4.3...HEAD
+[Unreleased]: https://github.com/stm32-rs/stm32f3xx-hal/compare/v0.5.0...HEAD
+[v0.5.0]: https://github.com/stm32-rs/stm32f3xx-hal/compare/v0.4.3...v0.5.0
 [v0.4.3]: https://github.com/stm32-rs/stm32f3xx-hal/compare/v0.4.2...v0.4.3
 [v0.4.2]: https://github.com/stm32-rs/stm32f3xx-hal/compare/v0.4.1...v0.4.2
 [v0.4.1]: https://github.com/stm32-rs/stm32f3xx-hal/compare/v0.4.0...v0.4.1

CHANGELOG.md

@@ -9,15 +9,12 @@ name = "stm32f3xx-hal"
 readme = "README.md"
 repository = "https://github.com/stm32-rs/stm32f3xx-hal"
 documentation = "https://docs.rs/stm32f3xx-hal"
-version = "0.4.3"
+version = "0.5.0"
 
 [package.metadata.docs.rs]
 features = ["stm32f303xc", "rt", "stm32-usbd"]
 targets = ["thumbv7em-none-eabihf"]
 
-[badges]
-travis-ci = { repository = "stm32-rs/stm32f3xx-hal" }
-
 [dependencies]
 cortex-m = "0.6"
 cortex-m-rt = "0.6"
@@ -38,35 +35,39 @@ version = "0.2"
 features = ["const-fn"]
 
 [dependencies.cast]
-default-features = false
 version = "0.2"
-
-[dependencies.void]
 default-features = false
+
+[dependencies.stable_deref_trait]
 version = "1"
+default-features = false
 
 [dependencies.stm32-usbd]
 version = "0.5"
 optional = true
 
+[dependencies.void]
+version = "1"
+default-features = false
+
 [dev-dependencies]
 panic-semihosting = "0.5"
 usb-device = "0.2"
 usbd-serial = "0.1"
+cortex-m-semihosting = "0.3"
 
 [features]
 default = ["unproven"]
+unproven = ["embedded-hal/unproven"]
 device-selected = []
 direct-call-deprecated = []
 rt = ["stm32f3/rt"]
 can = ["embedded-hal-can", "heapless"]
-# Any Changes here should be mirrored in README.md and src/lib.rs
-stm32f301 = ["stm32f3/stm32f301", "direct-call-deprecated"]
-stm32f301xb = ["stm32f301", "device-selected"]
-stm32f301xc = ["stm32f301", "device-selected"]
-stm32f301xd = ["stm32f301", "device-selected"]
-stm32f301xe = ["stm32f301", "device-selected"]
-stm32f318 = ["stm32f3/stm32f3x8", "device-selected"]
+
+# Any Changes here should be mirrored in README.md, src/lib.rs, and
+# .github/workflows/ci.yml.
+stm32f301 = ["stm32f3/stm32f301", "device-selected"]
+stm32f318 = ["stm32f3/stm32f301", "device-selected"]
 stm32f302 = ["stm32f3/stm32f302", "direct-call-deprecated"]
 stm32f302xb = ["stm32f302", "device-selected"]
 stm32f302xc = ["stm32f302", "device-selected"]
@@ -82,12 +83,11 @@ stm32f303xe = ["stm32f303", "stm32-usbd/ram_access_2x16", "device-selected"]
 stm32f303x6 = ["stm32f303", "device-selected"]
 stm32f303x8 = ["stm32f303", "device-selected"]
 stm32f373 = ["stm32f3/stm32f373", "device-selected"]
-stm32f378 = ["stm32f3/stm32f3x8", "device-selected"]
+stm32f378 = ["stm32f3/stm32f373", "device-selected"]
 stm32f334 = ["stm32f3/stm32f3x4", "device-selected"]
 stm32f328 = ["stm32f3/stm32f3x8", "device-selected"]
 stm32f358 = ["stm32f3/stm32f3x8", "device-selected"]
 stm32f398 = ["stm32f3/stm32f3x8", "device-selected"]
-unproven = ["embedded-hal/unproven"]
 
 [profile.dev]
 debug = true
@@ -115,5 +115,14 @@ name = "spi"
 required-features = ["stm32f303"]
 
 [[example]]
+<<<<<<< HEAD
 name = "can"
 required-features = ["rt", "can", "stm32f303"]
+=======
+name = "serial_dma"
+required-features = ["stm32f303"]
+
+[[example]]
+name = "adc"
+required-features = ["stm32f303"]
+>>>>>>> master

Cargo.toml

@@ -1,6 +1,6 @@
 # stm32f3xx-hal
 
-[![Build Status](https://travis-ci.com/stm32-rs/stm32f3xx-hal.svg)](https://travis-ci.com/stm32-rs/stm32f3xx-hal)
+[![Build Status](https://github.com/stm32-rs/stm32f3xx-hal/workflows/CI/badge.svg)](https://github.com/stm32-rs/stm32f3xx-hal/actions)
 [![Crate](https://img.shields.io/crates/v/stm32f3xx-hal.svg)](https://crates.io/crates/stm32f3xx-hal)
 [![Docs](https://docs.rs/stm32f3xx-hal/badge.svg)](https://docs.rs/stm32f3xx-hal)
 

README.md

@@ -0,0 +1,59 @@
+#![no_std]
+#![no_main]
+
+//! Example usage for ADC on STM32F303
+
+extern crate panic_semihosting;
+
+use cortex_m_rt::entry;
+use cortex_m_semihosting::hprintln;
+
+use stm32f3xx_hal::{adc, pac, prelude::*};
+
+#[entry]
+/// Main Thread
+fn main() -> ! {
+    // Get peripherals, clocks and freeze them
+    let mut dp = pac::Peripherals::take().unwrap();
+    let mut rcc = dp.RCC.constrain();
+    let clocks = rcc.cfgr.freeze(&mut dp.FLASH.constrain().acr);
+
+    // set up adc1
+    let mut adc1 = adc::Adc::adc1(
+        dp.ADC1, // The ADC we are going to control
+        // The following is only needed to make sure the clock signal for the ADC is set up
+        // correctly.
+        &mut dp.ADC1_2,
+        &mut rcc.ahb,
+        adc::CkMode::default(),
+        clocks,
+    );
+
+    // Set up pin PA0 as analog pin.
+    // This pin is connected to the user button on the stm32f3discovery board.
+    let mut gpio_a = dp.GPIOA.split(&mut rcc.ahb);
+    let mut adc1_in1_pin = gpio_a.pa0.into_analog(&mut gpio_a.moder, &mut gpio_a.pupdr);
+
+    // Be aware that the values in the table below depend on the input of VREF.
+    // To have a stable VREF input, put a condensator and a volt limiting diode in front of it.
+    //
+    // Also know that integer division and the ADC hardware unit always round down.
+    // To make up for those errors, see this forum entry:
+    // [https://forum.allaboutcircuits.com/threads/why-adc-1024-is-correct-and-adc-1023-is-just-plain-wrong.80018/]
+    hprintln!("
+    The ADC has a 12 bit resolution, i.e. if your reference Value is 3V:
+        approx. ADC value | approx. volt value
+        ==================+===================
+                        0 |        0 mV
+                     2048 |     1500 mV
+                     4095 |     3000 mV
+
+    If you are using a STM32F3Discovery, PA0 is connected to the User Button.
+    Pressing it should connect the user Button to to HIGH and the value should change from 0 to 4095.
+    ").expect("Error using hprintln.");
+
+    loop {
+        let adc1_in1_data: u16 = adc1.read(&mut adc1_in1_pin).expect("Error reading adc1.");
+        hprintln!("PA0 reads {}", adc1_in1_data).ok();
+    }
+}