2020-10-02 11:33:28 +02:00
|
|
|
# Migration of RTIC
|
|
|
|
|
|
|
|
## Migrating from v0.5.x to v0.6.0
|
|
|
|
|
|
|
|
This section describes how to upgrade from v0.5.x to v0.6.0 of the RTIC framework.
|
|
|
|
|
|
|
|
### `Cargo.toml` - version bump
|
|
|
|
|
|
|
|
Change the version of `cortex-m-rtic` to `"0.6.0"`.
|
|
|
|
|
|
|
|
### Module instead of Const
|
|
|
|
|
|
|
|
With the support of attributes on modules the `const APP` workaround is not needed.
|
|
|
|
|
|
|
|
Change
|
|
|
|
|
|
|
|
``` rust
|
|
|
|
#[rtic::app(/* .. */)]
|
|
|
|
const APP: () = {
|
|
|
|
[code here]
|
|
|
|
};
|
|
|
|
```
|
|
|
|
|
|
|
|
into
|
|
|
|
|
|
|
|
``` rust
|
|
|
|
#[rtic::app(/* .. */)]
|
|
|
|
mod app {
|
|
|
|
[code here]
|
|
|
|
}
|
|
|
|
```
|
|
|
|
|
|
|
|
Now that a regular Rust module is used it means it is possible to have custom
|
|
|
|
user code within that module.
|
|
|
|
Additionally, it means that `use`-statements for resources etc may be required.
|
|
|
|
|
|
|
|
### Init always returns late resources
|
|
|
|
|
|
|
|
In order to make the API more symmetric the #[init]-task always returns a late resource.
|
|
|
|
|
|
|
|
From this:
|
|
|
|
|
|
|
|
``` rust
|
|
|
|
#[rtic::app(device = lm3s6965)]
|
|
|
|
mod app {
|
|
|
|
#[init]
|
|
|
|
fn init(_: init::Context) {
|
|
|
|
rtic::pend(Interrupt::UART0);
|
|
|
|
}
|
|
|
|
[more code]
|
|
|
|
}
|
|
|
|
```
|
|
|
|
|
|
|
|
to this:
|
|
|
|
|
|
|
|
``` rust
|
|
|
|
#[rtic::app(device = lm3s6965)]
|
|
|
|
mod app {
|
|
|
|
#[init]
|
|
|
|
fn init(_: init::Context) -> init::LateResources {
|
|
|
|
rtic::pend(Interrupt::UART0);
|
|
|
|
|
|
|
|
init::LateResources {}
|
|
|
|
}
|
|
|
|
[more code]
|
|
|
|
}
|
|
|
|
```
|
|
|
|
|
|
|
|
## Migrating from v0.4.x to v0.5.0
|
2019-10-16 21:39:02 +02:00
|
|
|
|
2020-06-11 19:18:29 +02:00
|
|
|
This section covers how to upgrade an application written against RTIC v0.4.x to
|
2019-10-16 21:39:02 +02:00
|
|
|
the version v0.5.0 of the framework.
|
|
|
|
|
2020-10-02 11:33:28 +02:00
|
|
|
### `Cargo.toml`
|
2019-10-16 21:39:02 +02:00
|
|
|
|
2020-06-11 19:18:29 +02:00
|
|
|
First, the version of the `cortex-m-rtic` dependency needs to be updated to
|
2019-10-16 21:39:02 +02:00
|
|
|
`"0.5.0"`. The `timer-queue` feature needs to be removed.
|
|
|
|
|
|
|
|
``` toml
|
2020-06-11 19:18:29 +02:00
|
|
|
[dependencies.cortex-m-rtic]
|
2019-10-16 21:39:02 +02:00
|
|
|
# change this
|
|
|
|
version = "0.4.3"
|
|
|
|
|
|
|
|
# into this
|
2019-11-15 00:19:57 +01:00
|
|
|
version = "0.5.0"
|
2019-10-16 21:39:02 +02:00
|
|
|
|
|
|
|
# and remove this Cargo feature
|
|
|
|
features = ["timer-queue"]
|
|
|
|
# ^^^^^^^^^^^^^
|
|
|
|
```
|
|
|
|
|
2020-10-02 11:33:28 +02:00
|
|
|
### `Context` argument
|
2019-10-16 21:39:02 +02:00
|
|
|
|
2020-06-11 19:18:29 +02:00
|
|
|
All functions inside the `#[rtic::app]` item need to take as first argument a
|
2019-10-16 21:39:02 +02:00
|
|
|
`Context` structure. This `Context` type will contain the variables that were
|
|
|
|
magically injected into the scope of the function by version v0.4.x of the
|
|
|
|
framework: `resources`, `spawn`, `schedule` -- these variables will become
|
2020-06-11 19:18:29 +02:00
|
|
|
fields of the `Context` structure. Each function within the `#[rtic::app]` item
|
2019-10-16 21:39:02 +02:00
|
|
|
gets a different `Context` type.
|
|
|
|
|
|
|
|
``` rust
|
2020-06-11 19:18:29 +02:00
|
|
|
#[rtic::app(/* .. */)]
|
2019-10-16 21:39:02 +02:00
|
|
|
const APP: () = {
|
|
|
|
// change this
|
|
|
|
#[task(resources = [x], spawn = [a], schedule = [b])]
|
|
|
|
fn foo() {
|
|
|
|
resources.x.lock(|x| /* .. */);
|
|
|
|
spawn.a(message);
|
|
|
|
schedule.b(baseline);
|
|
|
|
}
|
|
|
|
|
|
|
|
// into this
|
|
|
|
#[task(resources = [x], spawn = [a], schedule = [b])]
|
|
|
|
fn foo(mut cx: foo::Context) {
|
|
|
|
// ^^^^^^^^^^^^^^^^^^^^
|
|
|
|
|
|
|
|
cx.resources.x.lock(|x| /* .. */);
|
|
|
|
// ^^^
|
|
|
|
|
|
|
|
cx.spawn.a(message);
|
|
|
|
// ^^^
|
|
|
|
|
|
|
|
cx.schedule.b(message, baseline);
|
|
|
|
// ^^^
|
|
|
|
}
|
|
|
|
|
|
|
|
// change this
|
|
|
|
#[init]
|
|
|
|
fn init() {
|
|
|
|
// ..
|
|
|
|
}
|
|
|
|
|
|
|
|
// into this
|
|
|
|
#[init]
|
|
|
|
fn init(cx: init::Context) {
|
|
|
|
// ^^^^^^^^^^^^^^^^^
|
|
|
|
// ..
|
|
|
|
}
|
|
|
|
|
|
|
|
// ..
|
|
|
|
};
|
|
|
|
```
|
|
|
|
|
2020-10-02 11:33:28 +02:00
|
|
|
### Resources
|
2019-10-16 21:39:02 +02:00
|
|
|
|
|
|
|
The syntax used to declare resources has been changed from `static mut`
|
|
|
|
variables to a `struct Resources`.
|
|
|
|
|
|
|
|
``` rust
|
2020-06-11 19:18:29 +02:00
|
|
|
#[rtic::app(/* .. */)]
|
2019-10-16 21:39:02 +02:00
|
|
|
const APP: () = {
|
|
|
|
// change this
|
|
|
|
static mut X: u32 = 0;
|
|
|
|
static mut Y: u32 = (); // late resource
|
|
|
|
|
|
|
|
// into this
|
|
|
|
struct Resources {
|
|
|
|
#[init(0)] // <- initial value
|
|
|
|
X: u32, // NOTE: we suggest changing the naming style to `snake_case`
|
|
|
|
|
|
|
|
Y: u32, // late resource
|
|
|
|
}
|
|
|
|
|
|
|
|
// ..
|
|
|
|
};
|
|
|
|
```
|
|
|
|
|
2020-10-02 11:33:28 +02:00
|
|
|
### Device peripherals
|
2019-10-16 21:39:02 +02:00
|
|
|
|
|
|
|
If your application was accessing the device peripherals in `#[init]` through
|
|
|
|
the `device` variable then you'll need to add `peripherals = true` to the
|
2020-06-11 19:18:29 +02:00
|
|
|
`#[rtic::app]` attribute to continue to access the device peripherals through
|
2019-10-16 21:39:02 +02:00
|
|
|
the `device` field of the `init::Context` structure.
|
|
|
|
|
|
|
|
Change this:
|
|
|
|
|
|
|
|
``` rust
|
2020-06-11 19:18:29 +02:00
|
|
|
#[rtic::app(/* .. */)]
|
2019-10-16 21:39:02 +02:00
|
|
|
const APP: () = {
|
|
|
|
#[init]
|
|
|
|
fn init() {
|
2019-10-23 20:31:33 +02:00
|
|
|
device.SOME_PERIPHERAL.write(something);
|
2019-10-16 21:39:02 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// ..
|
|
|
|
};
|
|
|
|
```
|
|
|
|
|
|
|
|
Into this:
|
|
|
|
|
|
|
|
``` rust
|
2020-06-11 19:18:29 +02:00
|
|
|
#[rtic::app(/* .. */, peripherals = true)]
|
2019-10-16 21:39:02 +02:00
|
|
|
// ^^^^^^^^^^^^^^^^^^
|
|
|
|
const APP: () = {
|
|
|
|
#[init]
|
|
|
|
fn init(cx: init::Context) {
|
|
|
|
// ^^^^^^^^^^^^^^^^^
|
2019-10-23 20:31:33 +02:00
|
|
|
cx.device.SOME_PERIPHERAL.write(something);
|
2019-10-16 21:39:02 +02:00
|
|
|
// ^^^
|
|
|
|
}
|
|
|
|
|
|
|
|
// ..
|
|
|
|
};
|
|
|
|
```
|
|
|
|
|
2020-10-02 11:33:28 +02:00
|
|
|
### `#[interrupt]` and `#[exception]`
|
2019-10-16 21:39:02 +02:00
|
|
|
|
|
|
|
The `#[interrupt]` and `#[exception]` attributes have been removed. To declare
|
|
|
|
hardware tasks in v0.5.x use the `#[task]` attribute with the `binds` argument.
|
|
|
|
|
|
|
|
Change this:
|
|
|
|
|
|
|
|
``` rust
|
2020-06-11 19:18:29 +02:00
|
|
|
#[rtic::app(/* .. */)]
|
2019-10-16 21:39:02 +02:00
|
|
|
const APP: () = {
|
|
|
|
// hardware tasks
|
|
|
|
#[exception]
|
|
|
|
fn SVCall() { /* .. */ }
|
|
|
|
|
|
|
|
#[interrupt]
|
|
|
|
fn UART0() { /* .. */ }
|
|
|
|
|
|
|
|
// software task
|
|
|
|
#[task]
|
|
|
|
fn foo() { /* .. */ }
|
|
|
|
|
|
|
|
// ..
|
|
|
|
};
|
|
|
|
```
|
|
|
|
|
|
|
|
Into this:
|
|
|
|
|
|
|
|
``` rust
|
2020-06-11 19:18:29 +02:00
|
|
|
#[rtic::app(/* .. */)]
|
2019-10-16 21:39:02 +02:00
|
|
|
const APP: () = {
|
|
|
|
#[task(binds = SVCall)]
|
|
|
|
// ^^^^^^^^^^^^^^
|
|
|
|
fn svcall(cx: svcall::Context) { /* .. */ }
|
|
|
|
// ^^^^^^ we suggest you use a `snake_case` name here
|
|
|
|
|
|
|
|
#[task(binds = UART0)]
|
|
|
|
// ^^^^^^^^^^^^^
|
|
|
|
fn uart0(cx: uart0::Context) { /* .. */ }
|
|
|
|
|
|
|
|
#[task]
|
|
|
|
fn foo(cx: foo::Context) { /* .. */ }
|
|
|
|
|
|
|
|
// ..
|
|
|
|
};
|
|
|
|
```
|
|
|
|
|
2020-10-02 11:33:28 +02:00
|
|
|
### `schedule`
|
2019-10-16 21:39:02 +02:00
|
|
|
|
|
|
|
The `timer-queue` feature has been removed. To use the `schedule` API one must
|
|
|
|
first define the monotonic timer the runtime will use using the `monotonic`
|
2020-06-11 19:18:29 +02:00
|
|
|
argument of the `#[rtic::app]` attribute. To continue using the cycle counter
|
2019-10-16 21:39:02 +02:00
|
|
|
(CYCCNT) as the monotonic timer, and match the behavior of version v0.4.x, add
|
2020-06-11 19:18:29 +02:00
|
|
|
the `monotonic = rtic::cyccnt::CYCCNT` argument to the `#[rtic::app]` attribute.
|
2019-10-16 21:39:02 +02:00
|
|
|
|
|
|
|
Also, the `Duration` and `Instant` types and the `U32Ext` trait have been moved
|
2020-06-11 19:18:29 +02:00
|
|
|
into the `rtic::cyccnt` module. This module is only available on ARMv7-M+
|
2019-12-03 12:33:24 +01:00
|
|
|
devices. The removal of the `timer-queue` also brings back the `DWT` peripheral
|
|
|
|
inside the core peripherals struct, this will need to be enabled by the application
|
2020-10-02 11:33:28 +02:00
|
|
|
inside `init`.
|
2019-10-16 21:39:02 +02:00
|
|
|
|
|
|
|
Change this:
|
|
|
|
|
|
|
|
``` rust
|
2020-06-11 19:18:29 +02:00
|
|
|
use rtic::{Duration, Instant, U32Ext};
|
2019-10-16 21:39:02 +02:00
|
|
|
|
2020-06-11 19:18:29 +02:00
|
|
|
#[rtic::app(/* .. */)]
|
2019-10-16 21:39:02 +02:00
|
|
|
const APP: () = {
|
|
|
|
#[task(schedule = [b])]
|
|
|
|
fn a() {
|
|
|
|
// ..
|
|
|
|
}
|
|
|
|
};
|
|
|
|
```
|
|
|
|
|
|
|
|
Into this:
|
|
|
|
|
|
|
|
``` rust
|
2020-06-11 19:18:29 +02:00
|
|
|
use rtic::cyccnt::{Duration, Instant, U32Ext};
|
2019-10-16 21:39:02 +02:00
|
|
|
// ^^^^^^^^
|
|
|
|
|
2020-06-11 19:18:29 +02:00
|
|
|
#[rtic::app(/* .. */, monotonic = rtic::cyccnt::CYCCNT)]
|
2019-10-16 21:39:02 +02:00
|
|
|
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
|
|
const APP: () = {
|
2019-12-03 12:33:24 +01:00
|
|
|
#[init]
|
|
|
|
fn init(cx: init::Context) {
|
|
|
|
cx.core.DWT.enable_cycle_counter();
|
|
|
|
// optional, configure the DWT run without a debugger connected
|
|
|
|
cx.core.DCB.enable_trace();
|
|
|
|
}
|
2019-10-16 21:39:02 +02:00
|
|
|
#[task(schedule = [b])]
|
|
|
|
fn a(cx: a::Context) {
|
|
|
|
// ..
|
|
|
|
}
|
|
|
|
};
|
|
|
|
```
|