From d2e7b9bd35cdae27ca1cd214f52608be63d61407 Mon Sep 17 00:00:00 2001 From: Mengxi-Xu Date: Thu, 26 Oct 2023 16:03:30 +0800 Subject: [PATCH] =?UTF-8?q?examples:=20=E6=95=B4=E7=90=86examples=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mengxi-Xu --- Cargo.toml | 16 ++++++++-------- .../{ => multicore}/multicore-demo/README.md | 0 .../multicore-demo/dsp}/Cargo.toml | 5 ++--- .../multicore-demo/dsp}/build.rs | 0 .../multicore-demo/dsp/src/main.rs | 0 .../multicore-demo/mcu/Cargo.toml | 2 +- .../multicore-demo/mcu}/build.rs | 0 .../multicore-demo/mcu/src/main.rs | 0 examples/{ => peripherals}/gpio-demo/Cargo.toml | 2 +- .../gpio-demo}/build.rs | 0 .../{ => peripherals}/gpio-demo/src/main.rs | 0 .../dsp => peripherals/i2c-demo}/Cargo.toml | 3 ++- .../i2c-demo}/build.rs | 0 examples/{ => peripherals}/i2c-demo/src/main.rs | 0 examples/{ => peripherals}/jtag-demo/Cargo.toml | 2 +- .../dsp => peripherals/jtag-demo}/build.rs | 0 .../{ => peripherals}/jtag-demo/src/main.rs | 0 examples/{ => peripherals}/lz4d-demo/Cargo.toml | 2 +- .../mcu => peripherals/lz4d-demo}/build.rs | 0 .../{ => peripherals}/lz4d-demo/src/main.rs | 0 .../{ => peripherals}/lz4d-demo/src/text.lz4 | Bin examples/{ => peripherals}/pwm-demo/Cargo.toml | 2 +- examples/{ => peripherals}/pwm-demo/build.rs | 0 examples/{ => peripherals}/pwm-demo/src/main.rs | 0 examples/{ => peripherals}/spi-demo/Cargo.toml | 2 +- examples/{ => peripherals}/spi-demo/README.md | 0 examples/{ => peripherals}/spi-demo/build.rs | 0 .../{ => peripherals}/spi-demo/src/ferris.raw | Bin examples/{ => peripherals}/spi-demo/src/main.rs | 0 examples/{ => peripherals}/uart-demo/Cargo.toml | 2 +- examples/{ => peripherals}/uart-demo/build.rs | 0 .../{ => peripherals}/uart-demo/src/main.rs | 0 32 files changed, 19 insertions(+), 19 deletions(-) rename examples/{ => multicore}/multicore-demo/README.md (100%) rename examples/{i2c-demo => multicore/multicore-demo/dsp}/Cargo.toml (81%) rename examples/{gpio-demo => multicore/multicore-demo/dsp}/build.rs (100%) rename examples/{ => multicore}/multicore-demo/dsp/src/main.rs (100%) rename examples/{ => multicore}/multicore-demo/mcu/Cargo.toml (87%) rename examples/{i2c-demo => multicore/multicore-demo/mcu}/build.rs (100%) rename examples/{ => multicore}/multicore-demo/mcu/src/main.rs (100%) rename examples/{ => peripherals}/gpio-demo/Cargo.toml (88%) rename examples/{jtag-demo => peripherals/gpio-demo}/build.rs (100%) rename examples/{ => peripherals}/gpio-demo/src/main.rs (100%) rename examples/{multicore-demo/dsp => peripherals/i2c-demo}/Cargo.toml (92%) rename examples/{lz4d-demo => peripherals/i2c-demo}/build.rs (100%) rename examples/{ => peripherals}/i2c-demo/src/main.rs (100%) rename examples/{ => peripherals}/jtag-demo/Cargo.toml (88%) rename examples/{multicore-demo/dsp => peripherals/jtag-demo}/build.rs (100%) rename examples/{ => peripherals}/jtag-demo/src/main.rs (100%) rename examples/{ => peripherals}/lz4d-demo/Cargo.toml (89%) rename examples/{multicore-demo/mcu => peripherals/lz4d-demo}/build.rs (100%) rename examples/{ => peripherals}/lz4d-demo/src/main.rs (100%) rename examples/{ => peripherals}/lz4d-demo/src/text.lz4 (100%) rename examples/{ => peripherals}/pwm-demo/Cargo.toml (88%) rename examples/{ => peripherals}/pwm-demo/build.rs (100%) rename examples/{ => peripherals}/pwm-demo/src/main.rs (100%) rename examples/{ => peripherals}/spi-demo/Cargo.toml (90%) rename examples/{ => peripherals}/spi-demo/README.md (100%) rename examples/{ => peripherals}/spi-demo/build.rs (100%) rename examples/{ => peripherals}/spi-demo/src/ferris.raw (100%) rename examples/{ => peripherals}/spi-demo/src/main.rs (100%) rename examples/{ => peripherals}/uart-demo/Cargo.toml (88%) rename examples/{ => peripherals}/uart-demo/build.rs (100%) rename examples/{ => peripherals}/uart-demo/src/main.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 3416a94..c15490a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,14 +25,14 @@ memoffset = "0.9.0" [workspace] members = [ - "examples/gpio-demo", - "examples/i2c-demo", - "examples/jtag-demo", - "examples/lz4d-demo", - "examples/multicore-demo/mcu", - "examples/multicore-demo/dsp", - "examples/pwm-demo", - "examples/uart-demo", + "examples/peripherals/gpio-demo", + "examples/peripherals/i2c-demo", + "examples/peripherals/jtag-demo", + "examples/peripherals/lz4d-demo", + "examples/multicore/multicore-demo/mcu", + "examples/multicore/multicore-demo/dsp", + "examples/peripherals/pwm-demo", + "examples/peripherals/uart-demo", ] [features] diff --git a/examples/multicore-demo/README.md b/examples/multicore/multicore-demo/README.md similarity index 100% rename from examples/multicore-demo/README.md rename to examples/multicore/multicore-demo/README.md diff --git a/examples/i2c-demo/Cargo.toml b/examples/multicore/multicore-demo/dsp/Cargo.toml similarity index 81% rename from examples/i2c-demo/Cargo.toml rename to examples/multicore/multicore-demo/dsp/Cargo.toml index c33d60d..37f131f 100644 --- a/examples/i2c-demo/Cargo.toml +++ b/examples/multicore/multicore-demo/dsp/Cargo.toml @@ -1,13 +1,12 @@ [package] -name = "i2c-demo" +name = "multicore-demo-dsp" version = "0.1.0" edition = "2021" -publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bl-soc = { path = "../..", features = ["bl808"] } +bl-soc = { path = "../../../..", features = ["bl808"] } base-address = "0.0.0" panic-halt = "0.2.0" embedded-time = "0.12.1" diff --git a/examples/gpio-demo/build.rs b/examples/multicore/multicore-demo/dsp/build.rs similarity index 100% rename from examples/gpio-demo/build.rs rename to examples/multicore/multicore-demo/dsp/build.rs diff --git a/examples/multicore-demo/dsp/src/main.rs b/examples/multicore/multicore-demo/dsp/src/main.rs similarity index 100% rename from examples/multicore-demo/dsp/src/main.rs rename to examples/multicore/multicore-demo/dsp/src/main.rs diff --git a/examples/multicore-demo/mcu/Cargo.toml b/examples/multicore/multicore-demo/mcu/Cargo.toml similarity index 87% rename from examples/multicore-demo/mcu/Cargo.toml rename to examples/multicore/multicore-demo/mcu/Cargo.toml index 57af60f..5f0bdd5 100644 --- a/examples/multicore-demo/mcu/Cargo.toml +++ b/examples/multicore/multicore-demo/mcu/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bl-soc = { path = "../../..", features = ["bl808"] } +bl-soc = { path = "../../../..", features = ["bl808"] } base-address = "0.0.0" panic-halt = "0.2.0" riscv = "0.10.1" diff --git a/examples/i2c-demo/build.rs b/examples/multicore/multicore-demo/mcu/build.rs similarity index 100% rename from examples/i2c-demo/build.rs rename to examples/multicore/multicore-demo/mcu/build.rs diff --git a/examples/multicore-demo/mcu/src/main.rs b/examples/multicore/multicore-demo/mcu/src/main.rs similarity index 100% rename from examples/multicore-demo/mcu/src/main.rs rename to examples/multicore/multicore-demo/mcu/src/main.rs diff --git a/examples/gpio-demo/Cargo.toml b/examples/peripherals/gpio-demo/Cargo.toml similarity index 88% rename from examples/gpio-demo/Cargo.toml rename to examples/peripherals/gpio-demo/Cargo.toml index c3e9cce..7cc1603 100644 --- a/examples/gpio-demo/Cargo.toml +++ b/examples/peripherals/gpio-demo/Cargo.toml @@ -7,7 +7,7 @@ publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bl-soc = { path = "../..", features = ["bl808"] } +bl-soc = { path = "../../..", features = ["bl808"] } base-address = "0.0.0" panic-halt = "0.2.0" embedded-hal = "1.0.0-rc.1" diff --git a/examples/jtag-demo/build.rs b/examples/peripherals/gpio-demo/build.rs similarity index 100% rename from examples/jtag-demo/build.rs rename to examples/peripherals/gpio-demo/build.rs diff --git a/examples/gpio-demo/src/main.rs b/examples/peripherals/gpio-demo/src/main.rs similarity index 100% rename from examples/gpio-demo/src/main.rs rename to examples/peripherals/gpio-demo/src/main.rs diff --git a/examples/multicore-demo/dsp/Cargo.toml b/examples/peripherals/i2c-demo/Cargo.toml similarity index 92% rename from examples/multicore-demo/dsp/Cargo.toml rename to examples/peripherals/i2c-demo/Cargo.toml index f328e32..2ebc51b 100644 --- a/examples/multicore-demo/dsp/Cargo.toml +++ b/examples/peripherals/i2c-demo/Cargo.toml @@ -1,7 +1,8 @@ [package] -name = "multicore-demo-dsp" +name = "i2c-demo" version = "0.1.0" edition = "2021" +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/examples/lz4d-demo/build.rs b/examples/peripherals/i2c-demo/build.rs similarity index 100% rename from examples/lz4d-demo/build.rs rename to examples/peripherals/i2c-demo/build.rs diff --git a/examples/i2c-demo/src/main.rs b/examples/peripherals/i2c-demo/src/main.rs similarity index 100% rename from examples/i2c-demo/src/main.rs rename to examples/peripherals/i2c-demo/src/main.rs diff --git a/examples/jtag-demo/Cargo.toml b/examples/peripherals/jtag-demo/Cargo.toml similarity index 88% rename from examples/jtag-demo/Cargo.toml rename to examples/peripherals/jtag-demo/Cargo.toml index d816789..dcc3786 100644 --- a/examples/jtag-demo/Cargo.toml +++ b/examples/peripherals/jtag-demo/Cargo.toml @@ -7,7 +7,7 @@ publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bl-soc = { path = "../..", features = ["bl808"] } +bl-soc = { path = "../../..", features = ["bl808"] } base-address = "0.0.0" panic-halt = "0.2.0" riscv = "0.10.1" diff --git a/examples/multicore-demo/dsp/build.rs b/examples/peripherals/jtag-demo/build.rs similarity index 100% rename from examples/multicore-demo/dsp/build.rs rename to examples/peripherals/jtag-demo/build.rs diff --git a/examples/jtag-demo/src/main.rs b/examples/peripherals/jtag-demo/src/main.rs similarity index 100% rename from examples/jtag-demo/src/main.rs rename to examples/peripherals/jtag-demo/src/main.rs diff --git a/examples/lz4d-demo/Cargo.toml b/examples/peripherals/lz4d-demo/Cargo.toml similarity index 89% rename from examples/lz4d-demo/Cargo.toml rename to examples/peripherals/lz4d-demo/Cargo.toml index 973d0f0..e0aa627 100644 --- a/examples/lz4d-demo/Cargo.toml +++ b/examples/peripherals/lz4d-demo/Cargo.toml @@ -7,7 +7,7 @@ publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bl-soc = { path = "../..", features = ["bl808"] } +bl-soc = { path = "../../..", features = ["bl808"] } base-address = "0.0.0" panic-halt = "0.2.0" embedded-hal = "1.0.0-rc.1" diff --git a/examples/multicore-demo/mcu/build.rs b/examples/peripherals/lz4d-demo/build.rs similarity index 100% rename from examples/multicore-demo/mcu/build.rs rename to examples/peripherals/lz4d-demo/build.rs diff --git a/examples/lz4d-demo/src/main.rs b/examples/peripherals/lz4d-demo/src/main.rs similarity index 100% rename from examples/lz4d-demo/src/main.rs rename to examples/peripherals/lz4d-demo/src/main.rs diff --git a/examples/lz4d-demo/src/text.lz4 b/examples/peripherals/lz4d-demo/src/text.lz4 similarity index 100% rename from examples/lz4d-demo/src/text.lz4 rename to examples/peripherals/lz4d-demo/src/text.lz4 diff --git a/examples/pwm-demo/Cargo.toml b/examples/peripherals/pwm-demo/Cargo.toml similarity index 88% rename from examples/pwm-demo/Cargo.toml rename to examples/peripherals/pwm-demo/Cargo.toml index 65c0be3..087d280 100644 --- a/examples/pwm-demo/Cargo.toml +++ b/examples/peripherals/pwm-demo/Cargo.toml @@ -7,7 +7,7 @@ publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bl-soc = { path = "../..", features = ["bl808"] } +bl-soc = { path = "../../..", features = ["bl808"] } base-address = "0.0.0" panic-halt = "0.2.0" embedded-time = "0.12.1" diff --git a/examples/pwm-demo/build.rs b/examples/peripherals/pwm-demo/build.rs similarity index 100% rename from examples/pwm-demo/build.rs rename to examples/peripherals/pwm-demo/build.rs diff --git a/examples/pwm-demo/src/main.rs b/examples/peripherals/pwm-demo/src/main.rs similarity index 100% rename from examples/pwm-demo/src/main.rs rename to examples/peripherals/pwm-demo/src/main.rs diff --git a/examples/spi-demo/Cargo.toml b/examples/peripherals/spi-demo/Cargo.toml similarity index 90% rename from examples/spi-demo/Cargo.toml rename to examples/peripherals/spi-demo/Cargo.toml index bbf8488..200ab94 100644 --- a/examples/spi-demo/Cargo.toml +++ b/examples/peripherals/spi-demo/Cargo.toml @@ -7,7 +7,7 @@ publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bl-soc = { path = "../..", features = ["bl808"] } +bl-soc = { path = "../../..", features = ["bl808"] } base-address = "0.0.0" panic-halt = "0.2.0" embedded-time = "0.12.1" diff --git a/examples/spi-demo/README.md b/examples/peripherals/spi-demo/README.md similarity index 100% rename from examples/spi-demo/README.md rename to examples/peripherals/spi-demo/README.md diff --git a/examples/spi-demo/build.rs b/examples/peripherals/spi-demo/build.rs similarity index 100% rename from examples/spi-demo/build.rs rename to examples/peripherals/spi-demo/build.rs diff --git a/examples/spi-demo/src/ferris.raw b/examples/peripherals/spi-demo/src/ferris.raw similarity index 100% rename from examples/spi-demo/src/ferris.raw rename to examples/peripherals/spi-demo/src/ferris.raw diff --git a/examples/spi-demo/src/main.rs b/examples/peripherals/spi-demo/src/main.rs similarity index 100% rename from examples/spi-demo/src/main.rs rename to examples/peripherals/spi-demo/src/main.rs diff --git a/examples/uart-demo/Cargo.toml b/examples/peripherals/uart-demo/Cargo.toml similarity index 88% rename from examples/uart-demo/Cargo.toml rename to examples/peripherals/uart-demo/Cargo.toml index c04c0fb..af14ab1 100644 --- a/examples/uart-demo/Cargo.toml +++ b/examples/peripherals/uart-demo/Cargo.toml @@ -7,7 +7,7 @@ publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bl-soc = { path = "../..", features = ["bl808"] } +bl-soc = { path = "../../..", features = ["bl808"] } base-address = "0.0.0" panic-halt = "0.2.0" embedded-time = "0.12.1" diff --git a/examples/uart-demo/build.rs b/examples/peripherals/uart-demo/build.rs similarity index 100% rename from examples/uart-demo/build.rs rename to examples/peripherals/uart-demo/build.rs diff --git a/examples/uart-demo/src/main.rs b/examples/peripherals/uart-demo/src/main.rs similarity index 100% rename from examples/uart-demo/src/main.rs rename to examples/peripherals/uart-demo/src/main.rs -- Gitee