aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Fresk <emil.fresk@gmail.com>2020-11-14 16:16:45 +0100
committerEmil Fresk <emil.fresk@gmail.com>2020-11-14 16:16:45 +0100
commit9cbe639ebfb0947a26fb0b7fe00ef21004fa4d8b (patch)
treebce4d119e79a24f970608e232d969d2ee3451fe2
parentd079949139b9d4d5280a08143edc1d717d5c5b52 (diff)
Updated changelog, use released version of rtic-core
-rw-r--r--CHANGELOG.md4
-rw-r--r--Cargo.toml3
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ccaba8..a5ff05f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased]
+### Added
+
+- Support for multi-locks, see `examples/multilock.rs` for syntax.
+
## [v0.6.0-alpha.0] - 2020-11-14
### Added
diff --git a/Cargo.toml b/Cargo.toml
index b98bbdc..05c572b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -57,8 +57,7 @@ required-features = ["__v7"]
[dependencies]
cortex-m = "0.6.2"
cortex-m-rtic-macros = { path = "macros", version = "0.6.0-alpha.0" }
-# rtic-core = "0.3.0"
-rtic-core = { git = "https://github.com/rtic-rs/rtic-core.git", branch = "multilock", version = "0.3.1" }
+rtic-core = "0.3.1"
cortex-m-rt = "0.6.9"
heapless = "0.5.0"
bare-metal = "1.0.0"