ua1zbe
/
LoRa_APRS_iGate111
mirror of https://github.com/richonguzman/LoRa_APRS_iGate.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HELTEC_V3 BME680 fix

This commit is contained in:
richonguzman 2024-05-14 11:43:29 -04:00
parent 630ec062c1
commit 3b81460798
1 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/bme_utils.cpp
View File

@ -16,11 +16,11 @@ float newHum, newTemp, newPress, newGas;
Adafruit_BME280 bme280; Adafruit_BME280 bme280;
Adafruit_BME680 bme680;
#ifdef HELTEC_V3 #ifdef HELTEC_V3
Adafruit_BMP280 bmp280(&Wire1); Adafruit_BMP280 bmp280(&Wire1);
#else #else
Adafruit_BMP280 bmp280; Adafruit_BMP280 bmp280;
Adafruit_BME680 bme680;
#endif #endif
@ -57,25 +57,19 @@ namespace BME_Utils {
wxModuleType = 1; wxModuleType = 1;
wxModuleFound = true; wxModuleFound = true;
} }
/*if (!wxModuleFound) {
if (bme680.begin(wxModuleAddress, &Wire1)) {
Serial.println("BME680 sensor found");
wxModuleType = 3;
wxModuleFound = true;
}
}*/
#else #else
if (bme280.begin(wxModuleAddress)) { if (bme280.begin(wxModuleAddress)) {
Serial.println("BME280 sensor found"); Serial.println("BME280 sensor found");
wxModuleType = 1; wxModuleType = 1;
wxModuleFound = true; wxModuleFound = true;
} }
/*if (!wxModuleFound) { if (!wxModuleFound) {
if (bme680.begin(wxModuleAddress)) { if (bme680.begin(wxModuleAddress)) {
Serial.println("BME680 sensor found"); Serial.println("BME680 sensor found");
wxModuleType = 3; wxModuleType = 3;
wxModuleFound = true; wxModuleFound = true;
}*/ }
}
#endif #endif
if (!wxModuleFound) { if (!wxModuleFound) {
if (bmp280.begin(wxModuleAddress)) { if (bmp280.begin(wxModuleAddress)) {
@ -106,13 +100,15 @@ namespace BME_Utils {
); );
Serial.println("BMP280 Module init done!"); Serial.println("BMP280 Module init done!");
break; break;
/*case 3: case 3:
bme680.setTemperatureOversampling(BME680_OS_1X); #ifndef HELTEC_V3
bme680.setHumidityOversampling(BME680_OS_1X); bme680.setTemperatureOversampling(BME680_OS_1X);
bme680.setPressureOversampling(BME680_OS_1X); bme680.setHumidityOversampling(BME680_OS_1X);
bme680.setIIRFilterSize(BME680_FILTER_SIZE_0); bme680.setPressureOversampling(BME680_OS_1X);
Serial.println("BMP680 Module init done!"); bme680.setIIRFilterSize(BME680_FILTER_SIZE_0);
break;*/ Serial.println("BMP680 Module init done!");
#endif
break;
} }
} }
} }
@ -198,16 +194,18 @@ namespace BME_Utils {
newPress = (bmp280.readPressure() / 100.0F); newPress = (bmp280.readPressure() / 100.0F);
newHum = 0; newHum = 0;
break; break;
/*case 3: // BME680 case 3: // BME680
bme680.performReading(); #ifndef HELTEC_V3
delay(50); bme680.performReading();
if (bme680.endReading()) { delay(50);
newTemp = bme680.temperature; if (bme680.endReading()) {
newPress = (bme680.pressure / 100.0F); newTemp = bme680.temperature;
newHum = bme680.humidity; newPress = (bme680.pressure / 100.0F);
newGas = bme680.gas_resistance / 1000.0; // in Kilo ohms newHum = bme680.humidity;
} newGas = bme680.gas_resistance / 1000.0; // in Kilo ohms
break;*/ }
#endif
break;
} }
if (isnan(newTemp) || isnan(newHum) || isnan(newPress)) { if (isnan(newTemp) || isnan(newHum) || isnan(newPress)) {