From af12ba2963db9ed3c70ff5d90d5210be7719c5d1 Mon Sep 17 00:00:00 2001 From: Jonathan Pallant Date: Mon, 22 Jul 2024 17:01:25 +0100 Subject: [PATCH] Rename demo-app to nrf52-app --- .github/workflows/build-ferrocene.yml | 12 ++++++------ .github/workflows/build.yml | 12 ++++++------ .github/workflows/clippy.yml | 4 ++-- .github/workflows/format.yml | 4 ++-- build.sh | 2 +- {demo-app => nrf52-app}/.cargo/config.toml | 0 {demo-app => nrf52-app}/.gitignore | 0 {demo-app => nrf52-app}/.vscode/launch.json | 4 ++-- {demo-app => nrf52-app}/.vscode/settings.json | 0 {demo-app => nrf52-app}/.vscode/tasks.json | 0 {demo-app => nrf52-app}/Cargo.lock | 2 +- {demo-app => nrf52-app}/Cargo.lock.license | 0 {demo-app => nrf52-app}/Cargo.toml | 2 +- {demo-app => nrf52-app}/build.rs | 0 {demo-app => nrf52-app}/memory.x | 0 {demo-app => nrf52-app}/src/main.rs | 0 16 files changed, 21 insertions(+), 21 deletions(-) rename {demo-app => nrf52-app}/.cargo/config.toml (100%) rename {demo-app => nrf52-app}/.gitignore (100%) rename {demo-app => nrf52-app}/.vscode/launch.json (86%) rename {demo-app => nrf52-app}/.vscode/settings.json (100%) rename {demo-app => nrf52-app}/.vscode/tasks.json (100%) rename {demo-app => nrf52-app}/Cargo.lock (99%) rename {demo-app => nrf52-app}/Cargo.lock.license (100%) rename {demo-app => nrf52-app}/Cargo.toml (98%) rename {demo-app => nrf52-app}/build.rs (100%) rename {demo-app => nrf52-app}/memory.x (100%) rename {demo-app => nrf52-app}/src/main.rs (100%) diff --git a/.github/workflows/build-ferrocene.yml b/.github/workflows/build-ferrocene.yml index ee50184..4c4bcee 100644 --- a/.github/workflows/build-ferrocene.yml +++ b/.github/workflows/build-ferrocene.yml @@ -5,7 +5,7 @@ name: workflow-build-everything-ferrocene run-name: Build Everything with Ferrocene on: [push] jobs: - job-build-demo-app: + job-build-nrf52-app: runs-on: ubuntu-latest needs: job-build-threadx-staticlib steps: @@ -30,21 +30,21 @@ jobs: echo "BUILD_SLUG=${slug}" >> "${GITHUB_ENV}" - name: Check Demo App run: | - cd demo-app + cd nrf52-app rustc --version cargo --version cargo check --target=thumbv7em-none-eabi - name: Build Demo App run: | - cd demo-app + cd nrf52-app rustc --version cargo --version cargo build --target=thumbv7em-none-eabi --release - - name: Upload demo-app + - name: Upload nrf52-app uses: actions/upload-artifact@master with: - name: demo-app - path: demo-app/target/thumbv7em-none-eabi/release/demo-app + name: nrf52-app + path: nrf52-app/target/thumbv7em-none-eabi/release/nrf52-app job-build-threadx-sys: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5f05a1b..69553cd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ name: workflow-build-everything run-name: Build Everything on: [push] jobs: - job-build-demo-app: + job-build-nrf52-app: runs-on: ubuntu-latest needs: job-build-threadx-staticlib steps: @@ -30,17 +30,17 @@ jobs: echo "BUILD_SLUG=${slug}" >> "${GITHUB_ENV}" - name: Check Demo App run: | - cd demo-app + cd nrf52-app cargo check --target=thumbv7em-none-eabi - name: Build Demo App run: | - cd demo-app + cd nrf52-app cargo build --target=thumbv7em-none-eabi --release - - name: Upload demo-app + - name: Upload nrf52-app uses: actions/upload-artifact@master with: - name: demo-app - path: demo-app/target/thumbv7em-none-eabi/release/demo-app + name: nrf52-app + path: nrf52-app/target/thumbv7em-none-eabi/release/nrf52-app job-build-threadx-sys: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index 0001b48..79f2290 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -5,7 +5,7 @@ name: workflow-code-analysis run-name: Run code analysis on: [push] jobs: - job-clippy-demo-app: + job-clippy-nrf52-app: runs-on: ubuntu-latest steps: - name: Checkout repo @@ -22,7 +22,7 @@ jobs: env: RUSTFLAGS: "-Dwarnings" run: | - cd demo-app + cd nrf52-app cargo clippy --all-features job-clippy-threadx-sys: runs-on: ubuntu-latest diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index e59a9ae..8a3eca1 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -5,14 +5,14 @@ name: workflow-code-format run-name: Check code formatting on: [push] jobs: - job-format-demo-app: + job-format-nrf52-app: runs-on: ubuntu-latest steps: - name: Checkout repo uses: actions/checkout@v4 - name: Check Formatting run: | - cd demo-app + cd nrf52-app cargo fmt -- --check job-format-threadx-sys: runs-on: ubuntu-latest diff --git a/build.sh b/build.sh index f318018..da8e6ed 100755 --- a/build.sh +++ b/build.sh @@ -7,6 +7,6 @@ set -euo pipefail -pushd demo-app +pushd nrf52-app cargo build --release popd diff --git a/demo-app/.cargo/config.toml b/nrf52-app/.cargo/config.toml similarity index 100% rename from demo-app/.cargo/config.toml rename to nrf52-app/.cargo/config.toml diff --git a/demo-app/.gitignore b/nrf52-app/.gitignore similarity index 100% rename from demo-app/.gitignore rename to nrf52-app/.gitignore diff --git a/demo-app/.vscode/launch.json b/nrf52-app/.vscode/launch.json similarity index 86% rename from demo-app/.vscode/launch.json rename to nrf52-app/.vscode/launch.json index 6069033..3d63bd5 100644 --- a/demo-app/.vscode/launch.json +++ b/nrf52-app/.vscode/launch.json @@ -2,12 +2,12 @@ // SPDX-License-Identifier: MIT OR Apache-2.0 { - // Use `nc localhost 8765 | defmt-print -e ./target/thumbv7em-none-eabihf/release/demo-app` to print the defmt output + // Use `nc localhost 8765 | defmt-print -e ./target/thumbv7em-none-eabihf/release/nrf52-app` to print the defmt output "version": "0.2.0", "configurations": [ { "cwd": "${workspaceRoot}", - "executable": "./target/thumbv7em-none-eabihf/release/demo-app", + "executable": "./target/thumbv7em-none-eabihf/release/nrf52-app", "name": "Debug Microcontroller (launch)", "request": "launch", "preLaunchTask": "rust: cargo build release", diff --git a/demo-app/.vscode/settings.json b/nrf52-app/.vscode/settings.json similarity index 100% rename from demo-app/.vscode/settings.json rename to nrf52-app/.vscode/settings.json diff --git a/demo-app/.vscode/tasks.json b/nrf52-app/.vscode/tasks.json similarity index 100% rename from demo-app/.vscode/tasks.json rename to nrf52-app/.vscode/tasks.json diff --git a/demo-app/Cargo.lock b/nrf52-app/Cargo.lock similarity index 99% rename from demo-app/Cargo.lock rename to nrf52-app/Cargo.lock index 377657f..ad2821a 100644 --- a/demo-app/Cargo.lock +++ b/nrf52-app/Cargo.lock @@ -243,7 +243,7 @@ dependencies = [ ] [[package]] -name = "demo-app" +name = "nrf52-app" version = "0.0.0" dependencies = [ "byte-strings", diff --git a/demo-app/Cargo.lock.license b/nrf52-app/Cargo.lock.license similarity index 100% rename from demo-app/Cargo.lock.license rename to nrf52-app/Cargo.lock.license diff --git a/demo-app/Cargo.toml b/nrf52-app/Cargo.toml similarity index 98% rename from demo-app/Cargo.toml rename to nrf52-app/Cargo.toml index 9ec263b..458d73a 100644 --- a/demo-app/Cargo.toml +++ b/nrf52-app/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Jonathan Pallant "] edition = "2021" license = "MIT OR Apache-2.0" -name = "demo-app" +name = "nrf52-app" version = "0.0.0" description = "Rust ThreadX demo on nRF52840" diff --git a/demo-app/build.rs b/nrf52-app/build.rs similarity index 100% rename from demo-app/build.rs rename to nrf52-app/build.rs diff --git a/demo-app/memory.x b/nrf52-app/memory.x similarity index 100% rename from demo-app/memory.x rename to nrf52-app/memory.x diff --git a/demo-app/src/main.rs b/nrf52-app/src/main.rs similarity index 100% rename from demo-app/src/main.rs rename to nrf52-app/src/main.rs