Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix: Compile Errors out of the box #205

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bugfix: Compile Errors out of the box #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions advanced/firmware/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ cortex-m = "0.7.6"
cortex-m-rt = "0.7.2"
cortex-m-rtic = "1.1.3"
defmt = "0.3.2"
defmt-rtt = "0.3.2"
defmt-rtt = "0.4.1"
dk = { path = "../../boards/dk", features = ["advanced"] }
panic-probe = { version = "0.3.0", features = ["print-defmt"] }
usb = { path = "../common/usb" }
Expand All @@ -33,7 +33,7 @@ debug = 2
debug-assertions = true # !
incremental = false
lto = "fat"
opt-level = 'z' # !
opt-level = 'z' # !
overflow-checks = false

[profile.release]
Expand All @@ -44,4 +44,3 @@ incremental = false
lto = "fat"
opt-level = 3
overflow-checks = false

12 changes: 5 additions & 7 deletions beginner/apps/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ name = "apps"
version = "0.0.0"

[dependencies]
cortex-m = {version = "0.7.6", features = ["critical-section-single-core"]}
cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] }
cortex-m-rt = "0.7.2"
dk = { path = "../../boards/dk", features = ["beginner"] }
heapless = "0.7.16"
panic-probe = { version = "0.3.0", features = ["print-defmt"] }
defmt = "0.3.2"
defmt-rtt = "0.3.2"
defmt-rtt = "0.4.1"

# optimize code in both profiles
[profile.dev]
Expand All @@ -21,7 +21,7 @@ debug = 2
debug-assertions = true # !
incremental = false
lto = "fat"
opt-level = 'z' # !
opt-level = 'z' # !
overflow-checks = false

[profile.release]
Expand All @@ -35,14 +35,12 @@ overflow-checks = false

[features]

default = [
"other-feature"
]
default = ["other-feature"]
other-feature = []
# do NOT modify these features
defmt-default = []
defmt-trace = []
defmt-debug = []
defmt-info = []
defmt-warn = []
defmt-error = []
defmt-error = []
8 changes: 3 additions & 5 deletions boards/dk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,19 @@ name = "dk"
version = "0.0.0"

[dependencies]
cortex-m = {version = "0.7.6", features = ["critical-section-single-core"]}
cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] }
cortex-m-rt = "0.7.2"
embedded-hal = "0.2.7"
hal = { package = "nrf52840-hal", version = "0.14.0" }
panic-probe = { version = "0.3.0", features = ["print-defmt"] }
defmt = "0.3.2"
defmt-rtt = "0.3.2"
defmt-rtt = "0.4.1"

[features]
advanced = []
beginner = []

default = [
"other-feature"
]
default = ["other-feature"]
other-feature = []

# do NOT modify these features
Expand Down
1 change: 1 addition & 0 deletions boards/dk/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#![deny(missing_docs)]
#![deny(warnings)]
#![no_std]
#![allow(static_mut_refs)]

use core::{
ops,
Expand Down