Skip to content

Commit ac0d232

Browse files
john30john30
committed
rework+merge PR #201 
1 parent 21e5bbe commit ac0d232

File tree

5 files changed

+33
-18
lines changed

5 files changed

+33
-18
lines changed

‎ebusd-2.1.x/en/vaillant/bai.0010004121.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ r,,HwcSetPotmeter,DHWSetPotmeter,,,,"F103",,,temp,,,DHW setpoint potentiometer
139139
r,,ProductionByte,ProductionByte,,,,"3E04",,,UCH,,,
140140
r,,SerialNumber,SerialNumber,,,,"3F04",,,HEX:8,,,serial number of AI
141141
# ##### dia level 2 #####,,,,,,,,,,,,,
142-
r;wi,,WPPWMPowerDia,d.14 WP_PWMPowerDia_DK,,,,"A100",,,UCH,,,Set-PWM-Powerrate of electronic-pump
142+
r;wi,,PumpPowerDesired,d.14 Desired heating pump power,,,,A100,,,UCH,0=auto;1=53;2=60;3=70;4=85;5=100,%,PWM-Desired central heating pump power,,,
143143
r;wi,,ReturnRegulation,d.17 Return regulation,,,,"0C04",,,onoff,,,heating flow/return regulation activation
144144
r;wi,,HcPumpMode,d.18 CH pump mode,,,,"4904",,,UCH,0=post run;1=permanent;2=winter,,"Pump mode: 0=post run, 1=continous, 2=Winter, 3=intermittend"
145145
r;wi,,HwcTempMax,d.20 Max value tanksetpoint,,,,"4304",,,temp,,,Adjustment of maximum tank setpoint range (maximum endposition of potmeter)

‎src/de.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2780,7 +2780,7 @@ Pred_AirPressure_RefPressureSum_DK: Pred_AirPressure_RefPressureSum_DK
27802780
SR_FLIDE_Mode_DK: SR_FLIDE_Mode_DK
27812781
CO_Sensor_SNR: CO_Sensor_SNR
27822782
value of waterpressure-sensor: 'Wasserdruck: value of waterpressure-sensor'
2783-
'd.14 WP_PWMPowerDia_DK: Set-PWM-Powerrate of electronic-pump': 'd.14 WP_PWMPowerDia_DK: Set-PWM-Powerrate of electronic-pump'
2783+
d.14 Desired heating pump power: 'd.14 WP_PWMPowerDia_DK: Set-PWM-Powerrate of electronic-pump'
27842784
'Pump mode: 0=post run, 1=continous, 2=Winter, 3=intermittend': 'Pump mode: 0=post run, 1=continous, 2=Winter, 3=intermittend'
27852785
Option relais function: Option relais function
27862786
d.26 OptionRelais_DK: d.26 OptionRelais_DK
@@ -2872,6 +2872,7 @@ digital ionisation voltage: digital ionisation voltage
28722872
'WaterpressureBranchControlOff_DK: water pressure branch control off': >-
28732873
Drucksprungerkennung ausschalten: Überwachung der Druckänderung beim Schalten
28742874
der Pumpe kann hiermit aktiviert oder deaktiviert werden
2875+
'd.14 WP_PWMPowerDia_DK: Set-PWM-Powerrate of electronic-pump': 'd.14 WP_PWMPowerDia_DK: Set-PWM-Powerrate of electronic-pump'
28752876
'd.63 exhaust way block counter: numbers the exhaust way was blocked': 'd.63 exhaust way block counter: numbers the exhaust way was blocked'
28762877
'WarmstartDemand: activation of warmstart': 'Warmstartanforderung: activation of warmstart'
28772878
'd.03 Temp DHW: actoSTOR inletsensor temperature': 'd.03 WW Vorlaufsolltemp: actoSTOR inletsensor temperature'
@@ -2919,7 +2920,6 @@ d.02 Max blocking time CH: d.02 Maximale Brennersperrzeit
29192920
'd.10 Central heating pump: Internal central heating pump': 'd.10 Wasserpumpe: Interne Heizungspumpe'
29202921
'd.11 External heating pump: External central heating pump': 'd.11 ext. Heizungspumpe: Externe Heizungspumpe'
29212922
PWM-Desired central heating pump power: PWM-Leistungsstufe der Heizungspumpe
2922-
d.14 Desired heating pump power: d.14 Leistung Heizungspumpe Soll
29232923
'd.15 Current heating pump power: Current central heating pump power': d.15 Leistung Heizungspumpe
29242924
'd.16 Room thermostat 24 V: xternal controls heat demand (Clamp 3-4)': 'd.16 Raumthermostat: Wärmeanforderung vom externen Regler (Klemme 3-4)'
29252925
'd.22 DHW demand: Domestic hot water demand': >-

‎src/en.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2621,7 +2621,7 @@ Pred_AirPressure_RefPressureSum_DK: Pred_AirPressure_RefPressureSum_DK
26212621
SR_FLIDE_Mode_DK: SR_FLIDE_Mode_DK
26222622
CO_Sensor_SNR: CO_Sensor_SNR
26232623
value of waterpressure-sensor: value of waterpressure-sensor
2624-
'd.14 WP_PWMPowerDia_DK: Set-PWM-Powerrate of electronic-pump': 'd.14 WP_PWMPowerDia_DK: Set-PWM-Powerrate of electronic-pump'
2624+
d.14 Desired heating pump power: d.14 Desired heating pump power
26252625
'Pump mode: 0=post run, 1=continous, 2=Winter, 3=intermittend': 'Pump mode: 0=post run, 1=continous, 2=Winter, 3=intermittend'
26262626
Option relais function: Option relais function
26272627
d.26 OptionRelais_DK: d.26 OptionRelais_DK
@@ -2715,6 +2715,7 @@ maximum waterpressure threshold: maximum waterpressure threshold
27152715
AWPC_EE_MaxThreshold_DK: AWPC_EE_MaxThreshold_DK
27162716
digital ionisation voltage: digital ionisation voltage
27172717
'WaterpressureBranchControlOff_DK: water pressure branch control off': 'WaterpressureBranchControlOff_DK: water pressure branch control off'
2718+
'd.14 WP_PWMPowerDia_DK: Set-PWM-Powerrate of electronic-pump': 'd.14 WP_PWMPowerDia_DK: Set-PWM-Powerrate of electronic-pump'
27182719
'd.63 exhaust way block counter: numbers the exhaust way was blocked': 'd.63 exhaust way block counter: numbers the exhaust way was blocked'
27192720
'WarmstartDemand: activation of warmstart': 'WarmstartDemand: activation of warmstart'
27202721
'd.03 Temp DHW: actoSTOR inletsensor temperature': 'd.03 Temp DHW: actoSTOR inletsensor temperature'
@@ -2759,7 +2760,6 @@ d.02 Max blocking time CH: d.02 Max blocking time CH
27592760
'd.10 Central heating pump: Internal central heating pump': 'd.10 Central heating pump: Internal central heating pump'
27602761
'd.11 External heating pump: External central heating pump': 'd.11 External heating pump: External central heating pump'
27612762
PWM-Desired central heating pump power: PWM-Desired central heating pump power
2762-
d.14 Desired heating pump power: d.14 Desired heating pump power
27632763
'd.15 Current heating pump power: Current central heating pump power': 'd.15 Current heating pump power: Current central heating pump power'
27642764
'd.16 Room thermostat 24 V: xternal controls heat demand (Clamp 3-4)': 'd.16 Room thermostat 24 V: xternal controls heat demand (Clamp 3-4)'
27652765
'd.22 DHW demand: Domestic hot water demand': 'd.22 DHW demand: Domestic hot water demand'

‎src/i18n.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17488,13 +17488,14 @@ valueofwaterpressuresensor:
1748817488
locations:
1748917489
- vaillant/bai.0010004121.inc::r::0x2,0
1749017490
- vaillant/bai.0010006101.inc::r::0x2,0
17491-
d14wppwmpowerdiadksetpwmpowerrateofelectronicpump:
17492-
first: 'd.14 WP_PWMPowerDia_DK: Set-PWM-Powerrate of electronic-pump'
17493-
en: 'd.14 WP_PWMPowerDia_DK: Set-PWM-Powerrate of electronic-pump'
17491+
d14desiredheatingpumppower:
17492+
first: d.14 Desired heating pump power
17493+
en: d.14 Desired heating pump power
1749417494
de: 'd.14 WP_PWMPowerDia_DK: Set-PWM-Powerrate of electronic-pump'
1749517495
locations:
1749617496
- vaillant/bai.0010004121.inc::r::0xa1,0
17497-
- vaillant/bai.0010006101.inc::r::0xa,0x4
17497+
- vaillant/bai.0010015600.inc::r::0xa1,0
17498+
- vaillant/bai.0010021961.inc::r::0xa1,0
1749817499
pumpmode0postrun1continous2winter3intermittend:
1749917500
first: 'Pump mode: 0=post run, 1=continous, 2=Winter, 3=intermittend'
1750017501
en: 'Pump mode: 0=post run, 1=continous, 2=Winter, 3=intermittend'
@@ -18177,6 +18178,12 @@ waterpressurebranchcontroloffdkwaterpressurebranchcontroloff:
1817718178
Schalten der Pumpe kann hiermit aktiviert oder deaktiviert werden
1817818179
locations:
1817918180
- vaillant/bai.0010006101.inc::r::0xaf,0
18181+
d14wppwmpowerdiadksetpwmpowerrateofelectronicpump:
18182+
first: 'd.14 WP_PWMPowerDia_DK: Set-PWM-Powerrate of electronic-pump'
18183+
en: 'd.14 WP_PWMPowerDia_DK: Set-PWM-Powerrate of electronic-pump'
18184+
de: 'd.14 WP_PWMPowerDia_DK: Set-PWM-Powerrate of electronic-pump'
18185+
locations:
18186+
- vaillant/bai.0010006101.inc::r::0xa,0x4
1818018187
d63exhaustwayblockcounternumberstheexhaustwaywasblocked:
1818118188
first: 'd.63 exhaust way block counter: numbers the exhaust way was blocked'
1818218189
en: 'd.63 exhaust way block counter: numbers the exhaust way was blocked'
@@ -18434,13 +18441,6 @@ pwmdesiredcentralheatingpumppower:
1843418441
locations:
1843518442
- vaillant/bai.0010015600.inc::r::0xa1,0:value
1843618443
- vaillant/bai.0010021961.inc::r::0xa1,0:value
18437-
d14desiredheatingpumppower:
18438-
first: d.14 Desired heating pump power
18439-
en: d.14 Desired heating pump power
18440-
de: d.14 Leistung Heizungspumpe Soll
18441-
locations:
18442-
- vaillant/bai.0010015600.inc::r::0xa1,0
18443-
- vaillant/bai.0010021961.inc::r::0xa1,0
1844418444
d15currentheatingpumppowercurrentcentralheatingpumppower:
1844518445
first: 'd.15 Current heating pump power: Current central heating pump power'
1844618446
en: 'd.15 Current heating pump power: Current central heating pump power'

‎src/vaillant/bai.0010004121_inc.tsp‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -664,9 +664,15 @@ namespace Bai._0010004121_inc {
664664
}
665665
// ##### dia level 2 #####
666666

667-
/** d.14 WP_PWMPowerDia_DK: Set-PWM-Powerrate of electronic-pump */
667+
/** d.14 Desired heating pump power */
668+
@inherit(r, wi)
668669
@ext(0xa1, 0)
669-
model WPPWMPowerDia is InstallRegister<UCH>;
670+
model PumpPowerDesired {
671+
/** PWM-Desired central heating pump power */
672+
@unit("%")
673+
@values(Values_PumpPowerDesired)
674+
value: UCH;
675+
}
670676

671677
/** d.17 Return regulation: heating flow/return regulation activation */
672678
@ext(0xc, 0x4)
@@ -1159,6 +1165,15 @@ namespace Bai._0010004121_inc {
11591165
@ext(0xfa, 0)
11601166
model PrEnergyCountHc3 is InstallRegister<ULG>;
11611167

1168+
enum Values_PumpPowerDesired {
1169+
auto: 0,
1170+
_53: 1,
1171+
_60: 2,
1172+
_70: 3,
1173+
_85: 4,
1174+
_100: 5,
1175+
}
1176+
11621177
enum Values_HcPumpMode {
11631178
post_run: 0,
11641179
permanent: 1,

0 commit comments

Comments
 (0)