Skip to content

Commit 27fab1c

Browse files
john30john30
committed
avoid using "value" for IGN field, drop comment from some IGN fields, workaround tsp prettier issue, update packages
1 parent bf11595 commit 27fab1c

15 files changed

Lines changed: 62 additions & 87 deletions

‎csvall.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ sed -i \
3737
-e 's#ReglerCurrentTEMP#ReglerCurrentTemp#' \
3838
-e 's#\(,CounterStartattempts[.*],\)temp0,#\1UCH,#' \
3939
-e 's#ForWay#FourWay#g' \
40+
-e 's#punp#pump#g' \
41+
-e 's#IGN:1,,,[^,]*#IGN:1,,,#g' \
4042
\{\} \; \
4143
&& npm run csv2tsp \
4244
&& npm run csv2tsp-combine \

‎package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@
2929
"homepage": "https://github.com/john30/ebusd-configuration#readme",
3030
"devDependencies": {
3131
"@types/js-yaml": "^4.0.9",
32-
"@types/node": "^20.14.8",
33-
"@typespec/json-schema": "~0.64.0",
34-
"@typespec/library-linter": "~0.64.0",
35-
"csv-parser": "^3.1.0",
32+
"@types/node": "^24.5.2",
33+
"@typespec/json-schema": "~1.4.0",
34+
"@typespec/library-linter": "~0.74.0",
35+
"csv-parser": "^3.2.0",
3636
"js-yaml": "^4.1.0",
37-
"typescript": "^5.7.3"
37+
"typescript": "^5.9.2"
3838
},
3939
"dependencies": {
40-
"@ebusd/ebus-typespec": ">=0.20.0",
41-
"@typespec/compiler": "~0.64.0",
42-
"tsx": "^4.19.2"
40+
"@ebusd/ebus-typespec": ">=0.23.0",
41+
"@typespec/compiler": "~1.4.0",
42+
"tsx": "^4.20.6"
4343
}
4444
}

‎src/de.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3722,7 +3722,6 @@ weekday on which legionella protection is started (may also be every day of the
37223722
täglich)
37233723
'Weekday: current day of week': Aktueller Wochentag
37243724
WeekDayProgSwitch: Wochenprogramm
3725-
whether timeslot is valid: whether timeslot is valid
37263725
'Wind_Off_DK: Wind-function not active': 'Wind_Off_DK: Wind-function not active'
37273726
'WP_SecondStage_DK: Second stage of the pump activated': 'WP_SecondStage_DK: Second stage of the pump activated'
37283727
'WP_SecondStage: Second stage of the pump activated': 'WP_SecondStage: Second stage of the pump activated'

‎src/en.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3546,7 +3546,6 @@ weekday on which legionella protection is started (may also be every day of the
35463546
the week)
35473547
'Weekday: current day of week': 'Weekday: current day of week'
35483548
WeekDayProgSwitch: WeekDayProgSwitch
3549-
whether timeslot is valid: whether timeslot is valid
35503549
'Wind_Off_DK: Wind-function not active': 'Wind_Off_DK: Wind-function not active'
35513550
'WP_SecondStage_DK: Second stage of the pump activated': 'WP_SecondStage_DK: Second stage of the pump activated'
35523551
'WP_SecondStage: Second stage of the pump activated': 'WP_SecondStage: Second stage of the pump activated'

‎src/i18n.yaml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23244,22 +23244,6 @@ weekdayprogswitch:
2324423244
first: WeekDayProgSwitch
2324523245
locations:
2324623246
- vaillant/15.e7f.csv::r,wi::0x2b,0
23247-
whethertimeslotisvalid:
23248-
de: whether timeslot is valid
23249-
en: whether timeslot is valid
23250-
first: whether timeslot is valid
23251-
locations:
23252-
- vaillant/15.700.csv::r_9::MF,0x24,0x3,0,0,1:value
23253-
- vaillant/15.700.csv::r_10::MF,0x24,0x3,0,0,0x2:value
23254-
- vaillant/15.700.csv::r_11::MF,0x24,0x3,0,0,0x3:value
23255-
- vaillant/15.700.csv::r_12::MF,0x24,0x3,1,0,1:value
23256-
- vaillant/15.700.csv::r_13::MF,0x24,0x3,1,0,0x2:value
23257-
- vaillant/15.700.csv::r_14::MF,0x24,0x3,0x3,0,0x2:value
23258-
- vaillant/15.700.csv::r_15::MF,0x24,0x3,0x3,0,1:value
23259-
- vaillant/15.700.csv::r_16::MF,0x24,0x3,0x3,1,0x2:value
23260-
- vaillant/15.700.csv::r_17::MF,0x24,0x3,0x3,1,1:value
23261-
- vaillant/15.700.csv::r_18::MF,0x24,0x3,0x3,0x2,0x2:value
23262-
- vaillant/15.700.csv::r_19::MF,0x24,0x3,0x3,0x2,1:value
2326323247
windoffdkwindfunctionnotactive:
2326423248
de: 'Wind_Off_DK: Wind-function not active'
2326523249
en: 'Wind_Off_DK: Wind-function not active'

‎src/main.tsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import "./vaillant/15.f37.tsp";
2323
import "./vaillant/15.f43.tsp";
2424
import "./vaillant/15.f47.tsp";
2525
import "./vaillant/15.sdr_p.tsp";
26-
import "./vaillant/15.ui.tsp";
2726
import "./vaillant/15.uih.tsp";
27+
import "./vaillant/15.ui.tsp";
2828
import "./vaillant/23.ehp.cc.tsp";
2929
import "./vaillant/23.solsy.cc.tsp";
3030
import "./vaillant/23.vr630.cc.tsp";

‎src/vaillant/08.bai.tsp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,9 @@ namespace Bai {
352352
@condition(Id.Id.hw, "=4702")
353353
hw_4702: Bai._0010008045_inc,
354354

355-
default: Bai._308523_inc, // final load alternative
355+
// final load alternative
356+
default: Bai._308523_inc,
357+
356358
Hcmode_inc,
357359
}
358360
}

‎src/vaillant/08.ehp.tsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace Ehp {
1919
@base(MF, 0x9, 0x29)
2020
model uhwc {
2121
@maxLength(2)
22-
value: IGN;
22+
ign: IGN;
2323
}
2424

2525
/** default *whwc */

‎src/vaillant/08.hmu.tsp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace Hmu {
3030
@base(MF, 0x1a, 0x5, 0xff, 0x32)
3131
model r_2 {
3232
@maxLength(3)
33-
value: IGN;
33+
ign: IGN;
3434
}
3535

3636
@inherit(r_2)
@@ -249,7 +249,7 @@ namespace Hmu {
249249
@base(MF, 0x1a, 0x5, 0xff, 0x34)
250250
model r_3 {
251251
@maxLength(3)
252-
value: IGN;
252+
ign: IGN;
253253
}
254254
// TODO ff34 prefix also seen as e534 in PR 330,see also duplication in StatCompressorHours with b434 and others. this seems to be HW/SW specific and needs to be sorted out.
255255

@@ -258,7 +258,7 @@ namespace Hmu {
258258
@base(MF, 0x1a, 0x5, 0xe5, 0x34)
259259
model u_1 {
260260
@maxLength(3)
261-
value: IGN;
261+
ign: IGN;
262262
}
263263

264264
@inherit(r_3, u_1)
@@ -492,7 +492,7 @@ namespace Hmu {
492492
@base(MF, 0x16, 0x18)
493493
model r_4 {
494494
@maxLength(1)
495-
value: IGN;
495+
ign: IGN;
496496
}
497497

498498
@inherit(r_4)
@@ -513,7 +513,7 @@ namespace Hmu {
513513
@base(MF, 0x16, 0x1a, 1)
514514
model r_5 {
515515
@maxLength(1)
516-
value: IGN;
516+
ign: IGN;
517517
}
518518

519519
@inherit(r_5)
@@ -653,7 +653,7 @@ namespace Hmu {
653653
@base(MF, 0x16, 0x1a, 0x2)
654654
model r_6 {
655655
@maxLength(1)
656-
value: IGN;
656+
ign: IGN;
657657
}
658658

659659
@inherit(r_6)
@@ -795,7 +795,7 @@ namespace Hmu {
795795
@base(MF, 0x14, 0x5)
796796
model rs {
797797
@maxLength(2)
798-
value: IGN;
798+
ign: IGN;
799799
}
800800

801801
/** default *ws for user level "service" */
@@ -1242,7 +1242,7 @@ namespace Hmu {
12421242
@base(MF, 0x14, 0x5)
12431243
model rs_1 {
12441244
@maxLength(2)
1245-
value: IGN;
1245+
ign: IGN;
12461246
}
12471247

12481248
/** default *ws for user level "service" */
@@ -1312,7 +1312,7 @@ namespace Hmu {
13121312
@base(MF, 0x1a, 0x5, 0, 0x32)
13131313
model rs_2 {
13141314
@maxLength(3)
1315-
value: IGN;
1315+
ign: IGN;
13161316
}
13171317
// example: 3108b51a040500321f / 0a000805f0000000000000
13181318

@@ -1374,7 +1374,7 @@ namespace Hmu {
13741374
@base(MF, 0x1a, 0x5)
13751375
model ri {
13761376
@maxLength(3)
1377-
value: IGN;
1377+
ign: IGN;
13781378
}
13791379

13801380
/** compressor hours */
@@ -1445,7 +1445,7 @@ namespace Hmu {
14451445
@base(MF, 0x9, 0x54, 0x2, 0)
14461446
model r_7 {
14471447
@maxLength(4)
1448-
value: IGN;
1448+
ign: IGN;
14491449
}
14501450

14511451
@inherit(r_7)

‎src/vaillant/15.700.tsp‎

Lines changed: 19 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace _700 {
1616
@base(MF, 0x24, 0x2, 0, 0, 0)
1717
model r_1 {
1818
@maxLength(4)
19-
value: IGN;
19+
ign: IGN;
2020
}
2121

2222
/** default *w */
@@ -517,7 +517,7 @@ namespace _700 {
517517
@base(MF, 0x24, 0x2, 0, 1, 0)
518518
model r_2 {
519519
@maxLength(4)
520-
value: IGN;
520+
ign: IGN;
521521
}
522522

523523
/** default *w */
@@ -601,7 +601,7 @@ namespace _700 {
601601
@base(MF, 0x24, 0x2, 0, 0x2, 0)
602602
model r_3 {
603603
@maxLength(4)
604-
value: IGN;
604+
ign: IGN;
605605
}
606606

607607
/** default *w */
@@ -731,7 +731,7 @@ namespace _700 {
731731
@base(MF, 0x24, 0x2, 0, 0x2, 1)
732732
model r_4 {
733733
@maxLength(4)
734-
value: IGN;
734+
ign: IGN;
735735
}
736736

737737
/** default *w */
@@ -861,7 +861,7 @@ namespace _700 {
861861
@base(MF, 0x24, 0x2, 0, 0x2, 0x2)
862862
model r_5 {
863863
@maxLength(4)
864-
value: IGN;
864+
ign: IGN;
865865
}
866866

867867
/** default *w */
@@ -991,7 +991,7 @@ namespace _700 {
991991
@base(MF, 0x24, 0x2, 0, 0x3, 0)
992992
model r_6 {
993993
@maxLength(4)
994-
value: IGN;
994+
ign: IGN;
995995
}
996996

997997
/** default *w */
@@ -1156,7 +1156,7 @@ namespace _700 {
11561156
@base(MF, 0x24, 0x2, 0, 0x3, 1)
11571157
model r_7 {
11581158
@maxLength(4)
1159-
value: IGN;
1159+
ign: IGN;
11601160
}
11611161

11621162
/** default *w */
@@ -1321,7 +1321,7 @@ namespace _700 {
13211321
@base(MF, 0x24, 0x2, 0, 0x3, 0x2)
13221322
model r_8 {
13231323
@maxLength(4)
1324-
value: IGN;
1324+
ign: IGN;
13251325
}
13261326

13271327
/** default *w */
@@ -1486,9 +1486,8 @@ namespace _700 {
14861486
/** default *r */
14871487
@base(MF, 0x24, 0x3, 0, 0, 1)
14881488
model r_9 {
1489-
/** whether timeslot is valid */
14901489
@maxLength(1)
1491-
value: IGN;
1490+
ign: IGN;
14921491
}
14931492

14941493
/** default *w */
@@ -1549,9 +1548,8 @@ namespace _700 {
15491548
/** default *r */
15501549
@base(MF, 0x24, 0x3, 0, 0, 0x2)
15511550
model r_10 {
1552-
/** whether timeslot is valid */
15531551
@maxLength(1)
1554-
value: IGN;
1552+
ign: IGN;
15551553
}
15561554

15571555
/** default *w */
@@ -1612,9 +1610,8 @@ namespace _700 {
16121610
/** default *r */
16131611
@base(MF, 0x24, 0x3, 0, 0, 0x3)
16141612
model r_11 {
1615-
/** whether timeslot is valid */
16161613
@maxLength(1)
1617-
value: IGN;
1614+
ign: IGN;
16181615
}
16191616

16201617
/** default *w */
@@ -1675,9 +1672,8 @@ namespace _700 {
16751672
/** default *r */
16761673
@base(MF, 0x24, 0x3, 1, 0, 1)
16771674
model r_12 {
1678-
/** whether timeslot is valid */
16791675
@maxLength(1)
1680-
value: IGN;
1676+
ign: IGN;
16811677
}
16821678

16831679
/** default *w */
@@ -1738,9 +1734,8 @@ namespace _700 {
17381734
/** default *r */
17391735
@base(MF, 0x24, 0x3, 1, 0, 0x2)
17401736
model r_13 {
1741-
/** whether timeslot is valid */
17421737
@maxLength(1)
1743-
value: IGN;
1738+
ign: IGN;
17441739
}
17451740

17461741
/** default *w */
@@ -1801,9 +1796,8 @@ namespace _700 {
18011796
/** default *r */
18021797
@base(MF, 0x24, 0x3, 0x3, 0, 0x2)
18031798
model r_14 {
1804-
/** whether timeslot is valid */
18051799
@maxLength(1)
1806-
value: IGN;
1800+
ign: IGN;
18071801
}
18081802

18091803
/** default *w */
@@ -1863,9 +1857,8 @@ namespace _700 {
18631857
/** default *r */
18641858
@base(MF, 0x24, 0x3, 0x3, 0, 1)
18651859
model r_15 {
1866-
/** whether timeslot is valid */
18671860
@maxLength(1)
1868-
value: IGN;
1861+
ign: IGN;
18691862
}
18701863

18711864
/** default *w */
@@ -1926,9 +1919,8 @@ namespace _700 {
19261919
/** default *r */
19271920
@base(MF, 0x24, 0x3, 0x3, 1, 0x2)
19281921
model r_16 {
1929-
/** whether timeslot is valid */
19301922
@maxLength(1)
1931-
value: IGN;
1923+
ign: IGN;
19321924
}
19331925

19341926
/** default *w */
@@ -1988,9 +1980,8 @@ namespace _700 {
19881980
/** default *r */
19891981
@base(MF, 0x24, 0x3, 0x3, 1, 1)
19901982
model r_17 {
1991-
/** whether timeslot is valid */
19921983
@maxLength(1)
1993-
value: IGN;
1984+
ign: IGN;
19941985
}
19951986

19961987
/** default *w */
@@ -2051,9 +2042,8 @@ namespace _700 {
20512042
/** default *r */
20522043
@base(MF, 0x24, 0x3, 0x3, 0x2, 0x2)
20532044
model r_18 {
2054-
/** whether timeslot is valid */
20552045
@maxLength(1)
2056-
value: IGN;
2046+
ign: IGN;
20572047
}
20582048

20592049
/** default *w */
@@ -2113,9 +2103,8 @@ namespace _700 {
21132103
/** default *r */
21142104
@base(MF, 0x24, 0x3, 0x3, 0x2, 1)
21152105
model r_19 {
2116-
/** whether timeslot is valid */
21172106
@maxLength(1)
2118-
value: IGN;
2107+
ign: IGN;
21192108
}
21202109

21212110
/** default *w */

0 commit comments

Comments
 (0)