Skip to content

Commit 21e5bbe

Browse files
john30john30
committed
rework+merge PR #416 
1 parent 00ac2f8 commit 21e5bbe

File tree

9 files changed

+29
-29
lines changed

9 files changed

+29
-29
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ r;wi,,RManagEE.VirtualPartloadEnableTemp,TR_Manag_EE.Virtual_Partload_Enable_DK,
163163
r,,ExternGasvalve,ExternGasvalve_DK,,,,"E400",,,onoff,,,external gasvalve activated
164164
r,,DCFTimeDate,DCF_TimeDate_DK,,,,"E500",,,HEX:8,,,DCF Time / date stamp struct { uchar sec; uchar min; uchar std; uchar tag; uchar mon; uchar wtg; uchar jah; } Tdcf77_time;
165165
r,,InitialisationSequence,InitialisationSequence_DK,,,,"9A01",,,UCH,,,value:0 -> off1-> full initialisation incl. all defaultvalues (done in the production)
166-
r,,FlowSetPotmeter,FlowSetPotmeter,,,,"1900",,,temp,,,flow setpoint potentiometer
166+
r,,FlowSetPotmeter,FlowSetPotmeter,,,,"F003",,,temp,,,flow setpoint potentiometer
167167
r,,HwcSetPotmeter,DHWSetPotmeter,,,,"F103",,,temp,,,DHW setpoint potentiometer
168168
r,,HwcSwitch,DHWSwitch,,,,"F303",,,onoff,,,DHW on/off
169169
r,,ProductionByte,ProductionByte,,,,"3E04",,,UCH,,,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ r,,ExternGasvalve,ExternGasvalve_DK,,,,"E400",,,onoff,,,external gasvalve activa
151151
r,,DCFTimeDate,DCF_TimeDate_DK,,,,"E500",,,HEX:8,,,DCF Time / date stamp struct { uchar sec; uchar min; uchar std; uchar tag; uchar mon; uchar wtg; uchar jah; } Tdcf77_time;
152152
r,,actoSTOREEPreventiveCounter,actoSTOR_EE_PreventiveCounter_DK,,,,"EC00",,,UIN;UIN;UIN,,,Predictive maintenance date of the actoSTOR
153153
r,,InitialisationSequence,InitialisationSequence_DK,,,,"9A01",,,UCH,,,value:0 -> off1-> full initialisation incl. all defaultvalues (done in the production)
154-
r,,FlowSetPotmeter,FlowSetPotmeter,,,,"1900",,,temp,,,flow setpoint potentiometer
154+
r,,FlowSetPotmeter,FlowSetPotmeter,,,,"F003",,,temp,,,flow setpoint potentiometer
155155
r,,HwcSetPotmeter,DHWSetPotmeter,,,,"F103",,,temp,,,DHW setpoint potentiometer
156156
r,,HwcSwitch,DHWSwitch,,,,"F303",,,onoff,,,DHW on/off
157157
r,,ProductionByte,ProductionByte,,,,"3E04",,,UCH,,,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ r,,ExternGasvalve,ExternGasvalve_DK,,,,"E400",,,onoff,,,external gasvalve activa
170170
r,,DCFTimeDate,DCF_TimeDate_DK,,,,"E500",,,HEX:8,,,DCF Time / date stamp struct { uchar sec; uchar min; uchar std; uchar tag; uchar mon; uchar wtg; uchar jah; } Tdcf77_time;
171171
r,,actoSTOREEPreventiveCounter,actoSTOR_EE_PreventiveCounter_DK,,,,"EC00",,,UIN;UIN;UIN,,,Predictive maintenance date of the actoSTOR
172172
r,,InitialisationSequence,InitialisationSequence_DK,,,,"9A01",,,UCH,,,value:0 -> off1-> full initialisation incl. all defaultvalues (done in the production)
173-
r,,FlowSetPotmeter,FlowSetPotmeter,,,,"1900",,,temp,,,flow setpoint potentiometer
173+
r,,FlowSetPotmeter,FlowSetPotmeter,,,,"F003",,,temp,,,flow setpoint potentiometer
174174
r,,HwcSetPotmeter,DHWSetPotmeter,,,,"F103",,,temp,,,DHW setpoint potentiometer
175175
r,,HwcSwitch,DHWSwitch,,,,"F303",,,onoff,,,DHW on/off
176176
r,,ProductionByte,ProductionByte,,,,"3E04",,,UCH,,,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ r,,ExternGasvalve,ExternGasvalve_DK,,,,"E400",,,onoff,,,external gasvalve activa
170170
r,,DCFTimeDate,DCF_TimeDate_DK,,,,"E500",,,HEX:8,,,DCF Time / date stamp struct { uchar sec; uchar min; uchar std; uchar tag; uchar mon; uchar wtg; uchar jah; } Tdcf77_time;
171171
r,,actoSTOREEPreventiveCounter,actoSTOR_EE_PreventiveCounter_DK,,,,"EC00",,,UIN;UIN;UIN,,,Predictive maintenance date of the actoSTOR
172172
r,,InitialisationSequence,InitialisationSequence_DK,,,,"9A01",,,UCH,,,value:0 -> off1-> full initialisation incl. all defaultvalues (done in the production)
173-
r,,FlowSetPotmeter,FlowSetPotmeter,,,,"1900",,,temp,,,flow setpoint potentiometer
173+
r,,FlowSetPotmeter,FlowSetPotmeter,,,,"F003",,,temp,,,flow setpoint potentiometer
174174
r,,HwcSetPotmeter,DHWSetPotmeter,,,,"F103",,,temp,,,DHW setpoint potentiometer
175175
r,,HwcSwitch,DHWSwitch,,,,"F303",,,onoff,,,DHW on/off
176176
r,,ProductionByte,ProductionByte,,,,"3E04",,,UCH,,,

‎src/i18n.yaml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16078,12 +16078,17 @@ prenergysumch1dkpredictivemaintenancedata:
1607816078
locations:
1607916079
- vaillant/bai.0010002315.inc::r::0xf5,0
1608016080
- vaillant/bai.0010002465.inc::r::0xf5,0
16081+
- vaillant/bai.0010003857.inc::r::0xf5,0
16082+
- vaillant/bai.0010003886.inc::r::0xf5,0
1608116083
- vaillant/bai.0010004121.inc::r::0xf5,0
1608216084
- vaillant/bai.0010004150.inc::r::0xf5,0
16085+
- vaillant/bai.0010005400.inc::r::0xf5,0
1608316086
- vaillant/bai.0010006101.inc::r::0xf5,0
1608416087
- vaillant/bai.0010007508.inc::r::0xf4,0
16088+
- vaillant/bai.0010007508.inc::r::0xf5,0
1608516089
- vaillant/bai.0010008045.inc::r::0xf5,0
1608616090
- vaillant/bai.0010010674.inc::r::0xf4,0
16091+
- vaillant/bai.0010010674.inc::r::0xf5,0
1608716092
- vaillant/bai.308523.inc::r::0xf5,0
1608816093
prenergycountch1dkpredictivemaintenancedata:
1608916094
first: 'PrEnergyCountCH1_DK: Predictive Maintenance data'
@@ -16092,15 +16097,14 @@ prenergycountch1dkpredictivemaintenancedata:
1609216097
locations:
1609316098
- vaillant/bai.0010002315.inc::r::0xf6,0
1609416099
- vaillant/bai.0010002465.inc::r::0xf6,0
16095-
- vaillant/bai.0010003857.inc::r::0xf5,0
16096-
- vaillant/bai.0010003886.inc::r::0xf5,0
16100+
- vaillant/bai.0010003857.inc::r::0xf6,0
16101+
- vaillant/bai.0010003886.inc::r::0xf6,0
1609716102
- vaillant/bai.0010004121.inc::r::0xf6,0
1609816103
- vaillant/bai.0010004150.inc::r::0xf6,0
16099-
- vaillant/bai.0010005400.inc::r::0xf5,0
1610016104
- vaillant/bai.0010006101.inc::r::0xf6,0
16101-
- vaillant/bai.0010007508.inc::r::0xf5,0
16105+
- vaillant/bai.0010007508.inc::r::0xf6,0
1610216106
- vaillant/bai.0010008045.inc::r::0xf6,0
16103-
- vaillant/bai.0010010674.inc::r::0xf5,0
16107+
- vaillant/bai.0010010674.inc::r::0xf6,0
1610416108
- vaillant/bai.308523.inc::r::0xf6,0
1610516109
prenergysumch2dkpredictivemaintenancedata:
1610616110
first: 'PrEnergySumCH2_DK: Predictive Maintenance data'
@@ -16109,14 +16113,14 @@ prenergysumch2dkpredictivemaintenancedata:
1610916113
locations:
1611016114
- vaillant/bai.0010002315.inc::r::0xf7,0
1611116115
- vaillant/bai.0010002465.inc::r::0xf7,0
16112-
- vaillant/bai.0010003857.inc::r::0xf6,0
16113-
- vaillant/bai.0010003886.inc::r::0xf6,0
16116+
- vaillant/bai.0010003857.inc::r::0xf7,0
16117+
- vaillant/bai.0010003886.inc::r::0xf7,0
1611416118
- vaillant/bai.0010004121.inc::r::0xf7,0
1611516119
- vaillant/bai.0010004150.inc::r::0xf7,0
1611616120
- vaillant/bai.0010006101.inc::r::0xf7,0
16117-
- vaillant/bai.0010007508.inc::r::0xf6,0
16121+
- vaillant/bai.0010007508.inc::r::0xf7,0
1611816122
- vaillant/bai.0010008045.inc::r::0xf7,0
16119-
- vaillant/bai.0010010674.inc::r::0xf6,0
16123+
- vaillant/bai.0010010674.inc::r::0xf7,0
1612016124
- vaillant/bai.308523.inc::r::0xf7,0
1612116125
prenergycountch2dkpredictivemaintenancedata:
1612216126
first: 'PrEnergyCountCH2_DK: Predictive Maintenance data'
@@ -16125,14 +16129,14 @@ prenergycountch2dkpredictivemaintenancedata:
1612516129
locations:
1612616130
- vaillant/bai.0010002315.inc::r::0xf8,0
1612716131
- vaillant/bai.0010002465.inc::r::0xf8,0
16128-
- vaillant/bai.0010003857.inc::r::0xf7,0
16129-
- vaillant/bai.0010003886.inc::r::0xf7,0
16132+
- vaillant/bai.0010003857.inc::r::0xf8,0
16133+
- vaillant/bai.0010003886.inc::r::0xf8,0
1613016134
- vaillant/bai.0010004121.inc::r::0xf8,0
1613116135
- vaillant/bai.0010004150.inc::r::0xf8,0
1613216136
- vaillant/bai.0010006101.inc::r::0xf8,0
16133-
- vaillant/bai.0010007508.inc::r::0xf7,0
16137+
- vaillant/bai.0010007508.inc::r::0xf8,0
1613416138
- vaillant/bai.0010008045.inc::r::0xf8,0
16135-
- vaillant/bai.0010010674.inc::r::0xf7,0
16139+
- vaillant/bai.0010010674.inc::r::0xf8,0
1613616140
- vaillant/bai.308523.inc::r::0xf8,0
1613716141
prenergysumch3dkpredictivemaintenancedata:
1613816142
first: 'PrEnergySumCH3_DK: Predictive Maintenance data'
@@ -16141,14 +16145,14 @@ prenergysumch3dkpredictivemaintenancedata:
1614116145
locations:
1614216146
- vaillant/bai.0010002315.inc::r::0xf9,0
1614316147
- vaillant/bai.0010002465.inc::r::0xf9,0
16144-
- vaillant/bai.0010003857.inc::r::0xf8,0
16145-
- vaillant/bai.0010003886.inc::r::0xf8,0
16148+
- vaillant/bai.0010003857.inc::r::0xf9,0
16149+
- vaillant/bai.0010003886.inc::r::0xf9,0
1614616150
- vaillant/bai.0010004121.inc::r::0xf9,0
1614716151
- vaillant/bai.0010004150.inc::r::0xf9,0
1614816152
- vaillant/bai.0010006101.inc::r::0xf9,0
16149-
- vaillant/bai.0010007508.inc::r::0xf8,0
16153+
- vaillant/bai.0010007508.inc::r::0xf9,0
1615016154
- vaillant/bai.0010008045.inc::r::0xf9,0
16151-
- vaillant/bai.0010010674.inc::r::0xf8,0
16155+
- vaillant/bai.0010010674.inc::r::0xf9,0
1615216156
- vaillant/bai.308523.inc::r::0xf9,0
1615316157
prenergycountch3dkpredictivemaintenancedata:
1615416158
first: 'PrEnergyCountCH3_DK: Predictive Maintenance data'
@@ -16157,14 +16161,10 @@ prenergycountch3dkpredictivemaintenancedata:
1615716161
locations:
1615816162
- vaillant/bai.0010002315.inc::r::0xfa,0
1615916163
- vaillant/bai.0010002465.inc::r::0xfa,0
16160-
- vaillant/bai.0010003857.inc::r::0xf9,0
16161-
- vaillant/bai.0010003886.inc::r::0xf9,0
1616216164
- vaillant/bai.0010004121.inc::r::0xfa,0
1616316165
- vaillant/bai.0010004150.inc::r::0xfa,0
1616416166
- vaillant/bai.0010006101.inc::r::0xfa,0
16165-
- vaillant/bai.0010007508.inc::r::0xf9,0
1616616167
- vaillant/bai.0010008045.inc::r::0xfa,0
16167-
- vaillant/bai.0010010674.inc::r::0xf9,0
1616816168
- vaillant/bai.308523.inc::r::0xfa,0
1616916169
heatingpartload:
1617016170
first: Heating part load

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,7 @@ namespace Bai._0010005400_inc {
781781
model InitialisationSequence is ReadonlyRegister<UCH>;
782782

783783
/** FlowSetPotmeter: flow setpoint potentiometer */
784-
@ext(0x19, 0)
784+
@ext(0xf0, 0x3)
785785
model FlowSetPotmeter is ReadonlyRegister<temp>;
786786

787787
/** DHWSetPotmeter: DHW setpoint potentiometer */

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ namespace Bai._0010006341_inc {
683683
model InitialisationSequence is ReadonlyRegister<UCH>;
684684

685685
/** FlowSetPotmeter: flow setpoint potentiometer */
686-
@ext(0x19, 0)
686+
@ext(0xf0, 0x3)
687687
model FlowSetPotmeter is ReadonlyRegister<temp>;
688688

689689
/** DHWSetPotmeter: DHW setpoint potentiometer */

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@ namespace Bai._0010007508_inc {
811811
model InitialisationSequence is ReadonlyRegister<UCH>;
812812

813813
/** FlowSetPotmeter: flow setpoint potentiometer */
814-
@ext(0x19, 0)
814+
@ext(0xf0, 0x3)
815815
model FlowSetPotmeter is ReadonlyRegister<temp>;
816816

817817
/** DHWSetPotmeter: DHW setpoint potentiometer */

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,7 @@ namespace Bai._0010010674_inc {
799799
model InitialisationSequence is ReadonlyRegister<UCH>;
800800

801801
/** FlowSetPotmeter: flow setpoint potentiometer */
802-
@ext(0x19, 0)
802+
@ext(0xf0, 0x3)
803803
model FlowSetPotmeter is ReadonlyRegister<temp>;
804804

805805
/** DHWSetPotmeter: DHW setpoint potentiometer */

0 commit comments

Comments
 (0)