Skip to content

Rename setCtrlHumiSampling to setCtrlMeasSamplingHumi. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Rename setCtrlHumiSampling to setCtrlMeasSamplingHumi. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DFRobot_BME280.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ DFRobot_BME280::eStatus_t DFRobot_BME280::begin()
getCalibrate();
setCtrlMeasSamplingPress(eSampling_X8);
setCtrlMeasSamplingTemp(eSampling_X8);
setCtrlHumiSampling(eSampling_X8);
setCtrlMeasSamplingHumi(eSampling_X8);
setConfigFilter(eConfigFilter_off);
setConfigTStandby(eConfigTStandby_125);
setCtrlMeasMode(eCtrlMeasMode_normal); // set control measurement mode to make these settings effective
Expand Down Expand Up @@ -158,7 +158,7 @@ void DFRobot_BME280::setCtrlMeasSamplingPress(eSampling_t eSampling)
writeRegBitsHelper(_sRegs.ctrl_meas, sRegFlied, sRegVal);
}

void DFRobot_BME280::setCtrlHumiSampling(eSampling_t eSampling)
void DFRobot_BME280::setCtrlMeasSamplingHumi(eSampling_t eSampling)
{
sRegCtrlHum_t sRegFlied = {0}, sRegVal = {0};
// sRegFlied.osrs_h = 0xff;
Expand Down
6 changes: 3 additions & 3 deletions DFRobot_BME280.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,11 +286,11 @@ class DFRobot_BME280
void setCtrlMeasSamplingPress(eSampling_t eSampling);

/**
* @fn setCtrlHumiSampling
* @brief setCtrlHumiSampling Set control measure humidity oversampling
* @fn setCtrlMeasSamplingHumi
* @brief setCtrlMeasSamplingHumi Set control measure humidity oversampling
* @param eSampling One enum of eSampling_t
*/
void setCtrlHumiSampling(eSampling_t eSampling);
void setCtrlMeasSamplingHumi(eSampling_t eSampling);

/**
* @fn setConfigFilter
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,11 @@ There two methods:
void setCtrlMeasSamplingPress(eSampling_t eSampling);

/**
* @fn setCtrlHumiSampling
* @brief setCtrlHumiSampling Set control measure humidity oversampling
* @fn setCtrlMeasSamplingHumi
* @brief setCtrlMeasSamplingHumi Set control measure humidity oversampling
* @param eSampling One enum of eSampling_t
*/
void setCtrlHumiSampling(eSampling_t eSampling);
void setCtrlMeasSamplingHumi(eSampling_t eSampling);

/**
* @fn setConfigFilter
Expand Down
4 changes: 2 additions & 2 deletions README_CN.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,11 @@ Gravity I2C BME280环境传感器使用BOSCH最新MEMS微机电传感器，具
void setCtrlMeasSamplingPress(eSampling_t eSampling);

/**
* @fn setCtrlHumiSampling
* @fn setCtrlMeasSamplingHumi
* @brief 设置控制测量湿度过采样
* @param eSampling - 枚举量 eSampling_t
*/
void setCtrlHumiSampling(eSampling_t eSampling);
void setCtrlMeasSamplingHumi(eSampling_t eSampling);

/**
* @fn setConfigFilter
Expand Down
2 changes: 1 addition & 1 deletion examples/config/config.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void setup()
bme.setConfigTStandby(BME::eConfigTStandby_125); // set standby time
bme.setCtrlMeasSamplingTemp(BME::eSampling_X8); // set temperature over sampling
bme.setCtrlMeasSamplingPress(BME::eSampling_X8); // set pressure over sampling
bme.setCtrlHumiSampling(BME::eSampling_X8); // set humidity over sampling
bme.setCtrlMeasSamplingHumi(BME::eSampling_X8); // set humidity over sampling
bme.setCtrlMeasMode(BME::eCtrlMeasMode_normal); // set control measurement mode to make these settings effective

delay(100);
Expand Down
2 changes: 1 addition & 1 deletion keywords.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ getHumidity KEYWORD2
calAltitude KEYWORD2
reset KEYWORD2
setCtrlMeasMode KEYWORD2
setCtrlHumiSampling KEYWORD2
setCtrlMeasSamplingHumi KEYWORD2
setCtrlMeasSamplingTemp KEYWORD2
setCtrlMeasSamplingPress KEYWORD2
setConfigFilter KEYWORD2
Expand Down