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

Fix set_regs

Browse source
This commit is contained in:
marcelbuesing 2018-05-15 21:49:21 +02:00 committed by marcelbuesing
parent cc3a5ca508
commit c54d2b8780
No known key found for this signature in database
GPG key ID: EF3934305E975944
1 changed files with 35 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

110
src/bme680.rs
View file

@ -104,10 +104,10 @@ pub const BME680_MEM_PAGE0: u8 = 0x10;
pub const BME680_MEM_PAGE1: u8 = 0x00; pub const BME680_MEM_PAGE1: u8 = 0x00;
/** Buffer length macro declaration */ /** Buffer length macro declaration */
pub const BME680_TMP_BUFFER_LENGTH: u8 = 40; pub const BME680_TMP_BUFFER_LENGTH: usize = 40;
pub const BME680_REG_BUFFER_LENGTH: u8 = 6; pub const BME680_REG_BUFFER_LENGTH: usize = 6;
pub const BME680_FIELD_DATA_LENGTH: u8 = 3; pub const BME680_FIELD_DATA_LENGTH: usize = 3;
pub const BME680_GAS_REG_BUF_LENGTH: u8 = 20; pub const BME680_GAS_REG_BUF_LENGTH: usize = 20;
/* Settings selector */ /* Settings selector */
pub const BME680_OST_SEL: u16 = 1; pub const BME680_OST_SEL: u16 = 1;
@ -377,31 +377,25 @@ where
} }
} }
pub fn bme680_set_regs(self, reg_addr: u8, reg_data: *const u8, len: u8) -> Result<()> { pub fn bme680_set_regs(self, reg: &[(u8, u8)]) -> Result<()> {
let mut tmp_buff = [0, BME680_TMP_BUFFER_LENGTH]; if reg.is_empty() || reg.len() > (BME680_TMP_BUFFER_LENGTH / 2) as usize {
return Err(Bme680Error::InvalidLength);
let mut index: u16;
if len > 0 && (len < BME680_TMP_BUFFER_LENGTH / 2) {
index = 0;
loop {
if !(index < len as u16) {
break;
}
tmp_buff[(2 * index) as (usize)] = *reg_addr.offset(index as (isize));
tmp_buff[(2 * index + 1) as (usize)] = *reg_data.offset(index as (isize));
index = index + 1;
}
self.i2c
.write(reg_addr, &tmp_buff)
.map_err(|_| Bme680Error::CommunicationFailure)
} else {
Err(Bme680Error::InvalidLength)
} }
let tmp_buff = Vec::with_capacity(BME680_TMP_BUFFER_LENGTH);
for (reg_addr, reg_data) in reg {
tmp_buff.push(reg_addr.to_owned());
tmp_buff.push(reg_data.to_owned());
}
self.i2c
.write(self.dev_id, tmp_buff.as_slice())
.map_err(|_| Bme680Error::CommunicationFailure)
} }
pub fn soft_reset(self) -> Result<()> { pub fn soft_reset(self) -> Result<()> {
self.bme680_set_regs(BME680_SOFT_RESET_ADDR, BME680_SOFT_RESET_CMD, 1u8)?; self.bme680_set_regs(&[(BME680_SOFT_RESET_ADDR, BME680_SOFT_RESET_CMD)])?;
self.delay.delay_ms(BME680_RESET_PERIOD); self.delay.delay_ms(BME680_RESET_PERIOD);
Ok(()) Ok(())
} }
@ -414,9 +408,8 @@ where
) -> Result<()> { ) -> Result<()> {
let mut reg_addr: u8; let mut reg_addr: u8;
// let mut data: u8 = 0u8; // let mut data: u8 = 0u8;
let mut count: u8 = 0u8;
let mut reg_array: [u8; 6] = 0i32 as ([u8; 6]); let reg = Vec::with_capacity(BME680_REG_BUFFER_LENGTH);
let mut data_array: [u8; 6] = 0i32 as ([u8; 6]);
let mut intended_power_mode = self.power_mode; let mut intended_power_mode = self.power_mode;
if desired_settings.contains(DesiredSensorSettings::GAS_MEAS_SEL) { if desired_settings.contains(DesiredSensorSettings::GAS_MEAS_SEL) {
@ -433,9 +426,7 @@ where
data = (data as (i32) & !0x1ci32 | self.tph_sett.filter as (i32) << 2i32 & 0x1ci32) data = (data as (i32) & !0x1ci32 | self.tph_sett.filter as (i32) << 2i32 & 0x1ci32)
as (u8); as (u8);
} }
reg_array[count as (usize)] = reg_addr; reg.push((reg_addr, data));
data_array[count as (usize)] = data;
count = (count as (i32) + 1) as (u8);
} }
if desired_settings.contains(DesiredSensorSettings::HCNTRL_SEL) { if desired_settings.contains(DesiredSensorSettings::HCNTRL_SEL) {
@ -443,9 +434,7 @@ where
reg_addr = 0x70u8; reg_addr = 0x70u8;
let mut data = self.get_regs_u8(reg_addr)?; let mut data = self.get_regs_u8(reg_addr)?;
data = (data as (i32) & !0x8i32 | self.gas_sett.heatr_ctrl as (i32) & 0x8i32) as (u8); data = (data as (i32) & !0x8i32 | self.gas_sett.heatr_ctrl as (i32) & 0x8i32) as (u8);
reg_array[count as (usize)] = reg_addr; reg.push((reg_addr, data));
data_array[count as (usize)] = data;
count = (count as (i32) + 1) as (u8);
} }
if desired_settings if desired_settings
@ -465,9 +454,7 @@ where
as (u8); as (u8);
} }
reg_array[count as (usize)] = reg_addr; reg.push((reg_addr, data));
data_array[count as (usize)] = data;
count = (count as (i32) + 1) as (u8);
} }
if desired_settings.contains(DesiredSensorSettings::OSH_SEL) { if desired_settings.contains(DesiredSensorSettings::OSH_SEL) {
@ -475,9 +462,6 @@ where
reg_addr = 0x72u8; reg_addr = 0x72u8;
let mut data = self.get_regs_u8(reg_addr)?; let mut data = self.get_regs_u8(reg_addr)?;
data = (data as (i32) & !0x7i32 | self.tph_sett.os_hum as (i32) & 0x7i32) as (u8); data = (data as (i32) & !0x7i32 | self.tph_sett.os_hum as (i32) & 0x7i32) as (u8);
reg_array[count as (usize)] = reg_addr;
data_array[count as (usize)] = data;
count = (count as (i32) + 1) as (u8);
} }
if desired_settings if desired_settings
@ -497,16 +481,10 @@ where
data = (data as (i32) & !0xfi32 | self.gas_sett.nb_conv as (i32) & 0xfi32) as (u8); data = (data as (i32) & !0xfi32 | self.gas_sett.nb_conv as (i32) & 0xfi32) as (u8);
} }
reg_array[count as (usize)] = reg_addr; reg.push((reg_addr, data));
data_array[count as (usize)] = data;
count = (count as (i32) + 1) as (u8);
} }
self.bme680_set_regs( self.bme680_set_regs(reg.as_slice())?;
reg_array.as_mut_ptr() as (*const u8),
data_array.as_mut_ptr() as (*const u8),
count,
)?;
self.power_mode = intended_power_mode; self.power_mode = intended_power_mode;
Ok(()) Ok(())
@ -515,7 +493,7 @@ where
// TODO replace desired_settings with proper flags type see lib.rs // TODO replace desired_settings with proper flags type see lib.rs
pub fn get_sensor_settings(self, mut desired_settings: u16) -> Result<SensorSettings> { pub fn get_sensor_settings(self, mut desired_settings: u16) -> Result<SensorSettings> {
let mut reg_addr: u8 = 0x70u8; let mut reg_addr: u8 = 0x70u8;
let mut data_array: [u8; 6] = 0i32 as ([u8; 6]); let mut data_array: [u8; 6] = [0; 6];
let mut sensor_settings = Default::default(); let mut sensor_settings = Default::default();
let data_array = self.get_regs(reg_addr, data_array.as_mut_ptr(), 6u16)?; let data_array = self.get_regs(reg_addr, data_array.as_mut_ptr(), 6u16)?;
@ -561,11 +539,7 @@ where
/* Call repeatedly until in sleep */ /* Call repeatedly until in sleep */
loop { loop {
self.get_regs( let tmp_pow_mode = self.get_regs_u8(BME680_CONF_T_P_MODE_ADDR)?;
BME680_CONF_T_P_MODE_ADDR,
&mut tmp_pow_mode as (*mut u8),
1u16,
)?;
/* Put to sleep before changing mode */ /* Put to sleep before changing mode */
pow_mode = tmp_pow_mode & BME680_MODE_MSK; pow_mode = tmp_pow_mode & BME680_MODE_MSK;
@ -573,11 +547,8 @@ where
if power_mode != PowerMode::SleepMode { if power_mode != PowerMode::SleepMode {
/* Set to sleep*/ /* Set to sleep*/
tmp_pow_mode = tmp_pow_mode & !BME680_MODE_MSK; tmp_pow_mode = tmp_pow_mode & !BME680_MODE_MSK;
self.bme680_set_regs( let reg = vec!((reg_addr, tmp_pow_mode));
&mut reg_addr as (*mut u8) as (*const u8), self.bme680_set_regs(reg.as_slice())?;
&mut tmp_pow_mode as (*mut u8) as (*const u8),
1u8,
)?;
self.delay.delay_ms(BME680_POLL_PERIOD_MS); self.delay.delay_ms(BME680_POLL_PERIOD_MS);
} else { } else {
// TODO do while in Rust? // TODO do while in Rust?
@ -588,11 +559,7 @@ where
/* Already in sleep */ /* Already in sleep */
if power_mode != PowerMode::SleepMode { if power_mode != PowerMode::SleepMode {
tmp_pow_mode = tmp_pow_mode & !BME680_MODE_MSK | power_mode.value(); tmp_pow_mode = tmp_pow_mode & !BME680_MODE_MSK | power_mode.value();
self.bme680_set_regs( self.bme680_set_regs(&[(reg_addr, tmp_pow_mode)])?;
&mut reg_addr as (*mut u8) as (*const u8),
&mut tmp_pow_mode as (*mut u8) as (*const u8),
1u8,
)?;
} }
Ok(()) Ok(())
} }
@ -712,24 +679,17 @@ where
} }
fn set_gas_config(&self, gas_sett: GasSett) -> Result<()> { fn set_gas_config(&self, gas_sett: GasSett) -> Result<()> {
let mut reg_addr: [u8; 2] = [0; 2]; let reg = Vec::with_capacity(2);
let mut reg_data: [u8; 2] = [0; 2];
if self.power_mode != PowerMode::ForcedMode { if self.power_mode != PowerMode::ForcedMode {
return Err(Bme680Error::DefinePwrMode); return Err(Bme680Error::DefinePwrMode);
} }
reg_addr[0] = BME680_RES_HEAT0_ADDR; reg.push((BME680_RES_HEAT0_ADDR, self.calc_heater_res(gas_sett.heatr_temp)));
reg_data[0] = self.calc_heater_res(gas_sett.heatr_temp); reg.push((BME680_GAS_WAIT0_ADDR, self.calc_heater_dur(gas_sett.heatr_dur)));
reg_addr[1] = BME680_GAS_WAIT0_ADDR;
reg_data[1] = self.calc_heater_dur(gas_sett.heatr_dur);
self.gas_sett.nb_conv = 0; self.gas_sett.nb_conv = 0;
self.bme680_set_regs( self.bme680_set_regs(reg.as_slice())
reg_addr.as_mut_ptr() as (*const u8),
reg_data.as_mut_ptr() as (*const u8),
2,
)
} }
fn get_gas_config(self) -> Result<GasSett> { fn get_gas_config(self) -> Result<GasSett> {