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.

Sign up for GitHub

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

Jump to bottom

some translations added/corrected #174

Draft
wants to merge 26 commits into
base: master
Choose a base branch
from
Draft

some translations added/corrected #174

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f643686
vaillant/_templates: add pumpstate=4 (warming the hot water circuit)
Mar 8, 2020
8358f9a
some translations added/corrected
bumaas Mar 26, 2020
6d63150
update name of CH1 & CH3
mucheinz Apr 25, 2020
a2e0573
Create 06.vms.csv
May 1, 2020
27c81ae
Update 06.vms.csv
May 1, 2020
bce4657
Create 06.vms.csv
Jul 29, 2020
abded2b
Merge remote-tracking branch 'upstream/master'
bumaas Jul 30, 2020
c5b10ec
Übersetzungen
bumaas Jul 30, 2020
0fe1b4c
add hint to latest on ebusd.eu
john30 Sep 20, 2020
ce60eed
Update 15.uih.csv
mucheinz Sep 20, 2020
96df290
Allow to send broadcast to set heater time/date for installer
samm-git Aug 12, 2019
9626d99
updated webservice version
john30 Feb 14, 2021
ae0f708
added name for HK3 (Vaillant - German)
mucheinz Feb 14, 2021
e0b336b
Merge pull request #139 from samm-git/broadcastrw
john30 Feb 20, 2021
5719e58
Merge pull request #172 from zajdee/master
john30 Feb 20, 2021
f580c69
Merge pull request #175 from mucheinz/patch-2
john30 Feb 20, 2021
1ac93ce
added 720+basv (fixes #166, fixes #196)
john30 Feb 20, 2021
65fd9ac
Merge pull request #179 from Standarduser/master
john30 Feb 20, 2021
c2bff3e
added mctype7 value 6=circulation (fixes #182)
john30 Feb 20, 2021
dc80f9c
updated webservice
john30 Feb 20, 2021
301baf4
Update 15.700.csv
bumaas Sep 10, 2021
d4e664e
some translations added/corrected
bumaas Mar 26, 2020
feaa9de
Übersetzungen
bumaas Jul 30, 2020
1fe73f6
Update 15.700.csv
bumaas Sep 10, 2021
9c78e95
Merge branch 'master' of https://github.com/bumaas/ebusd-configuration
bumaas Oct 7, 2021
5229cd5
new messages in 08.hmu.csv
bumaas Jan 16, 2022
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
2 changes: 1 addition & 1 deletion ebusd-1.x.x/vaillant_de/common.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ rw;rc,,Mode,Betriebsart,,,,01,,,temp0;hwcmode;IGN:2;HEX;IGN;onoff;IGN,,,
rm;rm4;rm5,,Mode,Betriebsart,,,,01,,,temp0;mcmode;IGN:2;HEX;IGN;onoff;IGN,,,
h,,Mode,Betriebsart,,,B510,00,mode,,UCH,0=off;1=standby;2=heat;3=water,,
h,,Status,Status,,,,03,,,temp;press;press;HEX:4,,,
h,,Status01,VL/RL/AussenTemp/VLWW/SpeicherTemp/Status,,,,01,,,temp1;temp1;temp2;temp1;temp1;pumpstate,,,
h,,Status01,VL/RL/AußenTemp/VLWW/SpeicherTemp/Status,,,,01,,,temp1;temp1;temp2;temp1;temp1;pumpstate,,,
h,,Status02,Mode/maxTemp/ReglerCurrentTEMP/maxTemp/ReglerCurrentTemp,,,,02,,,hwcmode;temp0;temp1;temp0;temp1,,,
rw;rc;rm;rm4;rm5,,Status,Status,,,,0D,,,temp0;onoff;temp;temp0,,,
rw;rc;rm;rm4;rm5,,Timer.Monday,Zeitfenster Montag,,,,02,,,slot1-3;daysel,,,
Expand Down
110 changes: 55 additions & 55 deletions ebusd-2.1.x/de/vaillant/15.700.csv
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions ebusd-2.1.x/de/vaillant/_templates.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ integral,SIN,,°min,
hcmode,UCH,0=auto;1=off;2=heat;2=water,,Boiler Modus
hcmode2,UCH,0=off;3=heat;4=water,,Boiler Modus
mcmode,UCH,0=disabled;1=on;2=off;3=auto;4=eco;5=low,,Mischer Modus
mctype,UCH,0=inactive;1=mixer;2=fixed;3=hwc;4=returnincr;5=pool,,Mischer Typ
mctype7,BI0:7,0=inactive;1=mixer;2=fixed;3=hwc;4=returnincr;5=pool,,Mischer Typ
mctype,UCH,0=inaktiv;1=Heizen;2=Festwert;3=WW;4=Rückl.anh.;5=Pool,,Mischer Typ
Copy link
Owner

Choose a reason for hiding this comment

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

lookup value assignments in templates are intentionally kept identical in all languages in order to be able to switch the language without having to adjust several clients. you'd rather do a translation of these values in your own client/frontend.

mctype7,BI0:7,0=inaktiv;1=Heizen;2=Festwert;3=WW;4=Rückl.anh.;5=Pool,,Mischer Typ
hwcmode,UCH,0=disabled;1=on;2=off;3=auto,,Warmwasser Modus
hwcmode2,UCH,0=off;1=on;2=auto;3=manual,,Warmwasser Modus
mixer,UCH,0=off;1=open;2=close,,Mixer Status
mixer,UCH,0=aus;1=offen;2=geschlossen,,Mixer Status
daynight,UCH,0=night;1=day;7=floorpaving,,Tag-/Nachtmodus
status,UCH,,,Status
onoff,UCH,0=off;1=on,,
yesno,UCH,0=no;1=yes,,
errorok,UCH,0=ok;1=error,,
sensor,UCH,0=ok;85=circuit;170=cutoff,,Fühlerstatus
onoff,UCH,0=aus;1=ein,,
yesno,UCH,0=nein;1=ja,,
errorok,UCH,0=ok;1=Fehler,,
sensor,UCH,0=ok;85=geschlossen;170=getrennt,,Fühlerstatus
tempsensor,temp;sensor,,,
tempmirror,UIN,,,
tempmirrorsensor,temp;tempmirror;sensor,,,
Expand All @@ -61,10 +61,10 @@ errors,error;error;error;error;error,,,
errorhistory,status;time2;date;error,,,
from,TTM,,,von
to,TTM,,,bis
slot1,from;to,,,Slot 1 von/bis
slot2,from;to,,,Slot 2 von/bis
slot3,from;to,,,Slot 3 von/bis
slot1-3,slot1;slot2;slot3,,,Slots 1-3
slot1,from;to,,,Zeitfenster 1 von/bis
slot2,from;to,,,Zeitfenster 2 von/bis
slot3,from;to,,,Zeitfenster 3 von/bis
slot1-3,slot1;slot2;slot3,,,Zeitfenster 1-3
timer,slot1-3;daysel,,,
backtype,UCH,0=not present;1=externalheat;2=externalwater;3=externalheatandwater;4=internalheatandwater,,
backmode,UCH,0=no backup;1=withbackup;2=onlybackup,,
Expand All @@ -74,7 +74,7 @@ energyr,UIR,,kWh,
energy4,ULG,,kWh,
cntstarts,ULG,,,Anzahl Starts
cntstarts2,UIN,,,Anzahl Starts
pumppow,UCH,0=0;1=1;2=2;3=3;4=4;5=5;6=6;7=off,,Pumpenleistung
pumppow,UCH,0=0;1=1;2=2;3=3;4=4;5=5;6=6;7=aus,,Pumpenleistung
pumpstate,UCH,0=off;1=on;2=overrun,,Pumpenstatus
dcfstate,UCH,0=nosignal;1=ok;2=sync;3=valid,,DCF Empfängerstatus
phaseok,UCH,0=error;7=ok,,Phasenstatus
Expand All @@ -95,5 +95,5 @@ shortname,STR:6,,,Name
phone,STR:9,,,Telefonnummer
shortphone,STR:6,,,Telefonnummer
mamode,UIN,0=circulation;1=dryer;2=zone;3=legiopump,,
offmode,UIN,0=eco;1=night,,
rcmode,UIN,0=off;1=modulating;2=thermostat,,
offmode,UIN,0=Eco;1=Nacht,,
rcmode,UIN,0=keine;1=Aufschaltung;2=Thermostat,,
2 changes: 1 addition & 1 deletion ebusd-2.1.x/de/vaillant/bai.0010005400.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ r,,PrVortexFlowSensorValue,PrVortexFlowSensorValue_DK,,,,"F400",,,SIN,,ADC,Wartu
r,,PrEnergyCountHc1,PrEnergyCountCH1_DK,,,,"F500",,,ULG,,,Wartungsdaten
# ##### expert level\Main #####,,,,,,,,,,,,,
r,,externalFlowTempDesired,ext. Vorlaufsollwert,,,,"2500",,,temp,,,Vorlaufsollwert von einem externen Regler an Klemme 7-8-9
r,,externalHwcSwitch,Wasserschalter,,,,"0000",,,onoff,,,Speicheranforderung eines externen Speichers über den Speicherkontakt
r,,externalHwcSwitch,ext. Wasserschalter,,,,"0000",,,onoff,,,Speicheranforderung eines externen Speichers über den Speicherkontakt
r,,Flame,Flammensignal,,,,"0500",,,UCH,240=off;15=on,,Flammensignal
r,,IFCFault,SD_IFC_Fault_DK,,,,"0700",,,UCH,240=off;15=on,,IFC error
r,,ChangesDSN,Anzhl der DSN Änderungen,,,,"0C00",,,UCH,,,Anzahl der DSN (Gerätekennung) Änderungen
Expand Down
12 changes: 6 additions & 6 deletions ebusd-2.1.x/de/vaillant/bai.0010015600.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# type (r[1-9];w;u),circuit,name,[comment],[QQ],ZZ,PBSB,[ID],field1,part (m/s),datatypes/templates,divider/values,unit,comment,,,
#,BAI00,ecoCompact (euro),0010015600 296,,,,,,,,,,,,,
*r,,,,,,"B509","0D",,,,,,,,,
*w,#NOT_YET_CONFIRMED,,,,,"B509","0E",,,,,,,,,
*w,,,,,,"B509","0E",,,,,,,,,
Copy link
Owner

Choose a reason for hiding this comment

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

were you able to confirm all write values?

*wi,#install_NOT_YET_CONFIRMED,,,,,"B509","0E",,,,,,,,,
*ws,#service_NOT_YET_CONFIRMED,,,,,"B509","0E",,,,,,,,,
*[SW>=413],scan,,,SW,,>=413,,,,,,,,,,
Expand Down Expand Up @@ -36,7 +36,7 @@ r,,RemainingBoilerblocktime,d.67 Verbleibende Brennersperrzeit,,,,"3800",,,minut
#r,,EBusHeatcontrol,d.90 Digitaler Regler,,,,"0004",,,yesno,,,Gibt an ob ein digitaler Regler erkannt wurde,,,
r,,dcfState,d.91 DCF Status,,,,"6900",,,dcfstate,,,DCF Status,,,
# ##### Expertenebene #####,,,,,,,,,,,,,,,,
r,,externalHwcSwitch,Wasserschalter,,,,"0000",,,onoff,,,Speicheranforderung eines externen Speichers über den Speicherkontakt,,,
r,,externalHwcSwitch,ext. Wasserschalter,,,,"0000",,,onoff,,,Speicheranforderung eines externen Speichers über den Speicherkontakt,,,
r,,WaterPressure,Wasserdruck,,,,"0200",,,presssensor,,,Wasserdruck,,,
r,,Flame,Flammensignal,,,,"0500",,,UCH,240=off;15=on,,Flammensignal,,,
r,,ChangesDSN,Anzahl der DSN Änderungen,,,,"0C00",,,UCH,,,Anzahl der DSN (Gerätekennung) Änderungen,,,
Expand All @@ -57,11 +57,11 @@ r,,HwcImpellorSwitch,Brauchwasserzapfung,,,,"5700",,,yesno,,,WW Zapfung,,,
r,,WarmstartDemand,Warmstartanforderung,,,,"3A04",,,yesno,,,Warmstartaktivierung,,,
r,,BoilerType,BoilerType,,,,"5E00",,,UCH,,,Boiler typ of the bmu,,,
r,,ParamToken,ParamToken,,,,"6000",,,UCH,,,token for parameter managment,,,
r,,ReturnTempExternal,Rücklauftemperatur,,,,"6B00",,,tempsensor,,,Externer Rücklauftemperatursensor,,,
r,,ReturnTempExternal,ext. Rücklauftemperatur,,,,"6B00",,,tempsensor,,,Externer Rücklauftemperatursensor,,,
r,,FloorHeatingContact,Anlegethermostat,,,,"7000",,,onoff,,,Eingang Anlegethermostat,,,
r,,Templimiter,Temperaturbegrenzer,,,,"7700",,,UCH,240=off;15=on,,Rückmeldung des Temperaturbegrenzer Signals,,,
r,,EbusVoltage,eBUS Spannung,,,,"7F00",,,onoff,,,Rückmeldung der eBUS Spannung,,,
r,,FluegasvalveOpen,Abgasklappe offen,,,,"8900",,,onoff,,,Rückmeldung Flüssiggasventil,,,
r,,FluegasvalveOpen,Abgasklappe offen,,,,"8900",,,yesno,,,Rückmeldung Flüssiggasventil,,,
r,,Testbyte,Testbyte,,,,"9900",,,UCH,,,Testbyte (relevant for the Tester),,,
r,,DSN,DSN,,,,"9A00",,,UIN,,,DSN: Device Specific number,,,
r,,TargetFanSpeedOutput,Lüfter Solldrehzahl,,,,"9F00",,,UIN,,1/min,Lüfterdrehzahl,,,
Expand Down Expand Up @@ -98,8 +98,8 @@ r,,DeactivationsTemplimiter,d.60 STB Abschaltungen,,,,"2000",,,UCH,,,Anzahl der
r,,DeactivationsIFC,d.61 Anzahl Zündfehler,,,,"1F00",,,UCH,,,Anzahl der Zündfehler (nicht erfolgreiche Züdung im letzten Versuch oder fehlerhaftes Flammensignal),,,
r,,averageIgnitiontime,d.64 Mittlere Zündzeit,,,,"2D00",,,UCH,10,s,Mittlere Zündzeit,,,
r,,maxIgnitiontime,d.65 Max. Zündzeit,,,,"2C00",,,UCH,10,s,Maximale Zündzeit,,,
r,,CounterStartattempts1,d.68 Zündfehler 1. Versuch,,,,"6E00",,,temp0,,,Anzahl der erfolglosen Zündversuche (im 1. Versuch),,,
r,,CounterStartattempts2,d.69 Zündfehler 2. Versuch,,,,"6F00",,,temp0,,,Anzahl der erfolglosen Zündversuche (im 2. Versuch),,,
r,,CounterStartattempts1,d.68 Zündfehler 1. Versuch,,,,"6E00",,,UCH,,,Anzahl der erfolglosen Zündversuche (im 1. Versuch),,,
r,,CounterStartattempts2,d.69 Zündfehler 2. Versuch,,,,"6F00",,,UCH,,,Anzahl der erfolglosen Zündversuche (im 2. Versuch),,,
r;wi,,FlowsetHcMax,d.71 Max. Vorlauftemp. Heizbetrieb,,,,"0E04",,,temp,,,Einstellung des maximalen Vorlaufsollwert im Heizbetrieb (bei Linksanschlag des Poti),,,
[SW>=413]r;wi,,APCLegioProtection,d.74 Legionellenschutz int.Speicher,,,,"9704",,,UCH,,,Legionellenschutz für internen Speicher,,,
r;wi,,StorageLoadTimeMax,d.75 Max. Speicherladezeit,,,,"6600",,,minutes0,,,Max. Speicherladezeit für Speicher ohne eigene Regelung,,,
Expand Down
2 changes: 1 addition & 1 deletion ebusd-2.1.x/de/vaillant/hcmode.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ r,,Status16,Aussentemperatur,,,,16,,,temp,,,
*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,,,,
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,,Status02,Betriebsart/Maximaltemperatur/ReglerCurrentTemp/Maximaltemperatur/ReglerCurrentTemp,,,,02,,,hwcmode;temp0;temp1;temp0;temp1,,,
r,,Status,Status,,,,03,,,temp;press;press;hcmode2;HEX,,,

*uw,,,,,,"B512",,,,,,,
Expand Down
6 changes: 3 additions & 3 deletions ebusd-2.1.x/en/vaillant/bai.0010015600.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ r,,ReturnTempExternal,Ext. return temperature,,,,"6B00",,,tempsensor,,,External
r,,FloorHeatingContact,Floor heating contact,,,,"7000",,,onoff,,,Floor heating contact,,,
r,,Templimiter,Temperature limiter sensor,,,,"7700",,,UCH,240=off;15=on,,Feedback of the temperature limiter sensor,,,
r,,EbusVoltage,eBUS voltage,,,,"7F00",,,onoff,,,eBUS voltage feedback,,,
r,,FluegasvalveOpen,Flue flap open,,,,"8900",,,onoff,,,Exhaust (flue) flap open,,,
r,,FluegasvalveOpen,Flue flap open,,,,"8900",,,yesno,,,Exhaust (flue) flap open,,,
r,,Testbyte,Testbyte,,,,"9900",,,UCH,,,Testbyte (relevant for testers),,,
r,,DSN,DSN,,,,"9A00",,,UIN,,,DSN: Device Specific number,,,
r,,TargetFanSpeedOutput,Target fan speed,,,,"9F00",,,UIN,,1/min,Target fan speed,,,
Expand Down Expand Up @@ -98,8 +98,8 @@ r,,DeactivationsTemplimiter,d.60 Shutdowns by the temp limiter,,,,"2000",,,UCH,,
r,,DeactivationsIFC,d.61 Ignition failures,,,,"1F00",,,UCH,,,Number of ignition failures (unsuccessful last-run or faulty flame signal),,,
r,,averageIgnitiontime,d.64 Average ignition time,,,,"2D00",,,UCH,10,s,Average ignition time,,,
r,,maxIgnitiontime,d.65 Maximum ignition time,,,,"2C00",,,UCH,10,s,Maximum ignition time,,,
r,,CounterStartattempts1,d.68 Failed ignition (1nd attempt),,,,"6E00",,,temp0,,,Number of unsuccessful ignition attempts (in the first attempt),,,
r,,CounterStartattempts2,d.69 Failed ignition (2nd attempt),,,,"6F00",,,temp0,,,Number of unsuccessful ignition attempts (in the second attempt),,,
r,,CounterStartattempts1,d.68 Failed ignition (1nd attempt),,,,"6E00",,,UCH,,,Number of unsuccessful ignition attempts (in the first attempt),,,
r,,CounterStartattempts2,d.69 Failed ignition (2nd attempt),,,,"6F00",,,UCH,,,Number of unsuccessful ignition attempts (in the second attempt),,,
r;wi,,FlowsetHcMax,d.71 CH max flow temperature,,,,"0E04",,,temp,,,Setting the maximum flow setpoint in heating mode (with left-hand stop of the potentiometer),,,
[SW>=413]r;wi,,APCLegioProtection,d.74 APC_LegioProtection,,,,"9704",,,UCH,,,Legionella protection for internal storage,,,
r;wi,,StorageLoadTimeMax,d.75 Maximum storage time,,,,"6600",,,minutes0,,,Maximum water storing time for storage without own controls,,,
Expand Down
2 changes: 1 addition & 1 deletion ebusd-2.1.x/en/vaillant/hcmode.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ r,,Status16,Outside temperature,,,,16,,,temp,,,
uw,,SetMode,Operation Mode,,,,00,,,hcmode,,,,flowtempdesired,,temp1,,,,hwctempdesired,,temp1,,,,hwcflowtempdesired,,temp0,,,,,,IGN:1,,,,disablehc,,BI0,,,,disablehwctapping,,BI1,,,,disablehwcload,,BI2,,,,,,IGN:1,,,,remoteControlHcPump,,BI0,,,,releaseBackup,,BI1,,,,releaseCooling,,BI2,,,,
#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,,Status02,Betriebsart/Maximaltemperatur/ReglerCurrentTemp/Maximaltemperatur/ReglerCurrentTemp,,,,02,,,hwcmode;temp0;temp1;temp0;temp1,,,
r,,Status,Status,,,,03,,,temp;press;press;hcmode2;HEX,,,

*uw,,,,,,"B512",,,,,,,
Expand Down