Skip to content

Commit 055ec3d

Browse files
clepskiclepski
authored
Merge branch 'main' into chore/switch-nginx-baseimage
2 parents 8f9255c + ef4b0fe commit 055ec3d

File tree

8 files changed

+681
-201
lines changed

8 files changed

+681
-201
lines changed

‎packages/compas-open-scd/public/nsdoc/README.md‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
Directory containing fixed nsdoc for the 'Validation' plugin:
22

3-
- IEC_61850-7-2_2007B3-en.nsdoc
4-
- IEC_61850-7-3_2007B3-en.nsdoc
5-
- IEC_61850-7-4_2007B3-en.nsdoc
6-
- IEC_61850-8-1_2003A2-en.nsdoc
3+
- IEC_61850-7-2_2007XX-en.nsdoc
4+
- IEC_61850-7-3_2007XX-en.nsdoc
5+
- IEC_61850-7-4_2007XX-en.nsdoc
6+
- IEC_61850-8-1_2003XX-en.nsdoc
7+
8+
Where `XX` represents the revision and release values.
9+
10+
This directory should also contain a `manifest.json` file listing all available NSDOC files for dynamic discovery. If the manifest is not present, the system will fall back to pattern-based file discovery.
11+
12+
## Fallback pattern discovery
13+
14+
When manifest.json is not available, the service checks for files using these patterns:
15+
16+
- Standards 7-2, 7-3, 7-4: `2007B5` to `2007B9` (stops at first found)
17+
- Standard 8-1: `2003A2` to `2003A9` (stops at first found)

‎packages/compas-open-scd/public/nsdoc/manifest.json.example‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
[
3+
"IEC_61850-7-2_2007B5-en.nsdoc",
4+
"IEC_61850-7-3_2007B5-en.nsdoc",
5+
"IEC_61850-7-4_2007B5-en.nsdoc",
6+
"IEC_61850-8-1_2003A2-en.nsdoc"
7+
]
8+

‎packages/compas-open-scd/public/xml/IEC_61850-7-2_2007B3.nsd‎ renamed to ‎packages/compas-open-scd/public/xml/IEC_61850-7-2_2007B5.nsd‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,15 @@
55
id="IEC 61850-7-2"
66
version="2007"
77
revision="B"
8-
release="3"
9-
umlVersion="WG10built4"
10-
umlDate="2019-10-02T00:00:00Z"
11-
publicationStage="IS">
8+
release="5"
9+
umlVersion="WG10built12"
10+
umlDate="2024-01-15"
11+
publicationStage="IS"
12+
appVersion="j61850DocBuilder 02.03 based on jCleanCim noNS beta9.3 (derived from jCleanCim 02-02)"
13+
namespaceType="basic"
14+
nsdVersion="2017"
15+
nsdRevision="B"
16+
nsdRelease="5">
1217
<Copyright>
1318
<Notice>
1419
COPYRIGHT (c) IEC, www.iec.ch/tc57/supportdocuments. This version of this NSD is part of IEC_61850-7-2:2010 Edition 2.1; see the IEC_61850-7-2:2010 Edition 2.1 for full legal notices. In case of any differences between the here-below code and the IEC published content, the here-below definition supersedes the IEC publication; it may contain updates. See history files. The whole document has to be taken into account to have a full description of this code component.
@@ -17,8 +22,8 @@
1722
<License uri="www.iec.ch/CCv1" kind="Standard"/>
1823
</Copyright>
1924
<Changes version="2007"
20-
revision="A"
21-
tissues="728, 730, 778, 780, 783, 786, 813, 820, 850, 852, 858, 860, 861, 869, 875, 876, 943, 970, 1038, 1050, 1061, 1062, 1071, 1091, 1092, 1116, 1122, 1127, 1145, 1154, 1194, 1202, 1232, 1242, 1252, 1276, 1283, 1307, 1308, 1319, 1338, 1341, 1356, 1377, 1386, 1428, 1432, 1433, 1435, 1439, 1455, 1569, 1589, 1622, 1630, 1650, 1652"/>
25+
revision="B"
26+
tissues="1781, 1782, 1801, 1841, 1847, 1822"/>
2227
<BasicTypes>
2328
<BasicType name="BOOLEAN" descID="IEC61850_7_2.BasicTypes::P_BOOLEAN.cl.desc"/>
2429
<BasicType name="INT8" descID="IEC61850_7_2.BasicTypes::P_INT8.cl.desc"/>
@@ -531,4 +536,4 @@
531536
presCond="M"/>
532537
</ConstructedAttribute>
533538
</ConstructedAttributes>
534-
</NS>
539+
</NS>

‎packages/compas-open-scd/public/xml/IEC_61850-7-3_2007B3.nsd‎ renamed to ‎packages/compas-open-scd/public/xml/IEC_61850-7-3_2007B5.nsd‎

Lines changed: 44 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,15 @@
55
id="IEC 61850-7-3"
66
version="2007"
77
revision="B"
8-
release="3"
9-
umlVersion="WG10built3"
10-
umlDate="2019-10-02T00:00:00Z"
11-
publicationStage="IS">
8+
release="5"
9+
umlVersion="WG10built12"
10+
umlDate="2024-02-12"
11+
publicationStage="IS"
12+
appVersion="j61850DocBuilder 02.03 based on jCleanCim noNS beta9.3 (derived from jCleanCim 02-02)"
13+
namespaceType="basic"
14+
nsdVersion="2017"
15+
nsdRevision="B"
16+
nsdRelease="5">
1217
<Copyright>
1318
<Notice>
1419
COPYRIGHT (c) IEC, www.iec.ch/tc57/supportdocuments. This version of this NSD is part of IEC_61850-7-3:2010 Edition 2.1; see the IEC_61850-7-3:2010 Edition 2.1 for full legal notices. In case of any differences between the here-below code and the IEC published content, the here-below definition supersedes the IEC publication; it may contain updates. See history files. The whole document has to be taken into account to have a full description of this code component.
@@ -17,9 +22,12 @@
1722
<License uri="www.iec.ch/CCv1" kind="Standard"/>
1823
</Copyright>
1924
<Changes version="2007"
20-
revision="A"
21-
tissues="690, 691, 692, 697, 698, 707, 709, 711, 722, 814, 816, 819, 832, 839, 846, 868, 887, 919, 924, 925, 926, 929, 953, 954, 962, 968, 996, 1078, 1079, 1122, 1127, 1184, 1187, 1189, 1220, 1233, 1240, 1242, 1247, 1253, 1265, 1270, 1311, 1372, 1387, 1388, 1403, 1430, 1438, 1578, 1581, 1598, 1602, 1623"/>
22-
<DependsOn id="IEC 61850-7-2" version="2007" revision="B"/>
25+
revision="B"
26+
tissues="1716, 1730, 1783, 1785, 1807, 1829, 1840, 1851, 1852, 1889, 1900"/>
27+
<DependsOn id="IEC 61850-7-2"
28+
version="2007"
29+
revision="B"
30+
dependencyType="dependsOn"/>
2331
<Enumerations>
2432
<Enumeration name="AngleReferenceKind"
2533
titleID="IEC61850_7_3.DAEnums::AngleReferenceKind.cl.title">
@@ -232,7 +240,7 @@
232240
descID="IEC61850_7_3.DAEnums::MultiplierKind.n.desc"/>
233241
<Literal name="µ"
234242
literalVal="-6"
235-
descID="IEC61850_7_3.DAEnums::MultiplierKind._micro.desc"/>
243+
descID="IEC61850_7_3.DAEnums::MultiplierKind.µ.desc"/>
236244
<Literal name="m"
237245
literalVal="-3"
238246
descID="IEC61850_7_3.DAEnums::MultiplierKind.m.desc"/>
@@ -385,7 +393,7 @@
385393
descID="IEC61850_7_3.DAEnums::SIUnitKind.Bq.desc"/>
386394
<Literal name="°C"
387395
literalVal="23"
388-
descID="IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc"/>
396+
descID="IEC61850_7_3.DAEnums::SIUnitKind.°C.desc"/>
389397
<Literal name="Sv"
390398
literalVal="24"
391399
descID="IEC61850_7_3.DAEnums::SIUnitKind.Sv.desc"/>
@@ -436,31 +444,31 @@
436444
descID="IEC61850_7_3.DAEnums::SIUnitKind.Pa.desc"/>
437445
<Literal name="m²"
438446
literalVal="41"
439-
descID="IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc"/>
447+
descID="IEC61850_7_3.DAEnums::SIUnitKind.m².desc"/>
440448
<Literal name="m³"
441449
literalVal="42"
442-
descID="IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc"/>
450+
descID="IEC61850_7_3.DAEnums::SIUnitKind.m³.desc"/>
443451
<Literal name="m/s"
444452
literalVal="43"
445453
descID="IEC61850_7_3.DAEnums::SIUnitKind.m_per_s.desc"/>
446454
<Literal name="m/s²"
447455
literalVal="44"
448-
descID="IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc"/>
456+
descID="IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc"/>
449457
<Literal name="m³/s"
450458
literalVal="45"
451-
descID="IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc"/>
459+
descID="IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc"/>
452460
<Literal name="m/m³"
453461
literalVal="46"
454-
descID="IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc"/>
462+
descID="IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc"/>
455463
<Literal name="M"
456464
literalVal="47"
457465
descID="IEC61850_7_3.DAEnums::SIUnitKind.M.desc"/>
458466
<Literal name="kg/m³"
459467
literalVal="48"
460-
descID="IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc"/>
468+
descID="IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc"/>
461469
<Literal name="m²/s"
462470
literalVal="49"
463-
descID="IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc"/>
471+
descID="IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc"/>
464472
<Literal name="W/m K"
465473
literalVal="50"
466474
descID="IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_K.desc"/>
@@ -478,10 +486,10 @@
478486
descID="IEC61850_7_3.DAEnums::SIUnitKind.rad_per_s.desc"/>
479487
<Literal name="W/m²"
480488
literalVal="55"
481-
descID="IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc"/>
489+
descID="IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc"/>
482490
<Literal name="J/m²"
483491
literalVal="56"
484-
descID="IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc"/>
492+
descID="IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc"/>
485493
<Literal name="S/m"
486494
literalVal="57"
487495
descID="IEC61850_7_3.DAEnums::SIUnitKind.S_per_m.desc"/>
@@ -516,16 +524,16 @@
516524
descID="IEC61850_7_3.DAEnums::SIUnitKind.Vs.desc"/>
517525
<Literal name="V²"
518526
literalVal="67"
519-
descID="IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc"/>
527+
descID="IEC61850_7_3.DAEnums::SIUnitKind.V².desc"/>
520528
<Literal name="As"
521529
literalVal="68"
522530
descID="IEC61850_7_3.DAEnums::SIUnitKind.As.desc"/>
523531
<Literal name="A²"
524532
literalVal="69"
525-
descID="IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc"/>
533+
descID="IEC61850_7_3.DAEnums::SIUnitKind.A².desc"/>
526534
<Literal name="A²t"
527535
literalVal="70"
528-
descID="IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc"/>
536+
descID="IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc"/>
529537
<Literal name="VAh"
530538
literalVal="71"
531539
descID="IEC61850_7_3.DAEnums::SIUnitKind.VAh.desc"/>
@@ -549,7 +557,7 @@
549557
descID="IEC61850_7_3.DAEnums::SIUnitKind.char_per_s.desc"/>
550558
<Literal name="kgm²"
551559
literalVal="78"
552-
descID="IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc"/>
560+
descID="IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc"/>
553561
<Literal name="dB"
554562
literalVal="79"
555563
descID="IEC61850_7_3.DAEnums::SIUnitKind.dB.desc"/>
@@ -1429,7 +1437,8 @@
14291437
type="Timestamp"
14301438
dchg="true"
14311439
descID="IEC61850_7_3.CDCStatusInfo::BCR.strTm.desc"
1432-
presCond="O"/>
1440+
presCond="OF"
1441+
presCondArgs="frVal"/>
14331442
<DataAttribute name="frPd"
14341443
fc="CF"
14351444
type="INT32"
@@ -3541,7 +3550,8 @@
35413550
type="FLOAT32"
35423551
dchg="true"
35433552
descID="IEC61850_7_3.CDCControl::APC.dbRef.desc"
3544-
presCond="M"/>
3553+
presCond="MO"
3554+
presCondArgs="db"/>
35453555
<DataAttribute name="d"
35463556
fc="DC"
35473557
type="VisString255"
@@ -3730,7 +3740,8 @@
37303740
type="FLOAT32"
37313741
dchg="true"
37323742
descID="IEC61850_7_3.CDCControl::BAC.dbRef.desc"
3733-
presCond="M"/>
3743+
presCond="MO"
3744+
presCondArgs="db"/>
37343745
<DataAttribute name="d"
37353746
fc="DC"
37363747
type="VisString255"
@@ -5765,7 +5776,9 @@
57655776
descID="IEC61850_7_3.CoreAbstractCDCs::BasePrimitiveCDC.dataNs.desc"
57665777
presCond="MOdataNs"/>
57675778
</CDC>
5768-
<CDC name="GTS" titleID="IEC61850_7_3.CDCServiceTracking::GTS.cl.title">
5779+
<CDC name="GTS"
5780+
titleID="IEC61850_7_3.CDCServiceTracking::GTS.cl.title"
5781+
typeKindParameterized="true">
57695782
<DataAttribute name="objRef"
57705783
fc="SR"
57715784
type="ObjRef"
@@ -5826,7 +5839,7 @@
58265839
presCond="M"/>
58275840
<DataAttribute name="dstAddress"
58285841
fc="SR"
5829-
type="PhyComAddr"
5842+
typeKind="SCSM"
58305843
descID="IEC61850_7_3.CDCServiceTracking::GTS.dstAddress.desc"
58315844
presCond="M"/>
58325845
<DataAttribute name="d"
@@ -5850,7 +5863,9 @@
58505863
descID="IEC61850_7_3.CoreAbstractCDCs::BasePrimitiveCDC.dataNs.desc"
58515864
presCond="MOdataNs"/>
58525865
</CDC>
5853-
<CDC name="MTS" titleID="IEC61850_7_3.CDCServiceTracking::MTS.cl.title">
5866+
<CDC name="MTS"
5867+
titleID="IEC61850_7_3.CDCServiceTracking::MTS.cl.title"
5868+
typeKindParameterized="true">
58545869
<DataAttribute name="objRef"
58555870
fc="SR"
58565871
type="ObjRef"
@@ -5922,7 +5937,7 @@
59225937
presCond="M"/>
59235938
<DataAttribute name="dstAddress"
59245939
fc="SR"
5925-
type="PhyComAddr"
5940+
typeKind="SCSM"
59265941
descID="IEC61850_7_3.CDCServiceTracking::MTS.dstAddress.desc"
59275942
presCond="M"/>
59285943
<DataAttribute name="d"

0 commit comments

Comments
 (0)