Merge branch 'master' into center-align
This commit is contained in:
@ -6,7 +6,7 @@ use defmt::*;
|
||||
use embassy_executor::Spawner;
|
||||
use embassy_stm32::adc::{Adc, SampleTime};
|
||||
use embassy_stm32::Config;
|
||||
use embassy_time::{Delay, Duration, Timer};
|
||||
use embassy_time::{Delay, Timer};
|
||||
use {defmt_rtt as _, panic_probe as _};
|
||||
|
||||
#[embassy_executor::main]
|
||||
@ -18,16 +18,16 @@ async fn main(_spawner: Spawner) {
|
||||
config.rcc.csi = true;
|
||||
config.rcc.pll_src = PllSource::Hsi;
|
||||
config.rcc.pll1 = Some(Pll {
|
||||
prediv: 4,
|
||||
mul: 50,
|
||||
divp: Some(2),
|
||||
divq: Some(8), // SPI1 cksel defaults to pll1_q
|
||||
prediv: PllPreDiv::DIV4,
|
||||
mul: PllMul::MUL50,
|
||||
divp: Some(PllDiv::DIV2),
|
||||
divq: Some(PllDiv::DIV8), // SPI1 cksel defaults to pll1_q
|
||||
divr: None,
|
||||
});
|
||||
config.rcc.pll2 = Some(Pll {
|
||||
prediv: 4,
|
||||
mul: 50,
|
||||
divp: Some(8), // 100mhz
|
||||
prediv: PllPreDiv::DIV4,
|
||||
mul: PllMul::MUL50,
|
||||
divp: Some(PllDiv::DIV8), // 100mhz
|
||||
divq: None,
|
||||
divr: None,
|
||||
});
|
||||
@ -55,6 +55,6 @@ async fn main(_spawner: Spawner) {
|
||||
info!("vrefint: {}", vrefint);
|
||||
let measured = adc.read(&mut p.PC0);
|
||||
info!("measured: {}", measured);
|
||||
Timer::after(Duration::from_millis(500)).await;
|
||||
Timer::after_millis(500).await;
|
||||
}
|
||||
}
|
||||
|
@ -5,7 +5,7 @@
|
||||
use defmt::*;
|
||||
use embassy_executor::Spawner;
|
||||
use embassy_stm32::gpio::{Level, Output, Speed};
|
||||
use embassy_time::{Duration, Timer};
|
||||
use embassy_time::Timer;
|
||||
use {defmt_rtt as _, panic_probe as _};
|
||||
|
||||
#[embassy_executor::main]
|
||||
@ -18,10 +18,10 @@ async fn main(_spawner: Spawner) {
|
||||
loop {
|
||||
info!("high");
|
||||
led.set_high();
|
||||
Timer::after(Duration::from_millis(500)).await;
|
||||
Timer::after_millis(500).await;
|
||||
|
||||
info!("low");
|
||||
led.set_low();
|
||||
Timer::after(Duration::from_millis(500)).await;
|
||||
Timer::after_millis(500).await;
|
||||
}
|
||||
}
|
||||
|
@ -6,10 +6,10 @@ use embassy_executor::Spawner;
|
||||
use embassy_stm32::dcmi::{self, *};
|
||||
use embassy_stm32::gpio::{Level, Output, Speed};
|
||||
use embassy_stm32::i2c::I2c;
|
||||
use embassy_stm32::rcc::{Mco, Mco1Source};
|
||||
use embassy_stm32::rcc::{Mco, Mco1Source, McoPrescaler};
|
||||
use embassy_stm32::time::khz;
|
||||
use embassy_stm32::{bind_interrupts, i2c, peripherals, Config};
|
||||
use embassy_time::{Duration, Timer};
|
||||
use embassy_time::Timer;
|
||||
use ov7725::*;
|
||||
use {defmt_rtt as _, panic_probe as _};
|
||||
|
||||
@ -32,10 +32,10 @@ async fn main(_spawner: Spawner) {
|
||||
config.rcc.csi = true;
|
||||
config.rcc.pll_src = PllSource::Hsi;
|
||||
config.rcc.pll1 = Some(Pll {
|
||||
prediv: 4,
|
||||
mul: 50,
|
||||
divp: Some(2),
|
||||
divq: Some(8), // 100mhz
|
||||
prediv: PllPreDiv::DIV4,
|
||||
mul: PllMul::MUL50,
|
||||
divp: Some(PllDiv::DIV2),
|
||||
divq: Some(PllDiv::DIV8), // 100mhz
|
||||
divr: None,
|
||||
});
|
||||
config.rcc.sys = Sysclk::Pll1P; // 400 Mhz
|
||||
@ -49,7 +49,7 @@ async fn main(_spawner: Spawner) {
|
||||
let p = embassy_stm32::init(config);
|
||||
|
||||
defmt::info!("Hello World!");
|
||||
let mco = Mco::new(p.MCO1, p.PA8, Mco1Source::HSI, 3);
|
||||
let mco = Mco::new(p.MCO1, p.PA8, Mco1Source::HSI, McoPrescaler::DIV3);
|
||||
|
||||
let mut led = Output::new(p.PE3, Level::High, Speed::Low);
|
||||
let cam_i2c = I2c::new(
|
||||
@ -86,11 +86,11 @@ async fn main(_spawner: Spawner) {
|
||||
loop {
|
||||
defmt::info!("high");
|
||||
led.set_high();
|
||||
Timer::after(Duration::from_millis(500)).await;
|
||||
Timer::after_millis(500).await;
|
||||
|
||||
defmt::info!("low");
|
||||
led.set_low();
|
||||
Timer::after(Duration::from_millis(500)).await;
|
||||
Timer::after_millis(500).await;
|
||||
}
|
||||
}
|
||||
|
||||
@ -99,7 +99,7 @@ mod ov7725 {
|
||||
|
||||
use defmt::Format;
|
||||
use embassy_stm32::rcc::{Mco, McoInstance};
|
||||
use embassy_time::{Duration, Timer};
|
||||
use embassy_time::Timer;
|
||||
use embedded_hal_async::i2c::I2c;
|
||||
|
||||
#[repr(u8)]
|
||||
@ -184,7 +184,7 @@ mod ov7725 {
|
||||
|
||||
const CAM_ADDR: u8 = 0x21;
|
||||
|
||||
#[derive(Format)]
|
||||
#[derive(Format, PartialEq, Eq)]
|
||||
pub enum Error<I2cError: Format> {
|
||||
I2c(I2cError),
|
||||
}
|
||||
@ -210,9 +210,9 @@ mod ov7725 {
|
||||
}
|
||||
|
||||
pub async fn init(&mut self) -> Result<(), Error<Bus::Error>> {
|
||||
Timer::after(Duration::from_millis(500)).await;
|
||||
Timer::after_millis(500).await;
|
||||
self.reset_regs().await?;
|
||||
Timer::after(Duration::from_millis(500)).await;
|
||||
Timer::after_millis(500).await;
|
||||
self.set_pixformat().await?;
|
||||
self.set_resolution().await?;
|
||||
Ok(())
|
||||
|
@ -20,16 +20,16 @@ fn main() -> ! {
|
||||
config.rcc.csi = true;
|
||||
config.rcc.pll_src = PllSource::Hsi;
|
||||
config.rcc.pll1 = Some(Pll {
|
||||
prediv: 4,
|
||||
mul: 50,
|
||||
divp: Some(2),
|
||||
divq: Some(8), // SPI1 cksel defaults to pll1_q
|
||||
prediv: PllPreDiv::DIV4,
|
||||
mul: PllMul::MUL50,
|
||||
divp: Some(PllDiv::DIV2),
|
||||
divq: Some(PllDiv::DIV8), // 100mhz
|
||||
divr: None,
|
||||
});
|
||||
config.rcc.pll2 = Some(Pll {
|
||||
prediv: 4,
|
||||
mul: 50,
|
||||
divp: Some(8), // 100mhz
|
||||
prediv: PllPreDiv::DIV4,
|
||||
mul: PllMul::MUL50,
|
||||
divp: Some(PllDiv::DIV8), // 100mhz
|
||||
divq: None,
|
||||
divr: None,
|
||||
});
|
||||
|
@ -28,16 +28,16 @@ async fn main(spawner: Spawner) {
|
||||
config.rcc.csi = true;
|
||||
config.rcc.pll_src = PllSource::Hsi;
|
||||
config.rcc.pll1 = Some(Pll {
|
||||
prediv: 4,
|
||||
mul: 50,
|
||||
divp: Some(2),
|
||||
divq: Some(8), // SPI1 cksel defaults to pll1_q
|
||||
prediv: PllPreDiv::DIV4,
|
||||
mul: PllMul::MUL50,
|
||||
divp: Some(PllDiv::DIV2),
|
||||
divq: Some(PllDiv::DIV8), // 100mhz
|
||||
divr: None,
|
||||
});
|
||||
config.rcc.pll2 = Some(Pll {
|
||||
prediv: 4,
|
||||
mul: 50,
|
||||
divp: Some(8), // 100mhz
|
||||
prediv: PllPreDiv::DIV4,
|
||||
mul: PllMul::MUL50,
|
||||
divp: Some(PllDiv::DIV8), // 100mhz
|
||||
divq: None,
|
||||
divr: None,
|
||||
});
|
||||
@ -79,7 +79,7 @@ async fn dac_task1(mut dac: Dac1Type) {
|
||||
dac.select_trigger(embassy_stm32::dac::Ch1Trigger::Tim6).unwrap();
|
||||
dac.enable_channel().unwrap();
|
||||
|
||||
TIM6::enable();
|
||||
TIM6::enable_and_reset();
|
||||
TIM6::regs().arr().modify(|w| w.set_arr(reload as u16 - 1));
|
||||
TIM6::regs().cr2().modify(|w| w.set_mms(Mms::UPDATE));
|
||||
TIM6::regs().cr1().modify(|w| {
|
||||
@ -118,7 +118,7 @@ async fn dac_task2(mut dac: Dac2Type) {
|
||||
error!("Reload value {} below threshold!", reload);
|
||||
}
|
||||
|
||||
TIM7::enable();
|
||||
TIM7::enable_and_reset();
|
||||
TIM7::regs().arr().modify(|w| w.set_arr(reload as u16 - 1));
|
||||
TIM7::regs().cr2().modify(|w| w.set_mms(Mms::UPDATE));
|
||||
TIM7::regs().cr1().modify(|w| {
|
||||
|
@ -11,7 +11,7 @@ use embassy_stm32::eth::{Ethernet, PacketQueue};
|
||||
use embassy_stm32::peripherals::ETH;
|
||||
use embassy_stm32::rng::Rng;
|
||||
use embassy_stm32::{bind_interrupts, eth, peripherals, rng, Config};
|
||||
use embassy_time::{Duration, Timer};
|
||||
use embassy_time::Timer;
|
||||
use embedded_io_async::Write;
|
||||
use rand_core::RngCore;
|
||||
use static_cell::make_static;
|
||||
@ -39,9 +39,9 @@ async fn main(spawner: Spawner) -> ! {
|
||||
config.rcc.hsi48 = true; // needed for RNG
|
||||
config.rcc.pll_src = PllSource::Hsi;
|
||||
config.rcc.pll1 = Some(Pll {
|
||||
prediv: 4,
|
||||
mul: 50,
|
||||
divp: Some(2),
|
||||
prediv: PllPreDiv::DIV4,
|
||||
mul: PllMul::MUL50,
|
||||
divp: Some(PllDiv::DIV2),
|
||||
divq: None,
|
||||
divr: None,
|
||||
});
|
||||
@ -77,9 +77,8 @@ async fn main(spawner: Spawner) -> ! {
|
||||
p.PG13,
|
||||
p.PB13,
|
||||
p.PG11,
|
||||
GenericSMI::new(),
|
||||
GenericSMI::new(0),
|
||||
mac_addr,
|
||||
0,
|
||||
);
|
||||
|
||||
let config = embassy_net::Config::dhcpv4(Default::default());
|
||||
@ -119,7 +118,7 @@ async fn main(spawner: Spawner) -> ! {
|
||||
let r = socket.connect(remote_endpoint).await;
|
||||
if let Err(e) = r {
|
||||
info!("connect error: {:?}", e);
|
||||
Timer::after(Duration::from_secs(1)).await;
|
||||
Timer::after_secs(1).await;
|
||||
continue;
|
||||
}
|
||||
info!("connected!");
|
||||
@ -129,7 +128,7 @@ async fn main(spawner: Spawner) -> ! {
|
||||
info!("write error: {:?}", e);
|
||||
break;
|
||||
}
|
||||
Timer::after(Duration::from_secs(1)).await;
|
||||
Timer::after_secs(1).await;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -11,7 +11,7 @@ use embassy_stm32::eth::{Ethernet, PacketQueue};
|
||||
use embassy_stm32::peripherals::ETH;
|
||||
use embassy_stm32::rng::Rng;
|
||||
use embassy_stm32::{bind_interrupts, eth, peripherals, rng, Config};
|
||||
use embassy_time::{Duration, Timer};
|
||||
use embassy_time::Timer;
|
||||
use embedded_io_async::Write;
|
||||
use embedded_nal_async::{Ipv4Addr, SocketAddr, SocketAddrV4, TcpConnect};
|
||||
use rand_core::RngCore;
|
||||
@ -40,9 +40,9 @@ async fn main(spawner: Spawner) -> ! {
|
||||
config.rcc.hsi48 = true; // needed for RNG
|
||||
config.rcc.pll_src = PllSource::Hsi;
|
||||
config.rcc.pll1 = Some(Pll {
|
||||
prediv: 4,
|
||||
mul: 50,
|
||||
divp: Some(2),
|
||||
prediv: PllPreDiv::DIV4,
|
||||
mul: PllMul::MUL50,
|
||||
divp: Some(PllDiv::DIV2),
|
||||
divq: None,
|
||||
divr: None,
|
||||
});
|
||||
@ -78,9 +78,8 @@ async fn main(spawner: Spawner) -> ! {
|
||||
p.PG13,
|
||||
p.PB13,
|
||||
p.PG11,
|
||||
GenericSMI::new(),
|
||||
GenericSMI::new(0),
|
||||
mac_addr,
|
||||
0,
|
||||
);
|
||||
|
||||
let config = embassy_net::Config::dhcpv4(Default::default());
|
||||
@ -106,8 +105,8 @@ async fn main(spawner: Spawner) -> ! {
|
||||
|
||||
info!("Network task initialized");
|
||||
|
||||
static STATE: TcpClientState<1, 1024, 1024> = TcpClientState::new();
|
||||
let client = TcpClient::new(&stack, &STATE);
|
||||
let state: TcpClientState<1, 1024, 1024> = TcpClientState::new();
|
||||
let client = TcpClient::new(&stack, &state);
|
||||
|
||||
loop {
|
||||
let addr = SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::new(10, 42, 0, 1), 8000));
|
||||
@ -116,7 +115,7 @@ async fn main(spawner: Spawner) -> ! {
|
||||
let r = client.connect(addr).await;
|
||||
if let Err(e) = r {
|
||||
info!("connect error: {:?}", e);
|
||||
Timer::after(Duration::from_secs(1)).await;
|
||||
Timer::after_secs(1).await;
|
||||
continue;
|
||||
}
|
||||
let mut connection = r.unwrap();
|
||||
@ -127,7 +126,7 @@ async fn main(spawner: Spawner) -> ! {
|
||||
info!("write error: {:?}", e);
|
||||
break;
|
||||
}
|
||||
Timer::after(Duration::from_secs(1)).await;
|
||||
Timer::after_secs(1).await;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -5,7 +5,7 @@
|
||||
use defmt::{info, unwrap};
|
||||
use embassy_executor::Spawner;
|
||||
use embassy_stm32::flash::Flash;
|
||||
use embassy_time::{Duration, Timer};
|
||||
use embassy_time::Timer;
|
||||
use {defmt_rtt as _, panic_probe as _};
|
||||
|
||||
#[embassy_executor::main]
|
||||
@ -16,7 +16,7 @@ async fn main(_spawner: Spawner) {
|
||||
const ADDR: u32 = 0; // This is the offset into bank 2, the absolute address is 0x8_0000
|
||||
|
||||
// wait a bit before accessing the flash
|
||||
Timer::after(Duration::from_millis(300)).await;
|
||||
Timer::after_millis(300).await;
|
||||
|
||||
let mut f = Flash::new_blocking(p.FLASH).into_blocking_regions().bank2_region;
|
||||
|
||||
|
@ -6,7 +6,7 @@ use defmt::*;
|
||||
use embassy_executor::Spawner;
|
||||
use embassy_stm32::fmc::Fmc;
|
||||
use embassy_stm32::Config;
|
||||
use embassy_time::{Delay, Duration, Timer};
|
||||
use embassy_time::{Delay, Timer};
|
||||
use {defmt_rtt as _, panic_probe as _};
|
||||
|
||||
#[embassy_executor::main]
|
||||
@ -18,10 +18,10 @@ async fn main(_spawner: Spawner) {
|
||||
config.rcc.csi = true;
|
||||
config.rcc.pll_src = PllSource::Hsi;
|
||||
config.rcc.pll1 = Some(Pll {
|
||||
prediv: 4,
|
||||
mul: 50,
|
||||
divp: Some(2),
|
||||
divq: Some(8), // 100mhz
|
||||
prediv: PllPreDiv::DIV4,
|
||||
mul: PllMul::MUL50,
|
||||
divp: Some(PllDiv::DIV2),
|
||||
divq: Some(PllDiv::DIV8), // 100mhz
|
||||
divr: None,
|
||||
});
|
||||
config.rcc.sys = Sysclk::Pll1P; // 400 Mhz
|
||||
@ -212,6 +212,6 @@ async fn main(_spawner: Spawner) {
|
||||
info!("Assertions succeeded.");
|
||||
|
||||
loop {
|
||||
Timer::after(Duration::from_millis(1000)).await;
|
||||
Timer::after_millis(1000).await;
|
||||
}
|
||||
}
|
||||
|
@ -4,10 +4,9 @@
|
||||
|
||||
use defmt::*;
|
||||
use embassy_executor::Spawner;
|
||||
use embassy_stm32::i2c::{Error, I2c, TimeoutI2c};
|
||||
use embassy_stm32::i2c::{Error, I2c};
|
||||
use embassy_stm32::time::Hertz;
|
||||
use embassy_stm32::{bind_interrupts, i2c, peripherals};
|
||||
use embassy_time::Duration;
|
||||
use {defmt_rtt as _, panic_probe as _};
|
||||
|
||||
const ADDRESS: u8 = 0x5F;
|
||||
@ -33,13 +32,9 @@ async fn main(_spawner: Spawner) {
|
||||
Default::default(),
|
||||
);
|
||||
|
||||
// I2C bus can freeze if SCL line is shorted or due to a broken device that clock stretches for too long.
|
||||
// TimeoutI2c allows recovering from such errors by throwing `Error::Timeout` after a given delay.
|
||||
let mut timeout_i2c = TimeoutI2c::new(&mut i2c, Duration::from_millis(1000));
|
||||
|
||||
let mut data = [0u8; 1];
|
||||
|
||||
match timeout_i2c.blocking_write_read(ADDRESS, &[WHOAMI], &mut data) {
|
||||
match i2c.blocking_write_read(ADDRESS, &[WHOAMI], &mut data) {
|
||||
Ok(()) => info!("Whoami: {}", data[0]),
|
||||
Err(Error::Timeout) => error!("Operation timed out"),
|
||||
Err(e) => error!("I2c Error: {:?}", e),
|
||||
|
@ -9,7 +9,7 @@ use embassy_stm32::gpio::Speed;
|
||||
use embassy_stm32::time::{khz, Hertz};
|
||||
use embassy_stm32::timer::*;
|
||||
use embassy_stm32::{into_ref, Config, Peripheral, PeripheralRef};
|
||||
use embassy_time::{Duration, Timer};
|
||||
use embassy_time::Timer;
|
||||
use {defmt_rtt as _, panic_probe as _};
|
||||
|
||||
#[embassy_executor::main]
|
||||
@ -22,10 +22,10 @@ async fn main(_spawner: Spawner) {
|
||||
config.rcc.hsi48 = true; // needed for RNG
|
||||
config.rcc.pll_src = PllSource::Hsi;
|
||||
config.rcc.pll1 = Some(Pll {
|
||||
prediv: 4,
|
||||
mul: 50,
|
||||
divp: Some(2),
|
||||
divq: Some(8), // 100 Mhz
|
||||
prediv: PllPreDiv::DIV4,
|
||||
mul: PllMul::MUL50,
|
||||
divp: Some(PllDiv::DIV2),
|
||||
divq: Some(PllDiv::DIV8), // 100mhz
|
||||
divr: None,
|
||||
});
|
||||
config.rcc.sys = Sysclk::Pll1P; // 400 Mhz
|
||||
@ -49,13 +49,13 @@ async fn main(_spawner: Spawner) {
|
||||
|
||||
loop {
|
||||
pwm.set_duty(Channel::Ch1, 0);
|
||||
Timer::after(Duration::from_millis(300)).await;
|
||||
Timer::after_millis(300).await;
|
||||
pwm.set_duty(Channel::Ch1, max / 4);
|
||||
Timer::after(Duration::from_millis(300)).await;
|
||||
Timer::after_millis(300).await;
|
||||
pwm.set_duty(Channel::Ch1, max / 2);
|
||||
Timer::after(Duration::from_millis(300)).await;
|
||||
Timer::after_millis(300).await;
|
||||
pwm.set_duty(Channel::Ch1, max - 1);
|
||||
Timer::after(Duration::from_millis(300)).await;
|
||||
Timer::after_millis(300).await;
|
||||
}
|
||||
}
|
||||
pub struct SimplePwm32<'d, T: CaptureCompare32bitInstance> {
|
||||
@ -73,8 +73,7 @@ impl<'d, T: CaptureCompare32bitInstance> SimplePwm32<'d, T> {
|
||||
) -> Self {
|
||||
into_ref!(tim, ch1, ch2, ch3, ch4);
|
||||
|
||||
T::enable();
|
||||
<T as embassy_stm32::rcc::low_level::RccPeripheral>::reset();
|
||||
T::enable_and_reset();
|
||||
|
||||
ch1.set_speed(Speed::VeryHigh);
|
||||
ch1.set_as_af(ch1.af_num(), AFType::OutputPushPull);
|
||||
|
@ -5,8 +5,8 @@
|
||||
use defmt::*;
|
||||
use embassy_executor::Spawner;
|
||||
use embassy_stm32::gpio::{Level, Output, Speed};
|
||||
use embassy_stm32::rcc::{Mco, Mco1Source};
|
||||
use embassy_time::{Duration, Timer};
|
||||
use embassy_stm32::rcc::{Mco, Mco1Source, McoPrescaler};
|
||||
use embassy_time::Timer;
|
||||
use {defmt_rtt as _, panic_probe as _};
|
||||
|
||||
#[embassy_executor::main]
|
||||
@ -16,15 +16,15 @@ async fn main(_spawner: Spawner) {
|
||||
|
||||
let mut led = Output::new(p.PB14, Level::High, Speed::Low);
|
||||
|
||||
let _mco = Mco::new(p.MCO1, p.PA8, Mco1Source::HSI, 8);
|
||||
let _mco = Mco::new(p.MCO1, p.PA8, Mco1Source::HSI, McoPrescaler::DIV8);
|
||||
|
||||
loop {
|
||||
info!("high");
|
||||
led.set_high();
|
||||
Timer::after(Duration::from_millis(500)).await;
|
||||
Timer::after_millis(500).await;
|
||||
|
||||
info!("low");
|
||||
led.set_low();
|
||||
Timer::after(Duration::from_millis(500)).await;
|
||||
Timer::after_millis(500).await;
|
||||
}
|
||||
}
|
||||
|
@ -9,7 +9,7 @@ use embassy_stm32::time::khz;
|
||||
use embassy_stm32::timer::simple_pwm::{PwmPin, SimplePwm};
|
||||
use embassy_stm32::timer::Channel;
|
||||
use embassy_stm32::Config;
|
||||
use embassy_time::{Duration, Timer};
|
||||
use embassy_time::Timer;
|
||||
use {defmt_rtt as _, panic_probe as _};
|
||||
|
||||
#[embassy_executor::main]
|
||||
@ -21,9 +21,9 @@ async fn main(_spawner: Spawner) {
|
||||
config.rcc.csi = true;
|
||||
config.rcc.pll_src = PllSource::Hsi;
|
||||
config.rcc.pll1 = Some(Pll {
|
||||
prediv: 4,
|
||||
mul: 50,
|
||||
divp: Some(2),
|
||||
prediv: PllPreDiv::DIV4,
|
||||
mul: PllMul::MUL50,
|
||||
divp: Some(PllDiv::DIV2),
|
||||
divq: None,
|
||||
divr: None,
|
||||
});
|
||||
@ -48,12 +48,12 @@ async fn main(_spawner: Spawner) {
|
||||
|
||||
loop {
|
||||
pwm.set_duty(Channel::Ch1, 0);
|
||||
Timer::after(Duration::from_millis(300)).await;
|
||||
Timer::after_millis(300).await;
|
||||
pwm.set_duty(Channel::Ch1, max / 4);
|
||||
Timer::after(Duration::from_millis(300)).await;
|
||||
Timer::after_millis(300).await;
|
||||
pwm.set_duty(Channel::Ch1, max / 2);
|
||||
Timer::after(Duration::from_millis(300)).await;
|
||||
Timer::after_millis(300).await;
|
||||
pwm.set_duty(Channel::Ch1, max - 1);
|
||||
Timer::after(Duration::from_millis(300)).await;
|
||||
Timer::after_millis(300).await;
|
||||
}
|
||||
}
|
||||
|
37
examples/stm32h7/src/bin/rtc.rs
Normal file
37
examples/stm32h7/src/bin/rtc.rs
Normal file
@ -0,0 +1,37 @@
|
||||
#![no_std]
|
||||
#![no_main]
|
||||
#![feature(type_alias_impl_trait)]
|
||||
|
||||
use chrono::{NaiveDate, NaiveDateTime};
|
||||
use defmt::*;
|
||||
use embassy_executor::Spawner;
|
||||
use embassy_stm32::rcc::LsConfig;
|
||||
use embassy_stm32::rtc::{Rtc, RtcConfig};
|
||||
use embassy_stm32::Config;
|
||||
use embassy_time::Timer;
|
||||
use {defmt_rtt as _, panic_probe as _};
|
||||
|
||||
#[embassy_executor::main]
|
||||
async fn main(_spawner: Spawner) {
|
||||
let mut config = Config::default();
|
||||
config.rcc.ls = LsConfig::default_lse();
|
||||
|
||||
let p = embassy_stm32::init(config);
|
||||
info!("Hello World!");
|
||||
|
||||
let now = NaiveDate::from_ymd_opt(2020, 5, 15)
|
||||
.unwrap()
|
||||
.and_hms_opt(10, 30, 15)
|
||||
.unwrap();
|
||||
|
||||
let mut rtc = Rtc::new(p.RTC, RtcConfig::default());
|
||||
info!("Got RTC! {:?}", now.timestamp());
|
||||
|
||||
rtc.set_datetime(now.into()).expect("datetime not set");
|
||||
|
||||
// In reality the delay would be much longer
|
||||
Timer::after_millis(20000).await;
|
||||
|
||||
let then: NaiveDateTime = rtc.now().unwrap().into();
|
||||
info!("Got RTC! {:?}", then.timestamp());
|
||||
}
|
@ -22,10 +22,10 @@ async fn main(_spawner: Spawner) -> ! {
|
||||
config.rcc.csi = true;
|
||||
config.rcc.pll_src = PllSource::Hsi;
|
||||
config.rcc.pll1 = Some(Pll {
|
||||
prediv: 4,
|
||||
mul: 50,
|
||||
divp: Some(2),
|
||||
divq: Some(4), // default clock chosen by SDMMCSEL. 200 Mhz
|
||||
prediv: PllPreDiv::DIV4,
|
||||
mul: PllMul::MUL50,
|
||||
divp: Some(PllDiv::DIV2),
|
||||
divq: Some(PllDiv::DIV4), // default clock chosen by SDMMCSEL. 200 Mhz
|
||||
divr: None,
|
||||
});
|
||||
config.rcc.sys = Sysclk::Pll1P; // 400 Mhz
|
||||
|
@ -6,7 +6,7 @@ use defmt::{info, unwrap};
|
||||
use embassy_executor::Spawner;
|
||||
use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
|
||||
use embassy_sync::signal::Signal;
|
||||
use embassy_time::{Duration, Timer};
|
||||
use embassy_time::Timer;
|
||||
use {defmt_rtt as _, panic_probe as _};
|
||||
|
||||
static SIGNAL: Signal<CriticalSectionRawMutex, u32> = Signal::new();
|
||||
@ -16,7 +16,7 @@ async fn my_sending_task() {
|
||||
let mut counter: u32 = 0;
|
||||
|
||||
loop {
|
||||
Timer::after(Duration::from_secs(1)).await;
|
||||
Timer::after_secs(1).await;
|
||||
|
||||
SIGNAL.signal(counter);
|
||||
|
||||
|
@ -44,10 +44,10 @@ fn main() -> ! {
|
||||
config.rcc.csi = true;
|
||||
config.rcc.pll_src = PllSource::Hsi;
|
||||
config.rcc.pll1 = Some(Pll {
|
||||
prediv: 4,
|
||||
mul: 50,
|
||||
divp: Some(2),
|
||||
divq: Some(4), // used by SPI3. 100Mhz.
|
||||
prediv: PllPreDiv::DIV4,
|
||||
mul: PllMul::MUL50,
|
||||
divp: Some(PllDiv::DIV2),
|
||||
divq: Some(PllDiv::DIV8), // used by SPI3. 100Mhz.
|
||||
divr: None,
|
||||
});
|
||||
config.rcc.sys = Sysclk::Pll1P; // 400 Mhz
|
||||
|
@ -40,10 +40,10 @@ fn main() -> ! {
|
||||
config.rcc.csi = true;
|
||||
config.rcc.pll_src = PllSource::Hsi;
|
||||
config.rcc.pll1 = Some(Pll {
|
||||
prediv: 4,
|
||||
mul: 50,
|
||||
divp: Some(2),
|
||||
divq: Some(4), // used by SPI3. 100Mhz.
|
||||
prediv: PllPreDiv::DIV4,
|
||||
mul: PllMul::MUL50,
|
||||
divp: Some(PllDiv::DIV2),
|
||||
divq: Some(PllDiv::DIV8), // used by SPI3. 100Mhz.
|
||||
divr: None,
|
||||
});
|
||||
config.rcc.sys = Sysclk::Pll1P; // 400 Mhz
|
||||
|
@ -28,9 +28,9 @@ async fn main(_spawner: Spawner) {
|
||||
config.rcc.hsi48 = true; // needed for USB
|
||||
config.rcc.pll_src = PllSource::Hsi;
|
||||
config.rcc.pll1 = Some(Pll {
|
||||
prediv: 4,
|
||||
mul: 50,
|
||||
divp: Some(2),
|
||||
prediv: PllPreDiv::DIV4,
|
||||
mul: PllMul::MUL50,
|
||||
divp: Some(PllDiv::DIV2),
|
||||
divq: None,
|
||||
divr: None,
|
||||
});
|
||||
|
@ -5,7 +5,7 @@
|
||||
use defmt::*;
|
||||
use embassy_executor::Spawner;
|
||||
use embassy_stm32::wdg::IndependentWatchdog;
|
||||
use embassy_time::{Duration, Timer};
|
||||
use embassy_time::Timer;
|
||||
use {defmt_rtt as _, panic_probe as _};
|
||||
|
||||
#[embassy_executor::main]
|
||||
@ -18,7 +18,7 @@ async fn main(_spawner: Spawner) {
|
||||
wdg.unleash();
|
||||
|
||||
loop {
|
||||
Timer::after(Duration::from_secs(1)).await;
|
||||
Timer::after_secs(1).await;
|
||||
wdg.pet();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user