Merge pull request #5 from uorocketry/remove_mutex

Migrated static RTC Mutex into SharedResources
uorocketry · Oct 5, 2024 · 0968981 · 0968981
2 parents c108137 + 4e16ca6
commit 0968981
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 24 deletions.
diff --git a/boards/pressure/src/main.rs b/boards/pressure/src/main.rs
@@ -43,8 +43,6 @@ fn panic() -> ! {
     cortex_m::asm::udf()
 }
 
-static RTC: Mutex<RefCell<Option<rtc::Rtc>>> = Mutex::new(RefCell::new(None));
-
 #[rtic::app(device = stm32h7xx_hal::stm32, peripherals = true, dispatchers = [EXTI0, EXTI1, EXTI2, SPI3, SPI2])]
 mod app {
 
@@ -65,6 +63,7 @@ mod app {
         can_command_manager: CanCommandManager,
         can_data_manager: CanDataManager,
         sbg_power: PB4<Output<PushPull>>,
+        rtc: rtc::Rtc,
     }
     #[local]
     struct LocalResources {
@@ -292,10 +291,6 @@ mod app {
 
         rtc.set_date_time(now);
 
-        cortex_m::interrupt::free(|cs| {
-            RTC.borrow(cs).replace(Some(rtc));
-        });
-
         /* Monotonic clock */
         Mono::start(core.SYST, 200_000_000);
 
@@ -319,6 +314,7 @@ mod app {
                 can_command_manager,
                 can_data_manager,
                 sbg_power,
+                rtc,
             },
             LocalResources {
                 led_red,

diff --git a/boards/strain/src/main.rs b/boards/strain/src/main.rs
@@ -43,8 +43,6 @@ fn panic() -> ! {
     cortex_m::asm::udf()
 }
 
-static RTC: Mutex<RefCell<Option<rtc::Rtc>>> = Mutex::new(RefCell::new(None));
-
 #[rtic::app(device = stm32h7xx_hal::stm32, peripherals = true, dispatchers = [EXTI0, EXTI1, EXTI2, SPI3, SPI2])]
 mod app {
 
@@ -65,6 +63,7 @@ mod app {
         can_command_manager: CanCommandManager,
         can_data_manager: CanDataManager,
         sbg_power: PB4<Output<PushPull>>,
+        rtc: rtc::Rtc,
     }
     #[local]
     struct LocalResources {
@@ -292,10 +291,6 @@ mod app {
 
         rtc.set_date_time(now);
 
-        cortex_m::interrupt::free(|cs| {
-            RTC.borrow(cs).replace(Some(rtc));
-        });
-
         /* Monotonic clock */
         Mono::start(core.SYST, 200_000_000);
 
@@ -319,6 +314,7 @@ mod app {
                 can_command_manager,
                 can_data_manager,
                 sbg_power,
+                rtc,
             },
             LocalResources {
                 led_red,

diff --git a/boards/temperature/src/main.rs b/boards/temperature/src/main.rs
@@ -43,8 +43,6 @@ fn panic() -> ! {
     cortex_m::asm::udf()
 }
 
-static RTC: Mutex<RefCell<Option<rtc::Rtc>>> = Mutex::new(RefCell::new(None));
-
 #[rtic::app(device = stm32h7xx_hal::stm32, peripherals = true, dispatchers = [EXTI0, EXTI1, EXTI2, SPI3, SPI2])]
 mod app {
 
@@ -65,6 +63,7 @@ mod app {
         can_command_manager: CanCommandManager,
         can_data_manager: CanDataManager,
         sbg_power: PB4<Output<PushPull>>,
+        rtc: rtc::Rtc,
     }
     #[local]
     struct LocalResources {
@@ -292,10 +291,6 @@ mod app {
 
         rtc.set_date_time(now);
 
-        cortex_m::interrupt::free(|cs| {
-            RTC.borrow(cs).replace(Some(rtc));
-        });
-
         /* Monotonic clock */
         Mono::start(core.SYST, 200_000_000);
 
@@ -319,6 +314,7 @@ mod app {
                 can_command_manager,
                 can_data_manager,
                 sbg_power,
+                rtc,
             },
             LocalResources {
                 led_red,

diff --git a/examples/rtic-playground/src/main.rs b/examples/rtic-playground/src/main.rs
@@ -43,8 +43,6 @@ fn panic() -> ! {
     cortex_m::asm::udf()
 }
 
-static RTC: Mutex<RefCell<Option<rtc::Rtc>>> = Mutex::new(RefCell::new(None));
-
 #[rtic::app(device = stm32h7xx_hal::stm32, peripherals = true, dispatchers = [EXTI0, EXTI1, EXTI2, SPI3, SPI2])]
 mod app {
 
@@ -65,6 +63,7 @@ mod app {
         can_command_manager: CanCommandManager,
         can_data_manager: CanDataManager,
         sbg_power: PB4<Output<PushPull>>,
+        rtc: rtc::Rtc,
     }
     #[local]
     struct LocalResources {
@@ -292,10 +291,6 @@ mod app {
 
         rtc.set_date_time(now);
 
-        cortex_m::interrupt::free(|cs| {
-            RTC.borrow(cs).replace(Some(rtc));
-        });
-
         /* Monotonic clock */
         Mono::start(core.SYST, 200_000_000);
 
@@ -319,6 +314,7 @@ mod app {
                 can_command_manager,
                 can_data_manager,
                 sbg_power,
+                rtc,
             },
             LocalResources {
                 led_red,