Skip to content

Commit db24969

Browse files
JakobVogelsangJakobVogelsang
committed
fix: nump NSD file versions
1 parent 2161c58 commit db24969

File tree

30 files changed

+1502
-1420
lines changed

30 files changed

+1502
-1420
lines changed

‎foundation/codecomponents/nsds.ts‎

Lines changed: 149 additions & 80 deletions
Large diffs are not rendered by default.

‎tDataTypeTemplates/nsdToJson/testJson/APC.ts‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ export const apcChildren = {
424424
tagName: "Literal",
425425
name: "°C",
426426
literalVal: "23",
427-
descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
427+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
428428
},
429429
Sv: {
430430
tagName: "Literal",
@@ -526,13 +526,13 @@ export const apcChildren = {
526526
tagName: "Literal",
527527
name: "m²",
528528
literalVal: "41",
529-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
529+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
530530
},
531531
"m³": {
532532
tagName: "Literal",
533533
name: "m³",
534534
literalVal: "42",
535-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
535+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
536536
},
537537
"m/s": {
538538
tagName: "Literal",
@@ -544,19 +544,19 @@ export const apcChildren = {
544544
tagName: "Literal",
545545
name: "m/s²",
546546
literalVal: "44",
547-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
547+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
548548
},
549549
"m³/s": {
550550
tagName: "Literal",
551551
name: "m³/s",
552552
literalVal: "45",
553-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
553+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
554554
},
555555
"m/m³": {
556556
tagName: "Literal",
557557
name: "m/m³",
558558
literalVal: "46",
559-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
559+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
560560
},
561561
M: {
562562
tagName: "Literal",
@@ -568,13 +568,13 @@ export const apcChildren = {
568568
tagName: "Literal",
569569
name: "kg/m³",
570570
literalVal: "48",
571-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
571+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
572572
},
573573
"m²/s": {
574574
tagName: "Literal",
575575
name: "m²/s",
576576
literalVal: "49",
577-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
577+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
578578
},
579579
"W/m K": {
580580
tagName: "Literal",
@@ -610,13 +610,13 @@ export const apcChildren = {
610610
tagName: "Literal",
611611
name: "W/m²",
612612
literalVal: "55",
613-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
613+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
614614
},
615615
"J/m²": {
616616
tagName: "Literal",
617617
name: "J/m²",
618618
literalVal: "56",
619-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
619+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
620620
},
621621
"S/m": {
622622
tagName: "Literal",
@@ -684,7 +684,7 @@ export const apcChildren = {
684684
tagName: "Literal",
685685
name: "V²",
686686
literalVal: "67",
687-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
687+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
688688
},
689689
As: {
690690
tagName: "Literal",
@@ -696,13 +696,13 @@ export const apcChildren = {
696696
tagName: "Literal",
697697
name: "A²",
698698
literalVal: "69",
699-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
699+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
700700
},
701701
"A²t": {
702702
tagName: "Literal",
703703
name: "A²t",
704704
literalVal: "70",
705-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
705+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
706706
},
707707
VAh: {
708708
tagName: "Literal",
@@ -750,7 +750,7 @@ export const apcChildren = {
750750
tagName: "Literal",
751751
name: "kgm²",
752752
literalVal: "78",
753-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
753+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
754754
},
755755
dB: {
756756
tagName: "Literal",
@@ -869,7 +869,7 @@ export const apcChildren = {
869869
tagName: "Literal",
870870
name: "µ",
871871
literalVal: "-6",
872-
descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
872+
descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
873873
},
874874
m: {
875875
tagName: "Literal",
@@ -1097,8 +1097,8 @@ export const apcChildren = {
10971097
type: "FLOAT32",
10981098
dchg: "true",
10991099
descID: "IEC61850_7_3.CDCControl::APC.dbRef.desc",
1100-
mandatory: true,
1101-
presCond: "M",
1100+
presCond: "MO",
1101+
presCondArgs: "db"
11021102
},
11031103
d: {
11041104
tagName: "DataAttribute",

‎tDataTypeTemplates/nsdToJson/testJson/ASG.ts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ export const asgChildren = {
128128
tagName: "Literal",
129129
name: "°C",
130130
literalVal: "23",
131-
descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
131+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
132132
},
133133
Sv: {
134134
tagName: "Literal",
@@ -230,13 +230,13 @@ export const asgChildren = {
230230
tagName: "Literal",
231231
name: "m²",
232232
literalVal: "41",
233-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
233+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
234234
},
235235
"m³": {
236236
tagName: "Literal",
237237
name: "m³",
238238
literalVal: "42",
239-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
239+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
240240
},
241241
"m/s": {
242242
tagName: "Literal",
@@ -248,19 +248,19 @@ export const asgChildren = {
248248
tagName: "Literal",
249249
name: "m/s²",
250250
literalVal: "44",
251-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
251+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
252252
},
253253
"m³/s": {
254254
tagName: "Literal",
255255
name: "m³/s",
256256
literalVal: "45",
257-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
257+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
258258
},
259259
"m/m³": {
260260
tagName: "Literal",
261261
name: "m/m³",
262262
literalVal: "46",
263-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
263+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
264264
},
265265
M: {
266266
tagName: "Literal",
@@ -272,13 +272,13 @@ export const asgChildren = {
272272
tagName: "Literal",
273273
name: "kg/m³",
274274
literalVal: "48",
275-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
275+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
276276
},
277277
"m²/s": {
278278
tagName: "Literal",
279279
name: "m²/s",
280280
literalVal: "49",
281-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
281+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
282282
},
283283
"W/m K": {
284284
tagName: "Literal",
@@ -314,13 +314,13 @@ export const asgChildren = {
314314
tagName: "Literal",
315315
name: "W/m²",
316316
literalVal: "55",
317-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
317+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
318318
},
319319
"J/m²": {
320320
tagName: "Literal",
321321
name: "J/m²",
322322
literalVal: "56",
323-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
323+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
324324
},
325325
"S/m": {
326326
tagName: "Literal",
@@ -388,7 +388,7 @@ export const asgChildren = {
388388
tagName: "Literal",
389389
name: "V²",
390390
literalVal: "67",
391-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
391+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
392392
},
393393
As: {
394394
tagName: "Literal",
@@ -400,13 +400,13 @@ export const asgChildren = {
400400
tagName: "Literal",
401401
name: "A²",
402402
literalVal: "69",
403-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
403+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
404404
},
405405
"A²t": {
406406
tagName: "Literal",
407407
name: "A²t",
408408
literalVal: "70",
409-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
409+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
410410
},
411411
VAh: {
412412
tagName: "Literal",
@@ -454,7 +454,7 @@ export const asgChildren = {
454454
tagName: "Literal",
455455
name: "kgm²",
456456
literalVal: "78",
457-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
457+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
458458
},
459459
dB: {
460460
tagName: "Literal",
@@ -573,7 +573,7 @@ export const asgChildren = {
573573
tagName: "Literal",
574574
name: "µ",
575575
literalVal: "-6",
576-
descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
576+
descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
577577
},
578578
m: {
579579
tagName: "Literal",

‎tDataTypeTemplates/nsdToJson/testJson/BAC.ts‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ export const bacChildren = {
434434
tagName: "Literal",
435435
name: "°C",
436436
literalVal: "23",
437-
descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
437+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
438438
},
439439
Sv: {
440440
tagName: "Literal",
@@ -536,13 +536,13 @@ export const bacChildren = {
536536
tagName: "Literal",
537537
name: "m²",
538538
literalVal: "41",
539-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
539+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
540540
},
541541
"m³": {
542542
tagName: "Literal",
543543
name: "m³",
544544
literalVal: "42",
545-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
545+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
546546
},
547547
"m/s": {
548548
tagName: "Literal",
@@ -554,19 +554,19 @@ export const bacChildren = {
554554
tagName: "Literal",
555555
name: "m/s²",
556556
literalVal: "44",
557-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
557+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
558558
},
559559
"m³/s": {
560560
tagName: "Literal",
561561
name: "m³/s",
562562
literalVal: "45",
563-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
563+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
564564
},
565565
"m/m³": {
566566
tagName: "Literal",
567567
name: "m/m³",
568568
literalVal: "46",
569-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
569+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
570570
},
571571
M: {
572572
tagName: "Literal",
@@ -578,13 +578,13 @@ export const bacChildren = {
578578
tagName: "Literal",
579579
name: "kg/m³",
580580
literalVal: "48",
581-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
581+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
582582
},
583583
"m²/s": {
584584
tagName: "Literal",
585585
name: "m²/s",
586586
literalVal: "49",
587-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
587+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
588588
},
589589
"W/m K": {
590590
tagName: "Literal",
@@ -620,13 +620,13 @@ export const bacChildren = {
620620
tagName: "Literal",
621621
name: "W/m²",
622622
literalVal: "55",
623-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
623+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
624624
},
625625
"J/m²": {
626626
tagName: "Literal",
627627
name: "J/m²",
628628
literalVal: "56",
629-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
629+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
630630
},
631631
"S/m": {
632632
tagName: "Literal",
@@ -694,7 +694,7 @@ export const bacChildren = {
694694
tagName: "Literal",
695695
name: "V²",
696696
literalVal: "67",
697-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
697+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
698698
},
699699
As: {
700700
tagName: "Literal",
@@ -706,13 +706,13 @@ export const bacChildren = {
706706
tagName: "Literal",
707707
name: "A²",
708708
literalVal: "69",
709-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
709+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
710710
},
711711
"A²t": {
712712
tagName: "Literal",
713713
name: "A²t",
714714
literalVal: "70",
715-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
715+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
716716
},
717717
VAh: {
718718
tagName: "Literal",
@@ -760,7 +760,7 @@ export const bacChildren = {
760760
tagName: "Literal",
761761
name: "kgm²",
762762
literalVal: "78",
763-
descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
763+
descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
764764
},
765765
dB: {
766766
tagName: "Literal",
@@ -879,7 +879,7 @@ export const bacChildren = {
879879
tagName: "Literal",
880880
name: "µ",
881881
literalVal: "-6",
882-
descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
882+
descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
883883
},
884884
m: {
885885
tagName: "Literal",
@@ -1107,8 +1107,8 @@ export const bacChildren = {
11071107
type: "FLOAT32",
11081108
dchg: "true",
11091109
descID: "IEC61850_7_3.CDCControl::BAC.dbRef.desc",
1110-
mandatory: true,
1111-
presCond: "M",
1110+
presCond: "MO",
1111+
presCondArgs: "db"
11121112
},
11131113
d: {
11141114
tagName: "DataAttribute",

0 commit comments

Comments
 (0)