From 36297e41b329ebc0d4656697548c7dfc528d3be6 Mon Sep 17 00:00:00 2001 From: Carmen Anderson Date: Wed, 25 Mar 2026 12:44:50 -0700 Subject: [PATCH 1/4] added exported_energy_accumulator field to the ontology to use for new meter points --- .../yaml/resources/METERS/entity_types/ABSTRACT.yaml | 6 ++++++ ontology/yaml/resources/METERS/entity_types/EM.yaml | 11 +++++++++++ ontology/yaml/resources/fields/telemetry_fields.yaml | 3 +++ ontology/yaml/resources/subfields/subfields.yaml | 1 + 4 files changed, 21 insertions(+) diff --git a/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml index 8811504515..32c8b73219 100644 --- a/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml @@ -31,6 +31,12 @@ PWM: uses: - energy_accumulator +PWM: + description: "Exported energy monitoring." + is_abstract: true + uses: + - exported_energy_accumulator + AVCM: guid: "0329a2b4-d474-444e-82af-c6c0432a9f48" description: "Average phase (line) level voltage and current monitoring. " diff --git a/ontology/yaml/resources/METERS/entity_types/EM.yaml b/ontology/yaml/resources/METERS/entity_types/EM.yaml index cdadfe2dd2..c57d33d237 100644 --- a/ontology/yaml/resources/METERS/entity_types/EM.yaml +++ b/ontology/yaml/resources/METERS/entity_types/EM.yaml @@ -97,6 +97,17 @@ EM_PWM_AVCM_PLPM_PVCM: - PLPM - PVCM +EM_PWM_EPWM_AVCM_PLPM_PVCM: + description: "The typical ION meter (Bay Area standard) with exported energy accumulation." + is_canonical: true + implements: + - EM + - PWM + - EPWM + - AVCM + - PLPM + - PVCM + EM_PWM_PWMRDM: guid: "5529f460-e69a-494d-927c-d516e6637b60" description: "Energy metering from Grid Electricity and Diesel Generator with power monitoring." diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml index 7c977fa074..5f839d97d0 100644 --- a/ontology/yaml/resources/fields/telemetry_fields.yaml +++ b/ontology/yaml/resources/fields/telemetry_fields.yaml @@ -1130,6 +1130,9 @@ literals: - expansion_valve_percentage_command: fixed_min: 0.0 fixed_max: 100.0 +- exported_energy_accumulator: + fixed_min: 0.0 + flexible_max: 36000000000000.0 - fabric_protection_alarm: - ACTIVE - INACTIVE diff --git a/ontology/yaml/resources/subfields/subfields.yaml b/ontology/yaml/resources/subfields/subfields.yaml index 0f2e99f581..0879e794d8 100644 --- a/ontology/yaml/resources/subfields/subfields.yaml +++ b/ontology/yaml/resources/subfields/subfields.yaml @@ -122,6 +122,7 @@ descriptor: exercise: "Mode of running equipment to maintain functionality ('exercise mode')." exhaust: "Process or component used in the removal of air from a conditioned system to the outside atmosphere." expansion: "Process of increasing the volume of a liquid." + exported: "Data or resources sent from a system to another system, file, or format for external use." fabric: "Textile material." failed: "Indicates that a point is not operating as intended or is incapable of operating." filtration: "Process of filtering contaminating elements from equipment or a system." From c4a90bfbac9f6fddd5922f9647b17cd4cd888148 Mon Sep 17 00:00:00 2001 From: Carmen Anderson Date: Wed, 25 Mar 2026 12:50:48 -0700 Subject: [PATCH 2/4] added E to EPWM --- ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml | 2 +- ontology/yaml/resources/METERS/entity_types/EM.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml index 32c8b73219..6dc94392e2 100644 --- a/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml @@ -31,7 +31,7 @@ PWM: uses: - energy_accumulator -PWM: +EPWM: description: "Exported energy monitoring." is_abstract: true uses: diff --git a/ontology/yaml/resources/METERS/entity_types/EM.yaml b/ontology/yaml/resources/METERS/entity_types/EM.yaml index c57d33d237..8e18abcdef 100644 --- a/ontology/yaml/resources/METERS/entity_types/EM.yaml +++ b/ontology/yaml/resources/METERS/entity_types/EM.yaml @@ -107,7 +107,7 @@ EM_PWM_EPWM_AVCM_PLPM_PVCM: - AVCM - PLPM - PVCM - + EM_PWM_PWMRDM: guid: "5529f460-e69a-494d-927c-d516e6637b60" description: "Energy metering from Grid Electricity and Diesel Generator with power monitoring." From 74b17f9816df78b996266450118a13541dca74dc Mon Sep 17 00:00:00 2001 From: db-robot Date: Wed, 25 Mar 2026 19:51:16 +0000 Subject: [PATCH 3/4] Add GUIDs to new entity types --- ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml | 1 + ontology/yaml/resources/METERS/entity_types/EM.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml index 6dc94392e2..a8ba777eb0 100644 --- a/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml @@ -32,6 +32,7 @@ PWM: - energy_accumulator EPWM: + guid: "9b3f8ac8-4c4c-4b57-93d5-283615b695c9" description: "Exported energy monitoring." is_abstract: true uses: diff --git a/ontology/yaml/resources/METERS/entity_types/EM.yaml b/ontology/yaml/resources/METERS/entity_types/EM.yaml index 8e18abcdef..2a3b37ec4f 100644 --- a/ontology/yaml/resources/METERS/entity_types/EM.yaml +++ b/ontology/yaml/resources/METERS/entity_types/EM.yaml @@ -98,6 +98,7 @@ EM_PWM_AVCM_PLPM_PVCM: - PVCM EM_PWM_EPWM_AVCM_PLPM_PVCM: + guid: "baad5f2b-2d40-4ff4-855c-2b418f07c532" description: "The typical ION meter (Bay Area standard) with exported energy accumulation." is_canonical: true implements: From 69812adb8fb974fef6887e0415581d6ad90cf019 Mon Sep 17 00:00:00 2001 From: Carmen Anderson Date: Mon, 30 Mar 2026 11:43:10 -0700 Subject: [PATCH 4/4] updated exported subfield --- ontology/yaml/resources/subfields/subfields.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ontology/yaml/resources/subfields/subfields.yaml b/ontology/yaml/resources/subfields/subfields.yaml index 6ac5585ebe..066ace0e55 100644 --- a/ontology/yaml/resources/subfields/subfields.yaml +++ b/ontology/yaml/resources/subfields/subfields.yaml @@ -123,7 +123,7 @@ descriptor: exercise: "Mode of running equipment to maintain functionality ('exercise mode')." exhaust: "Process or component used in the removal of air from a conditioned system to the outside atmosphere." expansion: "Process of increasing the volume of a liquid." - exported: "Data or resources sent from a system to another system, file, or format for external use." + exported: "Component sent from the modeled entity to another external entity." fabric: "Textile material." failed: "Indicates that a point is not operating as intended or is incapable of operating." filtration: "Process of filtering contaminating elements from equipment or a system."