From f0201aa5d285f59ed4e47477785c557e43b84f1c Mon Sep 17 00:00:00 2001 From: Pranay Shah <45097539+pranay2811@users.noreply.github.com> Date: Wed, 24 Jan 2024 13:36:22 -0500 Subject: [PATCH 01/10] Update telemetry_fields.yaml Added new fields: zone_air_differential_pressure_sensor zone_air_differential_pressure_setpoint --- ontology/yaml/resources/fields/telemetry_fields.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml index 55d036929..d85cca6b3 100644 --- a/ontology/yaml/resources/fields/telemetry_fields.yaml +++ b/ontology/yaml/resources/fields/telemetry_fields.yaml @@ -3352,3 +3352,10 @@ literals: - low_heating_supply_water_temperature_alarm: - ACTIVE - INACTIVE + +- zone_air_differential_pressure_sensor: + flexible_min: -996.320096 + flexible_max: 996.320096 +- zone_air_differential_pressure_setpoint: + flexible_min: -996.320096 + flexible_max: 996.320096 From 33b35a31dde5bf5a9ba279958b9799d8ce6fc57f Mon Sep 17 00:00:00 2001 From: Pranay Shah <45097539+pranay2811@users.noreply.github.com> Date: Wed, 24 Jan 2024 13:38:42 -0500 Subject: [PATCH 02/10] Added ZDPC --- ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index 71f6f468f..aee147a97 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -1675,6 +1675,15 @@ DSPM: - high_discharge_air_static_pressure_alarm - low_discharge_air_static_pressure_alarm +ZDPC: + description: "Zone differential pressure control." + is_abstract: true + uses: + - zone_air_differential_pressure_sensor + - zone_air_differential_pressure_setpoint + implements: + - OPERATIONAL + ZSPC: guid: "e7494570-617c-4599-a57e-8e09128e0a07" description: "Zone static pressure control." From e82165b252a83a890e12ebf115efb6d780a76968 Mon Sep 17 00:00:00 2001 From: Pranay Shah <45097539+pranay2811@users.noreply.github.com> Date: Wed, 24 Jan 2024 13:41:00 -0500 Subject: [PATCH 03/10] Added FAN_SS_VSC_ZDPC --- ontology/yaml/resources/HVAC/entity_types/FAN.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ontology/yaml/resources/HVAC/entity_types/FAN.yaml b/ontology/yaml/resources/HVAC/entity_types/FAN.yaml index 27a9e204a..14aa65083 100644 --- a/ontology/yaml/resources/HVAC/entity_types/FAN.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/FAN.yaml @@ -253,6 +253,15 @@ FAN_SS_CSP_VSC: - CSP - VSC +FAN_SS_VSC_ZDPC: + description: "Fan with start/stop, speed control, and zone differential pressure control." + is_canonical: true + implements: + - FAN + - SS + - VSC + - ZDPC + FAN_SS_VSC_ZTM: guid: "ffeecf58-f365-42f2-867a-ecf652189440" description: "Fan with zone temp monitoring and independent variable speed control (such as a kitchen hood, where the setpoints may be hidden)." From 3423d9ff80bae43c9f1880879d2b27ca31b69425 Mon Sep 17 00:00:00 2001 From: Pranay Shah <45097539+pranay2811@users.noreply.github.com> Date: Fri, 26 Jan 2024 03:57:35 +0530 Subject: [PATCH 04/10] Manually add GUID for ZDPC --- ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index aee147a97..bc5fc1a40 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -1676,6 +1676,7 @@ DSPM: - low_discharge_air_static_pressure_alarm ZDPC: + guid: feafa28d-9bee-4c4b-a506-5c372ac9d4eb description: "Zone differential pressure control." is_abstract: true uses: From 01210c0193be390023a76121d272282a36bd21d3 Mon Sep 17 00:00:00 2001 From: Pranay Shah <45097539+pranay2811@users.noreply.github.com> Date: Fri, 26 Jan 2024 03:58:37 +0530 Subject: [PATCH 05/10] Manually add GUID for FAN_SS_VSC_ZDPC --- ontology/yaml/resources/HVAC/entity_types/FAN.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ontology/yaml/resources/HVAC/entity_types/FAN.yaml b/ontology/yaml/resources/HVAC/entity_types/FAN.yaml index 14aa65083..4398dc940 100644 --- a/ontology/yaml/resources/HVAC/entity_types/FAN.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/FAN.yaml @@ -254,6 +254,7 @@ FAN_SS_CSP_VSC: - VSC FAN_SS_VSC_ZDPC: + guid: "c12ad743-343c-472b-b610-fd6b4e8e5aa6" description: "Fan with start/stop, speed control, and zone differential pressure control." is_canonical: true implements: From 4d12bc6bb32343f058ff687f01d0868f2ffe0f48 Mon Sep 17 00:00:00 2001 From: Pranay Shah <45097539+pranay2811@users.noreply.github.com> Date: Fri, 26 Jan 2024 03:59:19 +0530 Subject: [PATCH 06/10] Manually added GUID for ZDPC --- ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index bc5fc1a40..0c9e7de40 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -1676,7 +1676,7 @@ DSPM: - low_discharge_air_static_pressure_alarm ZDPC: - guid: feafa28d-9bee-4c4b-a506-5c372ac9d4eb + guid: "feafa28d-9bee-4c4b-a506-5c372ac9d4eb" description: "Zone differential pressure control." is_abstract: true uses: From d833964b7c14d71c9aad54e6612cf6fa115332f0 Mon Sep 17 00:00:00 2001 From: Pranay Shah <45097539+pranay2811@users.noreply.github.com> Date: Wed, 31 Jan 2024 15:23:23 -0500 Subject: [PATCH 07/10] Revert "Manually added GUID for ZDPC" This reverts commit 4d12bc6bb32343f058ff687f01d0868f2ffe0f48. --- ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index b9ca903e4..7a4ecf247 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -1676,7 +1676,7 @@ DSPM: - low_discharge_air_static_pressure_alarm ZDPC: - guid: "feafa28d-9bee-4c4b-a506-5c372ac9d4eb" + guid: feafa28d-9bee-4c4b-a506-5c372ac9d4eb description: "Zone differential pressure control." is_abstract: true uses: From f40635c506abd8aba39db86b3672cbff1e2d9602 Mon Sep 17 00:00:00 2001 From: Pranay Shah <45097539+pranay2811@users.noreply.github.com> Date: Wed, 31 Jan 2024 15:34:18 -0500 Subject: [PATCH 08/10] Rolling back previous commits --- .../yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 10 ---------- ontology/yaml/resources/HVAC/entity_types/FAN.yaml | 10 ---------- ontology/yaml/resources/fields/telemetry_fields.yaml | 7 ------- 3 files changed, 27 deletions(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index 7a4ecf247..047e7031b 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -1675,16 +1675,6 @@ DSPM: - high_discharge_air_static_pressure_alarm - low_discharge_air_static_pressure_alarm -ZDPC: - guid: feafa28d-9bee-4c4b-a506-5c372ac9d4eb - description: "Zone differential pressure control." - is_abstract: true - uses: - - zone_air_differential_pressure_sensor - - zone_air_differential_pressure_setpoint - implements: - - OPERATIONAL - ZSPC: guid: "e7494570-617c-4599-a57e-8e09128e0a07" description: "Zone static pressure control." diff --git a/ontology/yaml/resources/HVAC/entity_types/FAN.yaml b/ontology/yaml/resources/HVAC/entity_types/FAN.yaml index 4398dc940..27a9e204a 100644 --- a/ontology/yaml/resources/HVAC/entity_types/FAN.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/FAN.yaml @@ -253,16 +253,6 @@ FAN_SS_CSP_VSC: - CSP - VSC -FAN_SS_VSC_ZDPC: - guid: "c12ad743-343c-472b-b610-fd6b4e8e5aa6" - description: "Fan with start/stop, speed control, and zone differential pressure control." - is_canonical: true - implements: - - FAN - - SS - - VSC - - ZDPC - FAN_SS_VSC_ZTM: guid: "ffeecf58-f365-42f2-867a-ecf652189440" description: "Fan with zone temp monitoring and independent variable speed control (such as a kitchen hood, where the setpoints may be hidden)." diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml index d85cca6b3..55d036929 100644 --- a/ontology/yaml/resources/fields/telemetry_fields.yaml +++ b/ontology/yaml/resources/fields/telemetry_fields.yaml @@ -3352,10 +3352,3 @@ literals: - low_heating_supply_water_temperature_alarm: - ACTIVE - INACTIVE - -- zone_air_differential_pressure_sensor: - flexible_min: -996.320096 - flexible_max: 996.320096 -- zone_air_differential_pressure_setpoint: - flexible_min: -996.320096 - flexible_max: 996.320096 From e58678cdd5b29f920a3cd80d85b1b16371113e69 Mon Sep 17 00:00:00 2001 From: Pranay Shah <45097539+pranay2811@users.noreply.github.com> Date: Wed, 31 Jan 2024 16:27:27 -0500 Subject: [PATCH 09/10] Adding FAN_SS_VSC_ZSPC --- ontology/yaml/resources/HVAC/entity_types/FAN.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ontology/yaml/resources/HVAC/entity_types/FAN.yaml b/ontology/yaml/resources/HVAC/entity_types/FAN.yaml index 27a9e204a..7ea542e68 100644 --- a/ontology/yaml/resources/HVAC/entity_types/FAN.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/FAN.yaml @@ -37,6 +37,16 @@ FAN_SS_VSC: - SS - VSC +FAN_SS_VSC_ZSPC: + guid: "b9f968cc-211b-4b25-915d-525216aebc4e" + description: "Fan with start/stop status, open-loop speed control & zone static pressure control." + is_canonical: true + implements: + - FAN + - SS + - VSC + - ZSPC + FAN_SS_WDPM: guid: "d12cbe88-243a-40a5-b624-3a2f355e7cfc" description: "Fan with start/stop and differential pressure monitoring." From 46fe068b2aef25b2743512aa1ca48ef2eaac043d Mon Sep 17 00:00:00 2001 From: travis Date: Fri, 2 Feb 2024 07:45:06 -0800 Subject: [PATCH 10/10] update PVCM type --- ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml index 90f46a843..e7b748263 100644 --- a/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml @@ -62,6 +62,8 @@ PVCM: guid: "97b8b9c1-21dd-4201-9424-c776e28de758" description: "Phase-level current and voltage monitoring." is_abstract: true + opt_uses: + - neutral_line_current_sensor uses: - phase1_line_current_sensor - phase2_line_current_sensor