Skip to content

Commit

Permalink
Merge branch 'master' into svd_viewer
Browse files Browse the repository at this point in the history
  • Loading branch information
noppej committed Apr 18, 2022
2 parents b4d07f5 + ae318f0 commit 124529e
Show file tree
Hide file tree
Showing 5 changed files with 1,160 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Expand Up @@ -43,7 +43,7 @@ jobs:
override: true

- name: Cache Dependencies
uses: Swatinem/rust-cache@v1.3.0
uses: Swatinem/rust-cache@v1.4.0

- name: cargo check for probe-rs, --no-default-features
uses: actions-rs/cargo@v1.0.3
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
target: thumbv7m-none-eabi

- name: Cache Dependencies
uses: Swatinem/rust-cache@v1.3.0
uses: Swatinem/rust-cache@v1.4.0

- name: Run cargo test
uses: actions-rs/cargo@v1.0.3
Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:
run: rustup component add clippy

- name: Cache Dependencies
uses: Swatinem/rust-cache@v1.3.0
uses: Swatinem/rust-cache@v1.4.0

- name: Run cargo clippy
uses: actions-rs/clippy-check@v1.0.7
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Debugger: Add support for DAP Requests (Disassemble & SetInstructionBreakpoints) (#1049)
- Debugger: Add support for stepping at 'statement' level, plus 'step in', 'step out' (#1056)
- Debugger: Add support for navigating and monitoring SVD Peripheral Registers. (#1072)
- Added GD32F3x0 series support (#1079)

### Changed

Expand Down Expand Up @@ -64,6 +65,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Requires `probe-rs/vscode` [PR #27](https://github.com/probe-rs/vscode/pull/27)
- Debugger: Improved RTT reliability between debug adapter and VSCode (#1035)
- Fixed missing `derive` feature for examples using `clap`.
- Increase SWD wait timeout (#994)

## [0.12.0]

Expand Down
2 changes: 1 addition & 1 deletion probe-rs/src/probe/cmsisdap/mod.rs
Expand Up @@ -440,7 +440,7 @@ impl DebugProbe for CmsisDap {

self.transfer_configure(ConfigureRequest {
idle_cycles: 0,
wait_retry: 80,
wait_retry: 0xffff,
match_retry: 0,
})?;

Expand Down

0 comments on commit 124529e

Please sign in to comment.