Compare commits

...

4 Commits

7 changed files with 412 additions and 192 deletions

105
include/sensor_bmp180.cpp Normal file
View File

@ -0,0 +1,105 @@
//Connect SCL to D1, SDA to D2, GND and 3v3
#include "sensor_bmp180.h"
Sensor_BMP180::Sensor_BMP180()
{
Adafruit_BMP085 bmp180;
}
void Sensor_BMP180::init() //Things to be done during setup()
{
Serial.println("initializing bmp180");
if (!bmp180->begin()){
Serial.println("#ERROR: BMP180 init fail\n");
}else{
init_ok=true; //stays false if init failed, sensor will not be read in loop
}
}
//Also called during setup()
void Sensor_BMP180::setSettings_Temperature(float minchange, unsigned long senddelaymax, unsigned long readdelay)
{
data_temperature.minchange=minchange;
data_temperature.senddelaymax=senddelaymax;
data_temperature.readdelay=readdelay;
}
//Also called during setup()
void Sensor_BMP180::setSettings_Pressure(float minchange, unsigned long senddelaymax, unsigned long readdelay)
{
data_pressure.minchange=minchange;
data_pressure.senddelaymax=senddelaymax;
data_pressure.readdelay=readdelay;
}
//Called during setup
void Sensor_BMP180::advertise(HomieNode& p_sensorNode)
{
sensorNode = &p_sensorNode;
sensorNode->advertise("temperature");
sensorNode->advertise("pressure");
}
void Sensor_BMP180::sensorloop()
{
if (init_ok) {
loop_BMP180_temperature();
loop_BMP180_pressure();
}
}
void Sensor_BMP180::loop_BMP180_temperature()
{
sensordata &d=data_temperature;
bool _changed=false;
if (millis() >= (d.lastreadtime+d.readdelay)) {
d.value = bmp180->readTemperature();
if (fabs(d.lastsentvalue-d.value)>=d.minchange){
_changed=true;
}
d.lastreadtime=millis();
}
if (_changed || millis() >= (d.lastsent+d.senddelaymax)) {
Serial.print("Sending BMP180_temperature. reason=");
if (_changed) Serial.println("change"); else Serial.println("time");
if (!(isnan(d.value) == 1)){ //success
sensorNode->setProperty("temperature").send(String(d.value));
Homie.getLogger() << "temperature " << ": " << d.value << endl;
d.lastsentvalue=d.value;
}
d.lastsent=millis();
}
}
void Sensor_BMP180::loop_BMP180_pressure()
{
sensordata &d=data_pressure;
bool _changed=false;
if (millis() >= (d.lastreadtime+d.readdelay)) {
d.value = bmp180->readPressure()/100.0;
if (fabs(d.lastsentvalue-d.value)>=d.minchange){
_changed=true;
}
d.lastreadtime=millis();
}
if (_changed || millis() >= (d.lastsent+d.senddelaymax)) {
Serial.print("Sending BMP180_pressure. reason=");
if (_changed) Serial.println("change"); else Serial.println("time");
if (!(isnan(d.value) == 1)){ //success
Homie.getLogger() << "pressure " << ": " << d.value << endl;
sensorNode->setProperty("pressure").send(String(d.value));
d.lastsentvalue=d.value;
}
d.lastsent=millis();
}
}

37
include/sensor_bmp180.h Normal file
View File

@ -0,0 +1,37 @@
#ifndef SENSOR_BMP180_H
#define SENSOR_BMP180_H
#include "sensordata.h"
#include <Homie.h>
#include <Adafruit_BMP085.h>
class Sensor_BMP180
{
private:
Adafruit_BMP085 *bmp180;
HomieNode *sensorNode; //reference to HomieNode
struct sensordata data_temperature; //struct values are changed in setup()
struct sensordata data_pressure; //struct values are changed in setup()
bool init_ok;
public:
Sensor_BMP180();
void loop_BMP180_temperature();
void loop_BMP180_pressure();
void init();
void setSettings_Temperature(float minchange, unsigned long senddelaymax, unsigned long readdelay);
void setSettings_Pressure(float minchange, unsigned long senddelaymax, unsigned long readdelay);
void advertise(HomieNode& p_sensorNode);
void sensorloop();
};
#endif

110
include/sensor_dht22.cpp Normal file
View File

@ -0,0 +1,110 @@
// Digital pin connected to the DHT sensor. // dht pins: 1=power, 2=data, 3=NC, 4=GND. 10k from data to power needed
#include "sensor_dht22.h"
Sensor_DHT22::Sensor_DHT22(int pin)
{
dht = new DHT(pin,DHT22,11); //default:11
}
void Sensor_DHT22::init() //Things to be done during setup()
{
Serial.println("initializing dht");
dht->begin();
}
//Also called during setup()
void Sensor_DHT22::setSettings_Temperature(float minchange, unsigned long senddelaymax, unsigned long readdelay)
{
dataDHT22_temperature.minchange=minchange;
dataDHT22_temperature.senddelaymax=senddelaymax;
dataDHT22_temperature.readdelay=readdelay;
}
//Also called during setup()
void Sensor_DHT22::setSettings_Humidity(float minchange, unsigned long senddelaymax, unsigned long readdelay)
{
dataDHT22_humidity.minchange=minchange;
dataDHT22_humidity.senddelaymax=senddelaymax;
dataDHT22_humidity.readdelay=readdelay;
}
//Called during setup
void Sensor_DHT22::advertise(HomieNode& p_sensorNode)
{
sensorNode = &p_sensorNode;
#ifndef SENSOR_BMP180
sensorNode->advertise("temperature");
#else
sensorNode->advertise("temperature_dht");
#endif
sensorNode->advertise("humidity");
}
void Sensor_DHT22::sensorloop()
{
loop_DHT22_temperature();
loop_DHT22_humidity();
}
void Sensor_DHT22::loop_DHT22_temperature()
{
sensordata &d=dataDHT22_temperature;
bool _changed=false;
if (millis() >= (d.lastreadtime+d.readdelay)) {
d.value = dht->readTemperature();
if (fabs(d.lastsentvalue-d.value)>=d.minchange){
_changed=true;
}
d.lastreadtime=millis();
}
if (_changed || millis() >= (d.lastsent+d.senddelaymax)) {
Serial.print("Sending DHT22_temperature. reason=");
if (_changed) Serial.println("change"); else Serial.println("time");
if (!(isnan(d.value) == 1)){ //success
#ifndef SENSOR_BMP180
sensorNode->setProperty("temperature").send(String(d.value));
Homie.getLogger() << "temperature " << ": " << d.value << endl;
#else
sensorNode->setProperty("temperature_dht").send(String(d.value));
Homie.getLogger() << "temperature_dht " << ": " << d.value << endl;
#endif
d.lastsentvalue=d.value;
}
d.lastsent=millis();
}
}
void Sensor_DHT22::loop_DHT22_humidity()
{
sensordata &d=dataDHT22_humidity;
bool _changed=false;
if (millis() >= (d.lastreadtime+d.readdelay)) {
d.value = dht->readHumidity();
if (fabs(d.lastsentvalue-d.value)>=d.minchange){
_changed=true;
}
d.lastreadtime=millis();
}
if (_changed || millis() >= (d.lastsent+d.senddelaymax)) {
Serial.print("Sending DHT22_humidity. reason=");
if (_changed) Serial.println("change"); else Serial.println("time");
if (!(isnan(d.value) == 1)){ //success
Homie.getLogger() << "humidity " << ": " << d.value << endl;
sensorNode->setProperty("humidity").send(String(d.value));
d.lastsentvalue=d.value;
}
d.lastsent=millis();
}
}

43
include/sensor_dht22.h Normal file
View File

@ -0,0 +1,43 @@
#ifndef SENSOR_DHT22_H
#define SENSOR_DHT22_H
#include "sensordata.h"
#include <Homie.h>
#include <Adafruit_Sensor.h> //required for dht library
#include <DHT.h>
class Sensor_DHT22
{
private:
DHT *dht;
HomieNode *sensorNode; //reference to HomieNode
struct sensordata dataDHT22_temperature; //struct values are changed in setup()
struct sensordata dataDHT22_humidity; //struct values are changed in setup()
public:
Sensor_DHT22(int pin);
void loop_DHT22_temperature();
void loop_DHT22_humidity();
void init();
void setSettings_Temperature(float minchange, unsigned long senddelaymax, unsigned long readdelay);
void setSettings_Humidity(float minchange, unsigned long senddelaymax, unsigned long readdelay);
void advertise(HomieNode& p_sensorNode);
void sensorloop();
};
#endif

18
include/sensordata.h Normal file
View File

@ -0,0 +1,18 @@
#ifndef SENSORDATA_H
#define SENSORDATA_H
struct sensordata
{
unsigned long lastreadtime=0;
unsigned long readdelay=1000*10; //polling delay
float minchange=0; //send new value if difference to last sent value is greater than this
float lastsentvalue=0;
float value=0;
unsigned long lastsent=0;
unsigned long senddelaymax=1000*60*5; //maximum time until current value is send
};
#endif

View File

@ -8,10 +8,10 @@
; Please visit documentation for the other options and examples
; https://docs.platformio.org/page/projectconf.html
# Flash upload with platformio run -t upload --environment sensorespx
# Flash upload with: pio run -t upload --environment sensorespx
[platformio]
#For Config upload comment in data_dir line and flash with platformio run -t uploadfs --environment sensorespx
#For Config upload comment in data_dir line and flash with: pio run -t uploadfs --environment sensorespx
#data_dir=data_sensoresp0
#data_dir=data_sensoresp1
#data_dir=data_sensoresp2
@ -19,6 +19,7 @@
#data_dir=data_sensoresp4
#data_dir=data_sensoresp5
#data_dir=data_sensoresp3dprinter
data_dir=data_sensoresptest
#Outdoor
@ -66,10 +67,37 @@ build_flags =
lib_deps =
Adafruit BMP085 Library@1.1.0
https://github.com/adafruit/Adafruit_TCS34725
https://github.com/adafruit/Adafruit_TCS34725#1.3.5
ArduinoJson@6.16.1 #dependency of homie. using older version because of "ambiguous overload for operator|" error
Homie@3.0.0
#Test
[env:sensoresptest]
platform = espressif8266 @ 2.5.0
board = d1_mini
framework = arduino
monitor_port = /dev/ttyUSB0
monitor_speed = 115200
build_flags =
-D SENSOR_DHT22
-D SENSOR_DHT22_PIN=D7
-D SENSOR_DHT22_temperature_minchange=0.2
-D SENSOR_DHT22_humidity_minchange=2.0
-D SENSOR_BMP180
-D SENSOR_BMP180_temperature_minchange=0.2
-D SENSOR_BMP180_pressure_minchange=0.5
lib_deps =
DHT sensor library@1.3.10
ArduinoJson@6.16.1 #dependency of homie. using older version because of "ambiguous overload for operator|" error
Homie@3.0.0
Adafruit BMP085 Library@1.1.0
#Arbeitszimmer
[env:sensoresp1]
platform = espressif8266 @ 2.5.0
@ -81,9 +109,9 @@ monitor_speed = 115200
build_flags =
-D SENSOR_DHT22
-D DHTPIN=D7
-D dataDHT22_temperature_minchange=0.2
-D dataDHT22_humidity_minchange=2.0
-D SENSOR_DHT22_PIN=D7
-D SENSOR_DHT22_temperature_minchange=0.2
-D SENSOR_DHT22_humidity_minchange=2.0
-D SENSOR_BMP180
-D dataBMP180_temperature_minchange=0.2

View File

@ -11,46 +11,69 @@
#include "Arduino.h"
#include <Homie.h>
#ifndef HOMIE_H
#include <Homie.h>
#define HOMIE_H
#endif
#define FW_NAME "sensoresp" //gets printed on topic/$fw/name
#define FW_VERSION "1.0.0" //gets printed on topic/$fw/version
#define STATUSNODE
struct sensordata
{
unsigned long lastreadtime=0;
unsigned long readdelay=1000*10; //polling delay
float minchange=0; //send new value if difference to last sent value is greater than this
float lastsentvalue=0;
unsigned long lastsent=0;
unsigned long senddelaymax=1000*60*5; //maximum time until current value is send
};
#include "sensordata.h"
#ifdef SENSOR_DHT22
// Digital pin connected to the DHT sensor. // dht pins: 1=power, 2=data, 3=NC, 4=GND. 10k from data to power needed
#include <Adafruit_Sensor.h> //required for dht library
#include <DHT.h>
DHT dht(DHTPIN,DHT22,11); //default:11
#include "sensor_dht22.cpp"
Sensor_DHT22 sensor_dht22(SENSOR_DHT22_PIN);
struct sensordata dataDHT22_temperature; //struct values are changed in setup()
float value_temperatureDHT=0;
struct sensordata dataDHT22_humidity; //struct values are changed in setup()
float value_humidityDHT=0;
#ifndef SENSOR_DHT22_temperature_minchange
#define SENSOR_DHT22_temperature_minchange 0.2
#endif
#ifndef SENSOR_DHT22_temperature_senddelaymax
#define SENSOR_DHT22_temperature_senddelaymax 300000
#endif
#ifndef SENSOR_DHT22_temperature_readdelay
#define SENSOR_DHT22_temperature_readdelay 10000
#endif
#ifndef SENSOR_DHT22_humidity_minchange
#define SENSOR_DHT22_humidity_minchange 2.0
#endif
#ifndef SENSOR_DHT22_humidity_senddelaymax
#define SENSOR_DHT22_humidity_senddelaymax 300000
#endif
#ifndef SENSOR_DHT22_humidity_readdelay
#define SENSOR_DHT22_humidity_readdelay 10000
#endif
#endif
#ifdef SENSOR_BMP180
//Connect SCL to D1, SDA to D2, GND and 3v3
#include <Adafruit_BMP085.h>
bool bmp180init_ok=false;
Adafruit_BMP085 bmp180;
struct sensordata dataBMP180_temperature; //struct values are changed in setup()
float value_temperatureBMP=0;
struct sensordata dataBMP180_pressure; //struct values are changed in setup()
float value_pressureBMP=0;
#include "sensor_bmp180.cpp"
Sensor_BMP180 sensor_bmp180;
#ifndef SENSOR_BMP180_temperature_minchange
#define SENSOR_BMP180_temperature_minchange 0.2
#endif
#ifndef SENSOR_BMP180_temperature_senddelaymax
#define SENSOR_BMP180_temperature_senddelaymax 300000
#endif
#ifndef SENSOR_BMP180_temperature_readdelay
#define SENSOR_BMP180_temperature_readdelay 10000
#endif
#ifndef SENSOR_BMP180_pressure_minchange
#define SENSOR_BMP180_pressure_minchange 2.0
#endif
#ifndef SENSOR_BMP180_pressure_senddelaymax
#define SENSOR_BMP180_pressure_senddelaymax 300000
#endif
#ifndef SENSOR_BMP180_pressure_readdelay
#define SENSOR_BMP180_pressure_readdelay 10000
#endif
#endif
#ifdef SENSOR_HTU21D
@ -303,32 +326,18 @@ void setup() {
delay(1000); //wait for sensors to get powered
#ifdef SENSOR_DHT22
Serial.println("initializing dht");
dht.begin();
#ifdef dataDHT22_temperature_minchange
dataDHT22_temperature.minchange=dataDHT22_temperature_minchange;
#endif
#ifdef dataDHT22_humidity_minchange
dataDHT22_humidity.minchange=dataDHT22_humidity_minchange;
#endif
sensor_dht22.init();
sensor_dht22.setSettings_Temperature(SENSOR_DHT22_temperature_minchange,SENSOR_DHT22_temperature_senddelaymax,SENSOR_DHT22_temperature_readdelay);
sensor_dht22.setSettings_Humidity(SENSOR_DHT22_humidity_minchange,SENSOR_DHT22_humidity_senddelaymax,SENSOR_DHT22_humidity_readdelay);
#endif
#ifdef SENSOR_BMP180
Serial.println("initializing bmp180");
if (!bmp180.begin()){
Serial.println("#ERROR: BMP180 init fail\n");
}else{
bmp180init_ok=true; //stays false if init failed, sensor will not be read in loop
}
#ifdef dataBMP180_temperature_minchange
dataBMP180_temperature.minchange=dataBMP180_temperature_minchange;
#endif
#ifdef dataBMP180_pressure_minchange
dataBMP180_pressure.minchange=dataBMP180_pressure_minchange;
#endif
sensor_bmp180.init();
sensor_bmp180.setSettings_Temperature(SENSOR_BMP180_temperature_minchange,SENSOR_BMP180_temperature_senddelaymax,SENSOR_BMP180_temperature_readdelay);
sensor_bmp180.setSettings_Pressure(SENSOR_BMP180_temperature_minchange,SENSOR_BMP180_temperature_senddelaymax,SENSOR_BMP180_temperature_readdelay);
#endif
#ifdef SENSOR_HTU21D
@ -541,17 +550,15 @@ void setup() {
#endif
#ifdef SENSOR_DHT22
#ifndef SENSOR_BMP180
sensorNode.advertise("temperature");
#else
sensorNode.advertise("temperature_dht");
#endif
sensorNode.advertise("humidity");
sensor_dht22.advertise(sensorNode);
#endif
#ifdef SENSOR_BMP180
sensor_bmp180.advertise(sensorNode);
#endif
#ifdef SENSOR_HS1101
#if defined(SENSOR_DHT22)
#ifdef SENSOR_DHT22
sensorNode.advertise("humidity_hs1101");
#else
sensorNode.advertise("humidity");
@ -582,10 +589,6 @@ void setup() {
sensorNode.advertise("radar");
#endif
#ifdef SENSOR_BMP180
sensorNode.advertise("temperature");
sensorNode.advertise("pressure");
#endif
#ifdef SENSOR_HTU21D
sensorNode.advertise("temperature_htu");
@ -640,128 +643,7 @@ void loop() {
}
#ifdef SENSOR_DHT22
void loop_DHT22_temperature()
{
sensordata &d=dataDHT22_temperature;
bool _changed=false;
if (millis() >= (d.lastreadtime+d.readdelay)) {
value_temperatureDHT = dht.readTemperature();
if (fabs(d.lastsentvalue-value_temperatureDHT)>=d.minchange){
_changed=true;
}
d.lastreadtime=millis();
}
if (_changed || millis() >= (d.lastsent+d.senddelaymax)) {
Serial.print("Sending DHT22_temperature. reason=");
if (_changed) Serial.println("change"); else Serial.println("time");
checkESPStatus();
if (!(isnan(value_temperatureDHT) == 1)){ //success
#ifndef SENSOR_BMP180
sensorNode.setProperty("temperature").send(String(value_temperatureDHT));
Homie.getLogger() << "temperature " << ": " << value_temperatureDHT << endl;
#else
sensorNode.setProperty("temperature_dht").send(String(value_temperatureDHT));
Homie.getLogger() << "temperature_dht " << ": " << value_temperatureDHT << endl;
#endif
d.lastsentvalue=value_temperatureDHT;
}
d.lastsent=millis();
}
}
void loop_DHT22_humidity()
{
sensordata &d=dataDHT22_humidity;
bool _changed=false;
if (millis() >= (d.lastreadtime+d.readdelay)) {
value_humidityDHT = dht.readHumidity();
if (fabs(d.lastsentvalue-value_humidityDHT)>=d.minchange){
_changed=true;
}
d.lastreadtime=millis();
}
if (_changed || millis() >= (d.lastsent+d.senddelaymax)) {
Serial.print("Sending DHT22_humidity. reason=");
if (_changed) Serial.println("change"); else Serial.println("time");
checkESPStatus();
if (!(isnan(value_humidityDHT) == 1)){ //success
Homie.getLogger() << "humidity " << ": " << value_humidityDHT << endl;
sensorNode.setProperty("humidity").send(String(value_humidityDHT));
d.lastsentvalue=value_humidityDHT;
}
d.lastsent=millis();
}
}
#endif
#ifdef SENSOR_BMP180
void loop_BMP180_temperature()
{
sensordata &d=dataBMP180_temperature;
bool _changed=false;
if (millis() >= (d.lastreadtime+d.readdelay)) {
value_temperatureBMP = bmp180.readTemperature();
if (fabs(d.lastsentvalue-value_temperatureBMP)>=d.minchange){
_changed=true;
}
d.lastreadtime=millis();
}
if (_changed || millis() >= (d.lastsent+d.senddelaymax)) {
Serial.print("Sending BMP180_temperature. reason=");
if (_changed) Serial.println("change"); else Serial.println("time");
checkESPStatus();
if (!(isnan(value_temperatureBMP) == 1)){ //success
sensorNode.setProperty("temperature").send(String(value_temperatureBMP));
Homie.getLogger() << "temperature " << ": " << value_temperatureBMP << endl;
d.lastsentvalue=value_temperatureBMP;
}
d.lastsent=millis();
}
}
void loop_BMP180_pressure()
{
sensordata &d=dataBMP180_pressure;
bool _changed=false;
if (millis() >= (d.lastreadtime+d.readdelay)) {
value_pressureBMP = bmp180.readPressure()/100.0;
if (fabs(d.lastsentvalue-value_pressureBMP)>=d.minchange){
_changed=true;
}
d.lastreadtime=millis();
}
if (_changed || millis() >= (d.lastsent+d.senddelaymax)) {
Serial.print("Sending BMP180_pressure. reason=");
if (_changed) Serial.println("change"); else Serial.println("time");
checkESPStatus();
if (!(isnan(value_pressureBMP) == 1)){ //success
Homie.getLogger() << "pressure " << ": " << value_pressureBMP << endl;
sensorNode.setProperty("pressure").send(String(value_pressureBMP));
d.lastsentvalue=value_pressureBMP;
}
d.lastsent=millis();
}
}
#endif
#ifdef SENSOR_HTU21D
void loop_HTU21D_temperature()
@ -1354,17 +1236,14 @@ void loop_raingauge()
#endif
void loopHandler() {
checkESPStatus();
#ifdef SENSOR_DHT22
loop_DHT22_temperature();
loop_DHT22_humidity();
sensor_dht22.sensorloop();
#endif
#ifdef SENSOR_BMP180
if (bmp180init_ok) {
loop_BMP180_temperature();
loop_BMP180_pressure();
}
sensor_bmp180.sensorloop();
#endif
#ifdef SENSOR_HTU21D