Compare commits

...

10 commits

Author SHA1 Message Date
decf910b55 EXTI experiment 2024-03-22 12:45:36 +00:00
e3b9f7ceb0 use const declarations 2024-03-22 00:11:17 +00:00
75002d4bdc remove DMXIdle struct 2024-03-21 23:35:46 +00:00
dd8dfeacd6 DMX_LEN generic 2024-03-21 23:31:59 +00:00
c27c980097 implicit wait() 2024-03-21 22:50:21 +00:00
91139c792c streamlining 2024-03-21 21:04:51 +00:00
df790fcc74 main.rs task "foo" 2024-03-21 19:23:06 +00:00
a82f68d546 creation from serial 2024-03-21 18:52:04 +00:00
7c6328f9fc DMX as enum 2024-03-21 17:58:02 +00:00
340c5c3fb2 create dmx.rs 2024-03-21 14:29:37 +00:00
2 changed files with 109 additions and 34 deletions
bluepill-rs/src

55
bluepill-rs/src/dmx.rs Normal file
View file

@ -0,0 +1,55 @@
use cortex_m::singleton;
use stm32f1xx_hal::{dma, pac, prelude::*, rcc, serial};
const DMX_LEN_MAX: usize = 512;
type TxDma = dma::TxDma<serial::Tx<pac::USART1>, dma::dma1::C4>;
type DMXUniverse<const DMX_LEN: usize> = &'static mut [u8; DMX_LEN];
type DMXTransfer<const DMX_LEN: usize> = dma::Transfer<dma::R, DMXUniverse<DMX_LEN>, TxDma>;
pub enum DMX<const DMX_LEN: usize = 512> {
Idle(Option<TxDma>, Option<DMXUniverse<DMX_LEN>>),
Busy(Option<DMXTransfer<DMX_LEN>>),
}
impl<const DMX_LEN: usize> DMX<DMX_LEN> {
pub fn new<PINS>(
mut serial: serial::Serial<pac::USART1, PINS>,
channel: dma::dma1::C4,
clocks: &rcc::Clocks,
) -> Self
where
PINS: serial::Pins<pac::USART1>,
{
serial.reconfigure(250_000.bps(), &clocks).unwrap();
Self::Idle(Some(serial.tx.with_dma(channel)), None)
}
pub fn send(&mut self, data: &[u8]) {
if let Self::Busy(_) = self {
self.wait();
}
let Self::Idle(tx, txbuffer) = self else {
panic!("Broken DMX State!")
};
let txbuffer = txbuffer.take().unwrap_or_else(|| {
let foo = singleton!(: [u8; DMX_LEN_MAX] = [0u8; DMX_LEN_MAX]).unwrap();
(&mut foo[..DMX_LEN]).try_into().unwrap()
});
let tx = tx.take().unwrap();
txbuffer.copy_from_slice(&data[..DMX_LEN]);
*self = Self::Busy(Some(tx.write(txbuffer)));
}
pub fn wait(&mut self) {
let Self::Busy(xfer) = self else { return };
let xfer = xfer.take().unwrap();
let (txbuffer, tx) = xfer.wait();
*self = Self::Idle(Some(tx), Some(txbuffer));
}
}

View file

@ -2,33 +2,37 @@
#![no_std]
#![no_main]
mod i2c_reg_slave;
mod i2c_slave;
// mod i2c_reg_slave;
// mod i2c_slave;
mod dmx;
// extern crate panic_halt;
extern crate panic_semihosting;
#[rtic::app(device = stm32f1xx_hal::pac)]
#[rtic::app(device = stm32f1xx_hal::pac, dispatchers = [SPI1, SPI2, SPI3])]
mod app {
use crate::dmx::DMX;
use cortex_m::singleton;
use stm32f1xx_hal::{dma, gpio, pac, prelude::*, serial, timer};
use stm32f1xx_hal::{gpio, pac, prelude::*, serial, timer};
use systick_monotonic::Systick;
const DMX_LEN: usize = 512;
// A monotonic timer to enable scheduling in RTIC
#[monotonic(binds = SysTick, default = true)]
type MyMono = Systick<100>; // 100 Hz / 10 ms granularity
#[shared]
struct Shared {
buffer: &'static mut [u8; 512],
buffer: &'static mut [u8],
delay_us: timer::DelayUs<pac::TIM2>,
}
#[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>,
dmx: DMX<DMX_LEN>,
led: gpio::gpioc::PC13<gpio::Output<gpio::PushPull>>,
int_led: gpio::gpiob::PB0<gpio::Output<gpio::OpenDrain>>,
}
#[init]
@ -53,60 +57,76 @@ mod app {
// Acquire the peripherals
let mut gpioa = cx.device.GPIOA.split();
let mut gpiob = cx.device.GPIOB.split();
let mut gpioc = cx.device.GPIOC.split();
let mut afio = cx.device.AFIO.constrain();
let dma1 = cx.device.DMA1.split();
cx.device.EXTI.imr.write(|w| w.mr1().set_bit());
let _ = gpiob.pb10.into_pull_up_input(&mut gpiob.crh);
// Serial config
let serial = serial::Serial::new(
cx.device.USART1,
(
gpioa.pa9.into_alternate_push_pull(&mut gpioa.crh),
gpioa.pa9.into_alternate_open_drain(&mut gpioa.crh),
gpioa.pa10, //.into_pull_up_input(&mut gpioa.crh),
),
&mut afio.mapr,
250_000.bps(),
serial::Config::default(),
&clocks,
);
// rtic::pend(pac::Interrupt::DMA1_CHANNEL4); // ???
foo::spawn().unwrap();
(
Shared {
buffer: singleton!(: [u8; 512] = [0b01010101; 512]).unwrap(),
},
Local {
tx: Some(serial.tx.with_dma(dma1.4)),
txbuffer: Some(singleton!(: [u8; 512] = [0; 512]).unwrap()),
buffer: singleton!(: [u8; DMX_LEN] = [0b01010101; DMX_LEN]).unwrap(),
// Configure timer
delay_us: cx.device.TIM2.delay_us(&clocks),
},
Local {
dmx: DMX::new(serial, dma1.4, &clocks),
// Configure gpio C pin 13 as a push-pull output. The `crh` register is passed to the function
// in order to configure the port. For pins 0-7, crl should be passed instead.
led: gpioc.pc13.into_push_pull_output(&mut gpioc.crh),
led: gpioc
.pc13
.into_push_pull_output_with_state(&mut gpioc.crh, gpio::PinState::High),
int_led: gpiob
.pb0
.into_open_drain_output_with_state(&mut gpiob.crl, gpio::PinState::Low),
},
init::Monotonics(mono),
)
}
#[idle(local = [tx, txbuffer, delay_us, led], shared = [&buffer])]
fn idle(cx: idle::Context) -> ! {
#[idle]
fn idle(_: 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);
let xfer = tx.write(txbuffer);
cx.local.delay_us.delay(1.secs());
cx.local.led.set_high();
cx.local.delay_us.delay(1.secs());
cx.local.led.set_low();
(txbuffer, tx) = xfer.wait();
cx.local.tx.replace(tx);
cx.local.txbuffer.replace(txbuffer);
rtic::export::wfi();
}
}
#[task(local = [dmx, led], shared = [&buffer, delay_us])]
fn foo(mut cx: foo::Context) {
cx.local.dmx.send(cx.shared.buffer);
cx.local.led.toggle();
cx.shared.delay_us.lock(|d| d.delay(1.secs()));
// cx.local.dmx.wait();
foo::spawn().unwrap();
}
#[task(binds=EXTI0, local = [int_led], shared = [delay_us])]
fn bar(mut cx: bar::Context) {
cx.local.int_led.toggle();
cx.shared.delay_us.lock(|d| d.delay(1.secs()));
}
}