Skip to content

Fix cargo build and cargo build --examples #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tweksteen wants to merge 2 commits into
base: master
Choose a base branch
from
+15 −6
Open

Fix cargo build and cargo build --examples #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88c750d
Update stm32f4xx-hal to 0.14
tweksteen May 30, 2023
0e087f9
Fix build for examples/
tweksteen May 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,29 @@ license = "MIT OR Apache-2.0"
keywords = ["bme280", "bmp280", "temperature", "pressure", "humidity"]
categories = ["embedded", "no-std", "hardware-support", "embedded-hal"]
edition = "2018"
autoexamples = false

[lib]
name = "bme280"

[dependencies]
embedded-hal = "=1.0.0-alpha.8"
serde = { version = "1.0", optional = true, features = ["derive"] }
defmt = { version = "0.3.2", optional = true }
defmt = { version = "0.3", optional = true }
derive_more = { version = "0.99.17", optional = true}
embedded-hal-async = { version = "0.1.0-alpha.1", optional = true }
maybe-async-cfg = "0.2.3"

[dev-dependencies]
cortex-m-rtic = "1.0.0"
cortex-m = "0.7.3"
cortex-m = { version = "0.7.3", features = ["critical-section-single-core"] }
cortex-m-rt = "0.7.0"
defmt-rtt = "0.3.0"
defmt = "0.3"
defmt-rtt = "0.4"
panic-semihosting = "0.6"

[dev-dependencies.stm32f4xx-hal]
version = "0.13.2"
version = "0.14"
features = ["stm32f411"]

[features]
Expand Down
11 changes: 9 additions & 2 deletions examples/rtic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
//! Example on using the BME 280 via i2c on a stm32f411.
//!
//! To run, make sure you install the correct rustup target:
//! $ rustup target add thumbv7em-none-eabihf
//! $ cargo build --target thumbv7em-none-eabihf --examples

#![no_main]
#![no_std]

use defmt_rtt as _;
use panic_semihosting as _;

#[rtic::app(device = stm32f4xx_hal::pac)]
Expand All @@ -14,8 +21,8 @@ mod app {
timer::delay::Delay,
};

type Scl = Pin<Alternate<OpenDrain, 4>, 'B', 6>;
type Sda = Pin<Alternate<OpenDrain, 4>, 'B', 7>;
type Scl = Pin<'B', 6, Alternate<4, OpenDrain>>;
type Sda = Pin<'B', 7, Alternate<4, OpenDrain>>;

#[shared]
struct Shared {}
Expand Down