From b631f16ba943b634a63240d8977f6d4626ed3291 Mon Sep 17 00:00:00 2001 From: nwssullivan <90797459+nwssullivan@users.noreply.github.com> Date: Mon, 25 Jul 2022 16:22:19 -0600 Subject: [PATCH 1/8] Chilled beam addition Adding chilled beam telemetry fields --- ontology/yaml/resources/fields/telemetry_fields.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml index 59798cd7a..fdba3e4fc 100644 --- a/ontology/yaml/resources/fields/telemetry_fields.yaml +++ b/ontology/yaml/resources/fields/telemetry_fields.yaml @@ -1521,3 +1521,12 @@ literals: ## New fields for seismic detector - seismic_alarm + +## New fields for chilled beams +- zone_air_occupied_temperature_setpoint +- zone_air_unoccupied_cooling_temperature_setpoint +- perimeter_heating_valve_percentage_sensor +- perimeter_heating_valve_percentage_command +- perimeter_heating_supply_water_temperature_sensor + + From 720c9979fe36c81a9b9ece0f05ff4408eade8af2 Mon Sep 17 00:00:00 2001 From: nwssullivan <90797459+nwssullivan@users.noreply.github.com> Date: Mon, 25 Jul 2022 16:26:47 -0600 Subject: [PATCH 2/8] Chilled beams Adding descriptor for chilled beams field --- ontology/yaml/resources/subfields/subfields.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ontology/yaml/resources/subfields/subfields.yaml b/ontology/yaml/resources/subfields/subfields.yaml index ec221bd0c..af46989d4 100644 --- a/ontology/yaml/resources/subfields/subfields.yaml +++ b/ontology/yaml/resources/subfields/subfields.yaml @@ -168,6 +168,7 @@ descriptor: ozone: "Highly reactive gaseous compound comprised of three oxygen atoms." particle: "A very fine clump of solid matter." outside: "Process or measurement of local atmospheric conditions." + perimeter: "The outermost parts or boundary of an area or object (e.g. a zone)" phase: "A phase of three-phase power distribution systems." phase1: "The first (nominally A) phase of three-phase power distribution systems." phase2: "The second (nominally B) phase of three-phase power distribution systems." From df0f9e911b127a4ced71093f22b21768be586712 Mon Sep 17 00:00:00 2001 From: nwssullivan <90797459+nwssullivan@users.noreply.github.com> Date: Mon, 25 Jul 2022 16:28:58 -0600 Subject: [PATCH 3/8] Chilled beams --- ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml b/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml index 6b9ca832c..3b823942d 100644 --- a/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml @@ -372,3 +372,9 @@ CRREF: is_abstract: true implements: - EQUIPMENT + +CHB: + description: "Tag for chilled beams." + is_abstract: true + implements: + - EQUIPMENT From 42573fe70fe86ae4b1d139bdca82758cf1f993f3 Mon Sep 17 00:00:00 2001 From: nwssullivan <90797459+nwssullivan@users.noreply.github.com> Date: Mon, 25 Jul 2022 16:31:22 -0600 Subject: [PATCH 4/8] chilled beams --- .../yaml/resources/HVAC/entity_types/CHB.yaml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 ontology/yaml/resources/HVAC/entity_types/CHB.yaml diff --git a/ontology/yaml/resources/HVAC/entity_types/CHB.yaml b/ontology/yaml/resources/HVAC/entity_types/CHB.yaml new file mode 100644 index 000000000..6ce2468a8 --- /dev/null +++ b/ontology/yaml/resources/HVAC/entity_types/CHB.yaml @@ -0,0 +1,23 @@ +# Copyright 2020 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the License); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an AS IS BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +######################## +### Canonical Types ### +######################## + +CHB_test: + description: "Chilled beam with perimeter heating." + is_canonical: true + implements: + - CHB From 3a1e0ef4c972dbf7a37ee606c3ae0167cd7748e3 Mon Sep 17 00:00:00 2001 From: nwssullivan <90797459+nwssullivan@users.noreply.github.com> Date: Fri, 19 Aug 2022 14:21:46 -0600 Subject: [PATCH 5/8] Update telemetry_fields.yaml --- ontology/yaml/resources/fields/telemetry_fields.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml index fdba3e4fc..7b89b2285 100644 --- a/ontology/yaml/resources/fields/telemetry_fields.yaml +++ b/ontology/yaml/resources/fields/telemetry_fields.yaml @@ -1525,8 +1525,8 @@ literals: ## New fields for chilled beams - zone_air_occupied_temperature_setpoint - zone_air_unoccupied_cooling_temperature_setpoint -- perimeter_heating_valve_percentage_sensor -- perimeter_heating_valve_percentage_command +- perimeter_heating_water_valve_percentage_sensor +- perimeter_heating_water_valve_percentage_command - perimeter_heating_supply_water_temperature_sensor From aadf2b1ec6d48f885e14799855babe49fb01c714 Mon Sep 17 00:00:00 2001 From: nwssullivan <90797459+nwssullivan@users.noreply.github.com> Date: Fri, 19 Aug 2022 14:44:35 -0600 Subject: [PATCH 6/8] Update ABSTRACT.yaml abstract types for chilled beams --- .../resources/HVAC/entity_types/ABSTRACT.yaml | 54 ++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index 1196eb329..cc2c1dd5b 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -5413,4 +5413,56 @@ DFRMM: - MONITORING - \ No newline at end of file +CHWZOUC: + description: "Chilled water valve control with occupied/unoccupied setpoints and temperature monitoring." + is_abstract: true + opt_uses: + - chilled_supply_water_temperature_sensor + uses: + - chilled_water_valve_percentage_command + - zone_air_temperature_sensor + - zone_air_occupied_temperature_setpoint + - zone_air_unoccupied_cooling_temperature_setpoint + implements: + - CONTROL + +HWZOUC: + description: "Heating water valve control with occupied/unoccupied setpoints and temperature monitoring." + is_abstract: true + opt_uses: + - heating_supply_water_temperature_sensor + uses: + - heating_water_valve_percentage_command + - zone_air_temperature_sensor + - zone_air_occupied_temperature_setpoint + - zone_air_unoccupied_heating_temperature_setpoint + implements: + - CONTROL + +PERHWZOUC: + description: "Perimeter heating water valve control with occupied/unoccupied setpoints and temperature monitoring." + is_abstract: true + opt_uses: + - perimeter_heating_supply_water_temperature_sensor + uses: + - perimeter_heating_water_valve_percentage_command + - perimeter_heating_water_valve_percentage_sensor + - zone_air_temperature_sensor + - zone_air_occupied_temperature_setpoint + - zone_air_unoccupied_heating_temperature_setpoint + implements: + - CONTROL + +ZTOUC: + description: "Zone air temperature unoccupied/occupied control." + is_abstract: true + opt_uses: + - zone_air_relative_humidity_sensor + - zone_occupancy_status + uses: + - zone_air_temperature_sensor + - zone_air_occupied_temperature_setpoint + - zone_air_unoccupied_heating_temperature_setpoint + - zone_air_unoccupied_cooling_temperature_setpoint + implements: + - OPERATIONAL From 4d9b66b0c8b3ef7c04ca607dff2e136819cfbde5 Mon Sep 17 00:00:00 2001 From: nwssullivan <90797459+nwssullivan@users.noreply.github.com> Date: Fri, 19 Aug 2022 14:50:37 -0600 Subject: [PATCH 7/8] Update CHB.yaml --- ontology/yaml/resources/HVAC/entity_types/CHB.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/CHB.yaml b/ontology/yaml/resources/HVAC/entity_types/CHB.yaml index 6ce2468a8..373075e36 100644 --- a/ontology/yaml/resources/HVAC/entity_types/CHB.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/CHB.yaml @@ -16,8 +16,13 @@ ### Canonical Types ### ######################## -CHB_test: - description: "Chilled beam with perimeter heating." +CHB_ZTOUC_CHWZOUC_PERHWZOUC_CO2M_RMM: + description: "Chilled beam with perimeter heating, CO2 and run mode monitoring." is_canonical: true implements: - CHB + - ZTOUC + - CHWZOUC + - PERHWZOUC + - CO2M + - RMM From 5be5ddacb28cddef5e8574f7c44322662dd41030 Mon Sep 17 00:00:00 2001 From: nwssullivan <90797459+nwssullivan@users.noreply.github.com> Date: Fri, 19 Aug 2022 14:51:33 -0600 Subject: [PATCH 8/8] Update ABSTRACT.yaml --- .../resources/HVAC/entity_types/ABSTRACT.yaml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index cc2c1dd5b..d950124cd 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -5426,27 +5426,14 @@ CHWZOUC: implements: - CONTROL -HWZOUC: - description: "Heating water valve control with occupied/unoccupied setpoints and temperature monitoring." - is_abstract: true - opt_uses: - - heating_supply_water_temperature_sensor - uses: - - heating_water_valve_percentage_command - - zone_air_temperature_sensor - - zone_air_occupied_temperature_setpoint - - zone_air_unoccupied_heating_temperature_setpoint - implements: - - CONTROL - PERHWZOUC: description: "Perimeter heating water valve control with occupied/unoccupied setpoints and temperature monitoring." is_abstract: true opt_uses: - perimeter_heating_supply_water_temperature_sensor + - perimeter_heating_water_valve_percentage_sensor uses: - perimeter_heating_water_valve_percentage_command - - perimeter_heating_water_valve_percentage_sensor - zone_air_temperature_sensor - zone_air_occupied_temperature_setpoint - zone_air_unoccupied_heating_temperature_setpoint