Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Revert r-a
  • Loading branch information
bugadani committed Aug 30, 2024
commit b6da9b7536d57f29bbbb6ccdd98b9cbc444aeec3
25 changes: 0 additions & 25 deletions .vscode/settings.json.example

This file was deleted.

17 changes: 3 additions & 14 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[workspace]
resolver = "2"
members = [
"xtask",
"esp-hal",
members = ["xtask"]
exclude = [
"esp-alloc",
"esp-backtrace",
"esp-build",
"esp-hal",
"esp-hal-embassy",
"esp-hal-procmacros",
"esp-hal-smartled",
Expand All @@ -20,19 +20,8 @@ members = [
"extras/bench-server",
"extras/esp-wifishark",
"extras/ieee802154-sniffer",
]
exclude = [
"hil-test",
"xtensa-lx",
"xtensa-lx-rt",
"xtensa-lx-rt/procmacros",
]

[profile.release]
codegen-units = 1
debug = 2
debug-assertions = false
incremental = false
opt-level = 3
lto = 'fat'
overflow-checks = false
4 changes: 2 additions & 2 deletions esp-lp-hal/.cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[alias]
esp32c6 = "build --release --examples --features=esp32c6 --target riscv32imac-unknown-none-elf"
esp32s2 = "build --release --example=lp_blinky --features=esp32s2 --target riscv32imc-unknown-none-elf"
esp32s3 = "build --release --example=lp_blinky --features=esp32s3 --target riscv32imc-unknown-none-elf"
esp32s2 = "build --release --example=blinky --features=esp32s2 --target riscv32imc-unknown-none-elf"
esp32s3 = "build --release --example=blinky --features=esp32s3 --target riscv32imc-unknown-none-elf"

[build]
# target = "riscv32imc-unknown-none-elf" # ESP32-S2 + ESP32-S3
Expand Down
6 changes: 3 additions & 3 deletions esp-lp-hal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ embedded-hal = ["dep:embedded-hal", "dep:embedded-hal-nb"]
embedded-io = ["dep:embedded-io"]

[[example]]
name = "lp_blinky"
name = "blinky"
required-features = ["embedded-hal-02"]

[[example]]
name = "lp_i2c"
name = "i2c"
required-features = ["embedded-hal-02", "esp32c6"]

[[example]]
name = "lp_uart"
name = "uart"
required-features = ["embedded-hal-02", "esp32c6"]

[lints.rust]
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
9 changes: 9 additions & 0 deletions examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,12 @@ embassy-generic-timers = ["embassy-time/generic-queue-8"]

opsram-2m = ["esp-hal/opsram-2m"]
psram-2m = ["esp-hal/psram-2m"]

[profile.release]
codegen-units = 1
debug = 2
debug-assertions = false
incremental = false
opt-level = 3
lto = 'fat'
overflow-checks = false
2 changes: 1 addition & 1 deletion examples/src/bin/lp_core_basic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fn main() -> ! {

// load code to LP core
let lp_core_code =
load_lp_code!("../target/riscv32imac-unknown-none-elf/release/examples/lp_blinky");
load_lp_code!("../esp-lp-hal/target/riscv32imac-unknown-none-elf/release/examples/blinky");

// start LP core
lp_core_code.run(&mut lp_core, LpCoreWakeupSource::HpCpu, lp_pin);
Expand Down
2 changes: 1 addition & 1 deletion examples/src/bin/lp_core_i2c.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ fn main() -> ! {

// load code to LP core
let lp_core_code =
load_lp_code!("../target/riscv32imac-unknown-none-elf/release/examples/lp_i2c");
load_lp_code!("../esp-lp-hal/target/riscv32imac-unknown-none-elf/release/examples/i2c");

// start LP core
lp_core_code.run(&mut lp_core, LpCoreWakeupSource::HpCpu, lp_i2c);
Expand Down
2 changes: 1 addition & 1 deletion examples/src/bin/lp_core_uart.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ fn main() -> ! {

// Load code to LP core:
let lp_core_code =
load_lp_code!("../target/riscv32imac-unknown-none-elf/release/examples/lp_uart");
load_lp_code!("../esp-lp-hal/target/riscv32imac-unknown-none-elf/release/examples/uart");

// Start LP core:
lp_core_code.run(&mut lp_core, LpCoreWakeupSource::HpCpu, lp_uart);
Expand Down
2 changes: 1 addition & 1 deletion examples/src/bin/ulp_riscv_core_basic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ fn main() -> ! {

// load code to LP core
let lp_core_code =
load_lp_code!("../target/riscv32imc-unknown-none-elf/release/examples/lp_blinky");
load_lp_code!("../esp-lp-hal/target/riscv32imc-unknown-none-elf/release/examples/blinky");

// start LP core
lp_core_code.run(&mut ulp_core, ulp_core::UlpCoreWakeupSource::HpCpu, pin);
Expand Down
4 changes: 2 additions & 2 deletions xtask/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,10 @@ pub fn build_documentation(

let docs_path = windows_safe_path(
&workspace
.join(package.to_string())
.join("target")
.join(target)
.join("doc")
.join(package.to_string().replace('-', "_")),
.join("doc"),
);

Ok(docs_path)
Expand Down