Skip to content

Commit 9934f7e

Browse files
bors[bot]burrbull
andauthored
Merge #559
559: update ci, clippy & release 0.14 r=therealprof a=burrbull Co-authored-by: Andrey Zgarbul <[email protected]>
2 parents 07148a1 + 9533682 commit 9934f7e

File tree

8 files changed

+27
-32
lines changed

8 files changed

+27
-32
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,15 @@ jobs:
3737

3838
steps:
3939
- uses: actions/checkout@v3
40-
41-
- uses: actions-rs/toolchain@v1
42-
with:
43-
profile: minimal
44-
toolchain: ${{ matrix.rust }}
45-
target: thumbv7em-none-eabihf
46-
override: true
40+
- name: Use the latest ${{ matrix.rust }} rustc
41+
run: rustup update ${{ matrix.rust }} && rustup default ${{ matrix.rust }}
42+
- name: Add Cortex-M4F target
43+
run: rustup target add thumbv7em-none-eabihf
4744

4845
- name: Cache Dependencies
4946
uses: Swatinem/rust-cache@v2
5047
with:
51-
key: pac-v0.15.1-${{ matrix.mcu }}
48+
key: v0.14.0-${{ matrix.mcu }}
5249

5350
- uses: actions-rs/cargo@v1
5451
with:

.github/workflows/clippy.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,15 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v3
12-
13-
- uses: actions-rs/toolchain@v1
14-
with:
15-
profile: minimal
16-
toolchain: stable
17-
target: thumbv7em-none-eabihf
18-
override: true
19-
components: clippy
12+
- name: Use the latest stable rustc
13+
run: rustup update stable && rustup default stable
14+
- name: Add Cortex-M4F target
15+
run: rustup target add thumbv7em-none-eabihf
2016

2117
- name: Cache Dependencies
2218
uses: Swatinem/rust-cache@v2
2319
with:
24-
key: pac-v0.15.1
20+
key: v0.14.0
2521

2622
- uses: actions-rs/clippy-check@v1
2723
with:

.github/workflows/rustfmt.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v3
14-
- uses: actions-rs/toolchain@v1
15-
with:
16-
profile: minimal
17-
toolchain: stable
18-
override: true
19-
components: rustfmt
14+
- name: Use the latest stable rustc
15+
run: rustup update stable && rustup default stable
16+
2017
- uses: actions-rs/cargo@v1
2118
with:
2219
command: fmt

CHANGELOG.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
77

88
## [Unreleased]
99

10+
## [v0.14.0] - 2022-12-12
11+
1012
### Changed
1113

1214
- Add missing timer pins [#536]
@@ -70,18 +72,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
7072
[#515]: https://github.com/stm32-rs/stm32f4xx-hal/pull/515
7173
[#517]: https://github.com/stm32-rs/stm32f4xx-hal/pull/517
7274
[#519]: https://github.com/stm32-rs/stm32f4xx-hal/pull/519
75+
[#527]: https://github.com/stm32-rs/stm32f4xx-hal/pull/527
7376
[#529]: https://github.com/stm32-rs/stm32f4xx-hal/pull/529
7477
[#536]: https://github.com/stm32-rs/stm32f4xx-hal/pull/536
7578
[#534]: https://github.com/stm32-rs/stm32f4xx-hal/pull/529
79+
[#535]: https://github.com/stm32-rs/stm32f4xx-hal/pull/535
7680
[#540]: https://github.com/stm32-rs/stm32f4xx-hal/pull/540
7781
[#542]: https://github.com/stm32-rs/stm32f4xx-hal/pull/542
78-
[#527]: https://github.com/stm32-rs/stm32f4xx-hal/pull/527
7982
[#551]: https://github.com/stm32-rs/stm32f4xx-hal/pull/551
8083
[#552]: https://github.com/stm32-rs/stm32f4xx-hal/pull/552
8184
[#553]: https://github.com/stm32-rs/stm32f4xx-hal/pull/553
8285
[#554]: https://github.com/stm32-rs/stm32f4xx-hal/pull/554
8386
[#555]: https://github.com/stm32-rs/stm32f4xx-hal/pull/555
8487
[#556]: https://github.com/stm32-rs/stm32f4xx-hal/pull/556
88+
[#557]: https://github.com/stm32-rs/stm32f4xx-hal/pull/557
8589

8690
## [v0.13.2] - 2022-05-16
8791

@@ -743,7 +747,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
743747

744748
- Support for stm32f407 and stm32f429.
745749

746-
[Unreleased]: https://github.com/stm32-rs/stm32f4xx-hal/compare/v0.13.2...HEAD
750+
[Unreleased]: https://github.com/stm32-rs/stm32f4xx-hal/compare/v0.14.0...HEAD
751+
[v0.14.0]: https://github.com/stm32-rs/stm32f4xx-hal/compare/v0.13.2...v0.14.0
747752
[v0.13.2]: https://github.com/stm32-rs/stm32f4xx-hal/compare/v0.13.1...v0.13.2
748753
[v0.13.1]: https://github.com/stm32-rs/stm32f4xx-hal/compare/v0.13.0...v0.13.1
749754
[v0.13.0]: https://github.com/stm32-rs/stm32f4xx-hal/compare/v0.12.0...v0.13.0

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ license = "0BSD"
2020
name = "stm32f4xx-hal"
2121
readme = "README.md"
2222
repository = "https://github.com/stm32-rs/stm32f4xx-hal"
23-
version = "0.13.2"
23+
version = "0.14.0"
2424

2525
[package.metadata.docs.rs]
26-
features = ["stm32f429", "usb_fs", "can", "i2s", "fsmc_lcd", "rtic"]
26+
features = ["stm32f429", "usb_fs", "can", "i2s", "fsmc_lcd", "rtic", "defmt"]
2727
targets = ["thumbv7em-none-eabihf"]
2828

2929
[dependencies]
@@ -62,7 +62,7 @@ optional = true
6262

6363
[dev-dependencies]
6464
defmt = "0.3.2"
65-
defmt-rtt = "0.3.2"
65+
defmt-rtt = "0.4.0"
6666
panic-probe = { version = "0.3.0", features = [ "print-defmt" ] }
6767
panic-semihosting = "0.6.0"
6868
cortex-m-semihosting = "0.5.0"

src/bb.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,5 @@ pub unsafe fn write<T>(register: *const T, bit: u8, set: bool) {
4747

4848
let bit = bit as usize;
4949
let bb_addr = (PERI_BIT_BAND_BASE + (addr - PERI_ADDRESS_START) * 32) + 4 * bit;
50-
ptr::write_volatile(bb_addr as *mut u32, if set { 1 } else { 0 });
50+
ptr::write_volatile(bb_addr as *mut u32, u32::from(set));
5151
}

src/i2c.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ impl<I2C: Instance, PINS> I2c<I2C, PINS> {
551551
for op in ops {
552552
// 2. Execute previous operations.
553553
match &mut prev_op {
554-
Operation::Read(rb) => self.read_bytes(*rb)?,
554+
Operation::Read(rb) => self.read_bytes(rb)?,
555555
Operation::Write(wb) => self.write_bytes(wb.iter().cloned())?,
556556
};
557557
// 3. If operation changes type we must generate new start
@@ -592,7 +592,7 @@ impl<I2C: Instance, PINS> I2c<I2C, PINS> {
592592
for op in ops {
593593
// 2. Execute previous operations.
594594
match &mut prev_op {
595-
Operation::Read(rb) => self.read_bytes(*rb)?,
595+
Operation::Read(rb) => self.read_bytes(rb)?,
596596
Operation::Write(wb) => self.write_bytes(wb.iter().cloned())?,
597597
};
598598
// 3. If operation changes type we must generate new start

src/rtc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ fn decode_day(dr: &dr::R) -> u8 {
505505

506506
#[inline(always)]
507507
fn decode_month(dr: &dr::R) -> u8 {
508-
let mt: u8 = if dr.mt().bit() { 1 } else { 0 };
508+
let mt = u8::from(dr.mt().bit());
509509
bcd2_decode(mt, dr.mu().bits()) as u8
510510
}
511511

0 commit comments

Comments
 (0)