Skip to content

Commit

Permalink
Rename demo-app to nrf52-app
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathanpallant committed Jul 22, 2024
1 parent 1b6a136 commit af12ba2
Show file tree
Hide file tree
Showing 16 changed files with 21 additions and 21 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build-ferrocene.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/clippy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@

set -euo pipefail

pushd demo-app
pushd nrf52-app
cargo build --release
popd
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion demo-app/Cargo.lock → nrf52-app/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
2 changes: 1 addition & 1 deletion demo-app/Cargo.toml → nrf52-app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
authors = ["Jonathan Pallant <[email protected]>"]
edition = "2021"
license = "MIT OR Apache-2.0"
name = "demo-app"
name = "nrf52-app"
version = "0.0.0"
description = "Rust ThreadX demo on nRF52840"

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit af12ba2

Please sign in to comment.