Support for the STM32L0x0 subfamily

Cargo.toml

@@ -55,6 +55,7 @@ disable-linker-script = []
 
 # STM32L0 subfamilies
 # (Warning: Some peripherals, e.g. GPIO, don't follow this subfamily grouping.)
+stm32l0x0 = ["stm32l0/stm32l0x0"]
 stm32l0x1 = ["stm32l0/stm32l0x1"]
 stm32l0x2 = ["stm32l0/stm32l0x2"]
 stm32l0x3 = ["stm32l0/stm32l0x3"]
@@ -337,7 +338,7 @@ required-features = ["stm32l0x2", "io-STM32L071"]
 
 [[example]]
 name = "serial"
-required-features = ["stm32l0x2", "io-STM32L071"]
+# required-features = ["stm32l0x2", "io-STM32L071"]
 
 [[example]]
 name = "serial_dma"

build.rs

@@ -9,6 +9,10 @@ fn main() {
 
     let mut feature_count = 0;
 
+    if cfg!(feature = "stm32l0x0") {
+        feature_count += 1;
+    }
+
     if cfg!(feature = "stm32l0x1") {
         feature_count += 1;
     }
@@ -22,11 +26,13 @@ fn main() {
     }
 
     if feature_count != 1 {
-        panic!("\n\nMust select exactly one package for linker script generation!\nChoices: 'stm32l0x1' or 'stm32l0x2' or 'stm32l0x3'\nAlternatively, pick the mcu-feature that matches your MCU, for example 'mcu-STM32L071KBTx'\n\n");
+        panic!("\n\nMust select exactly one package for linker script generation!\nChoices: 'stm32l0x0' or 'stm32l0x1' or 'stm32l0x2' or 'stm32l0x3'\nAlternatively, pick the mcu-feature that matches your MCU, for example 'mcu-STM32L071KBTx'\n\n");
     }
 
     if !cfg!(feature = "disable-linker-script") {
-        let linker = if cfg!(feature = "stm32l0x1") {
+        let linker = if cfg!(feature = "stm32l0x0") {
+        		include_bytes!("memory_l0x0.x").as_ref()
+        } else if cfg!(feature = "stm32l0x1") {
             include_bytes!("memory_l0x1.x").as_ref()
         } else if cfg!(feature = "stm32l0x2") {
             include_bytes!("memory_l0x2.x").as_ref()
@@ -42,6 +48,7 @@ fn main() {
             .unwrap();
         println!("cargo:rustc-link-search={}", out.display());
 
+        println!("cargo:rerun-if-changed=memory_l0x0.x");
         println!("cargo:rerun-if-changed=memory_l0x1.x");
         println!("cargo:rerun-if-changed=memory_l0x2.x");
         println!("cargo:rerun-if-changed=memory_l0x3.x");

examples/blinky.rs

@@ -16,10 +16,10 @@ fn main() -> ! {
 
     // Acquire the GPIOA peripheral. This also enables the clock for GPIOA in
     // the RCC register.
-    let gpioa = dp.GPIOA.split(&mut rcc);
+    let gpioc = dp.GPIOC.split(&mut rcc);
 
     // Configure PA1 as output.
-    let mut led = gpioa.pa1.into_push_pull_output();
+    let mut led = gpioc.pc1.into_push_pull_output();
 
     loop {
         // Set the LED high one million times in a row.

examples/blinky_delay.rs

@@ -16,10 +16,10 @@ fn main() -> ! {
 
     // Acquire the GPIOA peripheral. This also enables the clock for GPIOA in
     // the RCC register.
-    let gpioa = dp.GPIOA.split(&mut rcc);
+    let gpioa = dp.GPIOC.split(&mut rcc);
 
     // Configure PA1 as output.
-    let mut led = gpioa.pa1.into_push_pull_output();
+    let mut led = gpioa.pc1.into_push_pull_output();
 
     // Get the delay provider.
     let mut delay = cp.SYST.delay(rcc.clocks);
@@ -29,6 +29,6 @@ fn main() -> ! {
         delay.delay_ms(500_u16);
 
         led.set_low().unwrap();
-        delay.delay_ms(500_u16);
+        delay.delay_ms(2000_u16);
     }
 }

examples/lptim.rs

@@ -10,7 +10,7 @@ use cortex_m_rt::entry;
 use nb::block;
 use stm32l0xx_hal::{
     exti::{DirectLine, Exti},
-    gpio::{gpiob::PB, Output, PushPull},
+    gpio::{gpioc::PC, Output, PushPull},
     lptim::{self, ClockSrc, LpTimer},
     pac,
     prelude::*,
@@ -27,11 +27,11 @@ fn main() -> ! {
     let mut rcc = dp.RCC.freeze(rcc::Config::msi(rcc::MSIRange::Range0));
     let mut exti = Exti::new(dp.EXTI);
     let mut pwr = PWR::new(dp.PWR, &mut rcc);
-    let gpiob = dp.GPIOB.split(&mut rcc);
+    let gpioc = dp.GPIOC.split(&mut rcc);
 
-    let mut led = gpiob.pb2.into_push_pull_output().downgrade();
+    let mut led = gpioc.pc1.into_push_pull_output().downgrade();
 
-    let mut lptim = LpTimer::init_periodic(dp.LPTIM, &mut pwr, &mut rcc, ClockSrc::Lse);
+    let mut lptim = LpTimer::init_periodic(dp.LPTIM, &mut pwr, &mut rcc, ClockSrc::Lsi);
 
     let exti_line = DirectLine::Lptim1;
 
@@ -105,7 +105,7 @@ fn main() -> ! {
     }
 }
 
-fn blink(led: &mut PB<Output<PushPull>>) {
+fn blink(led: &mut PC<Output<PushPull>>) {
     led.set_high().unwrap();
     delay();
     led.set_low().unwrap();

examples/pwm.rs

@@ -26,7 +26,7 @@ fn main() -> ! {
     // Initialize TIM2 for PWM
     let pwm = pwm::Timer::new(dp.TIM2, 10.khz(), &mut rcc);
 
-    #[cfg(feature = "stm32l0x1")]
+    #[cfg(any(feature = "stm32l0x0", feature = "stm32l0x1"))]
     let mut pwm = pwm.channel2.assign(gpioa.pa1);
 
     // This is LD2 on ST's B-L072Z-LRWAN1 development board.

examples/timer.rs

@@ -18,7 +18,7 @@ use stm32l0xx_hal::{
     timer::Timer,
 };
 
-static LED: Mutex<RefCell<Option<gpioa::PA1<Output<PushPull>>>>> = Mutex::new(RefCell::new(None));
+static LED: Mutex<RefCell<Option<gpioc::PC1<Output<PushPull>>>>> = Mutex::new(RefCell::new(None));
 static TIMER: Mutex<RefCell<Option<Timer<pac::TIM2>>>> = Mutex::new(RefCell::new(None));
 
 #[entry]
@@ -30,10 +30,10 @@ fn main() -> ! {
 
     // Acquire the GPIOA peripheral. This also enables the clock for GPIOA in
     // the RCC register.
-    let gpioa = dp.GPIOA.split(&mut rcc);
+    let gpioc = dp.GPIOC.split(&mut rcc);
 
     // Configure PA1 as output.
-    let led = gpioa.pa1.into_push_pull_output();
+    let led = gpioc.pc1.into_push_pull_output();
 
     // Configure the timer.
     let mut timer = dp.TIM2.timer(1.hz(), &mut rcc);

examples/timer_interrupt_rtic.rs

@@ -11,7 +11,7 @@ use stm32l0xx_hal::{gpio::*, pac, prelude::*, rcc::Config, timer::Timer};
 #[app(device = stm32l0xx_hal::pac, peripherals = true)]
 const APP: () = {
     struct Resources {
-        led: gpioa::PA<Output<PushPull>>,
+        led: gpioc::PC<Output<PushPull>>,
         timer: Timer<pac::TIM2>,
     }
 
@@ -24,13 +24,13 @@ const APP: () = {
 
         // Acquire the GPIOA peripheral. This also enables the clock for GPIOA
         // in the RCC register.
-        let gpioa = device.GPIOA.split(&mut rcc);
+        let gpioc = device.GPIOC.split(&mut rcc);
 
         // Configure PA1 as output.
-        let led = gpioa.pa1.into_push_pull_output().downgrade();
+        let led = gpioc.pc1.into_push_pull_output().downgrade();
 
         // Configure the timer.
-        let mut timer = device.TIM2.timer(1.hz(), &mut rcc);
+        let mut timer = device.TIM2.timer(8.hz(), &mut rcc);
         timer.listen();
 
         // Return the initialised resources.

memory_l0x0.x

@@ -0,0 +1,5 @@
+MEMORY
+{
+  FLASH : ORIGIN = 0x08000000, LENGTH = 128K
+  RAM : ORIGIN = 0x20000000, LENGTH = 20K
+}

src/dma.rs

@@ -26,7 +26,7 @@ use crate::{
     rcc::Rcc,
 };
 
-#[cfg(any(feature = "io-STM32L051", feature = "io-STM32L071"))]
+#[cfg(all(not(feature = "stm32l0x0"), any(feature = "io-STM32L051", feature = "io-STM32L071")))]
 use crate::pac::USART1;
 
 #[cfg(any(
@@ -37,9 +37,16 @@ use crate::pac::USART1;
 ))]
 use crate::{
     i2c,
-    pac::{I2C1, I2C2, I2C3, USART2},
+    pac::{I2C1, USART2},
     serial,
 };
+#[cfg(not(feature = "stm32l0x0"))]
+use crate::{
+    pac::{
+        I2C2,
+        I2C3
+    },
+};
 
 use crate::{pac::SPI1, spi};
 
@@ -329,14 +336,14 @@ macro_rules! impl_channel {
                     handle:  &mut Handle,
                     address: u32,
                 ) {
-                    handle.dma.$chfield.par.write(|w| w.pa().bits(address));
+                    unsafe { handle.dma.$chfield.par.write(|w| w.pa().bits(address)); }
                 }
 
                 fn set_memory_address(&self,
                     handle:  &mut Handle,
                     address: u32,
                 ) {
-                    handle.dma.$chfield.mar.write(|w| w.ma().bits(address));
+                    unsafe { handle.dma.$chfield.mar.write(|w| w.ma().bits(address)); }
                 }
 
                 fn set_transfer_len(&self, handle: &mut Handle, len: u16) {
@@ -509,7 +516,7 @@ impl_target!(
     adc::DmaToken, Channel2, 0;
 );
 
-#[cfg(any(feature = "io-STM32L051", feature = "io-STM32L071"))]
+#[cfg(all(not(feature = "stm32l0x0"), any(feature = "io-STM32L051", feature = "io-STM32L071")))]
 impl_target!(
     // USART1
     serial::Tx<USART1>, Channel2, 3;

src/exti.rs

@@ -308,11 +308,14 @@ impl ExtiLine for GpioLine {
 /// both.
 #[derive(Copy, Clone, PartialEq, Eq)]
 pub enum ConfigurableLine {
+    #[cfg(not(feature = "stm32l0x0"))]
     Pvd = 16,
     RtcAlarm = 17,
     RtcTamper_CssLse = 19,
     RtcWakeup = 20,
+    #[cfg(not(feature = "stm32l0x0"))]
     Comp1 = 21,
+    #[cfg(not(feature = "stm32l0x0"))]
     Comp2 = 22,
 }
 
@@ -321,12 +324,15 @@ impl ExtiLine for ConfigurableLine {
         use ConfigurableLine::*;
 
         Some(match line {
+            #[cfg(not(feature = "stm32l0x0"))]
             16 => Pvd,
             17 => RtcAlarm,
             // 18 = USB (or reserved)
             19 => RtcTamper_CssLse,
             20 => RtcWakeup,
+            #[cfg(not(feature = "stm32l0x0"))]
             21 => Comp1,
+            #[cfg(not(feature = "stm32l0x0"))]
             22 => Comp2,
             _ => return None,
         })
@@ -341,8 +347,10 @@ impl ExtiLine for ConfigurableLine {
         use ConfigurableLine::*;
 
         match self {
+            #[cfg(not(feature = "stm32l0x0"))]
             Pvd => Interrupt::PVD,
             RtcAlarm | RtcTamper_CssLse | RtcWakeup => Interrupt::RTC,
+            #[cfg(not(feature = "stm32l0x0"))]
             Comp1 | Comp2 => Interrupt::ADC_COMP,
         }
     }
@@ -354,7 +362,9 @@ pub enum DirectLine {
     #[cfg(any(feature = "stm32l0x2", feature = "stm32l0x3"))]
     Usb = 18,
     I2C1 = 23,
+    #[cfg(not(feature = "stm32l0x0"))]
     I2C3 = 24,
+    #[cfg(not(feature = "stm32l0x0"))]
     Usart1 = 25,
     Usart2 = 26,
     // 27 = reserved
@@ -370,7 +380,9 @@ impl ExtiLine for DirectLine {
             #[cfg(any(feature = "stm32l0x2", feature = "stm32l0x3"))]
             18 => Usb,
             23 => I2C1,
+            #[cfg(not(feature = "stm32l0x0"))]
             24 => I2C3,
+            #[cfg(not(feature = "stm32l0x0"))]
             25 => Usart1,
             26 => Usart2,
             // 27 = reserved
@@ -392,9 +404,14 @@ impl ExtiLine for DirectLine {
             #[cfg(any(feature = "stm32l0x2", feature = "stm32l0x3"))]
             Usb => Interrupt::USB,
             I2C1 => Interrupt::I2C1,
+            #[cfg(not(feature = "stm32l0x0"))]
             I2C3 => Interrupt::I2C3,
+            #[cfg(not(feature = "stm32l0x0"))]
             Usart1 => Interrupt::USART1,
             Usart2 => Interrupt::USART2,
+            #[cfg(feature = "stm32l0x0")]
+            Lpuart1 => Interrupt::LPUART1,
+            #[cfg(not(feature = "stm32l0x0"))]
             Lpuart1 => Interrupt::AES_RNG_LPUART1,
             Lptim1 => Interrupt::LPTIM1,
         }