Skip to content

Commit 7f7e1f6

Browse files
authored
Merge pull request #546 from stm32-rs/i2c-blocking-fix
I2c blocking fix
2 parents 24f18a4 + 08602e5 commit 7f7e1f6

File tree

5 files changed

+18
-13
lines changed

5 files changed

+18
-13
lines changed

.github/workflows/changelog.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
on:
2-
pull_request_target:
2+
pull_request:
3+
# Run on labeled/unlabeled in addition to defaults to detect
4+
# adding/removing skip-changelog labels.
5+
types: [opened, reopened, labeled, unlabeled, synchronize]
6+
merge_group:
37

48
name: Changelog check
59

@@ -9,11 +13,10 @@ jobs:
913
runs-on: ubuntu-latest
1014
steps:
1115
- name: Checkout sources
12-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1317

14-
- name: Changelog updated
15-
uses: Zomzog/changelog-[email protected]
18+
- name: Check changelog update
19+
uses: dangoslen/changelog-enforcer@v3
1620
with:
17-
fileName: CHANGELOG.md
18-
env:
19-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
21+
skipLabels: skip-changelog
22+
missingUpdateErrorMessage: "Please add a changelog entry to the appropriate section of the CHANGELOG.md file."

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
on:
22
push:
3-
branches: master
3+
branches: [master]
44
pull_request:
55
merge_group:
66

@@ -34,7 +34,7 @@ jobs:
3434
experimental: true
3535

3636
steps:
37-
- uses: actions/checkout@v3
37+
- uses: actions/checkout@v4
3838
- name: Use the latest ${{ matrix.rust }} rustc
3939
run: rustup update ${{ matrix.rust }} && rustup default ${{ matrix.rust }}
4040
- name: Add Cortex-M3 target

.github/workflows/clippy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
on:
22
push:
3-
branches: master
3+
branches: [master]
44
pull_request:
55

66
name: Clippy check
77
jobs:
88
clippy_check:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212
- name: Use the latest stable rustc
1313
run: rustup update stable && rustup default stable
1414
- name: Add Cortex-M3 target

.github/workflows/rustfmt.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
on:
22
push:
3-
branches: master
3+
branches: [master]
44
pull_request:
55
merge_group:
66

@@ -11,7 +11,7 @@ jobs:
1111
name: Rustfmt
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- name: Use the latest stable rustc
1616
run: rustup update stable && rustup default stable
1717

src/i2c/blocking.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,8 @@ pub trait BlockingI2cExt: I2cExt {
334334
}
335335
}
336336

337+
impl<I2C: I2cExt> BlockingI2cExt for I2C {}
338+
337339
impl<I2C: Instance, const R: u8> Rmp<I2C, R> {
338340
#[allow(clippy::too_many_arguments)]
339341
pub fn blocking_i2c(

0 commit comments

Comments
 (0)