Skip to content

Commit 2fd8407

Browse files
bors[bot]dependabot[bot]AfoHT
authored
Merge #63
63: Update stm32f3xx-hal requirement from 0.8.0 to 0.9.1 in /rtic_v0.5/stm32f3_blinky r=AfoHT a=dependabot[bot] Updates the requirements on [stm32f3xx-hal](https://github.com/stm32-rs/stm32f3xx-hal) to permit the latest version. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/stm32-rs/stm32f3xx-hal/releases">stm32f3xx-hal's releases</a>.</em></p> <blockquote> <h2>Release v0.9.1</h2> <h3>Added</h3> <ul> <li>Add a minimal DAC driver (<a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/318">#318</a>)</li> </ul> <h3>Fixed</h3> <ul> <li>Missing <code>MosiPin</code> impl for <code>PB5</code> (<a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/322">#322</a>)</li> <li>Read valid data from data register even if reception of next character has started (<a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/317">#317</a>)</li> </ul> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/stm32-rs/stm32f3xx-hal/blob/master/CHANGELOG.md">stm32f3xx-hal's changelog</a>.</em></p> <blockquote> <h2>[v0.9.1] - 2022-09-07</h2> <h3>Added</h3> <ul> <li>Add a minimal DAC driver (<a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/318">#318</a>)</li> </ul> <h3>Fixed</h3> <ul> <li>Missing <code>MosiPin</code> impl for <code>PB5</code> (<a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/322">#322</a>)</li> <li>Read valid data from data register even if reception of next character has started (<a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/317">#317</a>)</li> </ul> <h2>[v0.9.0] - 2022-03-06</h2> <h3>Added</h3> <ul> <li>Generic <code>into_af_push_pull&lt;A&gt;</code> and <code>into_af_open_drain&lt;A&gt;</code> (<a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/308">#308</a>)</li> <li><code>BusClock</code> and <code>BusTimerClock</code> traits (<a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/302">#302</a>)</li> <li><code>RccBus</code>, <code>Enable</code>, <code>Reset</code> traits and implementations for peripherals (<a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/299">#299</a>)</li> <li>Support cortex-m-rt <code>v0.7.0</code> but still allow <code>v0.6.13</code> (<a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/283">#283</a>)</li> <li>Make timer <code>InterruptTypes</code> fields public to be useful. (<a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/304">#304</a>)</li> <li>Add support for the internal <strong>signature</strong> peripheral (<a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/281">#281</a>)</li> <li>Add common derives to <code>Toggle</code>. (<a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/281">#281</a>)</li> <li>Add <code>is_interrupt_configured</code> and <code>configured_interrupts</code> function to <code>serial::Serial</code> and <code>timer::Timer</code>. (<a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/281">#281</a>)</li> </ul> <h3>Fixed</h3> <ul> <li>Fix <code>can</code> support. Can would not build for <code>stm32f302x6</code> for example. Also support <code>can</code> for every chip other than <code>stm32f301</code> and <code>stm32f318</code>. (<a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/283">#283</a>)</li> <li>Fix wrong ADC votlage regulator startup time calculation effecting calibration. (<a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/281">#281</a>)</li> </ul> <h3>Breaking Changes</h3> <ul> <li>Make <code>rtc</code> an optional feature. Without that feature <code>rtcc</code> as a dependency is not needed. (<a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/283">#283</a>)</li> <li>Update <code>rtcc</code> to <code>v0.3.0</code>. For a detailed changelog, go [here]. (<a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/314">#314</a>)</li> <li>Enable <code>rt</code>, <code>usb</code>, <code>can</code>, <code>rtc</code> and <code>ld</code> feature by default. To disable that behavior, set <code>default-features = false</code>. (<a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/283">#283</a>)</li> <li>The MSRV was bumped to 1.54 (<a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/308">#308</a>)</li> <li>Update <code>stm32f3</code> pac to v0.14.0 (<a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/282">#282</a>)</li> <li>Remove the <code>bxcan</code> re-export. (<a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/304">#304</a>)</li> <li>The LICENSE has been changed from BSD 0-clause to the familiar dual license MIT / Apache 2.0. This has been done, as this fits the ecosystem better and the dependencies where using the MIT / Apache 2.0 dual licensing already, which resulted into the situtation, that BSD 0-clause was not affectivly 0-clause as MIT conditions had to be met anyways. (🧂 IANAL). (<a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/309">#309</a>)</li> <li>Renamed <code>Serial::raw_read</code> to <code>Serial::read_data_register</code>. (<a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/281">#281</a>)</li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/stm32-rs/stm32f3xx-hal/commit/3a0c1630aa237159d76dfcf37406bf0643b96d69"><code>3a0c163</code></a> Release v0.9.1</li> <li><a href="https://github.com/stm32-rs/stm32f3xx-hal/commit/1410d31c251a19355e88964140e4a502233d3f6c"><code>1410d31</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/317">#317</a> from jr-oss/fix_uart_busy_handling</li> <li><a href="https://github.com/stm32-rs/stm32f3xx-hal/commit/414f20e1f3311b5c546da00c225be8f73d636f9c"><code>414f20e</code></a> Add missing Eq implementations to enums</li> <li><a href="https://github.com/stm32-rs/stm32f3xx-hal/commit/0ecd8ab321fb93320020200e9a93a205ee8a289c"><code>0ecd8ab</code></a> test: Add uart test to read data while status is busy</li> <li><a href="https://github.com/stm32-rs/stm32f3xx-hal/commit/4880c7c9e2251aa2fa98dd8ff557559ca6d944ce"><code>4880c7c</code></a> Add fix to CHANGELOG</li> <li><a href="https://github.com/stm32-rs/stm32f3xx-hal/commit/085bf1bb7cecd597589f59640da00f4a22cb859f"><code>085bf1b</code></a> Check for valid uart data, even when isr indicates rx busy.</li> <li><a href="https://github.com/stm32-rs/stm32f3xx-hal/commit/d30018e5eabeeb2fc2cef6113f6da7d1adc5c10d"><code>d30018e</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/stm32-rs/stm32f3xx-hal/issues/318">#318</a> from ferrous-systems/master</li> <li><a href="https://github.com/stm32-rs/stm32f3xx-hal/commit/7968b1e43581d824e1250319ce27e65b6eeb499d"><code>7968b1e</code></a> Fix rebase fallout</li> <li><a href="https://github.com/stm32-rs/stm32f3xx-hal/commit/b5ee5136d7200dea32ba9504cf7ce55c3567d217"><code>b5ee513</code></a> Add changelog entry</li> <li><a href="https://github.com/stm32-rs/stm32f3xx-hal/commit/40fe3e4694a4cdad5578d35c480d0ebc6edd023e"><code>40fe3e4</code></a> Use a linear fade instead of a sine table to make the example fit</li> <li>Additional commits viewable in <a href="https://github.com/stm32-rs/stm32f3xx-hal/compare/v0.8.0...v0.9.1">compare view</a></li> </ul> </details> <br /> Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - ``@dependabot` rebase` will rebase this PR - ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it - ``@dependabot` merge` will merge this PR after your CI passes on it - ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it - ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging - ``@dependabot` reopen` will reopen this PR if it is closed - ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Henrik Tjäder <henrik@tjaders.com>
2 parents 611da31 + e7aecfa commit 2fd8407

File tree

2 files changed

+27
-6
lines changed

2 files changed

+27
-6
lines changed

.github/workflows/build.yml

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ jobs:
6161

6262

6363
# Compilation
64-
build:
65-
name: build
64+
buildv0_5:
65+
name: build v0.5
6666
runs-on: ubuntu-22.04
6767
steps:
6868
- name: Checkout
@@ -78,7 +78,27 @@ jobs:
7878
run: cargo install flip-link
7979

8080
- name: cargo build
81-
run: find . -type f -name Cargo.toml -execdir cargo build --release --manifest-path {} +
81+
run: find rtic_v0.5 -type f -name Cargo.toml -execdir cargo build --release --manifest-path {} +
82+
83+
# Compilation
84+
buildv1:
85+
name: build v1
86+
runs-on: ubuntu-22.04
87+
steps:
88+
- name: Checkout
89+
uses: actions/checkout@v3
90+
91+
- name: Cache Dependencies
92+
uses: Swatinem/rust-cache@v2
93+
94+
- name: Install all Rust targets
95+
run: rustup target install thumbv6m-none-eabi thumbv7m-none-eabi thumbv7em-none-eabihf
96+
97+
- name: Install flip-link
98+
run: cargo install flip-link
99+
100+
- name: cargo build
101+
run: find rtic_v1 -type f -name Cargo.toml -execdir cargo build --release --manifest-path {} +
82102

83103
check-dependabot-config:
84104
name: Ensure that `dependabot.yml` is up to date
@@ -102,7 +122,8 @@ jobs:
102122
- style
103123
- check
104124
- clippy
105-
- build
125+
- buildv0_5
126+
- buildv1
106127
- check-dependabot-config
107128
runs-on: ubuntu-22.04
108129
steps:

rtic_v0.5/stm32f3_blinky/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ panic-halt = "0.2"
1010
panic-semihosting = "0.6"
1111
cortex-m-semihosting = "0.5.0"
1212
embedded-hal = "0.2.3"
13-
cortex-m-rtic = "0.5.1"
13+
cortex-m-rtic = { version = "0.5.9", default-features = false, features = ["cortex-m-7"] }
1414

1515
[dependencies.stm32f3xx-hal]
1616
features = ["stm32f303xc", "rt"]
17-
version = "0.8.0"
17+
version = "0.9.1"
1818

1919
# this lets you use `cargo fix`!
2020
[[bin]]

0 commit comments

Comments
 (0)