diff options
| author | Dion Dokter <[email protected]> | 2021-10-13 15:00:08 +0200 |
|---|---|---|
| committer | Dion Dokter <[email protected]> | 2021-10-13 15:00:08 +0200 |
| commit | c1c704bfc82c5cbe53a00dfe9e9d1d05ab365698 (patch) | |
| tree | ff5e691264af6b1f013c98539bf2456f99278a70 | |
| parent | ddcee446c1da46b00d2088cfa1f75481b1737cc7 (diff) | |
- Removed the enable assert from UARTE.
- Added nRF9160 to CI.
| -rw-r--r-- | .github/workflows/rust.yml | 3 | ||||
| -rw-r--r-- | embassy-nrf/src/uarte.rs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index b728c0db8..fed33cc86 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml | |||
| @@ -49,6 +49,9 @@ jobs: | |||
| 49 | target: thumbv7em-none-eabi | 49 | target: thumbv7em-none-eabi |
| 50 | features: nrf52833 | 50 | features: nrf52833 |
| 51 | - package: embassy-nrf | 51 | - package: embassy-nrf |
| 52 | target: thumbv8m.main-none-eabihf | ||
| 53 | features: nrf9160 | ||
| 54 | - package: embassy-nrf | ||
| 52 | target: thumbv7em-none-eabi | 55 | target: thumbv7em-none-eabi |
| 53 | features: nrf52840 | 56 | features: nrf52840 |
| 54 | - package: embassy-nrf | 57 | - package: embassy-nrf |
diff --git a/embassy-nrf/src/uarte.rs b/embassy-nrf/src/uarte.rs index 15ebcdd57..024a86c91 100644 --- a/embassy-nrf/src/uarte.rs +++ b/embassy-nrf/src/uarte.rs | |||
| @@ -68,8 +68,6 @@ impl<'d, T: Instance> Uarte<'d, T> { | |||
| 68 | 68 | ||
| 69 | let r = T::regs(); | 69 | let r = T::regs(); |
| 70 | 70 | ||
| 71 | assert!(r.enable.read().enable().is_disabled()); | ||
| 72 | |||
| 73 | rxd.conf().write(|w| w.input().connect().drive().h0h1()); | 71 | rxd.conf().write(|w| w.input().connect().drive().h0h1()); |
| 74 | r.psel.rxd.write(|w| unsafe { w.bits(rxd.psel_bits()) }); | 72 | r.psel.rxd.write(|w| unsafe { w.bits(rxd.psel_bits()) }); |
| 75 | 73 | ||
