andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-13 03:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v2' into v2

Browse Source
This commit is contained in:
Proddy
2020-06-17 17:28:09 +02:00
committed by GitHub
parent 8ab319dcbb ccd999bd6a
commit 3c8f2aff8a
9 changed files with 159 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/devices/thermostat.h
View File

@@ -62,7 +62,6 @@ class Thermostat : public EMSdevice {
uint8_t designtemp = EMS_VALUE_UINT_NOTSET; // heatingcurve design temp at MinExtTemp
int8_t offsettemp = EMS_VALUE_INT_NOTSET; // heatingcurve offest temp at roomtemp signed!
uint8_t hc_num() const {
return hc_num_;
}
@@ -80,13 +79,17 @@ class Thermostat : public EMSdevice {
enum Mode : uint8_t { UNKNOWN, OFF, MANUAL, AUTO, DAY, NIGHT, HEAT, NOFROST, ECO, HOLIDAY, COMFORT, OFFSET, DESIGN, SUMMER };
// for sorting
friend inline bool operator<(const std::shared_ptr<HeatingCircuit> & lhs, const std::shared_ptr<HeatingCircuit> & rhs) {
return (lhs->hc_num_ < rhs->hc_num_);
}
private:
uint8_t hc_num_;
uint16_t monitor_typeid_;
uint16_t set_typeid_;
};
std::string mode_tostring(uint8_t mode) const;
virtual void show_values(uuid::console::Shell & shell);