bluepill-rs/Cargo.lock

@@ -57,6 +57,7 @@ dependencies = [
  "nb 1.1.0",
  "panic-halt",
  "panic-semihosting",
+ "stm32f1",
  "stm32f1xx-hal",
  "systick-monotonic",
 ]

bluepill-rs/Cargo.toml

@@ -8,6 +8,7 @@ edition = "2021"
 [dependencies]
 # main deps
 embedded-hal = "1.0.0"
+stm32f1 = { version = "0.15", features = ["stm32f103", "rt"] }
 stm32f1xx-hal = { version = "0.10.0", features = ["rt", "stm32f103", "medium"] }
 nb = "1"
 cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] }

bluepill-rs/src/main.rs

@@ -8,7 +8,7 @@ mod i2c_slave;
 // extern crate panic_halt;
 extern crate panic_semihosting;
 
-#[rtic::app(device = stm32f1xx_hal::pac)]
+#[rtic::app(device = stm32f1::stm32f103, peripherals = true)]
 mod app {
     use cortex_m::singleton;
     use stm32f1xx_hal::{dma, gpio, pac, prelude::*, serial, timer};
@@ -20,13 +20,12 @@ mod app {
 
     #[shared]
     struct Shared {
-        buffer: &'static mut [u8; 512],
+        buffer: Option<&'static mut [u8; 512]>,
     }
 
     #[local]
     struct Local {
         tx: Option<dma::TxDma<serial::Tx<pac::USART1>, dma::dma1::C4>>,
-        txbuffer: Option<&'static mut [u8; 512]>,
         delay_us: timer::DelayUs<pac::TIM2>,
         led: gpio::gpioc::PC13<gpio::Output>,
     }
@@ -72,11 +71,10 @@ mod app {
 
         (
             Shared {
-                buffer: singleton!(: [u8; 512] = [0b01010101; 512]).unwrap(),
+                buffer: Some(singleton!(: [u8; 512] = [0b01010101; 512]).unwrap()),
             },
             Local {
                 tx: Some(serial.tx.with_dma(dma1.4)),
-                txbuffer: Some(singleton!(: [u8; 512] = [0; 512]).unwrap()),
 
                 // Configure timer
                 delay_us: cx.device.TIM2.delay_us(&clocks),
@@ -89,14 +87,14 @@ mod app {
         )
     }
 
-    #[idle(local = [tx, txbuffer, delay_us, led], shared = [&buffer])]
+    #[idle(local = [tx, delay_us, led], shared = [buffer])]
-    fn idle(cx: idle::Context) -> ! {
+    fn idle(mut cx: idle::Context) -> ! {
-        loop {
         let mut tx = cx.local.tx.take().unwrap();
-            let mut txbuffer = cx.local.txbuffer.take().unwrap();
 
-            txbuffer.copy_from_slice(*cx.shared.buffer);
+        loop {
-            let xfer = tx.write(txbuffer);
+            tx = (cx.shared.buffer).lock(|buffer| {
+                let buf = buffer.take().unwrap();
+                let xfer = tx.write(buf);
 
                 cx.local.delay_us.delay(1.secs());
                 cx.local.led.set_high();
@@ -104,9 +102,10 @@ mod app {
                 cx.local.delay_us.delay(1.secs());
                 cx.local.led.set_low();
 
-            (txbuffer, tx) = xfer.wait();
+                let (buf, tx) = xfer.wait();
-            cx.local.tx.replace(tx);
+                buffer.replace(buf);
-            cx.local.txbuffer.replace(txbuffer);
+                tx
+            });
         }
     }
 }