Skip to content

Commit 7b8cff7

Browse files
committed
Merge remote-tracking branch 'origin/rework-csvgen'
2 parents 4870cca + a57f272 commit 7b8cff7

File tree

4 files changed

+147
-166
lines changed

4 files changed

+147
-166
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ r;w,,z3Name1,Bezeichnung Zone 3 Teil 1,,,,1700,,,zname,,,name of zone 3
212212
r;w,,z3Name2,Bezeichnung Zone 3 Teil 2,,,,1800,,,zname,,,name of zone 3
213213
r;w,,z3DayTemp,Solltemperatur Zone 3,,,,2200,,,tempv,,,day setpoint for zone 3
214214
# ##### timers #####,,,,,,,,,,,,,
215-
*r,,,,,,,,,,,,,
216-
r,,unknownValue.a0,(3Zones;HWC&CC = constant value. General configuration?),,,B555,a0,,,HEX:8,,,First = Zones maybe? Rest unknown; needs some other configured ctlv2
215+
#*r,,,,,,,,,,,,,
216+
#r,,unknownValue.a0,(3Zones;HWC&CC = constant value. General configuration?),,,B555,a0,,,HEX:8,,,First = Zones maybe? Rest unknown; needs some other configured ctlv2
217217
#r,,unknownValue.a1,(3Zones;HWC&CC = Empty value. air;tariff;etc or Errors?),,,B555,a1,,,,,,
218218
#r,,unknownValue.a2,(3Zones;HWC&CC = Empty value. air;tariff;etc or Errors?),,,B555,a2,,,,,,
219219
# timers hot water,,,,,,,,,,,,,

src/i18n.yaml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6906,23 +6906,23 @@ firstzonesmayberestunknownneedssomeotherconfiguredctlv2:
69066906
en: First = Zones maybe? Rest unknown; needs some other configured ctlv2
69076907
de: Erstes Byte = Zonenanzahl?
69086908
locations:
6909-
- vaillant/15.ctlv2.csv::r::0xb5,0x55,0xa0:value
6909+
- vaillant/15.ctlv2.csv::r::MF,0x55,0xa0:value
69106910
3zoneshwcccconstantvaluegeneralconfiguration:
69116911
first: (3Zones;HWC&CC = constant value. General configuration?)
69126912
en: (3Zones;HWC&CC = constant value. General configuration?)
69136913
de: (3Zonen;HWC&CC = konstanter Wert. Generelle Konfiguration?)
69146914
locations:
6915-
- vaillant/15.ctlv2.csv::r::0xb5,0x55,0xa0
6915+
- vaillant/15.ctlv2.csv::r::MF,0x55,0xa0
69166916
configuration:
69176917
first: Configuration
69186918
en: Configuration
69196919
de: Konfiguration
69206920
locations:
6921-
- vaillant/15.ctlv2.csv::r::0xb5,0x55,0xa3,0,0x2:value
6922-
- vaillant/15.ctlv2.csv::r::0xb5,0x55,0xa3,0,0x3:value
6923-
- vaillant/15.ctlv2.csv::r::0xb5,0x55,0xa3,0,0:value
6924-
- vaillant/15.ctlv2.csv::r::0xb5,0x55,0xa3,1,0:value
6925-
- vaillant/15.ctlv2.csv::r::0xb5,0x55,0xa3,0x2,0:value
6921+
- vaillant/15.ctlv2.csv::r::MF,0x55,0xa3,0,0x2:value
6922+
- vaillant/15.ctlv2.csv::r::MF,0x55,0xa3,0,0x3:value
6923+
- vaillant/15.ctlv2.csv::r::MF,0x55,0xa3,0,0:value
6924+
- vaillant/15.ctlv2.csv::r::MF,0x55,0xa3,1,0:value
6925+
- vaillant/15.ctlv2.csv::r::MF,0x55,0xa3,0x2,0:value
69266926
- vaillant/50.zeo.mc.csv::r::0xc4,0
69276927
timerconfigurationstaticatmdescribesfeatueset:
69286928
first: timer Configuration(static atm? describes featue set?)
@@ -6931,31 +6931,31 @@ timerconfigurationstaticatmdescribesfeatueset:
69316931
Zeitfenster Konfiguration(aktuell statisch? Beschreibt eine Art
69326932
Funktionalitätsumfang)
69336933
locations:
6934-
- vaillant/15.ctlv2.csv::r::0xb5,0x55,0xa3,0,0x2
6935-
- vaillant/15.ctlv2.csv::r::0xb5,0x55,0xa3,0,0x3
6936-
- vaillant/15.ctlv2.csv::r::0xb5,0x55,0xa3,0,0
6937-
- vaillant/15.ctlv2.csv::r::0xb5,0x55,0xa3,1,0
6938-
- vaillant/15.ctlv2.csv::r::0xb5,0x55,0xa3,0x2,0
6934+
- vaillant/15.ctlv2.csv::r::MF,0x55,0xa3,0,0x2
6935+
- vaillant/15.ctlv2.csv::r::MF,0x55,0xa3,0,0x3
6936+
- vaillant/15.ctlv2.csv::r::MF,0x55,0xa3,0,0
6937+
- vaillant/15.ctlv2.csv::r::MF,0x55,0xa3,1,0
6938+
- vaillant/15.ctlv2.csv::r::MF,0x55,0xa3,0x2,0
69396939
amountofconfiguredslotsperweekday:
69406940
first: Amount of configured slots per weekday
69416941
en: Amount of configured slots per weekday
69426942
de: Anzahl der eingestellten Slots pro Wochentag
69436943
locations:
6944-
- vaillant/15.ctlv2.csv::r::0xb5,0x55,0xa4,0,0x2:value
6945-
- vaillant/15.ctlv2.csv::r::0xb5,0x55,0xa4,0,0x3:value
6946-
- vaillant/15.ctlv2.csv::r::0xb5,0x55,0xa4,0,0:value
6947-
- vaillant/15.ctlv2.csv::r::0xb5,0x55,0xa4,1,0:value
6948-
- vaillant/15.ctlv2.csv::r::0xb5,0x55,0xa4,0x2,0:value
6944+
- vaillant/15.ctlv2.csv::r::MF,0x55,0xa4,0,0x2:value
6945+
- vaillant/15.ctlv2.csv::r::MF,0x55,0xa4,0,0x3:value
6946+
- vaillant/15.ctlv2.csv::r::MF,0x55,0xa4,0,0:value
6947+
- vaillant/15.ctlv2.csv::r::MF,0x55,0xa4,1,0:value
6948+
- vaillant/15.ctlv2.csv::r::MF,0x55,0xa4,0x2,0:value
69496949
timeranzahl:
69506950
first: timer Anzahl
69516951
en: timer Anzahl
69526952
de: Zeitfenster Anzahl
69536953
locations:
6954-
- vaillant/15.ctlv2.csv::r::0xb5,0x55,0xa4,0,0x2
6955-
- vaillant/15.ctlv2.csv::r::0xb5,0x55,0xa4,0,0x3
6956-
- vaillant/15.ctlv2.csv::r::0xb5,0x55,0xa4,0,0
6957-
- vaillant/15.ctlv2.csv::r::0xb5,0x55,0xa4,1,0
6958-
- vaillant/15.ctlv2.csv::r::0xb5,0x55,0xa4,0x2,0
6954+
- vaillant/15.ctlv2.csv::r::MF,0x55,0xa4,0,0x2
6955+
- vaillant/15.ctlv2.csv::r::MF,0x55,0xa4,0,0x3
6956+
- vaillant/15.ctlv2.csv::r::MF,0x55,0xa4,0,0
6957+
- vaillant/15.ctlv2.csv::r::MF,0x55,0xa4,1,0
6958+
- vaillant/15.ctlv2.csv::r::MF,0x55,0xa4,0x2,0
69596959
timerheatingmonday1:
69606960
first: timer heating monday 1
69616961
en: timer heating monday 1

0 commit comments

Comments
 (0)