Skip to content

Commit 875d504

Browse files
committed
Formatted.
1 parent f07a2e6 commit 875d504

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

src/hts221.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//! * Driver for the HTS221 humidity sensor
22
//! See `http://www.st.com/content/st_com/en/products/mems-and-sensors/humidity-sensors/hts221.html`
33
4-
use i2cdev::core::I2CDevice;
54
use byteorder::{ByteOrder, LittleEndian};
5+
use i2cdev::core::I2CDevice;
66

77
pub const REG_AV_CONF: u8 = 0x10;
88
pub const REG_CTRL1: u8 = 0x20;

src/lib.rs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ extern crate libc;
2525
#[cfg(feature = "led-matrix")]
2626
extern crate sensehat_screen;
2727

28-
mod rh;
2928
mod hts221;
3029
mod lps25h;
30+
mod rh;
3131

32-
pub use measurements::Temperature;
33-
pub use measurements::Pressure;
3432
pub use measurements::Angle;
33+
pub use measurements::Pressure;
34+
pub use measurements::Temperature;
3535
pub use rh::RelativeHumidity;
3636

3737
use i2cdev::linux::{LinuxI2CDevice, LinuxI2CError};
@@ -99,8 +99,9 @@ impl<'a> SenseHat<'a> {
9999
pub fn get_temperature_from_pressure(&mut self) -> SenseHatResult<Temperature> {
100100
let status = self.pressure_chip.status()?;
101101
if (status & 1) != 0 {
102-
Ok(Temperature::from_celsius(self.pressure_chip
103-
.get_temp_celcius()?))
102+
Ok(Temperature::from_celsius(
103+
self.pressure_chip.get_temp_celcius()?
104+
))
104105
} else {
105106
Err(SenseHatError::NotReady)
106107
}
@@ -110,8 +111,9 @@ impl<'a> SenseHat<'a> {
110111
pub fn get_pressure(&mut self) -> SenseHatResult<Pressure> {
111112
let status = self.pressure_chip.status()?;
112113
if (status & 2) != 0 {
113-
Ok(Pressure::from_hectopascals(self.pressure_chip
114-
.get_pressure_hpa()?))
114+
Ok(Pressure::from_hectopascals(
115+
self.pressure_chip.get_pressure_hpa()?
116+
))
115117
} else {
116118
Err(SenseHatError::NotReady)
117119
}

src/lps25h.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//! * Driver for the LPS25H Pressure sensor
22
//! See <http://www.st.com/en/mems-and-sensors/lps25h.html>
33
4-
use i2cdev::core::I2CDevice;
54
use byteorder::{ByteOrder, LittleEndian};
5+
use i2cdev::core::I2CDevice;
66

77
pub const REG_RES_CONF: u8 = 0x10;
88
pub const REG_CTRL_REG_1: u8 = 0x20;
@@ -50,7 +50,8 @@ where
5050

5151
/// Obtain the temperature reading from the chip in deg C.
5252
pub fn get_temp_celcius(&mut self) -> Result<f64, T::Error> {
53-
self.get_temp().and_then(|c| Ok((f64::from(c) / 480.0) + 42.5))
53+
self.get_temp()
54+
.and_then(|c| Ok((f64::from(c) / 480.0) + 42.5))
5455
}
5556

5657
/// Obtain the pressure reading from the chip.

0 commit comments

Comments
 (0)