Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added some improvements to vaillant hcmode, hwcmode and mcmode #328

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions ebusd-2.1.x/de/vaillant/hcmode.inc
Original file line number Diff line number Diff line change
@@ -1,17 +1,29 @@
# type (r[1-9];w;u),circuit,name,[comment],[QQ],ZZ,PBSB,[ID],field1,part (m/s),datatypes/templates,divider/values,unit,comment
# HC Betriebsart,,,,,,,,,,,,,
*r,,,,,,"B504",,,,,,,
*w,,,,,,"B505",,,,,,,
r,,DateTime,Datum Uhrzeit,,,,00,,,dcfstate;btime;bdate;temp2,,,
r,,Mode,Betriebsart/Temperatur,,,,01,,,temp0:tempdesired;mcmode:operationmode;days:floorpavingdryingday;temp0;mcmode:teleswitchmode;mctype7:mixertype;IGN;daynight,,,
r,,Params,TempDesired/TempDesiredLow/HeatingCurve/Type/ShutdownTemp/?/FlowTempMin/FlowTempMax/MaxPreHeating,,,,09,,,temp0:tempdesired;temps:tempdesiredlow;curve;mctype7:mixertype;temp0:shutdowntemp;minutes0:pumpidleperiod;temp0:flowtempmin;temp0:flowtempmax;hours:maxpreheating,,,
r,,Status,Soll Vorlauf/Status/Ist/?,,,,0D,,,temp0:flowtempdesired;onoff:status;temp:flowtemp;IGN,,,
r,,Status0a,Status Vorlauf Ist/Mixer/Pumpe/Vorlauf Soll,,,,0A,,,temp;mixer;onoff;onoff;temp0
r,,Status16,Aussentemperatur,,,,16,,,temp,,,
w,,SetTempDesired,Solltemperatur setzen,,,,01,,,temp0,,,
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

many of those new items don't work on my EHP, so I guess these would have to go to a new hcmode2.inc or so and then included additionally from the circuits supporting it

w,,SetMode,Betriebsart setzen,,,,02,,,mcmode,,,
w,,SetTempDesiredLow,Absenksollwert setzen,,,,0a,,,temp0,,,
w,,SetHeatingCurve,Heizkurve setzen,,,,0b,,,curve,,,
w,,SetShutdownTemp,Aussentemp. Abschaltgrenze setzen,,,,0c,,,temp0,,,
w,,SetFlowTempMin,Minimalen Vorlaufsollwert setzen,,,,0e,,,temp0,,,
w,,SetFlowTempMax,Maximalen Vorlaufsollwert setzen,,,,0f,,,temp0,,,
w,,SetMaxPreHeating,Max. Voraufheizung setzen,,,,10,,,hours,,,

# HC Betriebsart2,,,,,,,,,,,,,
*r,,,,,,"B511",,,,,,,
*uw,,,,,,"B510",,,,,,,
uw,,SetMode,Betriebsart,,,,00,,,hcmode,,,,flowtempdesired,,temp1,,,,hwctempdesired,,temp1,,,,hwcflowtempdesired,,temp0,,,,,,IGN:1,,,,disablehc,,BI0,,,,disablehwctapping,,BI1,,,,disablehwcload,,BI2,,,,,,IGN:1,,,,remoteControlHcPump,,BI0,,,,releaseBackup,,BI1,,,,releaseCooling,,BI2,,,,
uw,,SetOperatingMode,Betriebsart,,,,00,,,hcmode,,,,flowtempdesired,,temp1,,,,hwctempdesired,,temp1,,,,hwcflowtempdesired,,temp0,,,,,,IGN:1,,,,disablehc,,BI0,,,,disablehwctapping,,BI1,,,,disablehwcload,,BI2,,,,,,IGN:1,,,,remoteControlHcPump,,BI0,,,,releaseBackup,,BI1,,,,releaseCooling,,BI2,,,,
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why does this have to be renamed?

#potential last byte: currentmode,s,UCH,0=off;1=standby;2=heat;3=water,,
r,,Status01,Vorlauftemperatur/Rücklauftemperatur/Aussentemperatur/WW Temperatur/Speichertemperatur/Pumpenstatus,,,,01,,,temp1;temp1;temp2;temp1;temp1;pumpstate,,,
r,,Status02,Betriebsart/Maximaltemperatur/ReglerCurrentTEMP/Maximaltemperatur/ReglerCurrentTemp,,,,02,,,hwcmode;temp0;temp1;temp0;temp1,,,
r,,Status,Status,,,,03,,,temp;press;press;hcmode2;HEX,,,

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why did you remove this?

*uw,,,,,,"B512",,,,,,,
uw,,StatusCirPump,Status Zirkulationspumpe,,,,00,,,UCH,0=off;100=on,,
9 changes: 5 additions & 4 deletions ebusd-2.1.x/de/vaillant/hwcmode.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
*r,,,,,,"B504",,,,,,,
*w,,,,,,"B505",,,,,,,
r,,DateTime,Datum Uhrzeit,,,,00,,,dcfstate;btime;bdate;temp2,,,
r,,Mode,Betriebsart/Temperatur,,,,01,,,temp0;hwcmode;IGN:2;hwcmode;mctype7;HEX;daynight,,,
r,,Mode,Betriebsart/Temperatur,,,,01,,,temp0:tempdesired;hwcmode:operationmode;IGN:3;mctype7:mixertype;IGN;daynight:dayornight,,,
w,,SetTempDesired,Solltemperatur setzen,,,,01,,,temp0,,,
w,,SetMode,Betriebsart setzen,,,,02,,,hwcmode,,,
w,,SetFlowTempMin,Minimalen Vorlaufsollwert setzen,,,,0e,,,temp0,,,
w,,SetFlowTempMax,Maximalen Vorlaufsollwert setzen,,,,0f,,,temp0,,,
r,,Params,Parameter,,,,09,,,temp0;IGN:3;mctype7;temps;IGN;temps;temps;IGN,,,
r,,Status0a,Status Vorlauf Ist/Mixer/Pumpe/Vorlauf Soll,,,,0A,,,temp;mixer;onoff;onoff;temp0
r,,Status,Soll/Status/Ist/Soll,,,,0D,,,temp0;onoff;temp;temp0,,,
r,,Params,Parameters,,,,09,,,temp0:tempdesired;IGN:3;mctype7:mixertype;IGN:2;temps:flowtempmin;temps:flowtempmax;IGN,,,
r,,Status0a,Status Vorlauf Ist/Mixer/Pumpe/Vorlauf Soll,,,,0A,,,temp:flowtemp;mixer;onoff:pump;onoff;temp0:flowtempdesired
r,,Status,Soll Vorlauf/Status/Ist/Solltemperatur,,,,0D,,,temp0:flowtempdesired;onoff:status;temp:flowtemp;IGN,,,
r,,Status16,Aussentemperatur,,,,16,,,temp,,,

11 changes: 6 additions & 5 deletions ebusd-2.1.x/de/vaillant/mcmode.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*r,,,,,,"B504",,,,,,,
*w,,,,,,"B505",,,,,,,
r,,DateTime,Datum Uhrzeit,,,,00,,,dcfstate;btime;bdate;temp2,,,
r,,Mode,Betriebsart/Temperatur,,,,01,,,temp0;mcmode;days;temp0;mcmode;mctype7;IGN;daynight,,,
r,,Mode,Betriebsart/Temperatur,,,,01,,,temp0:tempdesired;mcmode:operationmode;days:floorpavingdryingday;temp0:floorpavingdryingtemp;mcmode:teleswitchmode;mctype7:mixertype;IGN;daynight,,,
w,,SetTempDesired,Solltemperatur setzen,,,,01,,,temp0,,,
w,,SetMode,Betriebsart setzen,,,,02,,,mcmode,,,
w,,SetFloorPavingDryingDay,Estrichtrocknungstag setzen,,,,03,,,days,,,
Expand All @@ -17,8 +17,9 @@ w,,SetShutdownTemp,Aussentemp. Abschaltgrenze setzen,,,,0c,,,temp0,,,
w,,SetPumpIdlePeriod,Pumpensperrzeit setzen,,,,0d,,,minutes0,,,
w,,SetFlowTempMin,Minimalen Vorlaufsollwert setzen,,,,0e,,,temp0,,,
w,,SetFlowTempMax,Maximalen Vorlaufsollwert setzen,,,,0f,,,temp0,,,
w,,SetMaxPreHeating,Max. Voraufheizung setzen,,,,10,,,hours12,,,
r,,Params,Parameter,,,,09,,,temp0;temps;curve;mctype7;temps;minutes0;temps;temps;hours12,,,
r,,Status0a,Status Vorlauf Ist/Mixer/Pumpe/Vorlauf Soll,,,,0A,,,temp;mixer;onoff;onoff;temp0
r,,Status,Status Vorlauf Soll/Ist,,,,0D,,,temp0;onoff;temp;temp0,,,
w,,SetMaxPreHeating,Max. Voraufheizung setzen,,,,10,,,hours,,,
r,,Params,TempDesired/SetTempDesiredLow/HeatingCurve/Type/SetShutdownTemp/SetPumpIdlePeriod/FlowTempMin/FlowTempMax/MaxPreHeating,,,,09,,,temp0:tempdesired;temps:tempdesiredlow;curve;mctype7:mixertype;temps:shutdowntemp;minutes0:pumpidleperiod;temps:flowtempmin;temps:flowtempmax;hours:maxpreheating,,,
r,,Status0a,Status Vorlauf Ist/Mixer/Pumpe/Vorlauf Soll,,,,0A,,,temp:flowtemp;mctype7:mixertype;onoff:pump;onoff:status;temp0:flowtempdesired
r,,Status,Soll Vorlauf/Status/Ist/?,,,,0D,,,temp0:flowtempdesired;onoff:status;temp:flowtemp;IGN,,,

r,,Status16,Aussentemperatur,,,,16,,,temp,,,
14 changes: 13 additions & 1 deletion ebusd-2.1.x/en/vaillant/hcmode.inc
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
# type (r[1-9];w;u),circuit,name,[comment],[QQ],ZZ,PBSB,[ID],field1,part (m/s),datatypes/templates,divider/values,unit,comment
# HC operation mode,,,,,,,,,,,,,
*r,,,,,,"B504",,,,,,,
*w,,,,,,"B505",,,,,,,
r,,DateTime,Date Time,,,,00,,,dcfstate;btime;bdate;temp2,,,
r,,Mode,Mode/Temperature,,,,01,,,temp0:tempdesired;mcmode:operationmode;days:floorpavingdryingday;temp0;mcmode:teleswitchmode;mctype7:mixertype;IGN;daynight,,,
r,,Params,TempDesired/TempDesiredLow/HeatingCurve/Type/ShutdownTemp/?/FlowTempMin/FlowTempMax/MaxPreHeating,,,,09,,,temp0:tempdesired;temps:tempdesiredlow;curve;mctype7:mixertype;temp0:shutdowntemp;minutes0:pumpidleperiod;temp0:flowtempmin;temp0:flowtempmax;hours:maxpreheating,,,
r,,Status,Status flow desired/current,,,,0D,,,temp0:flowtempdesired;onoff:status;temp:flowtemp;IGN,,,
r,,Status0a,Status flow temperature/mixer/pump/desired flow temperature,,,,0A,,,temp;mctype7;onoff;onoff;temp0
r,,Status16,Outside temperature,,,,16,,,temp,,,
w,,SetTempDesired,Set desired temperature,,,,01,,,temp0,,,
w,,SetMode,Set operation mode,,,,02,,,mcmode,,,
w,,SetTempDesiredLow,Set desired low temperature,,,,0a,,,temp0,,,
w,,SetHeatingCurve,Set heating curve,,,,0b,,,curve,,,
w,,SetShutdownTemp,Set outside shutdown temperature,,,,0c,,,temp0,,,
w,,SetFlowTempMin,Set min flow temperature,,,,0e,,,temp0,,,
w,,SetFlowTempMax,Set max flow temperature,,,,0f,,,temp0,,,
w,,SetMaxPreHeating,Set max pre-heating,,,,10,,,hours,,,

# HC operation mode2,,,,,,,,,,,,,
*r,,,,,,"B511",,,,,,,
Expand All @@ -11,7 +24,6 @@ uw,,SetMode,Operation Mode,,,,00,,,hcmode,,,,flowtempdesired,,temp1,,,,hwctempde
#potential last byte: currentmode,s,UCH,0=off;1=standby;2=heat;3=water,,
r,,Status01,Vorlauftemperatur/Rücklauftemperatur/Aussentemperatur/WW Temperatur/Speichertemperatur/Pumpenstatus,,,,01,,,temp1;temp1;temp2;temp1;temp1;pumpstate,,,
r,,Status02,Betriebsart/Maximaltemperatur/ReglerCurrentTEMP/Maximaltemperatur/ReglerCurrentTemp,,,,02,,,hwcmode;temp0;temp1;temp0;temp1,,,
r,,Status,Status,,,,03,,,temp;press;press;hcmode2;HEX,,,

*uw,,,,,,"B512",,,,,,,
uw,,StatusCirPump,Status circulation pump,,,,00,,,UCH,0=off;100=on,,
6 changes: 3 additions & 3 deletions ebusd-2.1.x/en/vaillant/hwcmode.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
*r,,,,,,"B504",,,,,,,
*w,,,,,,"B505",,,,,,,
r,,DateTime,Date time,,,,00,,,dcfstate;btime;bdate;temp2,,,
r,,Mode,Operation mode,,,,01,,,temp0;hwcmode;IGN:2;hwcmode;mctype7;HEX;daynight,,,
r,,Mode,Operation mode,,,,01,,,temp0:tempdesired;hwcmode:operationmode;IGN:3;mctype7:mixertype;IGN;daynight:dayornight,,,
w,,SetTempDesired,Set desired temperature,,,,01,,,temp0,,,
w,,SetMode,Set operation mode,,,,02,,,hwcmode,,,
w,,SetFlowTempMin,Set min flow temperature,,,,0e,,,temp0,,,
w,,SetFlowTempMax,Set max flow temperature,,,,0f,,,temp0,,,
r,,Params,Parameters,,,,09,,,temp0;IGN:3;mctype7;temps;IGN;temps;temps;IGN,,,
r,,Params,Parameters,,,,09,,,temp0:tempdesired;IGN:3;mctype7:mixertype;IGN:2;temps:flowtempmin;temps:flowtempmax;IGN,,,
r,,Status0a,Status flow temperature/mixer/pump/desired flow temperature,,,,0A,,,temp:flowtemp;mixer;onoff:pump;onoff;temp0:flowtempdesired
r,,Status,Desired flow/status/flow/desired temperature,,,,0D,,,temp0;onoff;temp;temp0,,,
r,,Status,Desired flow/status/flow/desired temperature,,,,0D,,,temp0:flowtempdesired;onoff:status;temp:flowtemp;IGN,,,
r,,Status16,Outside temperature,,,,16,,,temp,,,
10 changes: 5 additions & 5 deletions ebusd-2.1.x/en/vaillant/mcmode.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*r,,,,,,"B504",,,,,,,
*w,,,,,,"B505",,,,,,,
r,,DateTime,Date time,,,,00,,,dcfstate;btime;bdate;temp2,,,
r,,Mode,Operation mode,,,,01,,,temp0:tempdesired;mcmode;days:floorpavingdryingday;temp0:floorpavingdryingtemp;mcmode:teleswitchmode;mctype7;IGN;daynight,,,
r,,Mode,Operation mode,,,,01,,,temp0:tempdesired;mcmode:operationmode;days:floorpavingdryingday;temp0:floorpavingdryingtemp;mcmode:teleswitchmode;mctype7:mixertype;IGN;daynight,,,
w,,SetTempDesired,Set desired temperature,,,,01,,,temp0,,,
w,,SetMode,Set operation mode,,,,02,,,mcmode,,,
w,,SetFloorPavingDryingDay,Set floor paving drying day,,,,03,,,days,,,
Expand All @@ -17,8 +17,8 @@ w,,SetShutdownTemp,Set outside shutdown temperature,,,,0c,,,temp0,,,
w,,SetPumpIdlePeriod,Set pump idle period,,,,0d,,,minutes0,,,
w,,SetFlowTempMin,Set min flow temperature,,,,0e,,,temp0,,,
w,,SetFlowTempMax,Set max flow temperature,,,,0f,,,temp0,,,
w,,SetMaxPreHeating,Set max pre-heating,,,,10,,,hours12,,,
r,,Params,Parameters,,,,09,,,temp0:tempdesired;temps:tempdesiredlow;curve;mctype7;temps:shutdowntemp;minutes0:pumpidleperiod;temps:flowtempmin;temps:flowtempmax;hours12:maxpreheating,,,
r,,Status0a,Status flow temperature/mixer/pump/desired flow temperature,,,,0A,,,temp:flowtemp;mixer;onoff:pump;onoff;temp0:flowtempdesired
r,,Status,Status flow desired/current,,,,0D,,,temp0:flowtempdesired;onoff;temp:flowtemp;temp0:tempdesired,,,
w,,SetMaxPreHeating,Set max pre-heating,,,,10,,,hours,,,
r,,Params,TempDesired/SetTempDesiredLow/HeatingCurve/Type/SetShutdownTemp/SetPumpIdlePeriod/FlowTempMin/FlowTempMax/MaxPreHeating,,,,09,,,temp0:tempdesired;temps:tempdesiredlow;curve;mctype7:mixertype;temps:shutdowntemp;minutes0:pumpidleperiod;temps:flowtempmin;temps:flowtempmax;hours:maxpreheating,,,
r,,Status0a,Status flow temperature/mixer/pump/desired flow temperature,,,,0A,,,temp:flowtemp;mixer:mixertype;onoff:pump;onoff:status;temp0:flowtempdesired
r,,Status,Status flow desired/current,,,,0D,,,temp0:flowtempdesired;onoff:status;temp:flowtemp;IGN,,,
r,,Status16,Outside temperature,,,,16,,,temp,,,
Loading