Skip to content

Commit 25fbcac

Browse files
Kudrat9Kudrat9
authored
Merge pull request #261 from dersecure/master
Multiple model updates and DERSec custom models
2 parents fde3354 + d11009f commit 25fbcac

File tree

159 files changed

+9257
-6393
lines changed

Some content is hidden

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

159 files changed

+9257
-6393
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- development
8+
pull_request:
9+
branches:
10+
- "*"
11+
12+
jobs:
13+
xml:
14+
name: Check XML
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v2
18+
- name: Install dependencies
19+
run: |
20+
sudo apt-get update --yes
21+
sudo apt-get install --yes libxml2-utils
22+
- name: Check
23+
run: make -C smdx
24+
json:
25+
name: Check JSON
26+
runs-on: ubuntu-latest
27+
steps:
28+
- uses: actions/checkout@v2
29+
- name: Install dependencies
30+
run: |
31+
sudo apt-get update --yes
32+
sudo apt-get install --yes python3-jsonschema
33+
- name: Check
34+
run: make -C json

‎json/model_101.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
"sf": "A_SF",
4242
"size": 1,
4343
"type": "uint16",
44-
"units": "A"
44+
"units": "A",
45+
"detail": "Connected Phase"
4546
},
4647
{
4748
"desc": "Phase B Current",

‎json/model_102.json‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
"sf": "A_SF",
3232
"size": 1,
3333
"type": "uint16",
34-
"units": "A"
34+
"units": "A",
35+
"detail": "Sum of active phases"
3536
},
3637
{
3738
"desc": "Phase A Current",
@@ -41,7 +42,8 @@
4142
"sf": "A_SF",
4243
"size": 1,
4344
"type": "uint16",
44-
"units": "A"
45+
"units": "A",
46+
"detail": "Connected Phase"
4547
},
4648
{
4749
"desc": "Phase B Current",
@@ -51,7 +53,8 @@
5153
"sf": "A_SF",
5254
"size": 1,
5355
"type": "uint16",
54-
"units": "A"
56+
"units": "A",
57+
"detail": "Connected Phase"
5558
},
5659
{
5760
"desc": "Phase C Current",

‎json/model_103.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
"sf": "A_SF",
3232
"size": 1,
3333
"type": "uint16",
34-
"units": "A"
34+
"units": "A",
35+
"detail": "Sum of active phases"
3536
},
3637
{
3738
"desc": "Phase A Current",
@@ -41,7 +42,8 @@
4142
"sf": "A_SF",
4243
"size": 1,
4344
"type": "uint16",
44-
"units": "A"
45+
"units": "A",
46+
"detail": "Connected Phase"
4547
},
4648
{
4749
"desc": "Phase B Current",
@@ -51,7 +53,8 @@
5153
"sf": "A_SF",
5254
"size": 1,
5355
"type": "uint16",
54-
"units": "A"
56+
"units": "A",
57+
"detail": "Connected Phase"
5558
},
5659
{
5760
"desc": "Phase C Current",
@@ -61,7 +64,8 @@
6164
"sf": "A_SF",
6265
"size": 1,
6366
"type": "uint16",
64-
"units": "A"
67+
"units": "A",
68+
"detail": "Connected Phase"
6569
},
6670
{
6771
"mandatory": "M",

‎json/model_111.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
"name": "AphA",
4040
"size": 2,
4141
"type": "float32",
42-
"units": "A"
42+
"units": "A",
43+
"detail": "Connected Phase"
4344
},
4445
{
4546
"desc": "Phase B Current",

‎json/model_112.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
"name": "AphA",
4040
"size": 2,
4141
"type": "float32",
42-
"units": "A"
42+
"units": "A",
43+
"detail": "Connected Phase"
4344
},
4445
{
4546
"desc": "Phase B Current",
@@ -48,7 +49,8 @@
4849
"name": "AphB",
4950
"size": 2,
5051
"type": "float32",
51-
"units": "A"
52+
"units": "A",
53+
"detail": "Connected Phase"
5254
},
5355
{
5456
"desc": "Phase C Current",

‎json/model_113.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
"name": "A",
3131
"size": 2,
3232
"type": "float32",
33-
"units": "A"
33+
"units": "A",
34+
"detail": "Sum of active phases"
3435
},
3536
{
3637
"desc": "Phase A Current",
@@ -39,7 +40,8 @@
3940
"name": "AphA",
4041
"size": 2,
4142
"type": "float32",
42-
"units": "A"
43+
"units": "A",
44+
"detail": "Connected Phase"
4345
},
4446
{
4547
"desc": "Phase B Current",
@@ -48,7 +50,8 @@
4850
"name": "AphB",
4951
"size": 2,
5052
"type": "float32",
51-
"units": "A"
53+
"units": "A",
54+
"detail": "Connected Phase"
5255
},
5356
{
5457
"desc": "Phase C Current",
@@ -57,7 +60,8 @@
5760
"name": "AphC",
5861
"size": 2,
5962
"type": "float32",
60-
"units": "A"
63+
"units": "A",
64+
"detail": "Connected Phase"
6165
},
6266
{
6367
"desc": "Phase Voltage AB",

‎json/model_120.json‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@
133133
"sf": "ARtg_SF",
134134
"size": 1,
135135
"type": "uint16",
136-
"units": "A"
136+
"units": "A",
137+
"detail": "Sum of all connected phases. Current rating under nominal voltage under nominal power factor."
137138
},
138139
{
139140
"desc": "Scale factor",
@@ -151,7 +152,8 @@
151152
"sf": "PFRtg_SF",
152153
"size": 1,
153154
"type": "int16",
154-
"units": "cos()"
155+
"units": "cos()",
156+
"detail": "EEI sign convention."
155157
},
156158
{
157159
"desc": "Minimum power factor capability of the inverter in quadrant 2.",
@@ -161,7 +163,8 @@
161163
"sf": "PFRtg_SF",
162164
"size": 1,
163165
"type": "int16",
164-
"units": "cos()"
166+
"units": "cos()",
167+
"detail": "EEI sign convention."
165168
},
166169
{
167170
"desc": "Minimum power factor capability of the inverter in quadrant 3.",
@@ -171,7 +174,8 @@
171174
"sf": "PFRtg_SF",
172175
"size": 1,
173176
"type": "int16",
174-
"units": "cos()"
177+
"units": "cos()",
178+
"detail": "EEI sign convention."
175179
},
176180
{
177181
"desc": "Minimum power factor capability of the inverter in quadrant 4.",
@@ -181,7 +185,8 @@
181185
"sf": "PFRtg_SF",
182186
"size": 1,
183187
"type": "int16",
184-
"units": "cos()"
188+
"units": "cos()",
189+
"detail": "EEI sign convention."
185190
},
186191
{
187192
"desc": "Scale factor",
@@ -263,7 +268,8 @@
263268
"type": "pad"
264269
}
265270
],
266-
"type": "group"
271+
"type": "group",
272+
"detail": "Ref 3: 8.14.3.2, Ref 4: 17"
267273
},
268274
"id": 120
269275
}

‎json/model_121.json‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,8 @@
144144
"sf": "PFMin_SF",
145145
"size": 1,
146146
"type": "int16",
147-
"units": "cos()"
147+
"units": "cos()",
148+
"detail": "EEI sign convention."
148149
},
149150
{
150151
"access": "RW",
@@ -154,7 +155,8 @@
154155
"sf": "PFMin_SF",
155156
"size": 1,
156157
"type": "int16",
157-
"units": "cos()"
158+
"units": "cos()",
159+
"detail": "EEI sign convention."
158160
},
159161
{
160162
"access": "RW",
@@ -164,7 +166,8 @@
164166
"sf": "PFMin_SF",
165167
"size": 1,
166168
"type": "int16",
167-
"units": "cos()"
169+
"units": "cos()",
170+
"detail": "EEI sign convention."
168171
},
169172
{
170173
"access": "RW",
@@ -174,7 +177,8 @@
174177
"sf": "PFMin_SF",
175178
"size": 1,
176179
"type": "int16",
177-
"units": "cos()"
180+
"units": "cos()",
181+
"detail": "EEI sign convention."
178182
},
179183
{
180184
"access": "RW",
@@ -328,7 +332,8 @@
328332
"type": "sunssf"
329333
}
330334
],
331-
"type": "group"
335+
"type": "group",
336+
"detail": "Ref 3: 8.4.2.1, Ref 4: 17"
332337
},
333338
"id": 121
334339
}

‎json/model_122.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,8 @@
224224
"value": 10
225225
}
226226
],
227-
"type": "bitfield32"
227+
"type": "bitfield32",
228+
"detail": "Bits shall be automatically cleared on read."
228229
},
229230
{
230231
"desc": "Bit Mask indicating which inverter controls are currently active.",
@@ -348,7 +349,8 @@
348349
"type": "sunssf"
349350
}
350351
],
351-
"type": "group"
352+
"type": "group",
353+
"detail": "Ref 3: 8.14.3.2, Ref 4: 17"
352354
},
353355
"id": 122
354-
}
356+
}

0 commit comments

Comments
 (0)