Skip to content

Commit 7b9d0e1

Browse files
committed
Multi-Board Treadmill Descriptors & BLE Advertise+Scan Test
1 parent b372e0c commit 7b9d0e1

File tree

6 files changed

+5
-49
lines changed

6 files changed

+5
-49
lines changed

board_descriptors/fb1384d5-e1a5-469c-beb4-0d4d215c9793/board-nrf52840dk-001050202501.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ board_module: hwci/boards/nrf52dk.py
44
features:
55
ble: true
66
debugger: jlink
7-
gpio: true
7+
gpio: false
88
pin_mappings:
99
P0.13:
1010
io_interface: raspberrypi5gpio

board_descriptors/fb1384d5-e1a5-469c-beb4-0d4d215c9793/board-nrf52840dk-001050244773.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ board_module: hwci/boards/nrf52dk.py
44
features:
55
ble: true
66
debugger: jlink
7-
gpio: true
7+
gpio: false
88
pin_mappings:
99
P0.13:
1010
io_interface: raspberrypi5gpio

board_descriptors/fb1384d5-e1a5-469c-beb4-0d4d215c9793/board-nrf52840dk-001050289195.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ board_module: hwci/boards/nrf52dk.py
44
features:
55
ble: true
66
debugger: jlink
7-
gpio: true
7+
gpio: false
88
pin_mappings:
99
P0.13:
1010
io_interface: raspberrypi5gpio

board_descriptors/fb1384d5-e1a5-469c-beb4-0d4d215c9793/board-nrf52840dk-001050292283.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ board_module: hwci/boards/nrf52dk.py
44
features:
55
ble: true
66
debugger: jlink
7-
gpio: true
7+
gpio: false
88
pin_mappings:
99
P0.13:
1010
io_interface: raspberrypi5gpio

hwci/core/main.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,7 @@
1010
import yaml
1111
from pathlib import Path
1212

13-
# python3 hwci/core/main.py \
14-
# --board-descriptors \
15-
# board_descriptors/host1234/board-nrf52840dk-68221128.yml \
16-
# board_descriptors/host1234/board-nrf52840dk-99001122.yml \
17-
# --test hwci/tests/ble_advertising_scanning_test.py
18-
19-
# python3 hwci/core/main.py \
13+
# python3 hwci/core/main.py \
2014
# --board-descriptors \
2115
# board_descriptors/fb1384d5-e1a5-469c-beb4-0d4d215c9793/board-nrf52840dk-001050202501.yml \
2216
# board_descriptors/fb1384d5-e1a5-469c-beb4-0d4d215c9793/board-nrf52840dk-001050244773.yml \

hwci/setup.sh

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -37,44 +37,6 @@ set -e -x
3737
# of its own build process:
3838
type rustup || (echo "rustup is not installed, aborting."; exit 1)
3939

40-
# Function to setup Tock-specific Rust toolchain with all required components
41-
setup_tock_toolchain() {
42-
# Define the specific toolchain needed
43-
local TOOLCHAIN="nightly-2024-11-16-aarch64-unknown-linux-gnu"
44-
45-
echo "Setting up Rust toolchain for Tock: $TOOLCHAIN"
46-
47-
# Install the specific toolchain if not already installed
48-
rustup toolchain install "$TOOLCHAIN"
49-
50-
# Add required components for Tock build
51-
rustup component add rust-src --toolchain "$TOOLCHAIN"
52-
rustup component add llvm-tools-preview --toolchain "$TOOLCHAIN"
53-
54-
# Add the target needed for Tock boards
55-
rustup target add thumbv7em-none-eabi --toolchain "$TOOLCHAIN"
56-
57-
# Verify installation
58-
echo "Verifying toolchain components..."
59-
rustup component list --toolchain "$TOOLCHAIN" | grep installed
60-
61-
# Set the PATH to include the LLVM tools from this toolchain
62-
RUSTC_SYSROOT=$(rustc +$TOOLCHAIN --print sysroot)
63-
LLVM_TOOLS_PATH=$(find "$RUSTC_SYSROOT" -path '*/llvm-tools*/bin' | head -n 1)
64-
65-
if [ -n "$LLVM_TOOLS_PATH" ]; then
66-
echo "Adding LLVM tools to PATH: $LLVM_TOOLS_PATH"
67-
export PATH="$LLVM_TOOLS_PATH:$PATH"
68-
echo "LLVM tools location: $(which llvm-size 2>/dev/null || echo 'Not found')"
69-
else
70-
echo "Warning: LLVM tools path not found in Rust installation"
71-
fi
72-
}
73-
74-
setup_tock_toolchain
75-
76-
77-
# Ensure that `elf2tab` is installed:
7840
if ! type elf2tab; then
7941
# We may not have a rustup default toolchain selected. In this case,
8042
# select the stable toolchain for elf2tab.

0 commit comments

Comments
 (0)