Skip to content

Commit 00ac2f8

Browse files
john30john30
committed
fix duplication of f400
1 parent 6876030 commit 00ac2f8

File tree

10 files changed

+61
-46
lines changed

10 files changed

+61
-46
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,10 @@ r,,WaterpressureMeasureCounter,WaterpressureMeasureCounter_DK,,,,"F100",,,UCH,,,
157157
r,,PrAPSCounter,PrAPSCounter_DK,,,,"F200",,,UCH,,,Predictive Maintenance data
158158
r,,PrAPSSum,PrAPSSum_DK,,,,"F300",,,seconds2,,,Predictive Maintenance data
159159
r,,PrVortexFlowSensorValue,PrVortexFlowSensorValue_DK,,,,"F400",,,SIN,,ADC,Predictive Maintenance data
160-
r;wi,,PrEnergyCountHc1,PrEnergyCountCH1_DK,,,,"F500",,,ULG,,,Predictive Maintenance data
161-
r;wi,,PrEnergySumHc2,PrEnergySumCH2_DK,,,,"F600",,,ULG,,,Predictive Maintenance data
162-
r;wi,,PrEnergyCountHc2,PrEnergyCountCH2_DK,,,,"F700",,,ULG,,,Predictive Maintenance data
163-
r;wi,,PrEnergySumHc3,PrEnergySumCH3_DK,,,,"F800",,,ULG,,,Predictive Maintenance data
164-
r;wi,,PrEnergyCountHc3,PrEnergyCountCH3_DK,,,,"F900",,,ULG,,,Predictive Maintenance data
160+
r;wi,,PrEnergySumHc1,PrEnergySumCH1_DK,,,,"F500",,,ULG,,,Predictive Maintenance data
161+
r;wi,,PrEnergyCountHc1,PrEnergyCountCH1_DK,,,,"F600",,,ULG,,,Predictive Maintenance data
162+
r;wi,,PrEnergySumHc2,PrEnergySumCH2_DK,,,,"F700",,,ULG,,,Predictive Maintenance data
163+
r;wi,,PrEnergyCountHc2,PrEnergyCountCH2_DK,,,,"F800",,,ULG,,,Predictive Maintenance data
164+
r;wi,,PrEnergySumHc3,PrEnergySumCH3_DK,,,,"F900",,,ULG,,,Predictive Maintenance data
165+
r;wi,,PrEnergyCountHc3,PrEnergyCountCH3_DK,,,,"FA00",,,ULG,,,Predictive Maintenance data
165166
!include,errors.inc,,,,,,,,,,,,

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,10 @@ r,,WaterpressureMeasureCounter,WaterpressureMeasureCounter_DK,,,,"F100",,,UCH,,,
162162
r,,PrAPSCounter,PrAPSCounter_DK,,,,"F200",,,UCH,,,Predictive Maintenance data
163163
r,,PrAPSSum,PrAPSSum_DK,,,,"F300",,,seconds2,,,Predictive Maintenance data
164164
r,,PrVortexFlowSensorValue,PrVortexFlowSensorValue_DK,,,,"F400",,,SIN,,ADC,Predictive Maintenance data
165-
r;wi,,PrEnergyCountHc1,PrEnergyCountCH1_DK,,,,"F500",,,ULG,,,Predictive Maintenance data
166-
r;wi,,PrEnergySumHc2,PrEnergySumCH2_DK,,,,"F600",,,ULG,,,Predictive Maintenance data
167-
r;wi,,PrEnergyCountHc2,PrEnergyCountCH2_DK,,,,"F700",,,ULG,,,Predictive Maintenance data
168-
r;wi,,PrEnergySumHc3,PrEnergySumCH3_DK,,,,"F800",,,ULG,,,Predictive Maintenance data
169-
r;wi,,PrEnergyCountHc3,PrEnergyCountCH3_DK,,,,"F900",,,ULG,,,Predictive Maintenance data
165+
r;wi,,PrEnergySumHc1,PrEnergySumCH1_DK,,,,"F500",,,ULG,,,Predictive Maintenance data
166+
r;wi,,PrEnergyCountHc1,PrEnergyCountCH1_DK,,,,"F600",,,ULG,,,Predictive Maintenance data
167+
r;wi,,PrEnergySumHc2,PrEnergySumCH2_DK,,,,"F700",,,ULG,,,Predictive Maintenance data
168+
r;wi,,PrEnergyCountHc2,PrEnergyCountCH2_DK,,,,"F800",,,ULG,,,Predictive Maintenance data
169+
r;wi,,PrEnergySumHc3,PrEnergySumCH3_DK,,,,"F900",,,ULG,,,Predictive Maintenance data
170+
r;wi,,PrEnergyCountHc3,PrEnergyCountCH3_DK,,,,"FA00",,,ULG,,,Predictive Maintenance data
170171
!include,errors.inc,,,,,,,,,,,,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ r,,PrAPSCounter,PrAPSCounter_DK,,,,"F200",,,UCH,,,Predictive Maintenance data
100100
r,,PrAPSSum,PrAPSSum_DK,,,,"F300",,,seconds2,,,Predictive Maintenance data
101101
r,,CurrentPartload,CurrentPartload,,,,"0001",,,UIN,,kW,Current calculated partload
102102
r,,PrVortexFlowSensorValue,PrVortexFlowSensorValue_DK,,,,"F400",,,SIN,,ADC,Predictive Maintenance data
103-
r;wi,,PrEnergyCountHc1,PrEnergyCountCH1_DK,,,,"F500",,,ULG,,,Predictive Maintenance data
103+
r;wi,,PrEnergySumHc1,PrEnergySumCH1_DK,,,,"F500",,,ULG,,,Predictive Maintenance data
104+
r;wi,,PrEnergyCountHc1,PrEnergyCountCH1_DK,,,,"F600",,,ULG,,,Predictive Maintenance data
104105
# ##### expert level\Main #####,,,,,,,,,,,,,
105106
r,,externalFlowTempDesired,external flowsetpoint,,,,"2500",,,temp,,,Flow target temperature from external regulator to terminal 7-8-9
106107
r,,externalHwcSwitch,DHWSwitch_DK,,,,"0000",,,onoff,,,Demand external tank (via contact)

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,12 @@ r;wi,,PrEnergyCountHwc3,PrEnergyCountDHW3_DK,,,,"CA00",,,ULG,,,Predictive Mainte
102102
r,,CurrentPartload,CurrentPartload,,,,"0001",,,UIN,,kW,Current calculated partload
103103
r,,WaterpressureVariantSum,WaterpressureVariantSum_DK,,,,"F000",,,pressm2,,,Predictive Maintenance data
104104
r,,WaterpressureMeasureCounter,WaterpressureMeasureCounter_DK,,,,"F100",,,UCH,,,Predictive Maintenance data
105-
r;wi,,PrEnergySumHc1,PrEnergySumCH1_DK,,,,"F400",,,ULG,,,Predictive Maintenance data
106-
r;wi,,PrEnergyCountHc1,PrEnergyCountCH1_DK,,,,"F500",,,ULG,,,Predictive Maintenance data
107-
r;wi,,PrEnergySumHc2,PrEnergySumCH2_DK,,,,"F600",,,ULG,,,Predictive Maintenance data
108-
r;wi,,PrEnergyCountHc2,PrEnergyCountCH2_DK,,,,"F700",,,ULG,,,Predictive Maintenance data
109-
r;wi,,PrEnergySumHc3,PrEnergySumCH3_DK,,,,"F800",,,ULG,,,Predictive Maintenance data
110-
r;wi,,PrEnergyCountHc3,PrEnergyCountCH3_DK,,,,"F900",,,ULG,,,Predictive Maintenance data
105+
r;wi,,PrEnergySumHc1,PrEnergySumCH1_DK,,,,"F500",,,ULG,,,Predictive Maintenance data
106+
r;wi,,PrEnergyCountHc1,PrEnergyCountCH1_DK,,,,"F600",,,ULG,,,Predictive Maintenance data
107+
r;wi,,PrEnergySumHc2,PrEnergySumCH2_DK,,,,"F700",,,ULG,,,Predictive Maintenance data
108+
r;wi,,PrEnergyCountHc2,PrEnergyCountCH2_DK,,,,"F800",,,ULG,,,Predictive Maintenance data
109+
r;wi,,PrEnergySumHc3,PrEnergySumCH3_DK,,,,"F900",,,ULG,,,Predictive Maintenance data
110+
r;wi,,PrEnergyCountHc3,PrEnergyCountCH3_DK,,,,"FA00",,,ULG,,,Predictive Maintenance data
111111
# ##### expert level\Main #####,,,,,,,,,,,,,
112112
r,,externalFlowTempDesired,external flowsetpoint,,,,"2500",,,temp,,,Flow target temperature from external regulator to terminal 7-8-9
113113
r,,externalHwcSwitch,DHWSwitch_DK,,,,"0000",,,onoff,,,Demand external tank (via contact)

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,12 @@ r;wi,,PrEnergyCountHwc3,PrEnergyCountDHW3_DK,,,,"CA00",,,ULG,,,Predictive Mainte
102102
r,,CurrentPartload,CurrentPartload,,,,"0001",,,UIN,,kW,Current calculated partload
103103
r,,WaterpressureVariantSum,WaterpressureVariantSum_DK,,,,"F000",,,pressm2,,,Predictive Maintenance data
104104
r,,WaterpressureMeasureCounter,WaterpressureMeasureCounter_DK,,,,"F100",,,UCH,,,Predictive Maintenance data
105-
r;wi,,PrEnergySumHc1,PrEnergySumCH1_DK,,,,"F400",,,ULG,,,Predictive Maintenance data
106-
r;wi,,PrEnergyCountHc1,PrEnergyCountCH1_DK,,,,"F500",,,ULG,,,Predictive Maintenance data
107-
r;wi,,PrEnergySumHc2,PrEnergySumCH2_DK,,,,"F600",,,ULG,,,Predictive Maintenance data
108-
r;wi,,PrEnergyCountHc2,PrEnergyCountCH2_DK,,,,"F700",,,ULG,,,Predictive Maintenance data
109-
r;wi,,PrEnergySumHc3,PrEnergySumCH3_DK,,,,"F800",,,ULG,,,Predictive Maintenance data
110-
r;wi,,PrEnergyCountHc3,PrEnergyCountCH3_DK,,,,"F900",,,ULG,,,Predictive Maintenance data
105+
r;wi,,PrEnergySumHc1,PrEnergySumCH1_DK,,,,"F500",,,ULG,,,Predictive Maintenance data
106+
r;wi,,PrEnergyCountHc1,PrEnergyCountCH1_DK,,,,"F600",,,ULG,,,Predictive Maintenance data
107+
r;wi,,PrEnergySumHc2,PrEnergySumCH2_DK,,,,"F700",,,ULG,,,Predictive Maintenance data
108+
r;wi,,PrEnergyCountHc2,PrEnergyCountCH2_DK,,,,"F800",,,ULG,,,Predictive Maintenance data
109+
r;wi,,PrEnergySumHc3,PrEnergySumCH3_DK,,,,"F900",,,ULG,,,Predictive Maintenance data
110+
r;wi,,PrEnergyCountHc3,PrEnergyCountCH3_DK,,,,"FA00",,,ULG,,,Predictive Maintenance data
111111
# ##### expert level\Main #####,,,,,,,,,,,,,
112112
r,,externalFlowTempDesired,external flowsetpoint,,,,"2500",,,temp,,,Flow target temperature from external regulator to terminal 7-8-9
113113
r,,externalHwcSwitch,DHWSwitch_DK,,,,"0000",,,onoff,,,Demand external tank (via contact)

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -723,24 +723,28 @@ namespace Bai._0010003857_inc {
723723
value: SIN;
724724
}
725725

726-
/** PrEnergyCountCH1_DK: Predictive Maintenance data */
726+
/** PrEnergySumCH1_DK: Predictive Maintenance data */
727727
@ext(0xf5, 0)
728+
model PrEnergySumHc1 is InstallRegister<ULG>;
729+
730+
/** PrEnergyCountCH1_DK: Predictive Maintenance data */
731+
@ext(0xf6, 0)
728732
model PrEnergyCountHc1 is InstallRegister<ULG>;
729733

730734
/** PrEnergySumCH2_DK: Predictive Maintenance data */
731-
@ext(0xf6, 0)
735+
@ext(0xf7, 0)
732736
model PrEnergySumHc2 is InstallRegister<ULG>;
733737

734738
/** PrEnergyCountCH2_DK: Predictive Maintenance data */
735-
@ext(0xf7, 0)
739+
@ext(0xf8, 0)
736740
model PrEnergyCountHc2 is InstallRegister<ULG>;
737741

738742
/** PrEnergySumCH3_DK: Predictive Maintenance data */
739-
@ext(0xf8, 0)
743+
@ext(0xf9, 0)
740744
model PrEnergySumHc3 is InstallRegister<ULG>;
741745

742746
/** PrEnergyCountCH3_DK: Predictive Maintenance data */
743-
@ext(0xf9, 0)
747+
@ext(0xfa, 0)
744748
model PrEnergyCountHc3 is InstallRegister<ULG>;
745749

746750
enum Values_HcPumpMode {

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -743,24 +743,28 @@ namespace Bai._0010003886_inc {
743743
value: SIN;
744744
}
745745

746-
/** PrEnergyCountCH1_DK: Predictive Maintenance data */
746+
/** PrEnergySumCH1_DK: Predictive Maintenance data */
747747
@ext(0xf5, 0)
748+
model PrEnergySumHc1 is InstallRegister<ULG>;
749+
750+
/** PrEnergyCountCH1_DK: Predictive Maintenance data */
751+
@ext(0xf6, 0)
748752
model PrEnergyCountHc1 is InstallRegister<ULG>;
749753

750754
/** PrEnergySumCH2_DK: Predictive Maintenance data */
751-
@ext(0xf6, 0)
755+
@ext(0xf7, 0)
752756
model PrEnergySumHc2 is InstallRegister<ULG>;
753757

754758
/** PrEnergyCountCH2_DK: Predictive Maintenance data */
755-
@ext(0xf7, 0)
759+
@ext(0xf8, 0)
756760
model PrEnergyCountHc2 is InstallRegister<ULG>;
757761

758762
/** PrEnergySumCH3_DK: Predictive Maintenance data */
759-
@ext(0xf8, 0)
763+
@ext(0xf9, 0)
760764
model PrEnergySumHc3 is InstallRegister<ULG>;
761765

762766
/** PrEnergyCountCH3_DK: Predictive Maintenance data */
763-
@ext(0xf9, 0)
767+
@ext(0xfa, 0)
764768
model PrEnergyCountHc3 is InstallRegister<ULG>;
765769

766770
enum Values_HcPumpMode {

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,8 +491,12 @@ namespace Bai._0010005400_inc {
491491
value: SIN;
492492
}
493493

494-
/** PrEnergyCountCH1_DK: Predictive Maintenance data */
494+
/** PrEnergySumCH1_DK: Predictive Maintenance data */
495495
@ext(0xf5, 0)
496+
model PrEnergySumHc1 is InstallRegister<ULG>;
497+
498+
/** PrEnergyCountCH1_DK: Predictive Maintenance data */
499+
@ext(0xf6, 0)
496500
model PrEnergyCountHc1 is InstallRegister<ULG>;
497501
// ##### expert level\Main #####
498502

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -495,27 +495,27 @@ namespace Bai._0010007508_inc {
495495
model WaterpressureMeasureCounter is ReadonlyRegister<UCH>;
496496

497497
/** PrEnergySumCH1_DK: Predictive Maintenance data */
498-
@ext(0xf4, 0)
498+
@ext(0xf5, 0)
499499
model PrEnergySumHc1 is InstallRegister<ULG>;
500500

501501
/** PrEnergyCountCH1_DK: Predictive Maintenance data */
502-
@ext(0xf5, 0)
502+
@ext(0xf6, 0)
503503
model PrEnergyCountHc1 is InstallRegister<ULG>;
504504

505505
/** PrEnergySumCH2_DK: Predictive Maintenance data */
506-
@ext(0xf6, 0)
506+
@ext(0xf7, 0)
507507
model PrEnergySumHc2 is InstallRegister<ULG>;
508508

509509
/** PrEnergyCountCH2_DK: Predictive Maintenance data */
510-
@ext(0xf7, 0)
510+
@ext(0xf8, 0)
511511
model PrEnergyCountHc2 is InstallRegister<ULG>;
512512

513513
/** PrEnergySumCH3_DK: Predictive Maintenance data */
514-
@ext(0xf8, 0)
514+
@ext(0xf9, 0)
515515
model PrEnergySumHc3 is InstallRegister<ULG>;
516516

517517
/** PrEnergyCountCH3_DK: Predictive Maintenance data */
518-
@ext(0xf9, 0)
518+
@ext(0xfa, 0)
519519
model PrEnergyCountHc3 is InstallRegister<ULG>;
520520
// ##### expert level\Main #####
521521

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -483,27 +483,27 @@ namespace Bai._0010010674_inc {
483483
model WaterpressureMeasureCounter is ReadonlyRegister<UCH>;
484484

485485
/** PrEnergySumCH1_DK: Predictive Maintenance data */
486-
@ext(0xf4, 0)
486+
@ext(0xf5, 0)
487487
model PrEnergySumHc1 is InstallRegister<ULG>;
488488

489489
/** PrEnergyCountCH1_DK: Predictive Maintenance data */
490-
@ext(0xf5, 0)
490+
@ext(0xf6, 0)
491491
model PrEnergyCountHc1 is InstallRegister<ULG>;
492492

493493
/** PrEnergySumCH2_DK: Predictive Maintenance data */
494-
@ext(0xf6, 0)
494+
@ext(0xf7, 0)
495495
model PrEnergySumHc2 is InstallRegister<ULG>;
496496

497497
/** PrEnergyCountCH2_DK: Predictive Maintenance data */
498-
@ext(0xf7, 0)
498+
@ext(0xf8, 0)
499499
model PrEnergyCountHc2 is InstallRegister<ULG>;
500500

501501
/** PrEnergySumCH3_DK: Predictive Maintenance data */
502-
@ext(0xf8, 0)
502+
@ext(0xf9, 0)
503503
model PrEnergySumHc3 is InstallRegister<ULG>;
504504

505505
/** PrEnergyCountCH3_DK: Predictive Maintenance data */
506-
@ext(0xf9, 0)
506+
@ext(0xfa, 0)
507507
model PrEnergyCountHc3 is InstallRegister<ULG>;
508508
// ##### expert level\Main #####
509509

0 commit comments

Comments
 (0)