Compare commits
2 Commits
880548d957
...
0fef57c37d
Author | SHA1 | Date | |
---|---|---|---|
0fef57c37d | |||
a5197922a2 |
2
Cargo.lock
generated
2
Cargo.lock
generated
|
@ -48,7 +48,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "air_filter"
|
||||
version = "0.2.0"
|
||||
version = "0.3.0"
|
||||
dependencies = [
|
||||
"bme280",
|
||||
"cfg-if",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "air_filter"
|
||||
version = "0.2.0"
|
||||
version = "0.3.0"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
|
|
21
src/main.rs
21
src/main.rs
|
@ -2,8 +2,8 @@
|
|||
#![no_main]
|
||||
#![feature(type_alias_impl_trait)]
|
||||
|
||||
use core::{cell::RefCell, str::from_utf8};
|
||||
use core::fmt::Debug;
|
||||
use core::{cell::RefCell, str::from_utf8};
|
||||
|
||||
use bme280::{i2c::AsyncBME280, Measurements};
|
||||
use const_format::formatcp;
|
||||
|
@ -300,7 +300,7 @@ async fn main(spawner: Spawner) {
|
|||
|
||||
let mut controller = Controller::new(p.PIN_28, p.PIN_27, p.PIN_26, p.PIN_22);
|
||||
|
||||
let i2c = i2c::I2c::new_async(p.I2C0, p.PIN_1, p.PIN_0, Irqs, i2c::Config::default());
|
||||
let i2c = i2c::I2c::new_async(p.I2C0, p.PIN_9, p.PIN_8, Irqs, i2c::Config::default());
|
||||
let mut bme280 = AsyncBME280::new_primary(i2c);
|
||||
let mut delay = Delay {};
|
||||
bme280.init(&mut delay).await.unwrap();
|
||||
|
@ -430,9 +430,10 @@ async fn main(spawner: Spawner) {
|
|||
)
|
||||
.await
|
||||
{
|
||||
Either3::First(_) => {
|
||||
Some(StateMessage::new(controller.get_state(), bme280.measure(&mut delay).await.unwrap()))
|
||||
}
|
||||
Either3::First(_) => Some(StateMessage::new(
|
||||
controller.get_state(),
|
||||
bme280.measure(&mut delay).await.unwrap(),
|
||||
)),
|
||||
Either3::Second(message) => match message {
|
||||
Ok((TOPIC_UPDATE, url)) => {
|
||||
let url: Vec<_, 256> = match Vec::from_slice(url) {
|
||||
|
@ -474,7 +475,10 @@ async fn main(spawner: Spawner) {
|
|||
|
||||
controller.set_state(message.get_state());
|
||||
|
||||
Some(StateMessage::new(controller.get_state(), bme280.measure(&mut delay).await.unwrap()))
|
||||
Some(StateMessage::new(
|
||||
controller.get_state(),
|
||||
bme280.measure(&mut delay).await.unwrap(),
|
||||
))
|
||||
}
|
||||
Ok(_) => None,
|
||||
Err(err) => {
|
||||
|
@ -485,7 +489,10 @@ async fn main(spawner: Spawner) {
|
|||
cortex_m::peripheral::SCB::sys_reset();
|
||||
}
|
||||
},
|
||||
Either3::Third(state) => Some(StateMessage::new(state, bme280.measure(&mut delay).await.unwrap())),
|
||||
Either3::Third(state) => Some(StateMessage::new(
|
||||
state,
|
||||
bme280.measure(&mut delay).await.unwrap(),
|
||||
)),
|
||||
};
|
||||
|
||||
if let Some(message) = message {
|
||||
|
|
Loading…
Reference in New Issue
Block a user