diff options
| author |  bors[bot] <26634292+bors[bot]@users.noreply.github.com>
| 2021-03-04 19:12:35 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2021-03-04 19:12:35 +0000 |
| commit | 89a5c8004efaa8f42c86a1aedb609f49ec511333 (patch) | |
| tree | 6db5b553e24a540284edc3f3fbf87043c638defc /examples/t-cfg-resources.rs | |
| parent | 81a8a591353b1ea0208c68b28ee81286629039cc (diff) | |
| parent | 2e4a4ffd87c8a031f27635c060042019511523dc (diff) | |
| download | rtic-89a5c8004efaa8f42c86a1aedb609f49ec511333.tar.gz rtic-89a5c8004efaa8f42c86a1aedb609f49ec511333.tar.zst rtic-89a5c8004efaa8f42c86a1aedb609f49ec511333.zip | |
Merge #436v0.6.0-alpha.1
436: New monotonic r=AfoHT a=korken89
Design document: https://hackmd.io/vWa9GvssR8qBfUYgMZm0CQ
Closes #433
Closes #432
Closes #427
Closes #426
Closes #403
Closes #332
Closes #312
Closes #309
Closes #299
Closes #292
Closes #247
Closes #219
Co-authored-by: Emil Fresk <emil.fresk@gmail.com>
Diffstat (limited to 'examples/t-cfg-resources.rs')
| -rw-r--r-- | examples/t-cfg-resources.rs | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/examples/t-cfg-resources.rs b/examples/t-cfg-resources.rs index 61eb4c7b..1adcb905 100644 --- a/examples/t-cfg-resources.rs +++ b/examples/t-cfg-resources.rs @@ -3,7 +3,7 @@ #![no_main] #![no_std] -use panic_halt as _; +use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { @@ -18,13 +18,16 @@ mod app { dummy: (), // dummy such that we have at least one late resource } #[init] - fn init(_: init::Context) -> init::LateResources { - init::LateResources { - // The feature needs to be applied everywhere x is defined or used - #[cfg(feature = "feature_x")] - x: 0, - dummy: (), // dummy such that we have at least one late resource - } + fn init(_: init::Context) -> (init::LateResources, init::Monotonics) { + ( + init::LateResources { + // The feature needs to be applied everywhere x is defined or used + #[cfg(feature = "feature_x")] + x: 0, + dummy: (), // dummy such that we have at least one late resource + }, + init::Monotonics(), + ) } #[idle] |