Skip to content

fix: nump NSD file versions #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JakobVogelsang merged 1 commit into from
Jul 28, 2025
Merged

fix: nump NSD file versions #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
229 changes: 149 additions & 80 deletions foundation/codecomponents/nsds.ts
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions tDataTypeTemplates/nsdToJson/testJson/APC.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ export const apcChildren = {
tagName: "Literal",
name: "°C",
literalVal: "23",
descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
},
Sv: {
tagName: "Literal",
Expand Down Expand Up @@ -526,13 +526,13 @@ export const apcChildren = {
tagName: "Literal",
name: "m²",
literalVal: "41",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
},
"m³": {
tagName: "Literal",
name: "m³",
literalVal: "42",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
},
"m/s": {
tagName: "Literal",
Expand All @@ -544,19 +544,19 @@ export const apcChildren = {
tagName: "Literal",
name: "m/s²",
literalVal: "44",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
},
"m³/s": {
tagName: "Literal",
name: "m³/s",
literalVal: "45",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
},
"m/m³": {
tagName: "Literal",
name: "m/m³",
literalVal: "46",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
},
M: {
tagName: "Literal",
Expand All @@ -568,13 +568,13 @@ export const apcChildren = {
tagName: "Literal",
name: "kg/m³",
literalVal: "48",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
},
"m²/s": {
tagName: "Literal",
name: "m²/s",
literalVal: "49",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
},
"W/m K": {
tagName: "Literal",
Expand Down Expand Up @@ -610,13 +610,13 @@ export const apcChildren = {
tagName: "Literal",
name: "W/m²",
literalVal: "55",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
},
"J/m²": {
tagName: "Literal",
name: "J/m²",
literalVal: "56",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
},
"S/m": {
tagName: "Literal",
Expand Down Expand Up @@ -684,7 +684,7 @@ export const apcChildren = {
tagName: "Literal",
name: "V²",
literalVal: "67",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
},
As: {
tagName: "Literal",
Expand All @@ -696,13 +696,13 @@ export const apcChildren = {
tagName: "Literal",
name: "A²",
literalVal: "69",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
},
"A²t": {
tagName: "Literal",
name: "A²t",
literalVal: "70",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
},
VAh: {
tagName: "Literal",
Expand Down Expand Up @@ -750,7 +750,7 @@ export const apcChildren = {
tagName: "Literal",
name: "kgm²",
literalVal: "78",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
},
dB: {
tagName: "Literal",
Expand Down Expand Up @@ -869,7 +869,7 @@ export const apcChildren = {
tagName: "Literal",
name: "µ",
literalVal: "-6",
descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
},
m: {
tagName: "Literal",
Expand Down Expand Up @@ -1097,8 +1097,8 @@ export const apcChildren = {
type: "FLOAT32",
dchg: "true",
descID: "IEC61850_7_3.CDCControl::APC.dbRef.desc",
mandatory: true,
presCond: "M",
presCond: "MO",
presCondArgs: "db"
},
d: {
tagName: "DataAttribute",
Expand Down
30 changes: 15 additions & 15 deletions tDataTypeTemplates/nsdToJson/testJson/ASG.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export const asgChildren = {
tagName: "Literal",
name: "°C",
literalVal: "23",
descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
},
Sv: {
tagName: "Literal",
Expand Down Expand Up @@ -230,13 +230,13 @@ export const asgChildren = {
tagName: "Literal",
name: "m²",
literalVal: "41",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
},
"m³": {
tagName: "Literal",
name: "m³",
literalVal: "42",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
},
"m/s": {
tagName: "Literal",
Expand All @@ -248,19 +248,19 @@ export const asgChildren = {
tagName: "Literal",
name: "m/s²",
literalVal: "44",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
},
"m³/s": {
tagName: "Literal",
name: "m³/s",
literalVal: "45",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
},
"m/m³": {
tagName: "Literal",
name: "m/m³",
literalVal: "46",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
},
M: {
tagName: "Literal",
Expand All @@ -272,13 +272,13 @@ export const asgChildren = {
tagName: "Literal",
name: "kg/m³",
literalVal: "48",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
},
"m²/s": {
tagName: "Literal",
name: "m²/s",
literalVal: "49",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
},
"W/m K": {
tagName: "Literal",
Expand Down Expand Up @@ -314,13 +314,13 @@ export const asgChildren = {
tagName: "Literal",
name: "W/m²",
literalVal: "55",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
},
"J/m²": {
tagName: "Literal",
name: "J/m²",
literalVal: "56",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
},
"S/m": {
tagName: "Literal",
Expand Down Expand Up @@ -388,7 +388,7 @@ export const asgChildren = {
tagName: "Literal",
name: "V²",
literalVal: "67",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
},
As: {
tagName: "Literal",
Expand All @@ -400,13 +400,13 @@ export const asgChildren = {
tagName: "Literal",
name: "A²",
literalVal: "69",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
},
"A²t": {
tagName: "Literal",
name: "A²t",
literalVal: "70",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
},
VAh: {
tagName: "Literal",
Expand Down Expand Up @@ -454,7 +454,7 @@ export const asgChildren = {
tagName: "Literal",
name: "kgm²",
literalVal: "78",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
},
dB: {
tagName: "Literal",
Expand Down Expand Up @@ -573,7 +573,7 @@ export const asgChildren = {
tagName: "Literal",
name: "µ",
literalVal: "-6",
descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
},
m: {
tagName: "Literal",
Expand Down
34 changes: 17 additions & 17 deletions tDataTypeTemplates/nsdToJson/testJson/BAC.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ export const bacChildren = {
tagName: "Literal",
name: "°C",
literalVal: "23",
descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
},
Sv: {
tagName: "Literal",
Expand Down Expand Up @@ -536,13 +536,13 @@ export const bacChildren = {
tagName: "Literal",
name: "m²",
literalVal: "41",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
},
"m³": {
tagName: "Literal",
name: "m³",
literalVal: "42",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
},
"m/s": {
tagName: "Literal",
Expand All @@ -554,19 +554,19 @@ export const bacChildren = {
tagName: "Literal",
name: "m/s²",
literalVal: "44",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
},
"m³/s": {
tagName: "Literal",
name: "m³/s",
literalVal: "45",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
},
"m/m³": {
tagName: "Literal",
name: "m/m³",
literalVal: "46",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
},
M: {
tagName: "Literal",
Expand All @@ -578,13 +578,13 @@ export const bacChildren = {
tagName: "Literal",
name: "kg/m³",
literalVal: "48",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
},
"m²/s": {
tagName: "Literal",
name: "m²/s",
literalVal: "49",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
},
"W/m K": {
tagName: "Literal",
Expand Down Expand Up @@ -620,13 +620,13 @@ export const bacChildren = {
tagName: "Literal",
name: "W/m²",
literalVal: "55",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
},
"J/m²": {
tagName: "Literal",
name: "J/m²",
literalVal: "56",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
},
"S/m": {
tagName: "Literal",
Expand Down Expand Up @@ -694,7 +694,7 @@ export const bacChildren = {
tagName: "Literal",
name: "V²",
literalVal: "67",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
},
As: {
tagName: "Literal",
Expand All @@ -706,13 +706,13 @@ export const bacChildren = {
tagName: "Literal",
name: "A²",
literalVal: "69",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
},
"A²t": {
tagName: "Literal",
name: "A²t",
literalVal: "70",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
},
VAh: {
tagName: "Literal",
Expand Down Expand Up @@ -760,7 +760,7 @@ export const bacChildren = {
tagName: "Literal",
name: "kgm²",
literalVal: "78",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
},
dB: {
tagName: "Literal",
Expand Down Expand Up @@ -879,7 +879,7 @@ export const bacChildren = {
tagName: "Literal",
name: "µ",
literalVal: "-6",
descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
},
m: {
tagName: "Literal",
Expand Down Expand Up @@ -1107,8 +1107,8 @@ export const bacChildren = {
type: "FLOAT32",
dchg: "true",
descID: "IEC61850_7_3.CDCControl::BAC.dbRef.desc",
mandatory: true,
presCond: "M",
presCond: "MO",
presCondArgs: "db"
},
d: {
tagName: "DataAttribute",
Expand Down
Loading