RTC/RCC: Fix LSI value being ignored. Make sure LSI is running for RTc

Author: MabezDev

.vscode/launch.json

@@ -13,7 +13,7 @@
             "debugger_args": [
                 "-nx" // dont use the .gdbinit file
             ],
-            "executable": "./target/thumbv7em-none-eabi/debug/examples/timer",
+            "executable": "./target/thumbv7em-none-eabi/debug/examples/rtc",
             "remote": true,
             "target": ":3333",
             "cwd": "${workspaceRoot}",

examples/rtc.rs

@@ -41,7 +41,7 @@ fn main() -> ! {
 
     let mut timer = Delay::new(cp.SYST, clocks);
     let mut pwr = dp.PWR.constrain(&mut rcc.apb1r1);
-    let rtc = Rtc::rtc(dp.RTC, &mut rcc.apb1r1, &mut rcc.bdcr, &mut pwr.cr1);
+    let rtc = Rtc::rtc(dp.RTC, &mut rcc.apb1r1, &mut rcc.bdcr, &mut pwr.cr1, clocks);
 
     let mut time = Time::new(21.hours(), 57.minutes(), 32.seconds(), false);
     let mut date = Date::new(1.day(), 24.date(), 4.month(), 2018.year());

src/rcc.rs

@@ -256,7 +256,7 @@ impl CFGR {
     /// Sets LSI clock on (the default) or off
     pub fn lsi(mut self, on: bool) -> Self
     {
-        self.hsi48 = on;
+        self.lsi = on;
         self
     }
 

src/rtc.rs

@@ -1,7 +1,7 @@
 //! RTC peripheral abstraction
 
 use crate::datetime::*;
-use crate::rcc::{BDCR, APB1R1};
+use crate::rcc::{BDCR, APB1R1, Clocks};
 use crate::pwr;
 use crate::stm32::{RTC};
 
@@ -11,7 +11,9 @@ pub struct Rtc {
 }
 
 impl Rtc {
-    pub fn rtc(rtc: RTC, apb1r1: &mut APB1R1, bdcr: &mut BDCR, pwrcr1: &mut pwr::CR1) -> Self {
+    pub fn rtc(rtc: RTC, apb1r1: &mut APB1R1, bdcr: &mut BDCR, pwrcr1: &mut pwr::CR1, clocks: Clocks) -> Self {
+
+        assert_eq!(clocks.lsi(), true); // make sure LSI is enabled
         // enable peripheral clock for communication
         apb1r1.enr().modify(|_, w| w.rtcapben().set_bit());
         pwrcr1.reg().read(); // read to allow the pwr clock to enable