Update probe-rs version (#1914)
* docs: Update probe-rs version * feat: Simplify probe-rs args * ci: Update the checkout action to use the fork
This commit is contained in:
parent
cb0016aa43
commit
2e8937a90f
7
.github/workflows/hil.yml
vendored
7
.github/workflows/hil.yml
vendored
@ -122,6 +122,13 @@ jobs:
|
|||||||
usb: USB0
|
usb: USB0
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
if: github.event_name != 'workflow_dispatch'
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
if: github.event_name == 'workflow_dispatch'
|
||||||
|
with:
|
||||||
|
repository: ${{ github.event.inputs.repository }}
|
||||||
|
ref: ${{ github.event.inputs.branch }}
|
||||||
|
|
||||||
- uses: actions/download-artifact@v4
|
- uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: tests-${{ matrix.target.soc }}
|
name: tests-${{ matrix.target.soc }}
|
||||||
|
|||||||
@ -21,7 +21,7 @@ We use [probe-rs] for flashing and running the tests on a target device, however
|
|||||||
```text
|
```text
|
||||||
cargo install probe-rs-tools \
|
cargo install probe-rs-tools \
|
||||||
--git https://github.com/probe-rs/probe-rs \
|
--git https://github.com/probe-rs/probe-rs \
|
||||||
--rev a6dd038 --force --locked
|
--rev bba1bb5 --force --locked
|
||||||
```
|
```
|
||||||
|
|
||||||
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].
|
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
|
|||||||
# Install dependencies
|
# Install dependencies
|
||||||
sudo apt install -y pkg-config libudev-dev
|
sudo apt install -y pkg-config libudev-dev
|
||||||
# Install probe-rs
|
# Install probe-rs
|
||||||
cargo install probe-rs-tools --git https://github.com/probe-rs/probe-rs --rev a6dd038 --force
|
cargo install probe-rs-tools --git https://github.com/probe-rs/probe-rs --rev bba1bb5 --force
|
||||||
# Add the udev rules
|
# Add the udev rules
|
||||||
wget -O - https://probe.rs/files/69-probe-rs.rules | sudo tee /etc/udev/rules.d/69-probe-rs.rules > /dev/null
|
wget -O - https://probe.rs/files/69-probe-rs.rules | sudo tee /etc/udev/rules.d/69-probe-rs.rules > /dev/null
|
||||||
# Add the user to plugdev group
|
# Add the user to plugdev group
|
||||||
|
|||||||
@ -242,19 +242,8 @@ pub fn execute_app(
|
|||||||
|
|
||||||
// probe-rs cannot currently do auto detection, so we need to tell probe-rs run
|
// probe-rs cannot currently do auto detection, so we need to tell probe-rs run
|
||||||
// which chip we are testing
|
// which chip we are testing
|
||||||
if subcommand == "test" {
|
if subcommand == "test" && chip == Chip::Esp32c2 {
|
||||||
if chip == Chip::Esp32 {
|
builder = builder.arg("--").arg("--speed").arg("15000");
|
||||||
builder = builder.arg("--").arg("--chip").arg("esp32-3.3v");
|
|
||||||
} else if chip == Chip::Esp32c2 {
|
|
||||||
builder = builder
|
|
||||||
.arg("--")
|
|
||||||
.arg("--chip")
|
|
||||||
.arg("esp32c2")
|
|
||||||
.arg("--speed")
|
|
||||||
.arg("15000");
|
|
||||||
} else {
|
|
||||||
builder = builder.arg("--").arg("--chip").arg(format!("{}", chip));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// If targeting an Xtensa device, we must use the '+esp' toolchain modifier:
|
// If targeting an Xtensa device, we must use the '+esp' toolchain modifier:
|
||||||
|
|||||||
@ -676,29 +676,15 @@ fn run_elfs(args: RunElfArgs) -> Result<()> {
|
|||||||
|
|
||||||
log::info!("Running test '{}' for '{}'", elf_name, args.chip);
|
log::info!("Running test '{}' for '{}'", elf_name, args.chip);
|
||||||
|
|
||||||
let command = if args.chip == Chip::Esp32 {
|
let command = if args.chip == Chip::Esp32c2 {
|
||||||
Command::new("probe-rs")
|
Command::new("probe-rs")
|
||||||
.arg("run")
|
.arg("run")
|
||||||
.arg("--chip")
|
|
||||||
.arg("esp32-3.3v")
|
|
||||||
.arg(elf_path)
|
|
||||||
.output()?
|
|
||||||
} else if args.chip == Chip::Esp32c2 {
|
|
||||||
Command::new("probe-rs")
|
|
||||||
.arg("run")
|
|
||||||
.arg("--chip")
|
|
||||||
.arg(args.chip.to_string())
|
|
||||||
.arg("--speed")
|
.arg("--speed")
|
||||||
.arg("15000")
|
.arg("15000")
|
||||||
.arg(elf_path)
|
.arg(elf_path)
|
||||||
.output()?
|
.output()?
|
||||||
} else {
|
} else {
|
||||||
Command::new("probe-rs")
|
Command::new("probe-rs").arg("run").arg(elf_path).output()?
|
||||||
.arg("run")
|
|
||||||
.arg("--chip")
|
|
||||||
.arg(args.chip.to_string())
|
|
||||||
.arg(elf_path)
|
|
||||||
.output()?
|
|
||||||
};
|
};
|
||||||
|
|
||||||
println!(
|
println!(
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user