dnutiu/bme680-rust
dnutiu/bme680-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: remove generic type from boundary_check_u8

Browse source
This commit is contained in:
Denis-Cosmin Nutiu 2024-02-26 21:25:31 +02:00
parent 99923f31e5
commit cb90ea40e4
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/lib.rs
View file

@ -180,7 +180,7 @@ pub enum Bme680Error {
} }
/// ///
/// Power mode settings /// Power mode settings of the sensor.
/// ///
#[derive(Debug, PartialEq, Clone, Copy)] #[derive(Debug, PartialEq, Clone, Copy)]
pub enum PowerMode { pub enum PowerMode {
@ -390,18 +390,22 @@ pub struct Bme680<I2C, D> {
device_address: I2CAddress, device_address: I2CAddress,
calibration_data: CalibrationData, calibration_data: CalibrationData,
temperature_offset: f32, temperature_offset: f32,
// TODO remove ? as it may not reflect the state of the device
power_mode: PowerMode, power_mode: PowerMode,
} }
fn boundary_check<I2C>( /// Checks if an u8 value is within the boundary and returns a Result containing an error
/// if the value is not within the boundary.
///
/// * `value` - The value to check for
/// * `value_name` - The name of the value
/// * `min` - The minimum boundary.
/// * `max` - The maximum boundary.
fn boundary_check_u8(
value: Option<u8>, value: Option<u8>,
value_name: &'static str, value_name: &'static str,
min: u8, min: u8,
max: u8, max: u8,
) -> Result<u8, Bme680Error<>> ) -> Result<u8, Bme680Error<>>
where
I2C: I2c,
{ {
let value = value.ok_or(Bme680Error::BoundaryCheckFailure(value_name))?; let value = value.ok_or(Bme680Error::BoundaryCheckFailure(value_name))?;
@ -531,7 +535,7 @@ impl<I2C, D> Bme680<I2C, D>
if desired_settings.contains(DesiredSensorSettings::HCNTRL_SEL) { if desired_settings.contains(DesiredSensorSettings::HCNTRL_SEL) {
debug!("HCNTRL_SEL: true"); debug!("HCNTRL_SEL: true");
let gas_sett_heatr_ctrl = let gas_sett_heatr_ctrl =
boundary_check::<I2C>(gas_sett.heatr_ctrl, "GasSett.heatr_ctrl", 0x0u8, 0x8u8)?; boundary_check_u8(gas_sett.heatr_ctrl, "GasSett.heatr_ctrl", 0x0u8, 0x8u8)?;
let mut data = I2CUtility::read_byte( let mut data = I2CUtility::read_byte(
&mut self.i2c_bus_handle, &mut self.i2c_bus_handle,
self.device_address.addr(), self.device_address.addr(),
@ -551,7 +555,7 @@ impl<I2C, D> Bme680<I2C, D>
if desired_settings.contains(DesiredSensorSettings::OST_SEL) { if desired_settings.contains(DesiredSensorSettings::OST_SEL) {
debug!("OST_SEL: true"); debug!("OST_SEL: true");
let tph_sett_os_temp = boundary_check::<I2C>( let tph_sett_os_temp = boundary_check_u8(
tph_sett.os_temp.map(|x| x as u8), tph_sett.os_temp.map(|x| x as u8),
"TphSett.os_temp", "TphSett.os_temp",
0, 0,
@ -573,7 +577,7 @@ impl<I2C, D> Bme680<I2C, D>
if desired_settings.contains(DesiredSensorSettings::OSH_SEL) { if desired_settings.contains(DesiredSensorSettings::OSH_SEL) {
debug!("OSH_SEL: true"); debug!("OSH_SEL: true");
let tph_sett_os_hum = let tph_sett_os_hum =
boundary_check::<I2C>(tph_sett.os_hum.map(|x| x as u8), "TphSett.os_hum", 0, 5)?; boundary_check_u8(tph_sett.os_hum.map(|x| x as u8), "TphSett.os_hum", 0, 5)?;
let mut data = let mut data =
I2CUtility::read_byte(&mut self.i2c_bus_handle, self.device_address.addr(), BME680_CONF_OS_H_ADDR)?; I2CUtility::read_byte(&mut self.i2c_bus_handle, self.device_address.addr(), BME680_CONF_OS_H_ADDR)?;
data = (data as i32 & !0x7i32 | tph_sett_os_hum as i32 & 0x7i32) as u8; data = (data as i32 & !0x7i32 | tph_sett_os_hum as i32 & 0x7i32) as u8;
@ -601,7 +605,7 @@ impl<I2C, D> Bme680<I2C, D>
if desired_settings.contains(DesiredSensorSettings::NBCONV_SEL) { if desired_settings.contains(DesiredSensorSettings::NBCONV_SEL) {
debug!("NBCONV_SEL: true"); debug!("NBCONV_SEL: true");
let gas_sett_nb_conv = let gas_sett_nb_conv =
boundary_check::<I2C>(Some(gas_sett.nb_conv), "GasSett.nb_conv", 0, 10)?; boundary_check_u8(Some(gas_sett.nb_conv), "GasSett.nb_conv", 0, 10)?;
data = (data as i32 & !0xfi32 | gas_sett_nb_conv as i32 & 0xfi32) as u8; data = (data as i32 & !0xfi32 | gas_sett_nb_conv as i32 & 0xfi32) as u8;
} }