diff --git a/examples/embassy-stm32g4/Cargo.toml b/examples/embassy-stm32g4/Cargo.toml index f4efbe90f8..dd97fdb4fc 100644 --- a/examples/embassy-stm32g4/Cargo.toml +++ b/examples/embassy-stm32g4/Cargo.toml @@ -8,17 +8,14 @@ license = "MIT OR Apache-2.0" [dependencies.rtic] path="../../rtic" -version = "=2.0" features = ["thumbv7-backend"] [dependencies.rtic-monotonics] path="../../rtic-monotonics" -version = "=1.5" features = ["cortex-m-systick"] [dependencies.rtic-sync] path="../../rtic-sync" -version = "=1.3" [dependencies] # Change stm32g431cb to your chip name, if necessary. Also change .cargo/config.toml diff --git a/examples/embassy-stm32g4/src/bin/blinky.rs b/examples/embassy-stm32g4/src/bin/blinky.rs index 9cc48997bd..6855b1edd1 100644 --- a/examples/embassy-stm32g4/src/bin/blinky.rs +++ b/examples/embassy-stm32g4/src/bin/blinky.rs @@ -2,9 +2,7 @@ #![deny(warnings)] #![no_main] #![no_std] -#![feature(type_alias_impl_trait)] -use defmt::*; use embassy_stm32::gpio::{Level, Output, Speed}; use rtic::app; use rtic_monotonics::systick::*; @@ -32,10 +30,10 @@ mod app { Systick::start(cx.core.SYST, 25_000_000, systick_mono_token); let p = embassy_stm32::init(Default::default()); - info!("Hello World!"); + defmt::info!("Hello World!"); let mut led = Output::new(p.PC6, Level::High, Speed::Low); - info!("high"); + defmt::info!("high"); led.set_high(); // Schedule the blinking task @@ -48,7 +46,7 @@ mod app { async fn blink(_cx: blink::Context, mut led: Output<'static, embassy_stm32::peripherals::PC6>) { let mut state = true; loop { - info!("blink"); + defmt::info!("blink"); if state { led.set_high(); } else { diff --git a/rtic-macros/CHANGELOG.md b/rtic-macros/CHANGELOG.md index 8e7947068c..66bd9bc2c2 100644 --- a/rtic-macros/CHANGELOG.md +++ b/rtic-macros/CHANGELOG.md @@ -7,6 +7,8 @@ For each category, *Added*, *Changed*, *Fixed* add new entries at the top! ## [Unreleased] +## [v2.1.0] - 2024-02-27 + ### Added - RTIC v2 now works on stable. diff --git a/rtic-macros/Cargo.toml b/rtic-macros/Cargo.toml index 5203774082..423fe31129 100644 --- a/rtic-macros/Cargo.toml +++ b/rtic-macros/Cargo.toml @@ -22,7 +22,7 @@ name = "rtic-macros" readme = "../README.md" repository = "https://github.com/rtic-rs/rtic" -version = "2.0.1" +version = "2.1.0" [lib] proc-macro = true diff --git a/rtic/CHANGELOG.md b/rtic/CHANGELOG.md index 6fc9e3fe18..22c5078fb1 100644 --- a/rtic/CHANGELOG.md +++ b/rtic/CHANGELOG.md @@ -7,6 +7,8 @@ For each category, *Added*, *Changed*, *Fixed* add new entries at the top! ## [Unreleased] +## [v2.1.0] - 2024-02-27 + ### Added - Unstable support for ESP32-C3 diff --git a/rtic/Cargo.toml b/rtic/Cargo.toml index 641d17cac3..d76f6e9cd4 100644 --- a/rtic/Cargo.toml +++ b/rtic/Cargo.toml @@ -22,7 +22,7 @@ name = "rtic" readme = "../README.md" repository = "https://github.com/rtic-rs/rtic" -version = "2.0.1" +version = "2.1.0" [package.metadata.docs.rs] features = ["rtic-macros/test-template"] @@ -38,7 +38,7 @@ bare-metal = "1.0.0" #portable-atomic = { version = "0.3.19" } atomic-polyfill = "1" rtic-monotonics = { path = "../rtic-monotonics", version = "1.4.0", optional = true } -rtic-macros = { path = "../rtic-macros", version = "2.0.1" } +rtic-macros = { path = "../rtic-macros", version = "=2.1.0" } rtic-core = "1" critical-section = "1"