Commit 984f230
committed
Allow OpenOCD to return hex formatted values
OpenOCD may return hex values from mem2array or mrw, so allow those.
mem2array output:
0 0xb8 1 0xba 2 0xc 3 0x0 4 0xb8 5 0xba
This might depend on the particular adapter driver being used but
parsing either is more robust. The problem was observed with OpenOCD
0.12.0 and cmsis-dap.
Failed with:
cargo xtask humility app/.../recovery.toml -- tasks
Finished `dev` profile [optimized + debuginfo] target(s) in 0.09s
Running `target/debug/xtask humility app/.../recovery.toml -- tasks`
humility: attached via OpenOCD
humility tasks failed: failed to read image ID at 0xcaec0; board mismatch?
Caused by:
invalid digit found in string
Error: humility failed1 parent 9948f3f commit 984f230
1 file changed
+5
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
627 | 627 | | |
628 | 628 | | |
629 | 629 | | |
630 | | - | |
| 630 | + | |
631 | 631 | | |
632 | 632 | | |
633 | 633 | | |
| |||
671 | 671 | | |
672 | 672 | | |
673 | 673 | | |
| 674 | + | |
| 675 | + | |
674 | 676 | | |
675 | 677 | | |
676 | 678 | | |
677 | | - | |
| 679 | + | |
678 | 680 | | |
679 | 681 | | |
680 | 682 | | |
| |||
689 | 691 | | |
690 | 692 | | |
691 | 693 | | |
692 | | - | |
| 694 | + | |
693 | 695 | | |
694 | 696 | | |
695 | 697 | | |
| |||
0 commit comments