Skip to content

Commit 2e8937a

Browse files
Update probe-rs version (esp-rs#1914)
* docs: Update probe-rs version * feat: Simplify probe-rs args * ci: Update the checkout action to use the fork
1 parent cb0016a commit 2e8937a

File tree

4 files changed

+13
-31
lines changed

4 files changed

+13
-31
lines changed

.github/workflows/hil.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,13 @@ jobs:
122122
usb: USB0
123123
steps:
124124
- uses: actions/checkout@v4
125+
if: github.event_name != 'workflow_dispatch'
126+
- uses: actions/checkout@v4
127+
if: github.event_name == 'workflow_dispatch'
128+
with:
129+
repository: ${{ github.event.inputs.repository }}
130+
ref: ${{ github.event.inputs.branch }}
131+
125132
- uses: actions/download-artifact@v4
126133
with:
127134
name: tests-${{ matrix.target.soc }}

hil-test/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ We use [probe-rs] for flashing and running the tests on a target device, however
2121
```text
2222
cargo install probe-rs-tools \
2323
--git https://github.com/probe-rs/probe-rs \
24-
--rev a6dd038 --force --locked
24+
--rev bba1bb5 --force --locked
2525
```
2626

2727
Target device **MUST** connected via its USB-Serial-JTAG port, or if unavailable (eg. ESP32, ESP32-C2, ESP32-S2) then you must connect a compatible debug probe such as an [ESP-Prog].
@@ -108,7 +108,7 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-t
108108
# Install dependencies
109109
sudo apt install -y pkg-config libudev-dev
110110
# Install probe-rs
111-
cargo install probe-rs-tools --git https://github.com/probe-rs/probe-rs --rev a6dd038 --force
111+
cargo install probe-rs-tools --git https://github.com/probe-rs/probe-rs --rev bba1bb5 --force
112112
# Add the udev rules
113113
wget -O - https://probe.rs/files/69-probe-rs.rules | sudo tee /etc/udev/rules.d/69-probe-rs.rules > /dev/null
114114
# Add the user to plugdev group

xtask/src/lib.rs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -242,19 +242,8 @@ pub fn execute_app(
242242

243243
// probe-rs cannot currently do auto detection, so we need to tell probe-rs run
244244
// which chip we are testing
245-
if subcommand == "test" {
246-
if chip == Chip::Esp32 {
247-
builder = builder.arg("--").arg("--chip").arg("esp32-3.3v");
248-
} else if chip == Chip::Esp32c2 {
249-
builder = builder
250-
.arg("--")
251-
.arg("--chip")
252-
.arg("esp32c2")
253-
.arg("--speed")
254-
.arg("15000");
255-
} else {
256-
builder = builder.arg("--").arg("--chip").arg(format!("{}", chip));
257-
}
245+
if subcommand == "test" && chip == Chip::Esp32c2 {
246+
builder = builder.arg("--").arg("--speed").arg("15000");
258247
}
259248

260249
// If targeting an Xtensa device, we must use the '+esp' toolchain modifier:

xtask/src/main.rs

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -676,29 +676,15 @@ fn run_elfs(args: RunElfArgs) -> Result<()> {
676676

677677
log::info!("Running test '{}' for '{}'", elf_name, args.chip);
678678

679-
let command = if args.chip == Chip::Esp32 {
679+
let command = if args.chip == Chip::Esp32c2 {
680680
Command::new("probe-rs")
681681
.arg("run")
682-
.arg("--chip")
683-
.arg("esp32-3.3v")
684-
.arg(elf_path)
685-
.output()?
686-
} else if args.chip == Chip::Esp32c2 {
687-
Command::new("probe-rs")
688-
.arg("run")
689-
.arg("--chip")
690-
.arg(args.chip.to_string())
691682
.arg("--speed")
692683
.arg("15000")
693684
.arg(elf_path)
694685
.output()?
695686
} else {
696-
Command::new("probe-rs")
697-
.arg("run")
698-
.arg("--chip")
699-
.arg(args.chip.to_string())
700-
.arg(elf_path)
701-
.output()?
687+
Command::new("probe-rs").arg("run").arg(elf_path).output()?
702688
};
703689

704690
println!(

0 commit comments

Comments
 (0)