From e860e555359db4636ec5bc08c6ec8ad791fb9d86 Mon Sep 17 00:00:00 2001 From: Will Stuckey Date: Fri, 4 Jul 2025 20:46:01 -0400 Subject: [PATCH 1/4] initial commit of robot names --- .github/workflows/CI.yml | 2 +- ateam-common-packets/include/robot_metadata.h | 18 ++++++++++++++++++ ateam-common-packets/rust-lib/build.rs | 12 ++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 ateam-common-packets/include/robot_metadata.h diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 18c7509..93832fa 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -5,7 +5,7 @@ on: pull_request: jobs: test-firmware-build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v2.4.0 - uses: cachix/install-nix-action@v16 diff --git a/ateam-common-packets/include/robot_metadata.h b/ateam-common-packets/include/robot_metadata.h new file mode 100644 index 0000000..5191de3 --- /dev/null +++ b/ateam-common-packets/include/robot_metadata.h @@ -0,0 +1,18 @@ +const char* names[] = { + "Kaladin", + "Shallan", + "Dalinar", + "Navani", + "Szeth", + "Teft", + "Lift" + "Venli", + "Sylphrena", + "Pattern", + "The Stormfather", + "The Sibling", + "Auxiliary", + "Phenadorana", + "Wyndle", + "Timbre" +}; \ No newline at end of file diff --git a/ateam-common-packets/rust-lib/build.rs b/ateam-common-packets/rust-lib/build.rs index 6698482..db467bf 100644 --- a/ateam-common-packets/rust-lib/build.rs +++ b/ateam-common-packets/rust-lib/build.rs @@ -113,10 +113,22 @@ fn main() { // Unwrap the Result and panic on failure. .expect("Unable to generate bindings"); + let robot_metadata_bindings = create_configured_builder() + // The input header we would like to generate + // bindings for. + .header("../include/robot_metadata.h") + .generate() + // Unwrap the Result and panic on failure. + .expect("Unable to generate robot metadata bindings"); + // Write the bindings to the lib source dir let out_dir = "src"; bindings .write_to_file(Path::new(&out_dir).join("bindings.rs")) .expect("Couldn't write Radio packet bindings!"); + + robot_metadata_bindings + .write_to_file(Path::new(&out_dir).join("metadata_bindings.rs")) + .expect("Couldn't write robot metadata bindings!"); } From d85ee178a3add28849789917df2547843343977b Mon Sep 17 00:00:00 2001 From: Will Stuckey Date: Fri, 4 Jul 2025 20:51:54 -0400 Subject: [PATCH 2/4] make metadata const ptr, and make name convention compliant --- ateam-common-packets/include/robot_metadata.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ateam-common-packets/include/robot_metadata.h b/ateam-common-packets/include/robot_metadata.h index 5191de3..56cfc93 100644 --- a/ateam-common-packets/include/robot_metadata.h +++ b/ateam-common-packets/include/robot_metadata.h @@ -1,4 +1,4 @@ -const char* names[] = { +const char *const ROBOT_NAMES[] = { "Kaladin", "Shallan", "Dalinar", From 797cf30c41f705e8e110d6a283a30fd53187e1bf Mon Sep 17 00:00:00 2001 From: Will Stuckey Date: Fri, 4 Jul 2025 20:54:50 -0400 Subject: [PATCH 3/4] move weekly check against nightly to 24.04 --- .github/workflows/WeeklyCheckOfRustNightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/WeeklyCheckOfRustNightly.yml b/.github/workflows/WeeklyCheckOfRustNightly.yml index fa6d19f..89a9373 100644 --- a/.github/workflows/WeeklyCheckOfRustNightly.yml +++ b/.github/workflows/WeeklyCheckOfRustNightly.yml @@ -4,7 +4,7 @@ on: - cron: "0 0 * * FRI" jobs: test-firmware-against-latest-nightly: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v2.4.0 - uses: cachix/install-nix-action@v16 From 904b5058fe75a9629ec98733ab96ceab9485fcf7 Mon Sep 17 00:00:00 2001 From: Joe Spall Date: Wed, 9 Jul 2025 18:40:09 -0700 Subject: [PATCH 4/4] Update ateam-common-packets/include/robot_metadata.h --- ateam-common-packets/include/robot_metadata.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ateam-common-packets/include/robot_metadata.h b/ateam-common-packets/include/robot_metadata.h index 56cfc93..788f9bb 100644 --- a/ateam-common-packets/include/robot_metadata.h +++ b/ateam-common-packets/include/robot_metadata.h @@ -5,7 +5,7 @@ const char *const ROBOT_NAMES[] = { "Navani", "Szeth", "Teft", - "Lift" + "Lift", "Venli", "Sylphrena", "Pattern",