Skip to content

Commit 6390762

Browse files
authored
Merge branch 'master' into spis-fix
2 parents 60b9185 + 6955467 commit 6390762

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44

55
### Fixes
66

7+
- Fix TWIS transfer `is_done()` always returns true ([#329]).
78
- Fix mistake in SPIS `Transfer` `is_done` to borrow `inner` ([#330]).
89

10+
[#329]: https://github.com/nrf-rs/nrf-hal/pull/329
911
[#330]: https://github.com/nrf-rs/nrf-hal/pull/330
1012

1113
## [0.12.2]

nrf-hal-common/src/twis.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -518,8 +518,7 @@ impl<T: Instance, B> Transfer<T, B> {
518518
.inner
519519
.as_mut()
520520
.unwrap_or_else(|| unsafe { core::hint::unreachable_unchecked() });
521-
inner.twis.is_done();
522-
true
521+
inner.twis.is_done()
523522
}
524523
}
525524

@@ -561,4 +560,4 @@ mod _twis1 {
561560
impl Instance for TWIS1 {
562561
const INTERRUPT: Interrupt = Interrupt::SPIM1_SPIS1_TWIM1_TWIS1_SPI1_TWI1;
563562
}
564-
}
563+
}

0 commit comments

Comments
 (0)