Skip to content

Multiple model updates and DERSec custom models #261

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
Kudrat9 merged 51 commits into from
Jun 13, 2025
Merged

Multiple model updates and DERSec custom models #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
3106216
preliminary github actions workflow
altendky Apr 26, 2020
1fe2b2a
sudo for apt-get
altendky Apr 26, 2020
1aac359
Merge branch 'development' into gha
altendky Apr 29, 2020
ae4cfd1
#207 - Fixed typo
shelcrow Nov 3, 2022
274cb96
#238 - Added static fields
shelcrow Nov 3, 2022
2d805ba
Standardize/cleanup the XML format.
nielsbasjes Dec 31, 2022
fdf5715
Fix the empty XML tags.
nielsbasjes Dec 31, 2022
e190746
adding standards list
dersecure Jun 11, 2024
d9eeeb8
remove duplicates
dersecure Jun 11, 2024
1bdbae9
cleanup
dersecure Jun 11, 2024
ef434b1
PF clarification
dersecure Jun 17, 2024
3349459
schema update to include standards array
dersecure Jun 17, 2024
e4767f2
SOC clarification
dersecure Jun 17, 2024
09dbbca
DA point comment
dersecure Jun 17, 2024
7efba22
updated curve pt comments
dersecure Jun 17, 2024
b5d88c6
watt-var clarification for load points
dersecure Jun 17, 2024
a60a2a3
Reference voltage values for 702 points
dersecure Jun 17, 2024
10d64f8
CLA bot update
dersecure Jun 17, 2024
0b6563d
CLA fix
dersecure Jun 17, 2024
fc20506
switching to comments
dersecure Jun 17, 2024
a5029cf
moving comments to detail because of workbook annotations
dersecure Jun 17, 2024
d4fe0a1
update detail fields
dersecure Jun 17, 2024
821a9fe
updated detailed description automation script
dersecure Jun 17, 2024
6b9b7e0
typo
dersecure Jun 17, 2024
7ddc692
xml cleanup
dersecure Jun 17, 2024
0187897
remove the unsupported XML format
dersecure Jun 26, 2024
4c32ca9
establishing unique names for all models
dersecure Jun 26, 2024
e7d83f7
Revert "xml cleanup"
dersecure Jun 26, 2024
ad5db0f
Leaving XML data for those that still use it
dersecure Jun 26, 2024
f9c7380
merge revert for manifest.py
dersecure Jun 26, 2024
bca62ef
Merge branch 'master' of github.com:sunspec/models
dersecure Nov 15, 2024
beb08e5
Merge branch 'sunspec:master' into master
dersecure Jun 7, 2025
0ab0d1d
SoC typo and schema change
dersecure Jun 12, 2025
4adb944
Merge branch 'master' of github.com:dersecure/models
dersecure Jun 12, 2025
a21c748
Merge Niels XML updates
dersecure Jun 12, 2025
cac043b
Merge pull request #71 from altendky/gha
dersecure Jun 12, 2025
9c1b88b
Merge remote-tracking branch 'sunspec/development'
dersecure Jun 12, 2025
e61d36a
DERSec custom models
dersecure Jun 13, 2025
5854781
schema fix; 64415 update
dersecure Jun 13, 2025
444a618
schema fix for 64410
dersecure Jun 13, 2025
4c7861c
@bikeshredder script
dersecure Jun 13, 2025
9775489
updated detail values for models based on smdx
dersecure Jun 13, 2025
71db774
update with units for 64413
dersecure Jun 13, 2025
2318336
Fix #258
dersecure Jun 13, 2025
2930e94
Fix for #256
dersecure Jun 13, 2025
d70403e
Fix #255
dersecure Jun 13, 2025
c8281ee
Soc -> SoC
dersecure Jun 13, 2025
6e1713c
Fix #60
dersecure Jun 13, 2025
45debad
reverting to SocRsvMax typo since some have 802 certifications
dersecure Jun 13, 2025
18ec13f
updated @bikeshedder
dersecure Jun 13, 2025
d11009f
updated the Excel file
dersecure Jun 13, 2025
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
34 changes: 34 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: CI

on:
push:
branches:
- master
- development
pull_request:
branches:
- "*"

jobs:
xml:
name: Check XML
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install dependencies
run: |
sudo apt-get update --yes
sudo apt-get install --yes libxml2-utils
- name: Check
run: make -C smdx
json:
name: Check JSON
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install dependencies
run: |
sudo apt-get update --yes
sudo apt-get install --yes python3-jsonschema
- name: Check
run: make -C json
3 changes: 2 additions & 1 deletion json/model_101.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
"sf": "A_SF",
"size": 1,
"type": "uint16",
"units": "A"
"units": "A",
"detail": "Connected Phase"
},
{
"desc": "Phase B Current",
Expand Down
9 changes: 6 additions & 3 deletions json/model_102.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
"sf": "A_SF",
"size": 1,
"type": "uint16",
"units": "A"
"units": "A",
"detail": "Sum of active phases"
},
{
"desc": "Phase A Current",
Expand All @@ -41,7 +42,8 @@
"sf": "A_SF",
"size": 1,
"type": "uint16",
"units": "A"
"units": "A",
"detail": "Connected Phase"
},
{
"desc": "Phase B Current",
Expand All @@ -51,7 +53,8 @@
"sf": "A_SF",
"size": 1,
"type": "uint16",
"units": "A"
"units": "A",
"detail": "Connected Phase"
},
{
"desc": "Phase C Current",
Expand Down
12 changes: 8 additions & 4 deletions json/model_103.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
"sf": "A_SF",
"size": 1,
"type": "uint16",
"units": "A"
"units": "A",
"detail": "Sum of active phases"
},
{
"desc": "Phase A Current",
Expand All @@ -41,7 +42,8 @@
"sf": "A_SF",
"size": 1,
"type": "uint16",
"units": "A"
"units": "A",
"detail": "Connected Phase"
},
{
"desc": "Phase B Current",
Expand All @@ -51,7 +53,8 @@
"sf": "A_SF",
"size": 1,
"type": "uint16",
"units": "A"
"units": "A",
"detail": "Connected Phase"
},
{
"desc": "Phase C Current",
Expand All @@ -61,7 +64,8 @@
"sf": "A_SF",
"size": 1,
"type": "uint16",
"units": "A"
"units": "A",
"detail": "Connected Phase"
},
{
"mandatory": "M",
Expand Down
3 changes: 2 additions & 1 deletion json/model_111.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
"name": "AphA",
"size": 2,
"type": "float32",
"units": "A"
"units": "A",
"detail": "Connected Phase"
},
{
"desc": "Phase B Current",
Expand Down
6 changes: 4 additions & 2 deletions json/model_112.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
"name": "AphA",
"size": 2,
"type": "float32",
"units": "A"
"units": "A",
"detail": "Connected Phase"
},
{
"desc": "Phase B Current",
Expand All @@ -48,7 +49,8 @@
"name": "AphB",
"size": 2,
"type": "float32",
"units": "A"
"units": "A",
"detail": "Connected Phase"
},
{
"desc": "Phase C Current",
Expand Down
12 changes: 8 additions & 4 deletions json/model_113.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"name": "A",
"size": 2,
"type": "float32",
"units": "A"
"units": "A",
"detail": "Sum of active phases"
},
{
"desc": "Phase A Current",
Expand All @@ -39,7 +40,8 @@
"name": "AphA",
"size": 2,
"type": "float32",
"units": "A"
"units": "A",
"detail": "Connected Phase"
},
{
"desc": "Phase B Current",
Expand All @@ -48,7 +50,8 @@
"name": "AphB",
"size": 2,
"type": "float32",
"units": "A"
"units": "A",
"detail": "Connected Phase"
},
{
"desc": "Phase C Current",
Expand All @@ -57,7 +60,8 @@
"name": "AphC",
"size": 2,
"type": "float32",
"units": "A"
"units": "A",
"detail": "Connected Phase"
},
{
"desc": "Phase Voltage AB",
Expand Down
18 changes: 12 additions & 6 deletions json/model_120.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@
"sf": "ARtg_SF",
"size": 1,
"type": "uint16",
"units": "A"
"units": "A",
"detail": "Sum of all connected phases. Current rating under nominal voltage under nominal power factor."
},
{
"desc": "Scale factor",
Expand All @@ -151,7 +152,8 @@
"sf": "PFRtg_SF",
"size": 1,
"type": "int16",
"units": "cos()"
"units": "cos()",
"detail": "EEI sign convention."
},
{
"desc": "Minimum power factor capability of the inverter in quadrant 2.",
Expand All @@ -161,7 +163,8 @@
"sf": "PFRtg_SF",
"size": 1,
"type": "int16",
"units": "cos()"
"units": "cos()",
"detail": "EEI sign convention."
},
{
"desc": "Minimum power factor capability of the inverter in quadrant 3.",
Expand All @@ -171,7 +174,8 @@
"sf": "PFRtg_SF",
"size": 1,
"type": "int16",
"units": "cos()"
"units": "cos()",
"detail": "EEI sign convention."
},
{
"desc": "Minimum power factor capability of the inverter in quadrant 4.",
Expand All @@ -181,7 +185,8 @@
"sf": "PFRtg_SF",
"size": 1,
"type": "int16",
"units": "cos()"
"units": "cos()",
"detail": "EEI sign convention."
},
{
"desc": "Scale factor",
Expand Down Expand Up @@ -263,7 +268,8 @@
"type": "pad"
}
],
"type": "group"
"type": "group",
"detail": "Ref 3: 8.14.3.2, Ref 4: 17"
},
"id": 120
}
15 changes: 10 additions & 5 deletions json/model_121.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@
"sf": "PFMin_SF",
"size": 1,
"type": "int16",
"units": "cos()"
"units": "cos()",
"detail": "EEI sign convention."
},
{
"access": "RW",
Expand All @@ -154,7 +155,8 @@
"sf": "PFMin_SF",
"size": 1,
"type": "int16",
"units": "cos()"
"units": "cos()",
"detail": "EEI sign convention."
},
{
"access": "RW",
Expand All @@ -164,7 +166,8 @@
"sf": "PFMin_SF",
"size": 1,
"type": "int16",
"units": "cos()"
"units": "cos()",
"detail": "EEI sign convention."
},
{
"access": "RW",
Expand All @@ -174,7 +177,8 @@
"sf": "PFMin_SF",
"size": 1,
"type": "int16",
"units": "cos()"
"units": "cos()",
"detail": "EEI sign convention."
},
{
"access": "RW",
Expand Down Expand Up @@ -328,7 +332,8 @@
"type": "sunssf"
}
],
"type": "group"
"type": "group",
"detail": "Ref 3: 8.4.2.1, Ref 4: 17"
},
"id": 121
}
8 changes: 5 additions & 3 deletions json/model_122.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,8 @@
"value": 10
}
],
"type": "bitfield32"
"type": "bitfield32",
"detail": "Bits shall be automatically cleared on read."
},
{
"desc": "Bit Mask indicating which inverter controls are currently active.",
Expand Down Expand Up @@ -348,7 +349,8 @@
"type": "sunssf"
}
],
"type": "group"
"type": "group",
"detail": "Ref 3: 8.14.3.2, Ref 4: 17"
},
"id": 122
}
}
3 changes: 2 additions & 1 deletion json/model_123.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,8 @@
"type": "sunssf"
}
],
"type": "group"
"type": "group",
"detail": "Ref 3: 8.7.1.2, 8.7.2.2, 8.7.3.2"
},
"id": 123
}
3 changes: 2 additions & 1 deletion json/model_124.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,8 @@
"type": "sunssf"
}
],
"type": "group"
"type": "group",
"detail": "Ref 3: 8.7.4.2"
},
"id": 124
}
3 changes: 2 additions & 1 deletion json/model_125.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@
"type": "pad"
}
],
"type": "group"
"type": "group",
"detail": "Ref 3: 8.7.5.1; Ref 4: 6"
},
"id": 125
}
5 changes: 3 additions & 2 deletions json/model_126.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,8 @@
"type": "sunssf"
}
],
"type": "group"
"type": "group",
"detail": "Ref 3: 8.8.1.2"
},
"id": 126
}
}
3 changes: 2 additions & 1 deletion json/model_127.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@
"type": "pad"
}
],
"type": "group"
"type": "group",
"detail": "Ref 3: 8.9.1.2, 8.9.4.2"
},
"id": 127
}
3 changes: 2 additions & 1 deletion json/model_128.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@
"type": "pad"
}
],
"type": "group"
"type": "group",
"detail": "Ref 3: 8.10.1.2; Ref 4: 12"
},
"id": 128
}
Loading