mirror of
https://github.com/emsesp/EMS-ESP32.git
synced 2025-12-06 15:59:52 +03:00
add PV max compressor power
This commit is contained in:
@@ -546,6 +546,13 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const
|
|||||||
FL_(hpMaxPower),
|
FL_(hpMaxPower),
|
||||||
DeviceValueUOM::PERCENT,
|
DeviceValueUOM::PERCENT,
|
||||||
MAKE_CF_CB(set_hpMaxPower));
|
MAKE_CF_CB(set_hpMaxPower));
|
||||||
|
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,
|
||||||
|
&pvMaxComp_,
|
||||||
|
DeviceValueType::UINT8,
|
||||||
|
DeviceValueNumOp::DV_NUMOP_DIV10,
|
||||||
|
FL_(pvMaxComp),
|
||||||
|
DeviceValueUOM::KW,
|
||||||
|
MAKE_CF_CB(set_pvMaxComp));
|
||||||
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,
|
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,
|
||||||
&hpSetDiffPress_,
|
&hpSetDiffPress_,
|
||||||
DeviceValueType::UINT8,
|
DeviceValueType::UINT8,
|
||||||
@@ -1929,6 +1936,7 @@ void Boiler::process_HpSilentMode(std::shared_ptr<const Telegram> telegram) {
|
|||||||
has_update(telegram, hpMaxPower_, 31);
|
has_update(telegram, hpMaxPower_, 31);
|
||||||
has_update(telegram, silentFrom_, 52); // in steps of 15 min
|
has_update(telegram, silentFrom_, 52); // in steps of 15 min
|
||||||
has_update(telegram, silentTo_, 53); // in steps of 15 min
|
has_update(telegram, silentTo_, 53); // in steps of 15 min
|
||||||
|
has_update(telegram, pvMaxComp_, 54); // #2062
|
||||||
has_update(telegram, hpshutdown_, 58); // 1 powers off
|
has_update(telegram, hpshutdown_, 58); // 1 powers off
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3104,6 +3112,15 @@ bool Boiler::set_hpMaxPower(const char * value, const int8_t id) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool Boiler::set_pvMaxComp(const char * value, const int8_t id) {
|
||||||
|
float v;
|
||||||
|
if (Helpers::value2float(value, v)) {
|
||||||
|
write_command(0x484, 54, (uint8_t)(v * 10), 0x484);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
bool Boiler::set_hpDiffPress(const char * value, const int8_t id) {
|
bool Boiler::set_hpDiffPress(const char * value, const int8_t id) {
|
||||||
int v;
|
int v;
|
||||||
if (Helpers::value2number(value, v)) {
|
if (Helpers::value2number(value, v)) {
|
||||||
|
|||||||
@@ -254,6 +254,7 @@ class Boiler : public EMSdevice {
|
|||||||
uint8_t maxHeatHeat_;
|
uint8_t maxHeatHeat_;
|
||||||
uint8_t maxHeatDhw_;
|
uint8_t maxHeatDhw_;
|
||||||
uint8_t hpMaxPower_;
|
uint8_t hpMaxPower_;
|
||||||
|
uint8_t pvMaxComp_;
|
||||||
|
|
||||||
uint8_t pvCooling_;
|
uint8_t pvCooling_;
|
||||||
uint8_t manDefrost_;
|
uint8_t manDefrost_;
|
||||||
@@ -476,6 +477,7 @@ class Boiler : public EMSdevice {
|
|||||||
bool set_hpCircPumpWw(const char * value, const int8_t id);
|
bool set_hpCircPumpWw(const char * value, const int8_t id);
|
||||||
bool set_hpPumpMode(const char * value, const int8_t id);
|
bool set_hpPumpMode(const char * value, const int8_t id);
|
||||||
bool set_hpMaxPower(const char * value, const int8_t id);
|
bool set_hpMaxPower(const char * value, const int8_t id);
|
||||||
|
bool set_pvMaxComp(const char * value, const int8_t id);
|
||||||
bool set_hpDiffPress(const char * value, const int8_t id);
|
bool set_hpDiffPress(const char * value, const int8_t id);
|
||||||
bool set_hpPowerLimit(const char * value, const int8_t id);
|
bool set_hpPowerLimit(const char * value, const int8_t id);
|
||||||
|
|
||||||
|
|||||||
@@ -409,6 +409,7 @@ MAKE_TRANSLATION(hpSwitchValve, "hpswitchvalve", "switch valve", "Schaltventil",
|
|||||||
MAKE_TRANSLATION(hpActivity, "hpactivity", "compressor activity", "Kompressoraktivität", "Compressoractiviteit", "Kompressoraktivitet", "pompa ciepła, aktywność sprężarki", "kompressoraktivitet", "", "hp ısı pompası", "attività compressore", "činnosť kompresora") // TODO translate
|
MAKE_TRANSLATION(hpActivity, "hpactivity", "compressor activity", "Kompressoraktivität", "Compressoractiviteit", "Kompressoraktivitet", "pompa ciepła, aktywność sprężarki", "kompressoraktivitet", "", "hp ısı pompası", "attività compressore", "činnosť kompresora") // TODO translate
|
||||||
|
|
||||||
MAKE_TRANSLATION(hpMaxPower, "hpmaxpower", "compressor max power", "max. Kompressorleistung", "", "", "maksymalna wydajność sprężarki", "", "", "", "", "max výkon kompresora") // TODO translate
|
MAKE_TRANSLATION(hpMaxPower, "hpmaxpower", "compressor max power", "max. Kompressorleistung", "", "", "maksymalna wydajność sprężarki", "", "", "", "", "max výkon kompresora") // TODO translate
|
||||||
|
MAKE_TRANSLATION(pvMaxComp, "pvmaxcomp", "pv compressor max power", "PV max. Kompressorleistung", "", "", "maksymalna wydajność sprężarki", "", "", "", "", "pv max výkon kompresora") // TODO translate
|
||||||
MAKE_TRANSLATION(hpPower, "hppower", "compressor power output", "Kompressorleistung", "Compressorvermogen", "Kompressoreffekt", "moc wyjściowa sprężarki", "kompressoreffekt", "puissance de sortie compresseur", "ısı pompası güç çıkışı", "potenza uscita compressore", "výkon kompresora")
|
MAKE_TRANSLATION(hpPower, "hppower", "compressor power output", "Kompressorleistung", "Compressorvermogen", "Kompressoreffekt", "moc wyjściowa sprężarki", "kompressoreffekt", "puissance de sortie compresseur", "ısı pompası güç çıkışı", "potenza uscita compressore", "výkon kompresora")
|
||||||
MAKE_TRANSLATION(hpTc0, "hptc0", "heat carrier return (TC0)", "Kältemittelrücklauf (TC0)", "Koudemiddel retour (TC0)", "Värmebärare Retur (TC0)", "temperatura nośnika ciepła na powrocie (TC0)", "kjølemiddel retur (TC0)", "retour caloporteur (TC0)", "sıcak su dönüşü (TC0)", "ritorno del refrigerante (TC0)", "návrat nosiča tepla (TC0)")
|
MAKE_TRANSLATION(hpTc0, "hptc0", "heat carrier return (TC0)", "Kältemittelrücklauf (TC0)", "Koudemiddel retour (TC0)", "Värmebärare Retur (TC0)", "temperatura nośnika ciepła na powrocie (TC0)", "kjølemiddel retur (TC0)", "retour caloporteur (TC0)", "sıcak su dönüşü (TC0)", "ritorno del refrigerante (TC0)", "návrat nosiča tepla (TC0)")
|
||||||
MAKE_TRANSLATION(hpTc1, "hptc1", "heat carrier forward (TC1)", "Kältemittelvorlauf (TC1)", "Koudemiddel aanvoer (TC1)", "Värmebärare Framledning (TC1)", "temperatura nośnika ciepła pierwotna (TC1)", "kjølemiddel tur (TC1)", "avance caloporteur (TC1)", "sıcak su çıkışı (TC1)", "flusso di refrigerante (TC1)", "nosič tepla vpred (TC1)")
|
MAKE_TRANSLATION(hpTc1, "hptc1", "heat carrier forward (TC1)", "Kältemittelvorlauf (TC1)", "Koudemiddel aanvoer (TC1)", "Värmebärare Framledning (TC1)", "temperatura nośnika ciepła pierwotna (TC1)", "kjølemiddel tur (TC1)", "avance caloporteur (TC1)", "sıcak su çıkışı (TC1)", "flusso di refrigerante (TC1)", "nosič tepla vpred (TC1)")
|
||||||
|
|||||||
Reference in New Issue
Block a user