Merge branch 'master' into subvariants

strom-und-spiele · web-flow · commit 6eb84f025d3e · 2020-04-17T09:33:08.000+02:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,44 +6,45 @@ description = "Peripheral access API for STM32F3 series microcontrollers"
 keywords = ["arm", "cortex-m", "stm32f3xx", "hal"]
 license = "0BSD"
 name = "stm32f3xx-hal"
+readme = "README.md"
 repository = "https://github.com/stm32-rs/stm32f3xx-hal"
 documentation = "https://docs.rs/stm32f3xx-hal"
-version = "0.4.1"
+version = "0.4.3"
 
 [package.metadata.docs.rs]
 features = ["stm32f303xc", "rt", "stm32-usbd"]
-default-target = "x86_64-unknown-linux-gnu"
+targets = ["thumbv7em-none-eabihf"]
 
 [badges]
 travis-ci = { repository = "stm32-rs/stm32f3xx-hal" }
 
 [dependencies]
-cortex-m = ">=0.5.8,<0.7"
-cortex-m-rt = "0.6.8"
-embedded-hal = "0.2.3"
-nb = "0.1.2"
-stm32f3 = "0.10.0"
+cortex-m = "0.6"
+cortex-m-rt = "0.6"
+embedded-hal = "0.2"
+nb = "0.1"
+stm32f3 = "0.10"
 
 [dependencies.bare-metal]
-version = "0.2.4"
+version = "0.2"
 features = ["const-fn"]
 
 [dependencies.cast]
 default-features = false
-version = "0.2.2"
+version = "0.2"
 
 [dependencies.void]
 default-features = false
-version = "1.0.2"
+version = "1"
 
 [dependencies.stm32-usbd]
-version = "0.5.0"
+version = "0.5"
 optional = true
 
 [dev-dependencies]
-panic-semihosting = "0.5.2"
-usb-device = "0.2.3"
-usbd-serial = "0.1.0"
+panic-semihosting = "0.5"
+usb-device = "0.2"
+usbd-serial = "0.1"
 
 [features]
 default = ["unproven"]
diff --git a/examples/pwm.rs b/examples/pwm.rs
@@ -3,7 +3,7 @@
 #![no_std]
 #![no_main]
 
-extern crate panic_semihosting;
+use panic_semihosting as _;
 
 use cortex_m_rt::entry;
 //use cortex_m_semihosting::hprintln;
@@ -23,7 +23,7 @@ fn main() -> ! {
     // Configure our clocks
     let mut flash = dp.FLASH.constrain();
     let mut rcc = dp.RCC.constrain();
-    let clocks = rcc.cfgr.freeze(&mut flash.acr);
+    let clocks = rcc.cfgr.sysclk(16.mhz()).freeze(&mut flash.acr);
 
     // Prep the pins we need in their correct alternate function
     let mut gpioa = dp.GPIOA.split(&mut rcc.ahb);
@@ -34,10 +34,8 @@ fn main() -> ! {
     let mut gpiob = dp.GPIOB.split(&mut rcc.ahb);
     let pb0 = gpiob.pb0.into_af2(&mut gpiob.moder, &mut gpiob.afrl);
     let pb1 = gpiob.pb1.into_af2(&mut gpiob.moder, &mut gpiob.afrl);
-    let pb3 = gpiob.pb3.into_af4(&mut gpiob.moder, &mut gpiob.afrl);
     let pb4 = gpiob.pb4.into_af2(&mut gpiob.moder, &mut gpiob.afrl);
     let pb5 = gpiob.pb5.into_af2(&mut gpiob.moder, &mut gpiob.afrl);
-    let pb7 = gpiob.pb7.into_af10(&mut gpiob.moder, &mut gpiob.afrl);
     let pb8 = gpiob.pb8.into_af1(&mut gpiob.moder, &mut gpiob.afrh);
     let pb10 = gpiob.pb10.into_af1(&mut gpiob.moder, &mut gpiob.afrh);
 
@@ -77,7 +75,7 @@ fn main() -> ! {
     tim3_ch3.set_duty(tim3_ch3.get_max_duty() / 50 * 3); // 6% duty cyle
     tim3_ch3.enable();
 
-    let mut tim3_ch4 = tim3_channels.3.output_to_pb1(pb1).output_to_pb7(pb7);
+    let mut tim3_ch4 = tim3_channels.3.output_to_pb1(pb1);
     tim3_ch4.set_duty(tim3_ch4.get_max_duty() / 10); // 10% duty cyle
     tim3_ch4.enable();
 
@@ -132,7 +130,7 @@ fn main() -> ! {
         &clocks, // To get the timer's clock speed
     );
 
-    let mut tim8_ch1 = tim8_channels.0.output_to_pb3(pb3).output_to_pc10(pc10);
+    let mut tim8_ch1 = tim8_channels.0.output_to_pc10(pc10);
     tim8_ch1.set_duty(tim8_ch1.get_max_duty() / 10); // 10% duty cyle
     tim8_ch1.enable();
 
diff --git a/examples/spi.rs b/examples/spi.rs
@@ -3,7 +3,7 @@
 #![no_std]
 #![no_main]
 
-extern crate panic_semihosting;
+use panic_semihosting as _;
 
 use stm32f3xx_hal as hal;
 
diff --git a/examples/toggle.rs b/examples/toggle.rs
@@ -6,7 +6,7 @@
 #![no_main]
 #![no_std]
 
-extern crate panic_semihosting;
+use panic_semihosting as _;
 
 use cortex_m_rt::entry;
 use stm32f3xx_hal::prelude::*;
diff --git a/examples/usb_serial.rs b/examples/usb_serial.rs
@@ -3,7 +3,7 @@
 #![no_std]
 #![no_main]
 
-extern crate panic_semihosting;
+use panic_semihosting as _;
 
 use cortex_m::asm::delay;
 use cortex_m_rt::entry;
diff --git a/src/gpio.rs b/src/gpio.rs
@@ -892,7 +892,7 @@ gpio!([
                 AF13: (into_af13, 13, ["stm32f334",],),
                 AF14: (into_af14, 14, ["stm32f302", "stm32f303xb", "stm32f303xc",],),
             ]),
-            PA13: (pa13, 13, Input<Floating>, AFRH, [
+            PA13: (pa13, 13, AF0, AFRH, [
                 AF0: (into_af0, 0,),
                 AF1: (into_af1, 1,),
                 AF3: (into_af3, 3,),
@@ -904,7 +904,7 @@ gpio!([
                 AF6: (into_af6, 6, ["stm32f373", "stm32f378", "stm32f398",],),
                 AF10: (into_af10, 10, ["stm32f302", "stm32f303xb", "stm32f303xc", "stm32f303xd", "stm32f303xe", "stm32f373", "stm32f378", "stm32f358", "stm32f398",],),
             ]),
-            PA14: (pa14, 14, Input<Floating>, AFRH, [
+            PA14: (pa14, 14, AF0, AFRH, [
                 AF0: (into_af0, 0,),
                 AF3: (into_af3, 3,),
                 AF4: (into_af4, 4,),
@@ -915,7 +915,7 @@ gpio!([
                 AF7: (into_af7, 7, ["stm32f301", "stm32f318", "stm32f302", "stm32f303", "stm32f334", "stm32f328", "stm32f358", "stm32f398",],),
                 AF10: (into_af10, 10, ["stm32f373", "stm32f378",],),
             ]),
-            PA15: (pa15, 15, Input<Floating>, AFRH, [
+            PA15: (pa15, 15, AF0, AFRH, [
                 AF0: (into_af0, 0,),
                 AF1: (into_af1, 1,),
                 AF4: (into_af4, 4,),
@@ -977,7 +977,7 @@ gpio!([
                 AF13: (into_af13, 13, ["stm32f334",],),
                 AF15: (into_af15, 15, ["stm32f301", "stm32f302", "stm32f303", "stm32f334",],),
             ]),
-            PB3: (pb3, 3, Input<Floating>, AFRL, [
+            PB3: (pb3, 3, AF0, AFRL, [
                 AF0: (into_af0, 0,),
                 AF1: (into_af1, 1,),
                 AF3: (into_af3, 3,),
@@ -993,7 +993,7 @@ gpio!([
                 AF12: (into_af12, 12, ["stm32f334",],),
                 AF13: (into_af13, 13, ["stm32f334",],),
             ]),
-            PB4: (pb4, 4, Input<Floating>, AFRL, [
+            PB4: (pb4, 4, AF0, AFRL, [
                 AF0: (into_af0, 0,),
                 AF1: (into_af1, 1,),
                 AF3: (into_af3, 3,),
diff --git a/src/i2c.rs b/src/i2c.rs
@@ -88,12 +88,12 @@ macro_rules! busy_wait {
         loop {
             let isr = $i2c.isr.read();
 
-            if isr.berr().is_error() {
+            if isr.$flag().$variant() {
+                break;
+            } else if isr.berr().is_error() {
                 return Err(Error::Bus);
             } else if isr.arlo().is_lost() {
                 return Err(Error::Arbitration);
-            } else if isr.$flag().$variant() {
-                break;
             } else {
                 // try again
             }
@@ -228,7 +228,7 @@ macro_rules! hal {
                             .start()
                             .start()
                             .autoend()
-                            .software()
+                            .automatic()
                     });
 
                     for byte in buffer {
@@ -315,16 +315,16 @@ macro_rules! hal {
                     });
 
                     for byte in bytes {
-                        // Wait until we are allowed to send data (START has been ACKed or last byte
-                        // when through)
+                        // Wait until we are allowed to send data
+                        // (START has been ACKed or last byte went through):
                         busy_wait!(self.i2c, txis, is_empty);
 
-                        // put byte on the wire
+                        // put byte into TXDR
                         // NOTE(write): writes all non-reserved bits.
                         self.i2c.txdr.write(|w| w.txdata().bits(*byte));
                     }
 
-                    // Wait until the last transmission is finished
+                    // Wait until the last byte transmission is finished:
                     busy_wait!(self.i2c, tc, is_complete);
 
                     // reSTART and prepare to receive bytes into `buffer`
diff --git a/src/lib.rs b/src/lib.rs
@@ -142,3 +142,6 @@ pub mod timer;
     )
 ))]
 pub mod usb;
+
+#[cfg(feature = "device-selected")]
+pub mod watchdog;
diff --git a/src/rcc.rs b/src/rcc.rs
diff --git a/src/serial.rs b/src/serial.rs
diff --git a/src/time.rs b/src/time.rs
diff --git a/src/watchdog.rs b/src/watchdog.rs

Original file line number	Diff line number	Diff line change
`@@ -142,3 +142,6 @@ pub mod timer;`
`142`	`142`	`)`
`143`	`143`	`))]`
`144`	`144`	`pub mod usb;`
	`145`	`+`
	`146`	`+#[cfg(feature = "device-selected")]`
	`147`	`+pub mod watchdog;`