Skip to content

Commit 0fb54ca

Browse files
juancho0202juancho0202
authored
Merge pull request #190 from com-pas/upstream-v0.24.0
Merging OpenSCD v0.24.0 into CoMPAS
2 parents 29519c5 + 46ddd4f commit 0fb54ca

File tree

120 files changed

+6574
-2412
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+6574
-2412
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
## testing
1313
/coverage/
14+
/**/dist/*.snap.dev.js
1415

1516
## docs
1617
/doc/

‎CHANGELOG.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [0.24.0](https://github.com/openscd/open-scd/compare/v0.23.0...v0.24.0) (2022-09-19)
6+
7+
8+
### Features
9+
10+
* **editor/ied:** Filter for logical nodes ([#990](https://github.com/openscd/open-scd/issues/990)) ([629cbcc](https://github.com/openscd/open-scd/commits/629cbcc2590b22c052e16778c919ac365a2886c6))
11+
* **editors/subscriber-later-binding:** Show connected and available ExtRef on FCDA selection (GOOSE) ([#995](https://github.com/openscd/open-scd/issues/995)) ([d88b7d2](https://github.com/openscd/open-scd/commits/d88b7d24cd50682cca4eb39e37f547fcc6702ce0))
12+
* **menu/compareied:** Compare View redesign to make it more clear ([#996](https://github.com/openscd/open-scd/issues/996)) ([342c30f](https://github.com/openscd/open-scd/commits/342c30ff826c10ff54ae9205f12841f7b02824c6))
13+
14+
15+
### Bug Fixes
16+
17+
* **editors/plugin:** disable read-only inputs ([#1000](https://github.com/openscd/open-scd/issues/1000)) ([e399e7e](https://github.com/openscd/open-scd/commits/e399e7e3685ad0ee5fee351eed0f53703a0f6528))
18+
519
## [0.23.0](https://github.com/openscd/open-scd/compare/v0.22.0...v0.23.0) (2022-09-05)
620

721

‎manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@
4040
"purpose": "maskable"
4141
}
4242
],
43-
"version": "0.23.0"
43+
"version": "0.24.0"
4444
}

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "open-scd",
3-
"version": "0.23.0",
3+
"version": "0.24.0",
44
"repository": "https://github.com/openscd/open-scd.git",
55
"description": "A bottom-up substation configuration designer for projects described using SCL `IEC 61850-6` Edition 2 or greater.",
66
"keywords": [

‎public/md/Bay.md‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
**Create Bay**
2+
3+
<img align="right" width="250" alt="grafik" src="https://user-images.githubusercontent.com/66802940/183960578-a50a489c-9e0e-489e-bdb5-aeb97f240082.png">
4+
5+
To create a new `Bay` element within the parent `VoltageLevel`
6+
7+
- Navigate to the **Substation** editor
8+
- Select the parent **VoltageLevel** you want to add the bay to
9+
- Fill in all required value
10+
- Click on **Add**
11+
12+
The create wizard allows to set
13+
14+
- `name`: unique identified of the Bay in the parent `VoltageLevel`
15+
- `desc`: human readable description
16+
17+
**Edit Bay**
18+
19+
<img width="250" alt="grafik" src="https://user-images.githubusercontent.com/66802940/183960790-d6c32f25-e829-4990-81be-2372c75fccbe.png">
20+
21+
To edit a `Bay` element:
22+
23+
- Navigate to the **Substation** editor
24+
- Select the **Bay** you want to edit
25+
- Click on the **edit** button
26+
- Make the changes and click **Save**
27+
28+
The element `Bay` has two attributes
29+
30+
- `name`: unique identified of the Bay in the parent `VoltageLevel`
31+
- `desc`: human readable description
32+
33+
**Remove Bay**
34+
35+
To remove an existing `Bay` element within the parent `VoltageLevel`
36+
37+
- Navigate to the **Substation** editor
38+
- Select the **Bay** you want to remove
39+
- Click on the **delete** button

‎public/md/ClientLN.md‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
1-
A `ClientLN` is one of 3 elements that are describing connections between IEDs in a SCL file.
1+
A `ClientLN` is one of 3 elements that are describing connections between IEDs in a SCL file.
22

3-
### HowTo connect Report with ClientLNs
4-
OpenSCD allows you to connect `ReportControl` via `ClientLN`. The starting point is the **IED** in the **Substation editor**.
3+
**HowTo connect Report with ClientLNs**
54

6-
<img src="https://user-images.githubusercontent.com/66802940/133250977-03eb956f-fde7-43bc-994c-790b7ec33a2a.png" alt="alt text" width="250">
5+
OpenSCD allows you to connect `ReportControl` via `ClientLN`. The starting point is the **IED** in the **Substation** editor.
76

7+
<img src="https://user-images.githubusercontent.com/66802940/133250977-03eb956f-fde7-43bc-994c-790b7ec33a2a.png" alt="alt text" width="250">
88

9-
- Click on a **IED**
10-
- Click on **Add connection** button
9+
- Click on an **IED**
10+
- Click on **Add connection** button
1111
- The `ClientLN` wizard open
12-
- On the right hand side you can select the `ReportControl` element(s) in the project
12+
- On the left hand side you can select the `ReportControl` element(s) in the project
1313
- On the right hand side you can see all logical node in the receiving IED (client).
1414
- All so-called client logical nodes - logical nodes allocated to `AccessPoint` are sorted be be on top.
1515
- `LN0` element are sorted to be at the bottom
1616
- Click on `CONNECT`
1717

1818
![grafik](https://user-images.githubusercontent.com/66802940/133251594-7d552b24-e64f-4875-932a-07c990c0c7ac.png)
1919

20-
> NOTE: When `ClientLN` connections are already present in the `Report Control` block the wizard does not close in **CONNECT**
20+
> NOTE: When `ClientLN` connections are already present in the `Report Control` block the wizard does not close on **CONNECT**
2121
22-
> NOTE: If the `EnableRpt` `max` attribute is smaller or equal to the `ClientLN` a connection is not possible. The `ReportControl` on the rigth hand side is disabled.
22+
> NOTE: If the `RptEnabled` `max` attribute is smaller or equal to the `ClientLN` a connection is not possible. The `ReportControl` on the right hand side is disabled.
2323
2424
> TIP: You can filter for several terms at same time. The space between terms is acting as a logical AND.
25-

‎public/md/Communication-Basics.md‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
The `Communication` section in a SCL file allows to specify the network, its access points as well as the configuration of each of the access points.
2+
3+
It has as children at least one `SubNetwork`. It can be configured through the child element `BitRate`. Each `SubNetwork` can have multiple `ConnectedAP` elements, which are pointers to IEDs `AccessPoint` - attributes `iedName` and `apName`. Each `ConnectedAP` has one `Address` element and that has as many `P` elements as there are settings for this particular access point. A `P` element is structured as followed:
4+
5+
```xml
6+
<P type="IP">192.168.210.122</P>
7+
```
8+
9+
The `type` attribute defines the setting type and the inner text (here 192.168.210.122) of the element defines the setting value. There are various other optional setting types defined and OpenSCD supports to set those:
10+
11+
- IP
12+
- IP-SUBNET
13+
- IP-GATEWAY
14+
- OSI-TSEL
15+
- OSI-SSEL
16+
- OSI-PSEL
17+
- OSI-AP-Title
18+
- OSI-AP-Invoke
19+
- OSI-AE-Qualifier
20+
- OSI-AE-Invoke
21+
- OSI-NSAP
22+
- VLAN-ID
23+
- VLAN-PRIORITY
24+
- SNTP-Port
25+
- MMS-Port
26+
- DNSName
27+
- UDP-Port
28+
- TCP-Port
29+
- C37-118-IP-Port
30+
- IPv6
31+
- IPv6-SUBNET
32+
- IPv6-GATEWAY
33+
- IPv6FlowLabel
34+
- IPv6ClassOfTraffic
35+
- IPv6-IGMPv3Src
36+
- IP-IGMPv3Sr
37+
- IP-ClassOfTraffic
38+
39+
Each is backed up with pattern check against the pattern defined in the schema (2007B4).
40+
41+
A very typical `Communication` section might look like this:
42+
43+
```xml
44+
<SubNetwork type="8-MMS" name="Stationbus" desc="Subnetwork">
45+
<BitRate unit="b/s" multiplier="M">10</BitRate>
46+
<ConnectedAP iedName="AA1E1Q04MU" apName="AP1">
47+
<Address>
48+
<P type="IP">192.168.210.142</P>
49+
<P type="IP-SUBNET">255.255.255.0</P>
50+
<P type="IP-GATEWAY">192.168.210.1</P>
51+
<P type="OSI-PSEL">00000001</P>
52+
<P type="OSI-SSEL">0001</P>
53+
<P type="OSI-TSEL">0001</P>
54+
<P type="OSI-AP-Title">1,3,9999,23</P>
55+
<P type="OSI-AE-Qualifier">23</P>
56+
</Address>
57+
</ConnectedAP>
58+
<ConnectedAP iedName="AA1E1Q02BCU" apName="AP1" redProt="prp">
59+
<Address>
60+
<P type="IP">192.168.210.121</P>
61+
<P type="IP-SUBNET">255.255.255.0</P>
62+
<P type="IP-GATEWAY">192.168.210.1</P>
63+
<P type="OSI-PSEL">00000001</P>
64+
<P type="OSI-SSEL">0001</P>
65+
<P type="OSI-TSEL">0001</P>
66+
<P type="OSI-AP-Title">1,3,9999,23</P>
67+
<P type="OSI-AE-Qualifier">23</P>
68+
</Address>
69+
</ConnectedAP>
70+
</SubNetwork>
71+
```
72+
73+
> NOTE: in addition to the namespace `xmlns="http://www.iec.ch/61850/2003/SCL"` SCL files can have `xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"` as well that allows to faster parse a SCL file for communication type configuration. A `P` type element that can look like this:
74+
75+
```xml
76+
<P xsi:type="tP_IP" type="IP">192.168.210.122</P>
77+
```
78+
79+
In OpenSCD you can configure the
80+
81+
- [SubNetwork](https://github.com/openscd/open-scd/wiki/Subnetwork)
82+
- [ConnectedAP](https://github.com/openscd/open-scd/wiki/ConnectedAP)

‎public/md/Communication.md‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎public/md/Conducting-Equipment.md‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
**Create ConductingEquipment**
2+
3+
<img align="right" width="250" alt="grafik" src="https://user-images.githubusercontent.com/66802940/183962761-e5b168bd-94b0-4200-baaa-824e9511aa3a.png">
4+
5+
To create a new `ConductingEquipment` element within the parent `Bay`
6+
7+
- Navigate to the **Substation** editor
8+
- Select the parent **Bay** you want to add the conducting equipment to
9+
- Select the type
10+
- Fill in all required values
11+
- Click on **Add**
12+
13+
The create wizard allows to set
14+
15+
- `type`: the standard IEC 61850 defines a set of types the user can choose from
16+
- `name`: unique identified of the conducting equipment in the parent `Bay`
17+
- `desc`: human readable description
18+
19+
**Edit ConductingEquipment**
20+
21+
<img width="250" alt="grafik" src="https://user-images.githubusercontent.com/66802940/183963460-6b7e4e5a-5612-441e-bca8-6cd354f1feda.png">
22+
23+
To edit a `ConductingEquipment` element:
24+
25+
- Navigate to the **Substation** editor
26+
- Select the **ConductingEquipment** you want to edit
27+
- Click on the **edit** button
28+
- Make the changes and click **Save**
29+
30+
The element `ConductingEquipment` has two attributes
31+
32+
- `name`: unique identified of the Bay in the parent `Bay`
33+
- `desc`: human readable description
34+
- `type`: cannot be edit!
35+
36+
**Remove ConductingEquipment**
37+
38+
To remove an existing `ConductingEquipment` element within the parent `Bay`
39+
40+
- Navigate to the **Substation** editor
41+
- Select the **ConductingEquipment** you want to remove
42+
- Click on the **delete** button
43+
44+
> NOTE: OpenSCD does not support the definition of user defined conducting equipment types. This can only be manipulated through the code editor.
45+
> NOTE: The **Earth Switch** is unfortunately not a type but a special version of `DIS`. It can be tagged to a earth switch through the data object `SwType` (an logical node reference to the logical node of class `XSWI`) must be present. Or it has a child `Terminal` with a `cNodeName = grounded`. Both those cases are recognized by OpenSCD and is displayed. When you create a new **Earth Switch** the second option is applied

0 commit comments

Comments
 (0)