Skip to content

Commit e2fbfee

Browse files
authored
Update dependencies (#335)
1 parent 3b384b4 commit e2fbfee

24 files changed

+318
-386
lines changed

.clippy.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
msrv = "1.54"
1+
msrv = "1.59"

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
- uses: actions/checkout@v2
5858
- uses: actions-rs/toolchain@v1
5959
with:
60-
toolchain: 1.54.0
60+
toolchain: 1.59.0
6161
target: thumbv7em-none-eabihf
6262
override: true
6363
profile: minimal

CHANGELOG.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1414

1515
## Unreleased
1616

17-
No changes.
17+
### Breaking changes
18+
19+
- Update `stm32f3` pac to v0.15.1 ([#282])
20+
- Update `bxcan` pac to v0.7.0 ([#282])
21+
- The MSRV was bumped to 1.59 ([#227])
1822

1923
## [v0.9.1] - 2022-09-07
2024

Cargo.toml

+19-23
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
edition = "2018"
2+
edition = "2021"
33
authors = [
44
"Dylan Frankland <[email protected]>",
55
"Sh3Rm4n <[email protected]>",
@@ -19,7 +19,7 @@ exclude = [
1919
".markdownlint.yml"
2020
]
2121
resolver = "2"
22-
rust-version = "1.54"
22+
rust-version = "1.59"
2323

2424
[workspace]
2525
members = [
@@ -36,31 +36,27 @@ rustc-args = ["--cfg", "docsrs"]
3636
[dependencies]
3737
cfg-if = "1.0.0"
3838
cortex-m = "0.7.4"
39-
cortex-m-rt = "0.7"
39+
cortex-m-rt = "0.7.3"
4040
defmt = { version = ">=0.2.3, <0.4.0", optional = true }
4141
embedded-dma = "0.2.0"
4242
embedded-hal = { version = "0.2.5", features = ["unproven"] }
4343
embedded-time = "0.12.0"
4444
nb = "1.0.0"
4545
paste = "1.0.5"
4646
rtcc = { version = "0.3.0", optional = true }
47-
stm32f3 = { version = "0.14.0", default-features = false }
48-
bxcan = { version = "0.6.2", optional = true }
47+
stm32f3 = { version = "0.15.1", default-features = false }
48+
bxcan = { version = "0.7.0", optional = true }
4949
stm32-usbd = { version = "0.6.0", optional = true }
5050
void = { version = "1.0.2", default-features = false }
5151
enumset = { version = "1.0.6", optional = true}
52-
# NOTE: Workaround for build
53-
# $ cargo +nightly update -Z minimal-versions
54-
# as long cortex-m depends on bare-metal 0.2.1
55-
bare-metal = "1.0.0"
5652

5753
[dev-dependencies]
58-
cortex-m-semihosting = "0.3.7"
54+
cortex-m-semihosting = "0.5.0"
5955
defmt = "0.3.0"
60-
defmt-rtt = "0.3.0"
56+
defmt-rtt = "0.4.0"
6157
defmt-test = "0.3.0"
6258
panic-probe = "0.3.0"
63-
panic-semihosting = "0.5.6"
59+
panic-semihosting = "0.6.0"
6460
usbd-serial = "0.1.1"
6561
usb-device = "0.2.8"
6662
cortex-m-rtic = "1.0"
@@ -171,44 +167,44 @@ opt-level = "s"
171167

172168
[[example]]
173169
name = "pwm"
174-
required-features = ["ld", "stm32f303xc"]
170+
required-features = ["ld", "stm32f303xc", "cortex-m/critical-section-single-core"]
175171

176172
[[example]]
177173
name = "toggle"
178-
required-features = ["ld", "stm32f303xc"]
174+
required-features = ["ld", "stm32f303xc", "cortex-m/critical-section-single-core"]
179175

180176
[[example]]
181177
name = "usb_serial"
182-
required-features = ["ld", "stm32f303xc", "usb"]
178+
required-features = ["ld", "stm32f303xc", "usb", "cortex-m/critical-section-single-core"]
183179

184180
[[example]]
185181
name = "spi"
186-
required-features = ["ld", "stm32f303xc"]
182+
required-features = ["ld", "stm32f303xc", "cortex-m/critical-section-single-core"]
187183

188184
[[example]]
189185
name = "can"
190-
required-features = ["ld", "rt", "can", "stm32f302xc"]
186+
required-features = ["ld", "rt", "can", "stm32f302xc", "cortex-m/critical-section-single-core"]
191187

192188
[[example]]
193189
name = "serial_dma"
194-
required-features = ["ld", "rt", "stm32f303xc"]
190+
required-features = ["ld", "rt", "stm32f303xc", "cortex-m/critical-section-single-core"]
195191

196192
[[example]]
197193
name = "serial_echo_rtic"
198-
required-features = ["ld", "rt", "stm32f303xc", "enumset"]
194+
required-features = ["ld", "rt", "stm32f303xc", "enumset", "cortex-m/critical-section-single-core"]
199195

200196
[[example]]
201197
name = "adc"
202-
required-features = ["ld", "stm32f303xc"]
198+
required-features = ["ld", "stm32f303xc", "cortex-m/critical-section-single-core"]
203199

204200
[[example]]
205201
name = "i2c_scanner"
206-
required-features = ["ld", "stm32f303xc"]
202+
required-features = ["ld", "stm32f303xc", "cortex-m/critical-section-single-core"]
207203

208204
[[example]]
209205
name = "gpio_erased"
210-
required-features = ["ld", "stm32f303xc"]
206+
required-features = ["ld", "stm32f303xc", "cortex-m/critical-section-single-core"]
211207

212208
[[example]]
213209
name = "gpio_interrupts"
214-
required-features = ["ld", "rt", "stm32f303xc"]
210+
required-features = ["ld", "rt", "stm32f303xc", "cortex-m/critical-section-single-core"]

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[![Crate](https://img.shields.io/crates/v/stm32f3xx-hal.svg)](https://crates.io/crates/stm32f3xx-hal)
55
[![Docs](https://docs.rs/stm32f3xx-hal/badge.svg)](https://docs.rs/stm32f3xx-hal)
66
[![Crates.io](https://img.shields.io/crates/d/stm32f3xx-hal.svg)](https://crates.io/crates/stm32f3xx-hal)
7-
![Minimum Supported Rust Version](https://img.shields.io/badge/rustc-1.54+-blue.svg)
7+
![Minimum Supported Rust Version](https://img.shields.io/badge/rustc-1.59+-blue.svg)
88

99
`stm32f3xx-hal` contains a multi device hardware abstraction on top of the
1010
peripheral access API for the STMicro STM32F3 series microcontrollers. The
@@ -139,7 +139,7 @@ See the [examples folder](examples) for more example programs.
139139

140140
## Minimum Supported Rust Version (MSRV)
141141

142-
This crate is guaranteed to compile on stable Rust 1.54.0 and up. It *might*
142+
This crate is guaranteed to compile on stable Rust 1.59.0 and up. It *might*
143143
compile with older versions but that may change in any new patch release.
144144

145145
<!-- This should not prevent anyone to use newer features. -->

examples/dac_sine.rs

-4
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,8 @@ fn main() -> ! {
2828
.into_push_pull_output(&mut gpioa.moder, &mut gpioa.otyper);
2929

3030
// set up dac1, data is twelve bits, aligned right
31-
#[cfg(not(feature = "svd-f302"))]
3231
let mut dac1 = Dac::new(dp.DAC1, &mut rcc.apb1);
3332

34-
#[cfg(feature = "svd-f302")]
35-
let mut dac1 = Dac::new(dp.DAC, &mut rcc.apb1);
36-
3733
let mut led = true;
3834

3935
loop {

examples/gpio_erased.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ fn main() -> ! {
4646
.downgrade(),
4747
];
4848

49-
hprintln!("Start scanning pin array").unwrap();
49+
hprintln!("Start scanning pin array");
5050
loop {
5151
for pin in pin_array.iter_mut() {
52-
hprintln!("Value is {}", pin.is_high().unwrap()).unwrap();
52+
hprintln!("Value is {}", pin.is_high().unwrap());
5353
asm::delay(1_000_000);
5454
}
5555
}

examples/i2c_scanner.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ fn main() -> ! {
4646
&mut rcc.apb1,
4747
);
4848

49-
hprintln!("Start i2c scanning...").expect("Error using hprintln.");
50-
hprintln!().unwrap();
49+
hprintln!("Start i2c scanning...");
50+
hprintln!();
5151

5252
for addr in 0x00_u8..0x80 {
5353
// Write the empty array and check the slave response.
@@ -63,8 +63,8 @@ fn main() -> ! {
6363
}
6464
}
6565

66-
hprintln!().unwrap();
67-
hprintln!("Done!").unwrap();
66+
hprintln!();
67+
hprintln!("Done!");
6868

6969
loop {
7070
asm::wfi();

0 commit comments

Comments
 (0)