diff options
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | embassy-nrf-examples/.cargo/config (renamed from examples/.cargo/config) | 0 | ||||
| -rw-r--r-- | embassy-nrf-examples/Cargo.toml (renamed from examples/Cargo.toml) | 2 | ||||
| -rw-r--r-- | embassy-nrf-examples/build.rs (renamed from examples/build.rs) | 0 | ||||
| -rw-r--r-- | embassy-nrf-examples/memory.x (renamed from examples/memory.x) | 0 | ||||
| -rw-r--r-- | embassy-nrf-examples/src/bin/buffered_uart.rs (renamed from examples/src/bin/buffered_uart.rs) | 0 | ||||
| -rw-r--r-- | embassy-nrf-examples/src/bin/executor_fairness_test.rs (renamed from examples/src/bin/executor_fairness_test.rs) | 0 | ||||
| -rw-r--r-- | embassy-nrf-examples/src/bin/gpiote.rs (renamed from examples/src/bin/gpiote.rs) | 0 | ||||
| -rw-r--r-- | embassy-nrf-examples/src/bin/gpiote_port.rs (renamed from examples/src/bin/gpiote_port.rs) | 0 | ||||
| -rw-r--r-- | embassy-nrf-examples/src/bin/multiprio.rs (renamed from examples/src/bin/multiprio.rs) | 0 | ||||
| -rw-r--r-- | embassy-nrf-examples/src/bin/qspi.rs (renamed from examples/src/bin/qspi.rs) | 0 | ||||
| -rw-r--r-- | embassy-nrf-examples/src/bin/rtc_async.rs (renamed from examples/src/bin/rtc_async.rs) | 0 | ||||
| -rw-r--r-- | embassy-nrf-examples/src/bin/rtc_raw.rs (renamed from examples/src/bin/rtc_raw.rs) | 0 | ||||
| -rw-r--r-- | embassy-nrf-examples/src/bin/uart.rs (renamed from examples/src/bin/uart.rs) | 0 | ||||
| -rw-r--r-- | embassy-nrf-examples/src/example_common.rs (renamed from examples/src/example_common.rs) | 0 | ||||
| -rwxr-xr-x | test-build.sh | 6 |
16 files changed, 5 insertions, 5 deletions
diff --git a/Cargo.toml b/Cargo.toml index 792804046..5ba9ba7d3 100644 --- a/Cargo.toml +++ b/Cargo.toml | |||
| @@ -3,8 +3,8 @@ | |||
| 3 | members = [ | 3 | members = [ |
| 4 | "embassy", | 4 | "embassy", |
| 5 | "embassy-nrf", | 5 | "embassy-nrf", |
| 6 | "embassy-nrf-examples", | ||
| 6 | "embassy-macros", | 7 | "embassy-macros", |
| 7 | "examples", | ||
| 8 | ] | 8 | ] |
| 9 | 9 | ||
| 10 | exclude = [ | 10 | exclude = [ |
diff --git a/examples/.cargo/config b/embassy-nrf-examples/.cargo/config index 3f319ae55..3f319ae55 100644 --- a/examples/.cargo/config +++ b/embassy-nrf-examples/.cargo/config | |||
diff --git a/examples/Cargo.toml b/embassy-nrf-examples/Cargo.toml index c845c1bfb..0c812db1d 100644 --- a/examples/Cargo.toml +++ b/embassy-nrf-examples/Cargo.toml | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | [package] | 1 | [package] |
| 2 | authors = ["Dario Nieuwenhuis <[email protected]>"] | 2 | authors = ["Dario Nieuwenhuis <[email protected]>"] |
| 3 | edition = "2018" | 3 | edition = "2018" |
| 4 | name = "embassy-examples" | 4 | name = "embassy-nrf-examples" |
| 5 | version = "0.1.0" | 5 | version = "0.1.0" |
| 6 | 6 | ||
| 7 | [features] | 7 | [features] |
diff --git a/examples/build.rs b/embassy-nrf-examples/build.rs index d534cc3df..d534cc3df 100644 --- a/examples/build.rs +++ b/embassy-nrf-examples/build.rs | |||
diff --git a/examples/memory.x b/embassy-nrf-examples/memory.x index 9b04edec0..9b04edec0 100644 --- a/examples/memory.x +++ b/embassy-nrf-examples/memory.x | |||
diff --git a/examples/src/bin/buffered_uart.rs b/embassy-nrf-examples/src/bin/buffered_uart.rs index 6e15fbcfa..6e15fbcfa 100644 --- a/examples/src/bin/buffered_uart.rs +++ b/embassy-nrf-examples/src/bin/buffered_uart.rs | |||
diff --git a/examples/src/bin/executor_fairness_test.rs b/embassy-nrf-examples/src/bin/executor_fairness_test.rs index 9b2c1bd26..9b2c1bd26 100644 --- a/examples/src/bin/executor_fairness_test.rs +++ b/embassy-nrf-examples/src/bin/executor_fairness_test.rs | |||
diff --git a/examples/src/bin/gpiote.rs b/embassy-nrf-examples/src/bin/gpiote.rs index afa1b85d5..afa1b85d5 100644 --- a/examples/src/bin/gpiote.rs +++ b/embassy-nrf-examples/src/bin/gpiote.rs | |||
diff --git a/examples/src/bin/gpiote_port.rs b/embassy-nrf-examples/src/bin/gpiote_port.rs index f5aa81322..f5aa81322 100644 --- a/examples/src/bin/gpiote_port.rs +++ b/embassy-nrf-examples/src/bin/gpiote_port.rs | |||
diff --git a/examples/src/bin/multiprio.rs b/embassy-nrf-examples/src/bin/multiprio.rs index c821e3dba..c821e3dba 100644 --- a/examples/src/bin/multiprio.rs +++ b/embassy-nrf-examples/src/bin/multiprio.rs | |||
diff --git a/examples/src/bin/qspi.rs b/embassy-nrf-examples/src/bin/qspi.rs index a7d47f79c..a7d47f79c 100644 --- a/examples/src/bin/qspi.rs +++ b/embassy-nrf-examples/src/bin/qspi.rs | |||
diff --git a/examples/src/bin/rtc_async.rs b/embassy-nrf-examples/src/bin/rtc_async.rs index dcdeb7049..dcdeb7049 100644 --- a/examples/src/bin/rtc_async.rs +++ b/embassy-nrf-examples/src/bin/rtc_async.rs | |||
diff --git a/examples/src/bin/rtc_raw.rs b/embassy-nrf-examples/src/bin/rtc_raw.rs index 438585460..438585460 100644 --- a/examples/src/bin/rtc_raw.rs +++ b/embassy-nrf-examples/src/bin/rtc_raw.rs | |||
diff --git a/examples/src/bin/uart.rs b/embassy-nrf-examples/src/bin/uart.rs index 107936686..107936686 100644 --- a/examples/src/bin/uart.rs +++ b/embassy-nrf-examples/src/bin/uart.rs | |||
diff --git a/examples/src/example_common.rs b/embassy-nrf-examples/src/example_common.rs index 60bb02082..60bb02082 100644 --- a/examples/src/example_common.rs +++ b/embassy-nrf-examples/src/example_common.rs | |||
diff --git a/test-build.sh b/test-build.sh index 52bf7bb7b..f67cc5b2b 100755 --- a/test-build.sh +++ b/test-build.sh | |||
| @@ -2,9 +2,6 @@ | |||
| 2 | 2 | ||
| 3 | set -euxo pipefail | 3 | set -euxo pipefail |
| 4 | 4 | ||
| 5 | # examples | ||
| 6 | (cd examples; cargo build --target thumbv7em-none-eabi --bins) | ||
| 7 | |||
| 8 | # embassy std | 5 | # embassy std |
| 9 | (cd embassy; cargo build --features log,std) | 6 | (cd embassy; cargo build --features log,std) |
| 10 | 7 | ||
| @@ -14,6 +11,9 @@ set -euxo pipefail | |||
| 14 | (cd embassy; cargo build --target thumbv7em-none-eabi --features defmt) | 11 | (cd embassy; cargo build --target thumbv7em-none-eabi --features defmt) |
| 15 | 12 | ||
| 16 | # embassy-nrf | 13 | # embassy-nrf |
| 14 | |||
| 15 | (cd embassy-nrf-examples; cargo build --target thumbv7em-none-eabi --bins) | ||
| 16 | |||
| 17 | (cd embassy-nrf; cargo build --target thumbv7em-none-eabi --features 52810) | 17 | (cd embassy-nrf; cargo build --target thumbv7em-none-eabi --features 52810) |
| 18 | #(cd embassy-nrf; cargo build --target thumbv7em-none-eabi --features 52811) # nrf52811-hal doesn't exist yet | 18 | #(cd embassy-nrf; cargo build --target thumbv7em-none-eabi --features 52811) # nrf52811-hal doesn't exist yet |
| 19 | (cd embassy-nrf; cargo build --target thumbv7em-none-eabi --features 52832) | 19 | (cd embassy-nrf; cargo build --target thumbv7em-none-eabi --features 52832) |
