Merge branch 'john30:master' into master

ChangeLog.md

@@ -1,3 +1,8 @@
+# 2023-01-02
+* added cooling, global off, and ventilation to vaillant/15.700
+* added vaillant/15.160
+* added another vaillant/08.bai 0010015600 variant: 0010021929 
+
 # 2022-05-08
 * added vaillant/15.e7c and 15.e7f_2
 * fix wrong assignment of vaillant/08.bai 0010014917 in en folder

ebusd-2.1.x/de/vaillant/08.bai.csv

@@ -13,7 +13,7 @@
 [PROD='0010006341']!load,bai.0010006341.inc,,,
 [PROD='0010007508';'0010007510';'0010007512';'0010007514';'0010007516';'0010007518';'0010007520';'0010007522';'0010007524';'0010007526';'0010007688';'0010007692';'0010007696';'0010007700';'0010007704']!load,bai.0010007508.inc,,,
 [PROD='0010010674';'0010010676';'0010010678';'207']!load,bai.0010010674.inc,,,
-[PROD='0010014917';'0010014629';'0010014630';'0010014631';'0010014632';'0010014633';'0010015596';'0010015597';'0010015598';'0010015599';'0010015600';'0010015601';'0010015602';'0010015603';'0010015604';'0010015605';'0010015606';'0010015607';'0010015608';'0010015609';'0010015610';'0010015611';'0010015612';'0010015613';'0010015614';'0010019268';'0010019276';'0010021888';'0010021891']!load,bai.0010015600.inc,,,
+[PROD='0010014917';'0010014629';'0010014630';'0010014631';'0010014632';'0010014633';'0010015596';'0010015597';'0010015598';'0010015599';'0010015600';'0010015601';'0010015602';'0010015603';'0010015604';'0010015605';'0010015606';'0010015607';'0010015608';'0010015609';'0010015610';'0010015611';'0010015612';'0010015613';'0010015614';'0010019268';'0010019276';'0010021888';'0010021891';'0010021929']!load,bai.0010015600.inc,,,
 [PROD='0020066007';'187']!load,bai.0020066007.inc,,,
 [PROD='0010004276';'0010004277';'0010004279';'0010004280';'0010004281';'0010004282';'0010004283';'0010004285';'0010004286';'0010004288';'0010004289';'0010004290';'0010004291';'0010004292';'0010004336';'0010004337';'0010004338';'0010004339';'0010004340';'0010005466';'0010005467';'0010005468';'0010005469';'0010010392';'0010010393';'0010010394';'0010010400';'0020051714';'0020051715';'0020051716';'0020051717';'174']!load,bai.308523.inc,,,
 [PROD='0010021961';'0010021962';'0010021963';'0010021964';'0010021965';'0010021966';'0010021967']!load,bai.0010021961.inc,,,

ebusd-2.1.x/de/vaillant/15.160.csv

@@ -0,0 +1,17 @@
+# type (r[1-9];w;u),circuit,name,[comment],[QQ],ZZ,PBSB,[ID],field1,part (m/s),datatypes/templates,divider/values,unit,comment
+#,35000,VTS 160,173 173,,,,,,,,,,
+*r,,,,,,"B509","0D",,,,,,
+*w,,,,,,"B509","0E",,,,,,
+*wi,#install,,,,,"B509","0E",,,,,,
+*ws,#service,,,,,"B509","0E",,,,,,
+*[SW],scan,,,SW,,,,,,,,,
+r;w,,Date,System Date,,,,"6100",,,date,,,Aktuelles Datum
+r;w,,Time,System Time,,,,"6000",,,time,,,Aktuelle Uhrzeit
+r;w,,SystemOnOff,System OnOFF,,,,"0100",,,UCH,0=on;1=off,,
+r;w,,OperatingMode,Betriebsmodus,,,,"2F00",,,UCH,2=Auto;3=Comfort,,
+r;w,,OverrideMode,Override-Modus,,,,"5D00",,,UCH,0=None;1=Party;4=Holiday,,
+r;w,,HolidayStartPeriod,Urlaub Startdatum,,,,"1100",,,date,,,Beginn des Urlaubs
+r;w,,HolidayEndPeriod,Urlaub Enddatum,,,,"1200",,,date,,,Enddatum des Urlaubs
+r;w,,LcdContrastValue,Display Kontrastwert,,,,"5A00",,,UCH,,,Einstellung des LCD-Kontrasts
+!include,timerhwc.inc,,,,,,,,,,,,
+!include,timerhc.inc,,,,,,,,,,,,

ebusd-2.1.x/de/vaillant/15.700.csv

@@ -3,8 +3,11 @@
 # ##### Generell #####,,,,,,,,,,,,,
 *r,,,,,,B524,02000000,,,IGN:4,,,
 *w,,,,,,B524,02010000,,,,,,
+*wi,#install,,,,,B524,02010000,,,,,,
 r;w,,ContinuosHeating,Durchgehendes Heizen,,,,0200,,,tempv,,,"-26=off, when the outside temperature falls below this threshold temperature the continuous heating function is started (off <=> function is disabled)"
 r;w,,FrostOverRideTime,Frostschutz-Verzögerung,,,,0300,,,hoursum2,,,delay before frost protection is activated
+r;w,,ManualCooling,Manuell kühlen,,,,0600,,,UIN,,,"Anzahl Tage manueller Kühlung (max. 99, 0=aus, Temperatur via z1CoolingTemp)"
+r;wi,,GlobalSystemOff,Global System Aus,,,,0700,,,yesno,,,Zum Ausschalten des Systems
 r;w,,HwcParallelLoading,Parallele Ladung Warmwasserkreis,,,,0A00,,,onoff,,,Heizbetrieb und Speicherladung parallel
 r;w,,MaxRoomHumidity,maxRoomHumidity,,,,0E00,,,UIN,,,maximale Raumluftfeuchte
 r;w,,AdaptHeatCurve,Adaptive Heizkurve,,,,1400,,,yesno,,,automatic correction of configured heat curve
@@ -21,6 +24,8 @@ r;w,,HydraulicScheme,Systemschema,,,,3600,,,UIN,,,Systemschema
 r,,WaterPressure,Wasserdruck,,,,3900,,,pressv,,,Wasserdruck
 r;w,,SolarYieldTotal,TotalSolarYield,,,,3D00,,,energy4,,,Solarertrag gesamt
 r;w,,YieldTotal,TotalEnvironmentalYield,,,,3E00,,,energy4,,,Umweltertrag gesamt
+r;w,,VentilationDay,SollLüftung,,,,4200,,,UIN,,,Lüftergeschwindigkeit tagsüber
+r;w,,VentilationNight,Absenklüftung,,,,4300,,,UIN,,,Lüftergeschwindigkeit nachts
 r;w,,HwcMaxFlowTempDesired,HwcMaxFlowTempDesired,,,,4600,,,tempv,,,maximum flow temperature setpoint of Hwc
 r,,SystemFlowTemp,Systemvorlauf,,,,4B00,,,tempv,,,Systemvorlauf
 r;w,,MultiRelaySetting,Multifunktionsausgang,,,,4D00,,,mamode,,,
@@ -51,6 +56,8 @@ r,,DisplayedOutsideTemp,Außentemperatur,,,,7300,,,tempv,,,Außentemperatur
 r;w,,SFMode,SFMode,,,,7400,,,sfmode,,,
 r;w,,KeyCodeforConfigMenu,Passwort für das Konfigurationsmenü,,,,7600,,,UIN,,,000-999; code for the installer's menues
 r;w,,OpMode,OpMode,,,,7b00,,,opmode,,,operation mode of all/configured zone(s) matching OpModeEffect
+r;w,,OpModeCooling,,,,,7c00,,,opmode,,,Betriebsart für Kühlung aller/konfigurierter Zonen
+r;w,,OpModeVentilation,,,,,1600,,,opmode,,,Betriebsart für Lüftung aller/konfigurierter Zonen
 r;w,,HolidayTemp,HolidayTemp,,,,8200,,,tempv,,,holiday setpoint
 r;w,,BankHolidayStartPeriod,BankHolidayStartPeriod,,,,8300,,,hfrom,,,start date of bank holidays
 r;w,,BankHolidayEndPeriod,BankHolidayEndPeriod,,,,8400,,,hto,,,end date of bank holidays
@@ -142,6 +149,7 @@ r;w,,Hc3PumpStatus,PumpStatus Heizkreis 3,,,,1E00,,,UIN,,,pump status of zone 3
 # ##### Zone 1 #####,,,,,,,,,,,,,
 *r,,,,,,B524,02000300,,,IGN:4,,,
 *w,,,,,,B524,02010300,,,,,,
+r;w,,z1OpModeCooling,Betriebsart für Kühlung Zone 1,,,,0100,,,opmode,,,operation mode for cooling of zone 1
 r;w,,z1CoolingTemp,Kühlsolltemperatur Zone 1,,,,0200,,,tempv,,,desired cooling setpoint for zone 1
 r;w,,z1HolidayStartPeriod,Ferienzeitraum Start Zone 1,,,,0300,,,hfrom,,,start date of holidays for zone 1
 r;w,,z1HolidayEndPeriod,Ferienzeitraum Ende Zone 1,,,,0400,,,hto,,,end date of holidays for zone 1
@@ -164,6 +172,7 @@ r;w,,z1Name2,Bezeichnung Zone 1 Teil 2,,,,1800,,,zname,,,name of zone 1
 # ##### Zone 2 #####,,,,,,,,,,,,,
 *r,,,,,,B524,02000301,,,IGN:4,,,
 *w,,,,,,B524,02010301,,,,,,
+r;w,,z2OpModeCooling,Betriebsart für Kühlung Zone 2,,,,0100,,,opmode,,,operation mode for cooling of zone 2
 r;w,,z2CoolingTemp,Kühlsolltemperatur Zone 2,,,,0200,,,tempv,,,desired cooling setpoint for zone 2
 r;w,,z2HolidayStartPeriod,Ferienzeitraum Start Zone 2,,,,0300,,,hfrom,,,start date of holidays for zone 2
 r;w,,z2HolidayEndPeriod,Ferienzeitraum Ende Zone 2,,,,0400,,,hto,,,end date of holidays for zone 2
@@ -186,7 +195,8 @@ r;w,,z2Name2,Bezeichnung Zone 2 Teil 2,,,,1800,,,zname,,,name of zone 2
 # ##### Zone 3 #####,,,,,,,,,,,,,
 *r,,,,,,B524,02000302,,,IGN:4,,,
 *w,,,,,,B524,02010302,,,,,,
-#r;w,,z3Unknown02,(konstant 24 - Lüfterstufe?) Temperatur Zone 3,,,,0200,,,tempv,,,unknown value for zone 3
+r;w,,z3OpModeCooling,Betriebsart für Kühlung Zone 3,,,,0100,,,opmode,,,operation mode for cooling of zone 3
+r;w,,z3CoolingTemp,Kühlsolltemperatur Zone 3,,,,0200,,,tempv,,,desired cooling setpoint for zone 3
 r;w,,z3HolidayStartPeriod,Ferienzeitraum Start Zone 3,,,,0300,,,hfrom,,,start date of holidays for zone 3
 r;w,,z3HolidayEndPeriod,Ferienzeitraum Ende Zone 3,,,,0400,,,hto,,,end date of holidays for zone 3
 r;w,,z3HolidayTemp,Raumsollwert Ferienbetrieb Zone 3,,,,0500,,,tempv,,,holiday setpoint for zone 3

ebusd-2.1.x/en/vaillant/08.bai.csv

@@ -13,7 +13,7 @@
 [PROD='0010006341']!load,bai.0010006341.inc,,,
 [PROD='0010007508';'0010007510';'0010007512';'0010007514';'0010007516';'0010007518';'0010007520';'0010007522';'0010007524';'0010007526';'0010007688';'0010007692';'0010007696';'0010007700';'0010007704']!load,bai.0010007508.inc,,,
 [PROD='0010010674';'0010010676';'0010010678';'207']!load,bai.0010010674.inc,,,
-[PROD='0010014917';'0010014629';'0010014630';'0010014631';'0010014632';'0010014633';'0010015596';'0010015597';'0010015598';'0010015599';'0010015600';'0010015601';'0010015602';'0010015603';'0010015604';'0010015605';'0010015606';'0010015607';'0010015608';'0010015609';'0010015610';'0010015611';'0010015612';'0010015613';'0010015614';'0010019268';'0010019276';'0010021888';'0010021891']!load,bai.0010015600.inc,,,
+[PROD='0010014917';'0010014629';'0010014630';'0010014631';'0010014632';'0010014633';'0010015596';'0010015597';'0010015598';'0010015599';'0010015600';'0010015601';'0010015602';'0010015603';'0010015604';'0010015605';'0010015606';'0010015607';'0010015608';'0010015609';'0010015610';'0010015611';'0010015612';'0010015613';'0010015614';'0010019268';'0010019276';'0010021888';'0010021891';'0010021929']!load,bai.0010015600.inc,,,
 [PROD='0020066007';'187']!load,bai.0020066007.inc,,,
 [PROD='0010004276';'0010004277';'0010004279';'0010004280';'0010004281';'0010004282';'0010004283';'0010004285';'0010004286';'0010004288';'0010004289';'0010004290';'0010004291';'0010004292';'0010004336';'0010004337';'0010004338';'0010004339';'0010004340';'0010005466';'0010005467';'0010005468';'0010005469';'0010010392';'0010010393';'0010010394';'0010010400';'0020051714';'0020051715';'0020051716';'0020051717';'174']!load,bai.308523.inc,,,
 [PROD='0010021961';'0010021962';'0010021963';'0010021964';'0010021965';'0010021966';'0010021967']!load,bai.0010021961.inc,,,

ebusd-2.1.x/en/vaillant/15.160.csv

@@ -0,0 +1,17 @@
+# type (r[1-9];w;u),circuit,name,[comment],[QQ],ZZ,PBSB,[ID],field1,part (m/s),datatypes/templates,divider/values,unit,comment
+#,35000,VTS 160,173 173,,,,,,,,,,
+*r,,,,,,"B509","0D",,,,,,
+*w,,,,,,"B509","0E",,,,,,
+*wi,#install,,,,,"B509","0E",,,,,,
+*ws,#service,,,,,"B509","0E",,,,,,
+*[SW],scan,,,SW,,,,,,,,,
+r;w,,Date,System Date,,,,"6100",,,date,,,current date
+r;w,,Time,System Time,,,,"6000",,,time,,,current time
+r;w,,SystemOnOff,System OnOFF,,,,"0100",,,UCH,0=on;1=off,,
+r;w,,OperatingMode,Operation mode,,,,"2F00",,,UCH,2=Auto;3=Comfort,,
+r;w,,OverrideMode,Override mode,,,,"5D00",,,UCH,0=None;1=Party;4=Holiday,,
+r;w,,HolidayStartPeriod,HolidayStartPeriod,,,,"1100",,,date,,,start date of holiday
+r;w,,HolidayEndPeriod,HolidayEndPeriod,,,,"1200",,,date,,,end date of holiday
+r;w,,LcdContrastValue,LcdContrastValue,,,,"5A00",,,UCH,,,setting of the LCD contrast
+!include,timerhwc.inc,,,,,,,,,,,,
+!include,timerhc.inc,,,,,,,,,,,,