aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md19
-rw-r--r--Cargo.toml4
-rw-r--r--README.md2
-rw-r--r--macros/Cargo.toml2
4 files changed, 23 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5ff05f0..599c1a6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,9 +5,28 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased]
+## [v0.6.0-alpha.2] - 2020-04-08
+
+### Added
+
+- Cancel and reschedule support to the monotonics
+
+### Fixed
+
+- UB in `spawn_at`
+- `#[cfg]` and other attributes now work on hardware tasks
+- Type aliases now work in `mod app`
+
+### Changed
+
+- The access to monotonic static methods was for example `MyMono::now()`, and is now `monotonics::MyMono::now()`
+
+## [v0.6.0-alpha.1] - 2020-03-04
+
### Added
- Support for multi-locks, see `examples/multilock.rs` for syntax.
+- New monotonic syntax and support, see `#[monotonic]`
## [v0.6.0-alpha.0] - 2020-11-14
diff --git a/Cargo.toml b/Cargo.toml
index 7ebaac41..08a18134 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@ name = "cortex-m-rtic"
readme = "README.md"
repository = "https://github.com/rtic-rs/cortex-m-rtic"
-version = "0.6.0-alpha.1"
+version = "0.6.0-alpha.2"
[lib]
name = "rtic"
@@ -53,7 +53,7 @@ required-features = ["__v7"]
[dependencies]
cortex-m = "0.7.0"
-cortex-m-rtic-macros = { path = "macros", version = "0.6.0-alpha.1" }
+cortex-m-rtic-macros = { path = "macros", version = "0.6.0-alpha.2" }
rtic-monotonic = "0.1.0-alpha.0"
rtic-core = "0.3.1"
heapless = "0.6.1"
diff --git a/README.md b/README.md
index 929a813c..e547b007 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ New features and big changes should go through the RFC process in the
## Acknowledgments
-This crate is based on [the Real-Time For the Masses language][rtfm-lang]
+This crate is based on the [Real-Time For the Masses language][rtfm-lang]
created by the Embedded Systems group at [LuleƄ University of Technology][ltu],
led by [Prof. Per Lindgren][per].
diff --git a/macros/Cargo.toml b/macros/Cargo.toml
index 203a2bb1..fb4dffb3 100644
--- a/macros/Cargo.toml
+++ b/macros/Cargo.toml
@@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0"
name = "cortex-m-rtic-macros"
readme = "../README.md"
repository = "https://github.com/rtic-rs/cortex-m-rtic"
-version = "0.6.0-alpha.1"
+version = "0.6.0-alpha.2"
[lib]
proc-macro = true