hodasemi/rs-dht-pio
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity Actions

Conversion refactor

Browse source
This commit is contained in:
Jonathan BAUDIN 2023-10-10 08:33:04 +02:00
parent 42339a8149
commit 882b6d36e2
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "dht-pio" name = "dht-pio"
version = "0.5.1" version = "0.5.2"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"

18
src/lib.rs
View file

@ -40,16 +40,16 @@ impl<P: PIOExt, STI: StateMachineIndex> Dht22<P, STI> {
} }
pub fn read(&mut self, delay: &mut Delay) -> Result<DhtResult, DhtError> { pub fn read(&mut self, delay: &mut Delay) -> Result<DhtResult, DhtError> {
let (t, h) = self.dht.read_data(delay)?; let (raw_temp, raw_hum) = self.dht.read_data(delay)?;
let mut final_t: i32 = (t & 0x7FFF) as i32; let mut final_t: f32 = (raw_temp & 0x7FFF) as f32;
if (t & 0x8000) > 0 { if (raw_temp & 0x8000) > 0 {
final_t *= -1; final_t *= -1.0;
} }
Ok(DhtResult { Ok(DhtResult {
temperature: final_t as f32 / 10.0, temperature: final_t / 10.0,
humidity: h as f32 / 10.0, humidity: raw_hum as f32 / 10.0,
}) })
} }
} }
@ -70,14 +70,14 @@ impl<P: PIOExt, STI: StateMachineIndex> Dht11<P, STI> {
pub fn read(&mut self, delay: &mut Delay) -> Result<DhtResult, DhtError> { pub fn read(&mut self, delay: &mut Delay) -> Result<DhtResult, DhtError> {
let (t, h) = self.dht.read_data(delay)?; let (t, h) = self.dht.read_data(delay)?;
let mut final_t: i32 = ((t & 0x7FFF) >> 8) as i32; let mut final_t: f32 = ((t & 0x7FFF) >> 8) as f32;
if (t & 0x8000) > 0 { if (t & 0x8000) > 0 {
final_t *= -1; final_t *= -1.0;
} }
Ok(DhtResult { Ok(DhtResult {
temperature: final_t as f32, temperature: final_t,
humidity: (h >> 8) as f32, humidity: (h >> 8) as f32,
}) })
} }