Skip to content

Make sure examples can actually build with defmt enabled, build some examples in CI #810

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

Merged
jessebraham merged 6 commits into from
Oct 5, 2023
Merged

Make sure examples can actually build with defmt enabled, build some examples in CI #810

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a7824bb
Make sure examples can build with defmt
bugadani Sep 21, 2023
fc9272a
Remove duplicate example checks
bugadani Sep 21, 2023
59dcd47
Fix examples
bugadani Sep 21, 2023
7adb0fb
Add changelog entry
bugadani Sep 28, 2023
43ae3cd
Actually build some examples with defmt feature enabled
bugadani Oct 5, 2023
5c58b4b
Add the defmt linker script in each package's build script
bugadani Oct 5, 2023
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
Next Next commit
Make sure examples can build with defmt
  • Loading branch information
@bugadani
bugadani committed Oct 5, 2023
commit a7824bbd0d82d030583783c14aff3dab2d554f74
3 changes: 3 additions & 0 deletions esp-hal-common/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,9 @@ fn main() -> Result<(), Box<dyn Error>> {

copy_dir_all("ld/sections", &out)?;

#[cfg(feature = "defmt")]
println!("cargo:rustc-link-arg=-Tdefmt.x");

// Generate the eFuse table from the selected device's CSV file:
gen_efuse_table(device_name, out)?;

Expand Down
6 changes: 3 additions & 3 deletions esp32-hal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ embedded-io-async = "0.5.0"
esp-alloc = "0.3.0"
esp-backtrace = { version = "0.8.0", features = ["esp32", "panic-handler", "exception-handler", "print-uart"] }
esp-hal-smartled = { version = "0.5.0", features = ["esp32"], path = "../esp-hal-smartled" }
esp-println = { version = "0.6.0", features = ["esp32", "log"] }
esp-println = { version = "0.6.0", features = ["esp32"] }
heapless = "0.7.16"
lis3dh-async = "0.8.0"
sha2 = { version = "0.10.7", default-features = false}
Expand All @@ -54,9 +54,9 @@ default = ["rt", "vectored", "xtal-40mhz"]
async = ["esp-hal-common/async"]
bluetooth = []
debug = ["esp-hal-common/debug"]
defmt = ["esp-hal-common/defmt"]
defmt = ["esp-hal-common/defmt", "esp-println/defmt"]
eh1 = ["esp-hal-common/eh1"]
log = ["esp-hal-common/log"]
log = ["esp-hal-common/log", "esp-println/log"]
rt = []
ufmt = ["esp-hal-common/ufmt"]
vectored = ["esp-hal-common/vectored"]
Expand Down
6 changes: 3 additions & 3 deletions esp32c2-hal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ embedded-hal-1 = { version = "=1.0.0-rc.1", package = "embedded-hal" }
embedded-hal-async = "=1.0.0-rc.1"
embedded-io-async = "0.5.0"
esp-backtrace = { version = "0.8.0", features = ["esp32c2", "panic-handler", "exception-handler", "print-uart"] }
esp-println = { version = "0.6.0", features = ["esp32c2", "log"] }
esp-println = { version = "0.6.0", features = ["esp32c2"] }
heapless = "0.7.16"
lis3dh-async = "0.8.0"
sha2 = { version = "0.10.7", default-features = false}
Expand All @@ -52,12 +52,12 @@ p256 = {version = "0.13.2", default-features = false, features = ["
default = ["rt", "vectored", "xtal-40mhz"]
async = ["esp-hal-common/async"]
debug = ["esp-hal-common/debug"]
defmt = ["esp-hal-common/defmt"]
defmt = ["esp-hal-common/defmt", "esp-println/defmt"]
direct-boot = ["esp-hal-common/rv-init-data"]
direct-vectoring = ["esp-hal-common/direct-vectoring"]
eh1 = ["esp-hal-common/eh1"]
interrupt-preemption = ["esp-hal-common/interrupt-preemption"]
log = ["esp-hal-common/log"]
log = ["esp-hal-common/log", "esp-println/log"]
rt = []
ufmt = ["esp-hal-common/ufmt"]
vectored = ["esp-hal-common/vectored"]
Expand Down
6 changes: 3 additions & 3 deletions esp32c3-hal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ embedded-hal-async = "=1.0.0-rc.1"
embedded-io-async = "0.5.0"
esp-backtrace = { version = "0.8.0", features = ["esp32c3", "panic-handler", "exception-handler", "print-uart"] }
esp-hal-smartled = { version = "0.5.0", features = ["esp32c3"], path = "../esp-hal-smartled" }
esp-println = { version = "0.6.0", features = ["esp32c3", "log"] }
esp-println = { version = "0.6.0", features = ["esp32c3"] }
heapless = "0.7.16"
hmac = { version = "0.12.1", default-features = false }
lis3dh-async = "0.8.0"
Expand All @@ -55,12 +55,12 @@ static_cell = { version = "1.2.0", features = ["nightly"] }
default = ["rt", "vectored", "esp-hal-common/rv-zero-rtc-bss"]
async = ["esp-hal-common/async"]
debug = ["esp-hal-common/debug"]
defmt = ["esp-hal-common/defmt"]
defmt = ["esp-hal-common/defmt", "esp-println/defmt"]
direct-boot = ["esp-hal-common/rv-init-data", "esp-hal-common/rv-init-rtc-data"]
direct-vectoring = ["esp-hal-common/direct-vectoring"]
eh1 = ["esp-hal-common/eh1"]
interrupt-preemption = ["esp-hal-common/interrupt-preemption"]
log = ["esp-hal-common/log"]
log = ["esp-hal-common/log", "esp-println/log"]
mcu-boot = []
rt = []
ufmt = ["esp-hal-common/ufmt"]
Expand Down
6 changes: 3 additions & 3 deletions esp32c6-hal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ embedded-can = "0.4.1"
embedded-io-async = "0.5.0"
esp-backtrace = { version = "0.8.0", features = ["esp32c6", "panic-handler", "exception-handler", "print-uart"] }
esp-hal-smartled = { version = "0.5.0", features = ["esp32c6"], path = "../esp-hal-smartled" }
esp-println = { version = "0.6.0", features = ["esp32c6", "log"] }
esp-println = { version = "0.6.0", features = ["esp32c6"] }
heapless = "0.7.16"
hmac = { version = "0.12.1", default-features = false }
lis3dh-async = "0.8.0"
Expand All @@ -58,12 +58,12 @@ p256 = {version = "0.13.2", default-features = false, features = ["
default = ["rt", "vectored", "esp-hal-common/rv-zero-rtc-bss"]
async = ["esp-hal-common/async"]
debug = ["esp-hal-common/debug"]
defmt = ["esp-hal-common/defmt"]
defmt = ["esp-hal-common/defmt", "esp-println/defmt"]
direct-boot = ["esp-hal-common/rv-init-data", "esp-hal-common/rv-init-rtc-data"]
direct-vectoring = ["esp-hal-common/direct-vectoring"]
eh1 = ["esp-hal-common/eh1"]
interrupt-preemption = ["esp-hal-common/interrupt-preemption"]
log = ["esp-hal-common/log"]
log = ["esp-hal-common/log", "esp-println/log"]
rt = []
ufmt = ["esp-hal-common/ufmt"]
vectored = ["esp-hal-common/vectored"]
Expand Down
6 changes: 3 additions & 3 deletions esp32h2-hal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ embedded-can = "0.4.1"
embedded-io-async = "0.5.0"
esp-backtrace = { version = "0.8.0", features = ["esp32h2", "panic-handler", "exception-handler", "print-uart"] }
esp-hal-smartled = { version = "0.5.0", features = ["esp32h2"], path = "../esp-hal-smartled" }
esp-println = { version = "0.6.0", features = ["esp32h2", "log"] }
esp-println = { version = "0.6.0", features = ["esp32h2"] }
heapless = "0.7.16"
hmac = { version = "0.12.1", default-features = false }
lis3dh-async = "0.8.0"
Expand All @@ -58,12 +58,12 @@ p256 = {version = "0.13.2", default-features = false, features = ["
default = ["rt", "vectored", "esp-hal-common/rv-zero-rtc-bss"]
async = ["esp-hal-common/async"]
debug = ["esp-hal-common/debug"]
defmt = ["esp-hal-common/defmt"]
defmt = ["esp-hal-common/defmt", "esp-println/defmt"]
direct-boot = ["esp-hal-common/rv-init-data", "esp-hal-common/rv-init-rtc-data"]
direct-vectoring = ["esp-hal-common/direct-vectoring"]
eh1 = ["esp-hal-common/eh1"]
interrupt-preemption = ["esp-hal-common/interrupt-preemption"]
log = ["esp-hal-common/log"]
log = ["esp-hal-common/log", "esp-println/log"]
rt = []
ufmt = ["esp-hal-common/ufmt"]
vectored = ["esp-hal-common/vectored"]
Expand Down
6 changes: 3 additions & 3 deletions esp32s2-hal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ embedded-io-async = "0.5.0"
esp-alloc = "0.3.0"
esp-backtrace = { version = "0.8.0", features = ["esp32s2", "panic-handler", "print-uart", "exception-handler"] }
esp-hal-smartled = { version = "0.5.0", features = ["esp32s2"], path = "../esp-hal-smartled" }
esp-println = { version = "0.6.0", features = ["esp32s2", "log"] }
esp-println = { version = "0.6.0", features = ["esp32s2"] }
heapless = "0.7.16"
hmac = { version = "0.12.1", default-features = false }
lis3dh-async = "0.8.0"
Expand All @@ -57,9 +57,9 @@ usbd-serial = "0.1.1"
default = ["rt", "vectored"]
async = ["esp-hal-common/async"]
debug = ["esp-hal-common/debug"]
defmt = ["esp-hal-common/defmt"]
defmt = ["esp-hal-common/defmt", "esp-println/defmt"]
eh1 = ["esp-hal-common/eh1"]
log = ["esp-hal-common/log"]
log = ["esp-hal-common/log", "esp-println/log"]
rt = []
ufmt = ["esp-hal-common/ufmt"]
vectored = ["esp-hal-common/vectored"]
Expand Down
6 changes: 3 additions & 3 deletions esp32s3-hal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ embedded-io-async = "0.5.0"
esp-alloc = "0.3.0"
esp-backtrace = { version = "0.8.0", features = ["esp32s3", "panic-handler", "exception-handler", "print-uart"] }
esp-hal-smartled = { version = "0.5.0", features = ["esp32s3"], path = "../esp-hal-smartled" }
esp-println = { version = "0.6.0", features = ["esp32s3", "log"] }
esp-println = { version = "0.6.0", features = ["esp32s3"] }
heapless = "0.7.16"
hmac = { version = "0.12.1", default-features = false }
lis3dh-async = "0.8.0"
Expand All @@ -59,10 +59,10 @@ usbd-serial = "0.1.1"
default = ["rt", "vectored"]
async = ["esp-hal-common/async"]
debug = ["esp-hal-common/debug"]
defmt = ["esp-hal-common/defmt"]
defmt = ["esp-hal-common/defmt", "esp-println/defmt"]
direct-boot = ["r0"]
eh1 = ["esp-hal-common/eh1"]
log = ["esp-hal-common/log"]
log = ["esp-hal-common/log", "esp-println/log"]
rt = []
ufmt = ["esp-hal-common/ufmt"]
vectored = ["esp-hal-common/vectored"]
Expand Down