Skip to content

Commit f538bca

Browse files
committed
add quickvetoduration/endtime/enddate as of #423 (reworked)
1 parent 32cff85 commit f538bca

2 files changed

Lines changed: 78 additions & 0 deletions

File tree

ebusd-2.1.x/en/vaillant/15.ctlv2.csv

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,9 @@ r;w,,z1HolidayEndPeriod,Ferienzeitraum Ende Zone 1,,,,0400,,,hto,,,end date of h
153153
r;w,,z1HolidayTemp,Raumsollwert Ferienbetrieb Zone 1,,,,0500,,,tempv,,,holiday setpoint for zone 1
154154
r;w,,z1OpMode,Betriebsart Zone 1,,,,0600,,,opmode,,,operation mode of zone 1
155155
r;w,,z1QuickVetoTemp,Quick Veto Temperatur Zone 1,,,,0800,,,tempv,,,manual override setpoint for zone 1
156+
r;w,,z1QuickVetoDuration,Duration of Quick Veto mode Zone 1,,,,2600,,,EXP,,h,valid values are 0.5-12 in steps of 0.5 and writing enables quick veto mode
157+
r,,z1QuickVetoEndTime,Quick Veto end time Zone 1,,,,1E00,,,HTI,,,
158+
r,,z1QuickVetoEndDate,Quick Veto end date Zone 1,,,,2400,,,date,,,
156159
r;w,,z1NightTemp,Absenktemperatur Zone 1,,,,0900,,,tempv,,,night setpoint for zone 1
157160
r;w,,z1BankHolidayStartPeriod,Bank Feiertag Start Zone 1,,,,0C00,,,hfrom,,,start date of bank holidays for zone 1
158161
r;w,,z1BankHolidayEndPeriod,Bank Feiertag Ende Zone 1,,,,0D00,,,hto,,,end date of bank holidays for zone 1
@@ -176,6 +179,9 @@ r;w,,z2HolidayEndPeriod,Ferienzeitraum Ende Zone 2,,,,0400,,,hto,,,end date of h
176179
r;w,,z2HolidayTemp,Raumsollwert Ferienbetrieb Zone 2,,,,0500,,,tempv,,,holiday setpoint for zone 2
177180
r;w,,z2OpMode,Betriebsart Zone 2,,,,0600,,,opmode,,,operation mode of zone 2
178181
r;w,,z2QuickVetoTemp,Quick Veto Temperatur Zone 2,,,,0800,,,tempv,,,manual override setpoint for zone 2
182+
r;w,,z2QuickVetoDuration,Duration of Quick Veto mode Zone 2,,,,2600,,,EXP,,h,valid values are 0.5-12 in steps of 0.5 and writing enables quick veto mode
183+
r,,z2QuickVetoEndTime,Quick Veto end time Zone 2,,,,1E00,,,HTI,,,
184+
r,,z2QuickVetoEndDate,Quick Veto end date Zone 2,,,,2400,,,date,,,
179185
r;w,,z2NightTemp,Absenktemperatur Zone 2,,,,0900,,,tempv,,,night setpoint for zone 2
180186
r;w,,z2BankHolidayStartPeriod,Bank Feiertag Start Zone 2,,,,0C00,,,hfrom,,,start date of bank holidays for zone 2
181187
r;w,,z2BankHolidayEndPeriod,Bank Feiertag Ende Zone 2,,,,0D00,,,hto,,,end date of bank holidays for zone 2
@@ -198,6 +204,9 @@ r;w,,z3HolidayEndPeriod,Ferienzeitraum Ende Zone 3,,,,0400,,,hto,,,end date of h
198204
r;w,,z3HolidayTemp,Raumsollwert Ferienbetrieb Zone 3,,,,0500,,,tempv,,,holiday setpoint for zone 3
199205
r;w,,z3OpMode,Betriebsart Zone 3,,,,0600,,,opmode,,,operation mode of zone 3
200206
r;w,,z3QuickVetoTemp,Quick Veto Temperatur Zone 3,,,,0800,,,tempv,,,manual override setpoint for zone 3
207+
r;w,,z3QuickVetoDuration,Duration of Quick Veto mode Zone 3,,,,2600,,,EXP,,h,valid values are 0.5-12 in steps of 0.5 and writing enables quick veto mode
208+
r,,z3QuickVetoEndTime,Quick Veto end time Zone 3,,,,1E00,,,HTI,,,
209+
r,,z3QuickVetoEndDate,Quick Veto end date Zone 3,,,,2400,,,date,,,
201210
r;w,,z3NightTemp,Absenktemperatur Zone 3,,,,0900,,,tempv,,,night setpoint for zone 3
202211
r;w,,z3BankHolidayStartPeriod,Bank Feiertag Start Zone 3,,,,0C00,,,hfrom,,,start date of bank holidays for zone 3
203212
r;w,,z3BankHolidayEndPeriod,Bank Feiertag Ende Zone 3,,,,0D00,,,hto,,,end date of bank holidays for zone 3

src/vaillant/15.ctlv2.tsp

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -964,6 +964,29 @@ namespace Ctlv2 {
964964
value: tempv;
965965
}
966966

967+
/** Duration of Quick Veto mode Zone 1 */
968+
@inherit(r_6, w_6)
969+
@ext(0x26, 0)
970+
model Z1QuickVetoDuration {
971+
/** valid values are 0.5-12 in steps of 0.5 and writing enables quick veto mode */
972+
@unit("h")
973+
value: EXP;
974+
}
975+
976+
/** Quick Veto end time Zone 1 */
977+
@inherit(r_6)
978+
@ext(0x1e, 0)
979+
model Z1QuickVetoEndTime {
980+
value: HTI;
981+
}
982+
983+
/** Quick Veto end date Zone 1 */
984+
@inherit(r_6)
985+
@ext(0x24, 0)
986+
model Z1QuickVetoEndDate {
987+
value: date;
988+
}
989+
967990
/** Absenktemperatur Zone 1 */
968991
@inherit(r_6, w_6)
969992
@ext(0x9, 0)
@@ -1122,6 +1145,29 @@ namespace Ctlv2 {
11221145
value: tempv;
11231146
}
11241147

1148+
/** Duration of Quick Veto mode Zone 2 */
1149+
@inherit(r_7, w_7)
1150+
@ext(0x26, 0)
1151+
model Z2QuickVetoDuration {
1152+
/** valid values are 0.5-12 in steps of 0.5 and writing enables quick veto mode */
1153+
@unit("h")
1154+
value: EXP;
1155+
}
1156+
1157+
/** Quick Veto end time Zone 2 */
1158+
@inherit(r_7)
1159+
@ext(0x1e, 0)
1160+
model Z2QuickVetoEndTime {
1161+
value: HTI;
1162+
}
1163+
1164+
/** Quick Veto end date Zone 2 */
1165+
@inherit(r_7)
1166+
@ext(0x24, 0)
1167+
model Z2QuickVetoEndDate {
1168+
value: date;
1169+
}
1170+
11251171
/** Absenktemperatur Zone 2 */
11261172
@inherit(r_7, w_7)
11271173
@ext(0x9, 0)
@@ -1272,6 +1318,29 @@ namespace Ctlv2 {
12721318
value: tempv;
12731319
}
12741320

1321+
/** Duration of Quick Veto mode Zone 3 */
1322+
@inherit(r_8, w_8)
1323+
@ext(0x26, 0)
1324+
model Z3QuickVetoDuration {
1325+
/** valid values are 0.5-12 in steps of 0.5 and writing enables quick veto mode */
1326+
@unit("h")
1327+
value: EXP;
1328+
}
1329+
1330+
/** Quick Veto end time Zone 3 */
1331+
@inherit(r_8)
1332+
@ext(0x1e, 0)
1333+
model Z3QuickVetoEndTime {
1334+
value: HTI;
1335+
}
1336+
1337+
/** Quick Veto end date Zone 3 */
1338+
@inherit(r_8)
1339+
@ext(0x24, 0)
1340+
model Z3QuickVetoEndDate {
1341+
value: date;
1342+
}
1343+
12751344
/** Absenktemperatur Zone 3 */
12761345
@inherit(r_8, w_8)
12771346
@ext(0x9, 0)

0 commit comments

Comments
 (0)