diff options
| -rw-r--r-- | CHANGELOG.md | 12 | ||||
| -rw-r--r-- | Cargo.toml | 10 | ||||
| -rw-r--r-- | macros/Cargo.toml | 5 | ||||
| -rw-r--r-- | macros/src/codegen/module.rs | 4 | ||||
| -rw-r--r-- | macros/src/codegen/util.rs | 5 |
5 files changed, 19 insertions, 17 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 599c1a6a..4d1e7fad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,15 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] -## [v0.6.0-alpha.2] - 2020-04-08 +## [v0.6.0-alpha.3] - 2021-05-27 + +### Fixed + +- Fixed codegen structure to not have issues with local paths +- Default paths for monotonics now work properly +- New `embedded-time` version to `0.11` + +## [v0.6.0-alpha.2] - 2021-04-08 ### Added @@ -21,7 +29,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - 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 +## [v0.6.0-alpha.1] - 2021-03-04 ### Added @@ -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.3" +version = "0.6.0-alpha.4" [lib] name = "rtic" @@ -53,17 +53,15 @@ required-features = ["__v7"] [dependencies] cortex-m = "0.7.0" -cortex-m-rtic-macros = { path = "macros", version = "0.6.0-alpha.3" } -# rtic-monotonic = "0.1.0-alpha.1" -rtic-monotonic = { path = "../rtic-monotonic" } +cortex-m-rtic-macros = { path = "macros", version = "0.6.0-alpha.4" } +rtic-monotonic = "0.1.0-alpha.1" rtic-core = "0.3.1" heapless = "0.6.1" bare-metal = "1.0.0" generic-array = "0.14" [dependencies.dwt-systick-monotonic] -# version = "0.1.0-alpha.2" -path = "../dwt-systick-monotonic" +version = "0.1.0-alpha.2" optional = true [build-dependencies] diff --git a/macros/Cargo.toml b/macros/Cargo.toml index bf8ff29b..aa96d09e 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.3" +version = "0.6.0-alpha.4" [lib] proc-macro = true @@ -22,5 +22,4 @@ proc-macro2 = "1" proc-macro-error = "1" quote = "1" syn = "1" -# rtic-syntax = "0.5.0-alpha.2" -rtic-syntax = { path = "../../rtic-syntax" } +rtic-syntax = "0.5.0-alpha.3" diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs index 2f6ec335..a3d3fab2 100644 --- a/macros/src/codegen/module.rs +++ b/macros/src/codegen/module.rs @@ -157,11 +157,11 @@ pub fn codegen( Context::HardwareTask(t) => { &app.hardware_tasks[t].cfgs // ... - }, + } Context::SoftwareTask(t) => { &app.software_tasks[t].cfgs // ... - }, + } _ => &v, }; diff --git a/macros/src/codegen/util.rs b/macros/src/codegen/util.rs index 92c7154a..3e42eda9 100644 --- a/macros/src/codegen/util.rs +++ b/macros/src/codegen/util.rs @@ -142,10 +142,7 @@ pub fn mark_internal_ident(ident: &Ident) -> Ident { /// Mark an ident as internal pub fn mark_internal_name(name: &str) -> Ident { - Ident::new( - &format!("__rtic_internal_{}", name), - Span::call_site(), - ) + Ident::new(&format!("__rtic_internal_{}", name), Span::call_site()) } fn link_section_index() -> usize { |