andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-01-31 02:59:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev

Browse Source
This commit is contained in:
Proddy
2020-10-03 21:26:09 +02:00
committed by GitHub
parent 5ab5d747bc eb98caa87a
commit 239e51bc2e
22 changed files with 998 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/devices/thermostat.h
View File

@@ -107,7 +107,8 @@ class Thermostat : public EMSdevice {
static uuid::log::Logger logger_;
void add_commands();
bool export_values(uint8_t mqtt_format, JsonObject & doc);
bool export_values_main(JsonObject & doc);
bool export_values_hc(uint8_t mqtt_format, JsonObject & doc);
// specific thermostat characteristics, stripping the option bits at pos 6 and 7
inline uint8_t model() const {
@@ -122,7 +123,7 @@ class Thermostat : public EMSdevice {
std::string datetime_; // date and time stamp
bool changed_ = false;
bool changed_ = false;
// Installation parameters
uint8_t ibaMainDisplay_ =