ut3ums/WxBox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BMP280 MS5611 added

Browse Source
This commit is contained in:
Myk
2024-04-13 01:03:37 +03:00
parent 54285dd721
commit 258fa0097d
9 changed files with 294 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

200
src/main.cpp
View File

@@ -1,14 +1,19 @@
#include "ESPAsyncWebServer.h"
#include <WiFi.h>
#include <Wire.h>
#include <time.h>
// Sensors
#include "HDC1080Sensor.h"
#include "CCS811Sensor.h"
#include <time.h>
#include "MS5611Sensor.h"
#include "BMP280Sensor.h"
//#include "src/ESPinfluxdb.h" // https://github.com/hwwong/ESP_influxdb // 14.04.2019
#include "http_static.h" // HTTP pages and JSON request templates
// ********************** Config **********************
// DeepSleep time – send data every 60 seconds
// DeepSleep time send data every 60 seconds
const int sleepTimeS = 60;
// WiFi Config
@@ -24,19 +29,64 @@ struct tm timeinfo;
// Create AsyncWebServer object on port 80
AsyncWebServer server(80);
// Globals for HDC1080
// Globals for HDC1080 :: Temp/Humidity
HDC1080Sensor HDC1080_sensors;
double hdc1080_temp, hdc1080_humidity;
bool hdc1080_err;
// Globals for CCS811
// Globals for CCS811 :: eTVOC/eCO2
CCS811Sensor CCS811_sensors;
uint16_t eco2, etvoc, errstat, raw;
uint16_t ccs811_eco2, ccs811_etvoc, ccs811_errstat, ccs811_raw;
// Globals for MS5611 :: Pressure/Altitude
MS5611Sensor MS5611_sensors;
double ms5611_temp, ms5611_pressure, ms5611_altitude;
// Globals for BMP280 :: Temp/Hum/Pressure
BMP280Sensor BMP280_sensors;
float bmp280_temp, bmp280_humidity, bmp280_pressure, bmp280_altitude;
// loop cycle
#define workCycle 60 //seconds
// ******************** Config End ********************
void scanI2CDevices() {
byte error, address;
int nDevices;
Serial.println("Scanning...");
nDevices = 0;
for (address = 1; address < 127; address++) {
Wire.beginTransmission(address);
error = Wire.endTransmission();
if (error == 0) {
Serial.print("I2C device found at address 0x");
if (address < 16) {
Serial.print("0");
}
Serial.print(address, HEX);
Serial.println(" !");
nDevices++;
} else if (error == 4) {
Serial.print("Unknown error at address 0x");
if (address < 16) {
Serial.print("0");
}
Serial.println(address, HEX);
}
}
if (nDevices == 0) {
Serial.println("No I2C devices found\n");
} else {
Serial.println("done\n");
}
}
// ---------- HDC1080 ----------
String readHDC1080Temperature() {
// Sensor readings may also be up to 2 seconds 'old' (its a very slow sensor)
if (isnan(hdc1080_temp)) {
@@ -58,7 +108,8 @@ String readHDC1080Humidity() {
return String(hdc1080_humidity);
}
}
// ---------- End HDC1080 ----------
// ---------- CCS11 ----------
String processCCS811Error(err_t errstat) {
if ( errstat == CCS811_ERRSTAT_OK_NODATA ) {
Serial.println("CCS811: waiting for (new) data");
@@ -74,20 +125,100 @@ String processCCS811Error(err_t errstat) {
}
String readCCS811TVOC() {
if( errstat==CCS811_ERRSTAT_OK ){
return String(etvoc);
if( ccs811_errstat==CCS811_ERRSTAT_OK ){
return String(ccs811_etvoc);
} else {
return processCCS811Error(errstat);
return processCCS811Error(ccs811_errstat);
}
}
String readCCS811ECO2() {
if( errstat==CCS811_ERRSTAT_OK ){
return String(eco2);
if( ccs811_errstat==CCS811_ERRSTAT_OK ){
return String(ccs811_eco2);
} else {
return processCCS811Error(errstat);
return processCCS811Error(ccs811_errstat);
}
}
// ---------- End CCS11 ----------
// ---------- MS5611 ----------
String readMS5611Temperature() {
// Sensor readings may also be up to 2 seconds 'old' (its a very slow sensor)
if (isnan(ms5611_temp)) {
Serial.println("Failed to read from MS5611 sensor!");
return "--";
}
else {
return String(ms5611_temp);
}
}
String readMS5611Pressure() {
// Sensor readings may also be up to 2 seconds 'old' (its a very slow sensor)
if (isnan(ms5611_pressure)) {
Serial.println("Failed to read from MS5611 sensor!");
return "--";
}
else {
return String(ms5611_temp);
}
}
String readMS5611Altitude() {
// Sensor readings may also be up to 2 seconds 'old' (its a very slow sensor)
if (isnan(ms5611_altitude)) {
Serial.println("Failed to read from MS5611 sensor!");
return "--";
}
else {
return String(ms5611_altitude);
}
}
// ---------- End MS5611 ----------
// ---------- BMP280 ----------
String readBMP280Temperature() {
// Sensor readings may also be up to 2 seconds 'old' (its a very slow sensor)
if (isnan(bmp280_temp)) {
Serial.println("Failed to read from BMP280 sensor!");
return "--";
}
else {
return String(bmp280_temp);
}
}
String readBMP280Humidity() {
// Sensor readings may also be up to 2 seconds 'old' (its a very slow sensor)
if (isnan(bmp280_humidity)) {
Serial.println("Failed to read from BMP280 sensor!");
return "--";
}
else {
return String(bmp280_humidity);
}
}
String readBMP280Pressure() {
// Sensor readings may also be up to 2 seconds 'old' (its a very slow sensor)
if (isnan(bmp280_pressure)) {
Serial.println("Failed to read from BMP280 sensor!");
return "--";
}
else {
return String(bmp280_pressure);
}
}
String readBMP280Altitude() {
// Sensor readings may also be up to 2 seconds 'old' (its a very slow sensor)
if (isnan(bmp280_altitude)) {
Serial.println("Failed to read from BMP280 sensor!");
return "--";
}
else {
return String(bmp280_altitude);
}
}
// ---------- End BMP280 ----------
String formatISO8601() {
char timestamp[20]; // Buffer for timestamp
@@ -163,17 +294,22 @@ void setup()
HDC1080_sensors.init();
// eCO2 and eTVOC, temp and humidity needed to adjust values
CCS811_sensors.init(&hdc1080_temp, &hdc1080_humidity);
// Todo add pointer to temp, we might allight Altimeter by another sens
// MS5611_sensors.init();
// humidity, temperature, pressure and altitude
BMP280_sensors.init();
// Pages and JSONs
server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){
request->send_P(200, "text/html", http_static::index_html, processor);
});
// Deprecated
server.on("/api/sensors.json", HTTP_GET, [](AsyncWebServerRequest *request){
request->send_P(200, "text/html", http_static::sensor_things_resp, processor);
});
// lightweight named endpoints
// DEPRECATED lightweight named endpoints
server.on("/temperature", HTTP_GET, [](AsyncWebServerRequest *request){
request->send_P(200, "text/plain", readHDC1080Temperature().c_str());
});
@@ -187,6 +323,19 @@ void setup()
request->send_P(200, "text/plain", readCCS811ECO2().c_str());
});
// For prometheus scrapping. to be deprecated as well
server.on("/metrics", HTTP_GET, [](AsyncWebServerRequest *request) {
String response = "hdc1080_temperature " + String(readHDC1080Temperature()) + "\n";
response += "hdc1080_humidity " + String(readHDC1080Humidity()) + "\n";
response += "ccs811_tvoc " + String(readCCS811TVOC()) + "\n";
response += "ccs811_eco2 " + String(readCCS811ECO2()) + "\n";
response += "bmp280_temperature " + String(readBMP280Temperature()) + "\n";
response += "bmp280_humidity " + String(readBMP280Humidity()) + "\n";
response += "bmp280_pressure " + String(readBMP280Pressure()) + "\n";
response += "bmp280_altitude " + String(readBMP280Altitude()) + "\n";
request->send(200, "text/plain", response);
});
// Start server
server.begin();
}
@@ -202,16 +351,27 @@ void loop()
Serial.println("Failed to obtain time");
return;
}
scanI2CDevices();
Serial.print(&timeinfo, "[%M-%d-%Y--%H:%M:%S]: ");
HDC1080_sensors.read_values(&hdc1080_temp, &hdc1080_humidity, &hdc1080_err);
CCS811_sensors.read_values(&eco2, &etvoc, &errstat, &raw);
CCS811_sensors.read_values(&ccs811_eco2, &ccs811_etvoc, &ccs811_errstat, &ccs811_raw);
BMP280_sensors.read_values(&bmp280_temp, &bmp280_humidity, &bmp280_pressure, &bmp280_altitude);
Serial.print("H="); Serial.print(readHDC1080Temperature()); Serial.print(" °C ");
Serial.print("T="); Serial.print(readHDC1080Humidity()); Serial.print(" % ");
Serial.print("eco2="); Serial.print(readCCS811ECO2()); Serial.print(" ppm ");
Serial.print("etvoc="); Serial.print(readCCS811TVOC()); Serial.print(" ppb ");
Serial.print("T=");
Serial.print(readHDC1080Temperature());
Serial.print(" / ");
Serial.print(readBMP280Temperature());
Serial.print(" °C ");
Serial.print("H=");
Serial.print(readHDC1080Humidity());
Serial.print(" / ");
Serial.print(readBMP280Humidity());
Serial.print(" % ");
Serial.print("eco2="); Serial.print(readCCS811ECO2()); Serial.print(" ppm ");
Serial.print("etvoc="); Serial.print(readCCS811TVOC()); Serial.print(" ppb ");
Serial.print("pressure="); Serial.print(readBMP280Pressure()); Serial.print(" Pa ");
Serial.print("alt="); Serial.print(readBMP280Altitude()); Serial.print(" m ");
Serial.println("");
// Wait
delay(workCycle*1000);

30
src/sensors/BMP280Sensor.cpp Normal file
View File

@@ -0,0 +1,30 @@
// BMP280Sensor.cpp
#include "BMP280Sensor.h"
BMP280Sensor::BMP280Sensor(uint8_t address) : _address(address) {
// Constructor sets the address
}
void BMP280Sensor::init() {
// Enable BMP280
bool ok = bmp280.begin(_address);
/* weather monitoring settings from driver lib */
bmp280.setSampling(Adafruit_BME280::MODE_FORCED,
Adafruit_BME280::SAMPLING_X1, // temperature
Adafruit_BME280::SAMPLING_X1, // pressure
Adafruit_BME280::SAMPLING_X1, // humidity
Adafruit_BME280::FILTER_OFF );
}
void BMP280Sensor::read_values(float* temperature, float* humidity, float* pressure, float* altitude) {
// Only needed in forced mode! In normal mode, you can remove the next line.
bmp280.takeForcedMeasurement(); // has no effect in normal mode
if (humidity) *humidity = bmp280.readHumidity();
if (temperature) *temperature = bmp280.readTemperature();
if (pressure) *pressure = bmp280.readPressure() / 100.0F;
if (altitude) *altitude = bmp280.readAltitude(SEALEVELPRESSURE_HPA);
}

25
src/sensors/MS5611Sensor.cpp Normal file
View File

@@ -0,0 +1,25 @@
// MS5611Sensor.cpp
#include "MS5611Sensor.h"
// Initialize MS5611 sensor
// Ultra high resolution: MS5611_ULTRA_HIGH_RES
// (default) High resolution: MS5611_HIGH_RES
// Standard: MS5611_STANDARD
// Low power: MS5611_LOW_POWER
// Ultra low power: MS5611_ULTRA_LOW_POWER
MS5611Sensor::MS5611Sensor() {
// Constructor - No need to do anything here
}
void MS5611Sensor::init() {
ms5611.begin(MS5611_ULTRA_HIGH_RES);
}
void MS5611Sensor::read_values(double* temperature, double* preasure, double* altitude) {
if (temperature) *temperature = ms5611.readTemperature(true);
if (preasure) *preasure = ms5611.readPressure(true);
if (altitude) *altitude = ms5611.getAltitude(*preasure); // second arg double seaLevelPressure = 101325
}

8
src/static/sensor_things_tmpl.json
View File

@@ -19,7 +19,7 @@
"definition": "http://www.qudt.org/qudt/owl/1.0.0/quantity/Instances.html#Temperature"
},
"Sensor": {
"name": "Temperature Sensor",
"name": "temperature",
"description": "Sensor for measuring temperature"
},
"Observations": [
@@ -43,7 +43,7 @@
"definition": "http://www.qudt.org/qudt/owl/1.0.0/quantity/Instances.html#RelativeHumidity"
},
"Sensor": {
"name": "Humidity Sensor",
"name": "humidity",
"description": "Sensor for measuring humidity"
},
"Observations": [
@@ -67,7 +67,7 @@
"definition": "http://www.qudt.org/qudt/owl/1.0.0/quantity/Instances.html#TotalVolatileOrganicCompounds"
},
"Sensor": {
"name": "TVOC Sensor",
"name": "etcov",
"description": "Sensor for measuring Total Volatile Organic Compounds"
},
"Observations": [
@@ -91,7 +91,7 @@
"definition": "http://www.qudt.org/qudt/owl/1.0.0/quantity/Instances.html#CarbonDioxideConcentration"
},
"Sensor": {
"name": "eCO2 Sensor",
"name": "eco2",
"description": "Sensor for measuring Equivalent Carbon Dioxide"
},
"Observations": [