mirrors/embedded-trainings-2020
1
0
Fork 0
mirror of https://github.com/ferrous-systems/embedded-trainings-2020.git synced 2025-01-10 00:05:45 +00:00
Code Issues Projects Releases Wiki Activity

Fixed compile errors for beginner/hello binary

Browse source
This commit is contained in:
baxterjo 2024-12-22 10:39:18 -08:00
parent f24b6aa2fb
commit d217f3255c
4 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
advanced/firmware/Cargo.toml
View file

@ -16,7 +16,7 @@ cortex-m = "0.7.6"
cortex-m-rt = "0.7.2" cortex-m-rt = "0.7.2"
cortex-m-rtic = "1.1.3" cortex-m-rtic = "1.1.3"
defmt = "0.3.2" defmt = "0.3.2"
defmt-rtt = "0.3.2" defmt-rtt = "0.4.1"
dk = { path = "../../boards/dk", features = ["advanced"] } dk = { path = "../../boards/dk", features = ["advanced"] }
panic-probe = { version = "0.3.0", features = ["print-defmt"] } panic-probe = { version = "0.3.0", features = ["print-defmt"] }
usb = { path = "../common/usb" } usb = { path = "../common/usb" }
@ -44,4 +44,3 @@ incremental = false
lto = "fat" lto = "fat"
opt-level = 3 opt-level = 3
overflow-checks = false overflow-checks = false

8
beginner/apps/Cargo.toml
View file

@ -6,13 +6,13 @@ name = "apps"
version = "0.0.0" version = "0.0.0"
[dependencies] [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" cortex-m-rt = "0.7.2"
dk = { path = "../../boards/dk", features = ["beginner"] } dk = { path = "../../boards/dk", features = ["beginner"] }
heapless = "0.7.16" heapless = "0.7.16"
panic-probe = { version = "0.3.0", features = ["print-defmt"] } panic-probe = { version = "0.3.0", features = ["print-defmt"] }
defmt = "0.3.2" defmt = "0.3.2"
defmt-rtt = "0.3.2" defmt-rtt = "0.4.1"
# optimize code in both profiles # optimize code in both profiles
[profile.dev] [profile.dev]
@ -35,9 +35,7 @@ overflow-checks = false
[features] [features]
default = [ default = ["other-feature"]
"other-feature"
]
other-feature = [] other-feature = []
# do NOT modify these features # do NOT modify these features
defmt-default = [] defmt-default = []

8
boards/dk/Cargo.toml
View file

@ -6,21 +6,19 @@ name = "dk"
version = "0.0.0" version = "0.0.0"
[dependencies] [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" cortex-m-rt = "0.7.2"
embedded-hal = "0.2.7" embedded-hal = "0.2.7"
hal = { package = "nrf52840-hal", version = "0.14.0" } hal = { package = "nrf52840-hal", version = "0.14.0" }
panic-probe = { version = "0.3.0", features = ["print-defmt"] } panic-probe = { version = "0.3.0", features = ["print-defmt"] }
defmt = "0.3.2" defmt = "0.3.2"
defmt-rtt = "0.3.2" defmt-rtt = "0.4.1"
[features] [features]
advanced = [] advanced = []
beginner = [] beginner = []
default = [ default = ["other-feature"]
"other-feature"
]
other-feature = [] other-feature = []
# do NOT modify these features # do NOT modify these features

1
boards/dk/src/lib.rs
View file

@ -3,6 +3,7 @@
#![deny(missing_docs)] #![deny(missing_docs)]
#![deny(warnings)] #![deny(warnings)]
#![no_std] #![no_std]
#![allow(static_mut_refs)]
use core::{ use core::{
ops, ops,