Skip to content

Commit 4f33625

Browse files
author
Stefan Ermens
committed
SMHE-2415: Add sag and swell threshold objects to config
Signed-off-by: stefanermens <[email protected]>
1 parent 9d873b7 commit 4f33625

File tree

5 files changed

+371
-7
lines changed

5 files changed

+371
-7
lines changed

‎osgp/protocol-adapter-dlms/osgp-dlms/src/main/java/org/opensmartgridplatform/dlms/objectconfig/DlmsObjectType.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,13 @@ public enum DlmsObjectType {
5757
AVERAGE_VOLTAGE_L3,
5858
NUMBER_OF_POWER_FAILURES,
5959
NUMBER_OF_LONG_POWER_FAILURES,
60+
THRESHOLD_VOLTAGE_SAG,
61+
TIME_THRESHOLD_VOLTAGE_SAG,
6062
NUMBER_OF_VOLTAGE_SAGS_FOR_L1,
6163
NUMBER_OF_VOLTAGE_SAGS_FOR_L2,
6264
NUMBER_OF_VOLTAGE_SAGS_FOR_L3,
65+
THRESHOLD_VOLTAGE_SWELL,
66+
TIME_THRESHOLD_VOLTAGE_SWELL,
6367
NUMBER_OF_VOLTAGE_SWELLS_FOR_L1,
6468
NUMBER_OF_VOLTAGE_SWELLS_FOR_L2,
6569
NUMBER_OF_VOLTAGE_SWELLS_FOR_L3,

‎osgp/protocol-adapter-dlms/osgp-dlms/src/main/resources/dlmsprofiles/dlmsprofile-dsmr22.json‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,66 @@
413413
}
414414
]
415415
},
416+
{
417+
"tag": "THRESHOLD_VOLTAGE_SWELL",
418+
"description": "Threshold for voltage swell",
419+
"class-id": 3,
420+
"version": 0,
421+
"obis": "1.0.12.35.0.255",
422+
"group": "ELECTRICITY",
423+
"meterTypes": [
424+
"SP",
425+
"PP"
426+
],
427+
"attributes": [
428+
{
429+
"id": 2,
430+
"description": "value",
431+
"datatype": "long-unsigned",
432+
"valuetype": "SET_BY_CLIENT",
433+
"value": 253,
434+
"access": "RW"
435+
},
436+
{
437+
"id": 3,
438+
"description": "scaler_unit",
439+
"datatype": "scal_unit_type",
440+
"valuetype": "FIXED_IN_PROFILE",
441+
"value": "0, V",
442+
"access": "R"
443+
}
444+
]
445+
},
446+
{
447+
"tag": "TIME_THRESHOLD_VOLTAGE_SWELL",
448+
"description": "Time threshold for voltage swell",
449+
"class-id": 3,
450+
"version": 0,
451+
"obis": "1.0.12.44.0.255",
452+
"group": "ELECTRICITY",
453+
"meterTypes": [
454+
"SP",
455+
"PP"
456+
],
457+
"attributes": [
458+
{
459+
"id": 2,
460+
"description": "value",
461+
"datatype": "long-unsigned",
462+
"valuetype": "SET_BY_CLIENT",
463+
"value": 30,
464+
"access": "RW"
465+
},
466+
{
467+
"id": 3,
468+
"description": "scaler_unit",
469+
"datatype": "scal_unit_type",
470+
"valuetype": "FIXED_IN_PROFILE",
471+
"value": "0, s",
472+
"access": "R"
473+
}
474+
]
475+
},
416476
{
417477
"tag": "NUMBER_OF_VOLTAGE_SWELLS_FOR_L1",
418478
"description": "Number of voltage swells in phase L1",
@@ -479,6 +539,66 @@
479539
}
480540
]
481541
},
542+
{
543+
"tag": "THRESHOLD_VOLTAGE_SAG",
544+
"description": "Threshold for voltage sag",
545+
"class-id": 3,
546+
"version": 0,
547+
"obis": "1.0.12.31.0.255",
548+
"group": "ELECTRICITY",
549+
"meterTypes": [
550+
"SP",
551+
"PP"
552+
],
553+
"attributes": [
554+
{
555+
"id": 2,
556+
"description": "value",
557+
"datatype": "long-unsigned",
558+
"valuetype": "SET_BY_CLIENT",
559+
"value": 207,
560+
"access": "RW"
561+
},
562+
{
563+
"id": 3,
564+
"description": "scaler_unit",
565+
"datatype": "scal_unit_type",
566+
"valuetype": "FIXED_IN_PROFILE",
567+
"value": "0, V",
568+
"access": "R"
569+
}
570+
]
571+
},
572+
{
573+
"tag": "TIME_THRESHOLD_VOLTAGE_SAG",
574+
"description": "Time threshold for voltage sag ",
575+
"class-id": 3,
576+
"version": 0,
577+
"obis": "1.0.12.43.0.255",
578+
"group": "ELECTRICITY",
579+
"meterTypes": [
580+
"SP",
581+
"PP"
582+
],
583+
"attributes": [
584+
{
585+
"id": 2,
586+
"description": "value",
587+
"datatype": "long-unsigned",
588+
"valuetype": "SET_BY_CLIENT",
589+
"value": 30,
590+
"access": "RW"
591+
},
592+
{
593+
"id": 3,
594+
"description": "scaler_unit",
595+
"datatype": "scal_unit_type",
596+
"valuetype": "FIXED_IN_PROFILE",
597+
"value": "0, s",
598+
"access": "R"
599+
}
600+
]
601+
},
482602
{
483603
"tag": "NUMBER_OF_VOLTAGE_SAGS_FOR_L1",
484604
"description": "Number of voltage sags in phase L1",

‎osgp/protocol-adapter-dlms/osgp-dlms/src/main/resources/dlmsprofiles/dlmsprofile-dsmr422.json‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,66 @@
606606
}
607607
]
608608
},
609+
{
610+
"tag": "THRESHOLD_VOLTAGE_SWELL",
611+
"description": "Threshold for voltage swell",
612+
"class-id": 3,
613+
"version": 0,
614+
"obis": "1.0.12.35.0.255",
615+
"group": "ELECTRICITY",
616+
"meterTypes": [
617+
"SP",
618+
"PP"
619+
],
620+
"attributes": [
621+
{
622+
"id": 2,
623+
"description": "value",
624+
"datatype": "long-unsigned",
625+
"valuetype": "SET_BY_CLIENT",
626+
"value": 253,
627+
"access": "RW"
628+
},
629+
{
630+
"id": 3,
631+
"description": "scaler_unit",
632+
"datatype": "scal_unit_type",
633+
"valuetype": "FIXED_IN_PROFILE",
634+
"value": "0, V",
635+
"access": "R"
636+
}
637+
]
638+
},
639+
{
640+
"tag": "TIME_THRESHOLD_VOLTAGE_SWELL",
641+
"description": "Time threshold for voltage swell",
642+
"class-id": 3,
643+
"version": 0,
644+
"obis": "1.0.12.44.0.255",
645+
"group": "ELECTRICITY",
646+
"meterTypes": [
647+
"SP",
648+
"PP"
649+
],
650+
"attributes": [
651+
{
652+
"id": 2,
653+
"description": "value",
654+
"datatype": "long-unsigned",
655+
"valuetype": "SET_BY_CLIENT",
656+
"value": 30,
657+
"access": "RW"
658+
},
659+
{
660+
"id": 3,
661+
"description": "scaler_unit",
662+
"datatype": "scal_unit_type",
663+
"valuetype": "FIXED_IN_PROFILE",
664+
"value": "0, s",
665+
"access": "R"
666+
}
667+
]
668+
},
609669
{
610670
"tag": "NUMBER_OF_VOLTAGE_SWELLS_FOR_L1",
611671
"description": "Number of voltage swells in phase L1",
@@ -687,6 +747,66 @@
687747
}
688748
]
689749
},
750+
{
751+
"tag": "THRESHOLD_VOLTAGE_SAG",
752+
"description": "Threshold for voltage sag",
753+
"class-id": 3,
754+
"version": 0,
755+
"obis": "1.0.12.31.0.255",
756+
"group": "ELECTRICITY",
757+
"meterTypes": [
758+
"SP",
759+
"PP"
760+
],
761+
"attributes": [
762+
{
763+
"id": 2,
764+
"description": "value",
765+
"datatype": "long-unsigned",
766+
"valuetype": "SET_BY_CLIENT",
767+
"value": 207,
768+
"access": "RW"
769+
},
770+
{
771+
"id": 3,
772+
"description": "scaler_unit",
773+
"datatype": "scal_unit_type",
774+
"valuetype": "FIXED_IN_PROFILE",
775+
"value": "0, V",
776+
"access": "R"
777+
}
778+
]
779+
},
780+
{
781+
"tag": "TIME_THRESHOLD_VOLTAGE_SAG",
782+
"description": "Time threshold for voltage sag ",
783+
"class-id": 3,
784+
"version": 0,
785+
"obis": "1.0.12.43.0.255",
786+
"group": "ELECTRICITY",
787+
"meterTypes": [
788+
"SP",
789+
"PP"
790+
],
791+
"attributes": [
792+
{
793+
"id": 2,
794+
"description": "value",
795+
"datatype": "long-unsigned",
796+
"valuetype": "SET_BY_CLIENT",
797+
"value": 30,
798+
"access": "RW"
799+
},
800+
{
801+
"id": 3,
802+
"description": "scaler_unit",
803+
"datatype": "scal_unit_type",
804+
"valuetype": "FIXED_IN_PROFILE",
805+
"value": "0, s",
806+
"access": "R"
807+
}
808+
]
809+
},
690810
{
691811
"tag": "NUMBER_OF_VOLTAGE_SAGS_FOR_L1",
692812
"description": "Number of voltage sags in phase L1",

0 commit comments

Comments
 (0)