This commit is contained in:
proddy
2025-12-29 12:31:42 +01:00
parent d73ca2c890
commit 484b547df5
5 changed files with 5913 additions and 5914 deletions

View File

@@ -4138,7 +4138,7 @@
| hc1.switchprogmode | switch program mode | enum [level\|absolute] | | true | HC | 52 | 1 | 1 |
| hc1.redthreshold | reduction threshold | int8 (>=12<=22) | C | true | HC | 53 | 1 | 1/2 |
| hc1.solarinfl | solar influence | uint8 (>=-5<=4294967295) | C | true | HC | 54 | 1 | 1 |
| hc1.currsolarinfl | curent solar influence | uint8 (>=0<=25) | C | false | HC | 55 | 1 | 1/10 |
| hc1.currsolarinfl | current solar influence | uint8 (>=0<=25) | C | false | HC | 55 | 1 | 1/10 |
| hc1.heatingpid | heating PID | enum [fast\|medium\|slow] | | true | HC | 56 | 1 | 1 |
| hc1.pumpopt | pump optimization | boolean | | true | HC | 57 | 1 | 1 |
| hc1.inttimefloor | integral time floor | uint8 (>=160<=320) | minutes | true | HC | 58 | 1 | 10 |
@@ -4573,7 +4573,7 @@
| hc1.switchprogmode | switch program mode | enum [level\|absolute] | | true | HC | 52 | 1 | 1 |
| hc1.redthreshold | reduction threshold | int8 (>=12<=22) | C | true | HC | 53 | 1 | 1/2 |
| hc1.solarinfl | solar influence | uint8 (>=-5<=4294967295) | C | true | HC | 54 | 1 | 1 |
| hc1.currsolarinfl | curent solar influence | uint8 (>=0<=25) | C | false | HC | 55 | 1 | 1/10 |
| hc1.currsolarinfl | current solar influence | uint8 (>=0<=25) | C | false | HC | 55 | 1 | 1/10 |
| hc1.heatingpid | heating PID | enum [fast\|medium\|slow] | | true | HC | 56 | 1 | 1 |
| hc1.pumpopt | pump optimization | boolean | | true | HC | 57 | 1 | 1 |
| hc1.inttimefloor | integral time floor | uint8 (>=160<=320) | minutes | true | HC | 58 | 1 | 10 |
@@ -4672,7 +4672,7 @@
| hc1.switchprogmode | switch program mode | enum [level\|absolute] | | true | HC | 52 | 1 | 1 |
| hc1.redthreshold | reduction threshold | int8 (>=12<=22) | C | true | HC | 53 | 1 | 1/2 |
| hc1.solarinfl | solar influence | uint8 (>=-5<=4294967295) | C | true | HC | 54 | 1 | 1 |
| hc1.currsolarinfl | curent solar influence | uint8 (>=0<=25) | C | false | HC | 55 | 1 | 1/10 |
| hc1.currsolarinfl | current solar influence | uint8 (>=0<=25) | C | false | HC | 55 | 1 | 1/10 |
| hc1.heatingpid | heating PID | enum [fast\|medium\|slow] | | true | HC | 56 | 1 | 1 |
| hc1.pumpopt | pump optimization | boolean | | true | HC | 57 | 1 | 1 |
| hc1.inttimefloor | integral time floor | uint8 (>=160<=320) | minutes | true | HC | 58 | 1 | 10 |
@@ -4784,7 +4784,7 @@
| hc1.switchprogmode | switch program mode | enum [level\|absolute] | | true | HC | 52 | 1 | 1 |
| hc1.redthreshold | reduction threshold | int8 (>=12<=22) | C | true | HC | 53 | 1 | 1/2 |
| hc1.solarinfl | solar influence | uint8 (>=-5<=4294967295) | C | true | HC | 54 | 1 | 1 |
| hc1.currsolarinfl | curent solar influence | uint8 (>=0<=25) | C | false | HC | 55 | 1 | 1/10 |
| hc1.currsolarinfl | current solar influence | uint8 (>=0<=25) | C | false | HC | 55 | 1 | 1/10 |
| hc1.heatingpid | heating PID | enum [fast\|medium\|slow] | | true | HC | 56 | 1 | 1 |
| hc1.pumpopt | pump optimization | boolean | | true | HC | 57 | 1 | 1 |
| hc1.inttimefloor | integral time floor | uint8 (>=160<=320) | minutes | true | HC | 58 | 1 | 10 |
@@ -4922,7 +4922,7 @@
| hc1.switchprogmode | switch program mode | enum [level\|absolute] | | true | HC | 52 | 1 | 1 |
| hc1.redthreshold | reduction threshold | int8 (>=12<=22) | C | true | HC | 53 | 1 | 1/2 |
| hc1.solarinfl | solar influence | uint8 (>=-5<=4294967295) | C | true | HC | 54 | 1 | 1 |
| hc1.currsolarinfl | curent solar influence | uint8 (>=0<=25) | C | false | HC | 55 | 1 | 1/10 |
| hc1.currsolarinfl | current solar influence | uint8 (>=0<=25) | C | false | HC | 55 | 1 | 1/10 |
| hc1.heatingpid | heating PID | enum [fast\|medium\|slow] | | true | HC | 56 | 1 | 1 |
| hc1.pumpopt | pump optimization | boolean | | true | HC | 57 | 1 | 1 |
| hc1.inttimefloor | integral time floor | uint8 (>=160<=320) | minutes | true | HC | 58 | 1 | 10 |
@@ -6299,7 +6299,7 @@
| dhw.disinfectiontemp | disinfection temperature | uint8 (>=0<=254) | C | true | DHW | 8 | 1 | 1 |
| dhw.circ | circulation active | boolean | | true | DHW | 9 | 1 | 1 |
| dhw.circmode | circulation pump mode | enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] | | true | DHW | 10 | 1 | 1 |
| dhw.circtc | circulation time controled | boolean | | true | DHW | 22 | 1 | 1 |
| dhw.circtc | circulation time controlled | boolean | | true | DHW | 22 | 1 | 1 |
| dhw.keepwarm | keep warm | boolean | | true | DHW | 23 | 1 | 1 |
| dhw.status2 | status 2 | enum [\|\|\|no heat\|\|\|heat request\|\|disinfecting\|hold] | | false | DHW | 24 | 1 | 1 |
| dhw.pumpmod | pump modulation | uint8 (>=0<=100) | % | false | DHW | 25 | 1 | 1 |
@@ -6325,7 +6325,7 @@
| dhw.disinfectiontemp | disinfection temperature | uint8 (>=0<=254) | C | true | DHW | 8 | 1 | 1 |
| dhw.circ | circulation active | boolean | | true | DHW | 9 | 1 | 1 |
| dhw.circmode | circulation pump mode | enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] | | true | DHW | 10 | 1 | 1 |
| dhw.circtc | circulation time controled | boolean | | true | DHW | 22 | 1 | 1 |
| dhw.circtc | circulation time controlled | boolean | | true | DHW | 22 | 1 | 1 |
| dhw.keepwarm | keep warm | boolean | | true | DHW | 23 | 1 | 1 |
| dhw.status2 | status 2 | enum [\|\|\|no heat\|\|\|heat request\|\|disinfecting\|hold] | | false | DHW | 24 | 1 | 1 |
| dhw.pumpmod | pump modulation | uint8 (>=0<=100) | % | false | DHW | 25 | 1 | 1 |

File diff suppressed because it is too large Load Diff

View File

@@ -187,7 +187,6 @@ Connack
CONNACK
connectcb
connectcount
controled
controlmode
coolingcircuit
coolingon

View File

@@ -821,7 +821,7 @@ MAKE_TRANSLATION(vacations8, "vacations8", "vacation dates 8", "Urlaubstage 8",
MAKE_TRANSLATION(absent, "absent", "absent", "Abwesend", "", "Frånvarande", "", "", "", "", "", "chýbajúci", "chybějící")
MAKE_TRANSLATION(redthreshold, "redthreshold", "reduction threshold", "Absenkschwelle", "", "Tröskel för sänkning", "", "", "", "", "", "zníženie tresholdu", "práh snížení")
MAKE_TRANSLATION(solarinfl, "solarinfl", "solar influence", "Solareinfluß", "", "", "", "", "", "", "", "slnečný vplyv", "sluneční vliv")
MAKE_TRANSLATION(currsolarinfl, "currsolarinfl", "curent solar influence", "akt. Solareinfluß", "", "", "", "", "", "", "", "aktuálny slnečný vplyv", "aktuální sluneční vliv")
MAKE_TRANSLATION(currsolarinfl, "currsolarinfl", "current solar influence", "akt. Solareinfluß", "", "", "", "", "", "", "", "aktuálny slnečný vplyv", "aktuální sluneční vliv")
MAKE_TRANSLATION(hpmode, "hpmode", "HP Mode", "WP-Modus", "Modus warmtepomp", "Värmepumpsläge", "tryb pracy pompy ciepła", "", "", "yüksek güç modu", "Modalità Termopompa", "Režim TČ", "režim tepelného čerpadla")
MAKE_TRANSLATION(dewoffset, "dewoffset", "dew point offset", "Taupunktdifferenz", "Offset dauwpunt", "Daggpunktsförskjutning", "przesunięcie punktu rosy", "", "", "çiğ noktası göreli", "differenza del punto di rugiada", "posun rosného bodu", "offset rosného bodu")
@@ -906,7 +906,7 @@ MAKE_TRANSLATION(wwTemp5, "temp5", "temperature 5", "Temperatur 5", "Temperatuur
MAKE_TRANSLATION(wwTemp6, "temp6", "temperature 6", "Temperatur 6", "Temperatuur 6", "Temperatur 6", "temperatura 6", "temperatur 6", "température 6", "sıcaklık 6", "Temperatura 6", "teplota 6", "teplota 6")
// MAKE_TRANSLATION(wwTemp7, "temp7", "temperature 7", "Temperatur 7", "Temperatuur 7", "Temperatur 7", "temperatura 7", "Temperatur 7", "température 7", "sıcaklık 7", "Temperatura 7", "teplota 7", "teplota 7")
MAKE_TRANSLATION(wwPump, "pump", "pump", "Pumpe", "Pomp", "Pump", "pompa", "pumpe", "pompe", "pompa", "Pompa", "čerpadlo", "čerpadlo")
MAKE_TRANSLATION(wwCircTc, "circtc", "circulation time controled", "zeitgesteuerte Zirkulation", "", "Tidsstyrd cirkulation", "", "", "", "", "", "riadená doba cirkulácie", "řízený čas cirkulace")
MAKE_TRANSLATION(wwCircTc, "circtc", "circulation time controlled", "zeitgesteuerte Zirkulation", "", "Tidsstyrd cirkulation", "", "", "", "", "", "riadená doba cirkulácie", "řízený čas cirkulace")
MAKE_TRANSLATION(errorDisp, "errordisp", "error display", "Fehleranzeige", "", "Feldisplay", "wyświetlanie błędów", "", "", "", "", "zobrazenie chyby", "zobrazení chyb")
MAKE_TRANSLATION(deltaTRet, "deltatret", "temp. diff. return valve", "Temperaturdifferenz Rücklaufventil", "", "Temperaturskillnad returventil", "różnica temp. zaworu powrotnego", "", "", "", "", "rozdiel teplôt spätného ventilu", "rozdíl teploty zpátečního ventilu")

View File

@@ -141,7 +141,7 @@ void Water::process_SM100wwParam2(std::shared_ptr<const Telegram> telegram) {
void Water::process_SM100wwCirc(std::shared_ptr<const Telegram> telegram) {
has_update(telegram, wwCirc_, 0);
has_update(telegram, wwCircMode_, 3);
has_update(telegram, wwCircTc_, 4); // time controled on/off
has_update(telegram, wwCircTc_, 4); // time controlled on/off
}
// SM100wwKeepWarm - 0x7AE, keepWarm
@@ -351,7 +351,7 @@ bool Water::set_wwCircMode(const char * value, const int8_t id) {
return true;
}
// set time controled mode on/off
// set time controlled mode on/off
bool Water::set_wwCircTc(const char * value, const int8_t id) {
bool b;
if (!Helpers::value2bool(value, b)) {