interfisch
/
sensoresp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix mhz19 calibration handler

This commit is contained in:
interfisch 2021-11-08 20:21:50 +01:00
parent 310fb73fba
commit 875a7c0101
3 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/sensor_mhz19b.cpp
View File

@ -66,25 +66,7 @@ void Sensor_MHZ19B::setSettings(float minchange, unsigned long senddelaymax, uns
}
bool Sensor_MHZ19B::mhz19calibrationHandler(const HomieRange& range, const String& value) {
if (range.isRange) {
return false; //if range is given but index is not in allowed range
}
Homie.getLogger() << "mhz19 calibration " << ": " << value << endl;
if (value=="zero") {
mhz19->calibrateZero();
Homie.getLogger() << "mhz19 calibration " << ": " << value << endl;
#ifdef STATUSNODE
sensorNode->setProperty("status").send("MHZ19 Zero Calibration triggered");
#endif
} else {
Homie.getLogger() << "Value outside range" << endl;
return false;
}
return true;
}
//Called during setup
void Sensor_MHZ19B::advertise(HomieNode& p_sensorNode)
@ -92,7 +74,7 @@ void Sensor_MHZ19B::advertise(HomieNode& p_sensorNode)
sensorNode = &p_sensorNode;
sensorNode->advertise("co2");
#ifdef MHZ19CALIBRATIONTOPIC
sensorNode->advertise("mhz19calibration").settable(&Sensor_MHZ19B::mhz19calibrationHandler)); //not working!!! TODO: Fix it
sensorNode->advertise("mhz19calibration").settable(mhz19calibrationHandler);
#endif
}
@ -169,4 +151,6 @@ int Sensor_MHZ19B::mhz19_readValue_reimplemented(Stream *_streamRef, MHZ19 *_mhz
return co2;
}
void Sensor_MHZ19B::calibrateZero() {
mhz19->calibrateZero();
}

5
include/sensor_mhz19b.h
View File

@ -33,7 +33,7 @@ private:
//#define MHZ19CALIBRATIONTOPIC //TODO: fix it
#define MHZ19CALIBRATIONTOPIC
public:
Sensor_MHZ19B(int prx, int ptx);
@ -43,8 +43,7 @@ public:
void advertise(HomieNode& p_sensorNode);
void sensorloop();
bool mhz19calibrationHandler(const HomieRange& range, const String& value);
void calibrateZero();
};
#endif

33
src/main.cpp
View File

@ -21,6 +21,12 @@
#define STATUSNODE
// data/homie/config.json hochladen mit platformio run --target uploadfs
// config contains homie device name, mqtt ip and wifi credentials
HomieNode sensorNode("sensors", "Sensors","sensors"); //id, name, type
#include "sensordata.h"
@ -189,9 +195,30 @@
#endif
#ifdef SENSOR_MHZ19B
bool mhz19calibrationHandler(const HomieRange& range, const String& value);
#include "sensor_mhz19b.cpp"
Sensor_MHZ19B sensor_mhz19b(SENSOR_MHZ19B_SERIAL_RX,SENSOR_MHZ19B_SERIAL_TX);
bool mhz19calibrationHandler(const HomieRange& range, const String& value) {
if (range.isRange) {
return false; //if range is given but index is not in allowed range
}
Homie.getLogger() << "mhz19 calibration " << ": " << value << endl;
if (value=="zero") {
sensor_mhz19b.calibrateZero();//mhz19->calibrateZero();
Homie.getLogger() << "mhz19 calibration " << ": " << value << endl;
#ifdef STATUSNODE
sensorNode.setProperty("status").send("MHZ19 Zero Calibration triggered");
#endif
} else {
Homie.getLogger() << "Value outside range" << endl;
return false;
}
return true;
}
#ifndef SENSOR_MHZ19B_minchange
#define SENSOR_MHZ19B_minchange 10.0
#endif
@ -317,12 +344,6 @@
#endif
// data/homie/config.json hochladen mit platformio run --target uploadfs
// config contains homie device name, mqtt ip and wifi credentials
HomieNode sensorNode("sensors", "Sensors","sensors"); //id, name, type
char tempstring[16]; //for dtostrf