diff --git a/src/hts221.rs b/src/hts221.rs index 72140da..f0c0aec 100644 --- a/src/hts221.rs +++ b/src/hts221.rs @@ -1,8 +1,8 @@ //! * Driver for the HTS221 humidity sensor //! See `http://www.st.com/content/st_com/en/products/mems-and-sensors/humidity-sensors/hts221.html` -use i2cdev::core::I2CDevice; use byteorder::{ByteOrder, LittleEndian}; +use i2cdev::core::I2CDevice; pub const REG_AV_CONF: u8 = 0x10; pub const REG_CTRL1: u8 = 0x20; diff --git a/src/lib.rs b/src/lib.rs index eefbe0b..12d4755 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -25,13 +25,13 @@ extern crate libc; #[cfg(feature = "led-matrix")] extern crate sensehat_screen; -mod rh; mod hts221; mod lps25h; +mod rh; -pub use measurements::Temperature; -pub use measurements::Pressure; pub use measurements::Angle; +pub use measurements::Pressure; +pub use measurements::Temperature; pub use rh::RelativeHumidity; use i2cdev::linux::{LinuxI2CDevice, LinuxI2CError}; @@ -99,8 +99,9 @@ impl<'a> SenseHat<'a> { pub fn get_temperature_from_pressure(&mut self) -> SenseHatResult { let status = self.pressure_chip.status()?; if (status & 1) != 0 { - Ok(Temperature::from_celsius(self.pressure_chip - .get_temp_celcius()?)) + Ok(Temperature::from_celsius( + self.pressure_chip.get_temp_celcius()? + )) } else { Err(SenseHatError::NotReady) } @@ -110,8 +111,9 @@ impl<'a> SenseHat<'a> { pub fn get_pressure(&mut self) -> SenseHatResult { let status = self.pressure_chip.status()?; if (status & 2) != 0 { - Ok(Pressure::from_hectopascals(self.pressure_chip - .get_pressure_hpa()?)) + Ok(Pressure::from_hectopascals( + self.pressure_chip.get_pressure_hpa()? + )) } else { Err(SenseHatError::NotReady) } diff --git a/src/lps25h.rs b/src/lps25h.rs index bcce9fb..7b2d88b 100644 --- a/src/lps25h.rs +++ b/src/lps25h.rs @@ -1,8 +1,8 @@ //! * Driver for the LPS25H Pressure sensor //! See -use i2cdev::core::I2CDevice; use byteorder::{ByteOrder, LittleEndian}; +use i2cdev::core::I2CDevice; pub const REG_RES_CONF: u8 = 0x10; pub const REG_CTRL_REG_1: u8 = 0x20; @@ -50,7 +50,8 @@ where /// Obtain the temperature reading from the chip in deg C. pub fn get_temp_celcius(&mut self) -> Result { - self.get_temp().and_then(|c| Ok((f64::from(c) / 480.0) + 42.5)) + self.get_temp() + .and_then(|c| Ok((f64::from(c) / 480.0) + 42.5)) } /// Obtain the pressure reading from the chip.