From 681715563351424f1ada364afc652565959ffa84 Mon Sep 17 00:00:00 2001 From: Jane Date: Mon, 20 Nov 2023 11:18:57 -0800 Subject: [PATCH 1/5] New subfields, fields, abstracts, canonical types and a general type. --- .../resources/HVAC/entity_types/ABSTRACT.yaml | 225 +++++++++++++++++- .../yaml/resources/HVAC/entity_types/AHU.yaml | 17 ++ .../resources/HVAC/entity_types/ASHP.yaml | 32 +++ .../resources/HVAC/entity_types/CDWS.yaml | 11 + .../yaml/resources/HVAC/entity_types/CH.yaml | 33 +++ .../resources/HVAC/entity_types/CHWS.yaml | 25 ++ .../yaml/resources/HVAC/entity_types/CT.yaml | 15 ++ .../yaml/resources/HVAC/entity_types/DMP.yaml | 8 + .../yaml/resources/HVAC/entity_types/FAN.yaml | 9 + .../yaml/resources/HVAC/entity_types/FCU.yaml | 20 ++ .../HVAC/entity_types/GENERALTYPES.yaml | 12 + .../yaml/resources/HVAC/entity_types/HWS.yaml | 18 ++ .../yaml/resources/HVAC/entity_types/HX.yaml | 20 ++ .../yaml/resources/HVAC/entity_types/MAU.yaml | 17 ++ .../yaml/resources/HVAC/entity_types/PMP.yaml | 9 + .../yaml/resources/HVAC/entity_types/RP.yaml | 41 ++++ .../yaml/resources/HVAC/entity_types/VAV.yaml | 82 +++++++ .../resources/fields/telemetry_fields.yaml | 143 ++++++++++- .../yaml/resources/subfields/subfields.yaml | 1 + 19 files changed, 729 insertions(+), 9 deletions(-) create mode 100644 ontology/yaml/resources/HVAC/entity_types/ASHP.yaml diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index 3d4deef8f..5eea0dd27 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -145,6 +145,8 @@ REFM: is_abstract: true implements: - MONITORING + opt_uses: + - high_zone_air_refrigerant_concentration_alarm uses: - zone_air_refrigerant_concentration_sensor @@ -263,6 +265,8 @@ DSP: opt_uses: - discharge_air_temperature_sensor - zone_air_relative_humidity_sensor + - high_zone_air_relative_humidity_alarm + - low_zone_air_relative_humidity_alarm - failed_discharge_air_temperature_alarm - failed_zone_air_temperature_alarm - high_zone_air_temperature_alarm @@ -1470,6 +1474,8 @@ EPC: - exhaust_air_static_pressure_setpoint opt_uses: - exhaust_air_flowrate_sensor + - high_exhaust_air_static_pressure_alarm + - low_exhaust_air_static_pressure_alarm implements: - OPERATIONAL @@ -1759,6 +1765,7 @@ CHWDC: - cooling_thermal_power_capacity - leaving_cooling_coil_temperature_sensor - failed_discharge_air_temperature_alarm + - failed_chilled_water_valve_alarm uses: - chilled_water_valve_percentage_command - discharge_air_temperature_sensor @@ -1866,6 +1873,7 @@ CHWZC: - leaving_cooling_coil_temperature_sensor - failed_discharge_air_temperature_alarm - failed_zone_air_temperature_alarm + - failed_chilled_water_valve_alarm - high_zone_air_temperature_alarm - low_zone_air_temperature_alarm uses: @@ -2702,6 +2710,7 @@ HWZC: - failed_zone_air_temperature_alarm - high_zone_air_temperature_alarm - low_zone_air_temperature_alarm + - failed_heating_water_valve_alarm uses: - heating_water_valve_percentage_command - zone_air_heating_temperature_setpoint @@ -3139,6 +3148,8 @@ ECON: opt_uses: - low_limit_outside_air_damper_percentage_command - outside_air_damper_percentage_sensor + - failed_outside_air_damper_alarm + - failed_outside_air_flowrate_alarm - outside_air_flowrate_sensor - outside_air_flowrate_setpoint - outside_air_relative_humidity_sensor @@ -3308,6 +3319,7 @@ VOADM: - mixed_air_temperature_sensor - outside_air_damper_percentage_sensor - failed_mixed_air_temperature_alarm + - failed_outside_air_damper_alarm uses: - outside_air_damper_percentage_command - outside_air_temperature_sensor @@ -3332,6 +3344,7 @@ OAFM: opt_uses: - outside_air_damper_percentage_sensor - outside_air_temperature_sensor + - failed_outside_air_flowrate_alarm uses: - outside_air_flowrate_sensor implements: @@ -3519,6 +3532,7 @@ BYPVPM: is_abstract: true opt_uses: - bypass_valve_percentage_sensor + - failed_bypass_valve_alarm uses: - bypass_valve_percentage_command implements: @@ -3615,18 +3629,18 @@ CHWBZC: - high_zone_air_temperature_alarm - low_zone_air_temperature_alarm - CHWBYPVPM: guid: "68cd5104-bf2e-48f3-8b88-c12192509393" description: "Chilled water bypass valve percentage monitoring." is_abstract: true + opt_uses: + - failed_chilled_water_bypass_valve_alarm uses: - chilled_water_bypass_valve_percentage_command - chilled_water_bypass_valve_percentage_sensor implements: - MONITORING - MXVPM: guid: "4bb25777-d661-4fd3-9f8f-a84b349ada87" description: "Mixing valve percent monitoring." @@ -4268,6 +4282,7 @@ SWISOVM: - MONITORING opt_uses: - failed_isolation_valve_alarm + - failed_supply_water_isolation_valve_alarm - local_override_isolation_valve_alarm @@ -4275,6 +4290,8 @@ SWISOVPM: guid: "33856563-ebe5-42ee-a928-e8b46d81772d" description: "Supply side isolation valve monitoring." is_abstract: true + opt_uses: + - failed_supply_water_isolation_valve_alarm uses: - supply_water_isolation_valve_percentage_command - supply_water_isolation_valve_percentage_sensor @@ -4286,6 +4303,8 @@ RWISOVM: guid: "2d35bbb0-bcad-4f36-a8cb-0c9031d81886" description: "Return side isolation valve monitoring." is_abstract: true + opt_uses: + - failed_return_water_isolation_valve_alarm uses: - return_water_isolation_valve_command - return_water_isolation_valve_status @@ -4353,6 +4372,8 @@ CHWSWISOVM: guid: "1a187792-767f-4132-9333-161c6db07ce4" description: "Supply side isolation valve monitoring." is_abstract: true + opt_uses: + - failed_chilled_supply_water_isolation_valve_alarm uses: - chilled_supply_water_isolation_valve_command - chilled_supply_water_isolation_valve_status @@ -4446,6 +4467,8 @@ CWRISOVM: guid: "cb8b8c1e-30c2-48fc-b6c0-44d73468d994" description: "Condensing water return isolation monitoring." is_abstract: true + opt_uses: + - failed_condensing_return_water_isolation_valve_alarm uses: - condensing_return_water_isolation_valve_command - condensing_return_water_isolation_valve_status @@ -4457,6 +4480,8 @@ CWSISOVPM: guid: "3221aa75-8df4-4964-82dd-9a5c59c3a73b" description: "Condensing water supply isolation monitoring." is_abstract: true + opt_uses: + - failed_condensing_supply_water_isolation_valve_alarm uses: - condensing_supply_water_isolation_valve_percentage_command - condensing_supply_water_isolation_valve_percentage_sensor @@ -4468,6 +4493,8 @@ CWSISOVM: guid: "6284c4c0-1261-44f7-bebb-ab6aa11443ca" description: "Condensing water supply isolation monitoring." is_abstract: true + opt_uses: + - failed_condensing_supply_water_isolation_valve_alarm uses: - condensing_supply_water_isolation_valve_command - condensing_supply_water_isolation_valve_status @@ -6933,3 +6960,197 @@ PMDM: - zone_air_pm10pt0_density_sensor implements: - MONITORING + +HSWTC: + description: "Heating water valve monitoring on supply water side." + is_abstract: true + opt_uses: + - heating_supply_water_valve_percentage_sensor + - heating_return_water_temperature_sensor + - failed_heating_supply_water_valve_alarm + uses: + - heating_supply_water_valve_percentage_command + - heating_supply_water_temperature_sensor + - heating_supply_water_temperature_setpoint + implements: + - CONTROL + +WSEBYPVPM: + description: "Water side economizer bypass valve monitoring." + is_abstract: true + opt_uses: + - economizer_bypass_valve_percentage_sensor + - failed_economizer_bypass_valve_alarm + uses: + - economizer_bypass_valve_percentage_command + implements: + - MONITORING + +FSISOVM: + description: "Filtration supply isolation valve monitoring." + is_abstract: true + uses: + - filtration_supply_water_isolation_valve_command + implements: + - MONITORING + +FRISOVM: + description: "Filtration return isolation valve monitoring." + is_abstract: true + uses: + - filtration_return_water_isolation_valve_command + implements: + - MONITORING + +PRWFRM: + description: "Primary supply water flowrate monitoring" + uses: + - primary_supply_water_flowrate_sensor + implements: + - MONITORING + +SEWFRM: + description: "Secondary supply water flowrate monitoring" + uses: + - secondary_supply_water_flowrate_sensor + implements: + - MONITORING + +MWFRM: + description: "Make-up water flowrate monitoring." + is_abstract: true + opt_uses: + - failed_makeup_water_flowrate_alarm + uses: + - makeup_water_flowrate_sensor + implements: + - MONITORING + +BWFRM: + description: "Blowdown water flowrate monitoring." + is_abstract: true + opt_uses: + - failed_blowdown_water_flowrate_alarm + uses: + - blowdown_water_flowrate_sensor + implements: + - MONITORING + +DX3SCHWC: + description: "Three compressor run control on chilled supply water side." + is_abstract: true + uses: + - compressor_run_command_1 + - compressor_run_command_2 + - compressor_run_command_3 + - compressor_run_status_1 + - compressor_run_status_2 + - compressor_run_status_3 + - chilled_supply_water_temperature_sensor + - chilled_supply_water_temperature_setpoint + implements: + - CONTROL + +CWBYPVPM: + description: "Condensing water bypass valve percentage monitoring." + is_abstract: true + opt_uses: + - failed_condensing_water_bypass_valve_alarm + uses: + - condensing_water_bypass_valve_percentage_command + - condensing_water_bypass_valve_percentage_sensor + implements: + - MONITORING + +HWBYPVPM: + description: "Heating water bypass valve percentage monitoring." + is_abstract: true + opt_uses: + - failed_heating_water_bypass_valve_alarm + uses: + - heating_water_bypass_valve_percentage_command + - heating_water_bypass_valve_percentage_sensor + implements: + - MONITORING + +HWBYPVM: + description: "Heating water bypass valve monitoring." + is_abstract: true + opt_uses: + - failed_heating_water_bypass_valve_alarm + uses: + - heating_water_bypass_valve_command + - heating_water_bypass_valve_status + implements: + - MONITORING + +HWDPC: + description: "Heating water differential pressure control." + is_abstract: true + uses: + - heating_water_differential_pressure_sensor + - heating_water_differential_pressure_setpoint + implements: + - OPERATIONAL + +HP6SWC: + description: "Six-compressor heat pump control on supply water side." + is_abstract: true + opt_uses: + - heating_percentage_command + - heating_thermal_power_capacity + - high_supply_water_temperature_alarm + - low_supply_water_temperature_alarm + uses: + - compressor_run_command_1 + - compressor_run_command_2 + - compressor_run_command_3 + - compressor_run_command_4 + - compressor_run_command_5 + - compressor_run_command_6 + - compressor_run_status_1 + - compressor_run_status_2 + - compressor_run_status_3 + - compressor_run_status_4 + - compressor_run_status_5 + - compressor_run_status_6 + - supply_water_temperature_sensor + - supply_water_temperature_setpoint + implements: + - CONTROL + +CPC2X: + description: "Circulation control for 2 pumps." + is_abstract: true + uses: + - circulation_pump_run_command_1 + - circulation_pump_run_status_1 + - circulation_pump_run_command_2 + - circulation_pump_run_status_2 + +SDHC: + description: "Supply dehumidification control with a temperature setpoint." + is_abstract: true + opt_uses: + - dehumidification_percentage_command + - zone_air_dewpoint_temperature_sensor + - supply_air_relative_humidity_sensor + - failed_dehumidifier_alarm + uses: + - dehumidification_run_command + - leaving_dehumidifier_temperature_sensor + - leaving_dehumidifier_temperature_setpoint + implements: + - CONTROL + +FPHC: + description: "Four pipe heating and cooling control for radiant panels." + is_abstract: true + opt_uses: + - heating_supply_water_isolation_valve_command + - chilled_supply_water_isolation_valve_command + - heating_water_valve_percentage_sensor + - chilled_water_valve_percentage_sensor + uses: + - heating_water_valve_percentage_command + - chilled_water_valve_percentage_command \ No newline at end of file diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml index 110a6e31a..95988d036 100644 --- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml @@ -4932,3 +4932,20 @@ AHU_CHWSC_EFSS_EFVSC_FDPM3X_HTWHLSTC_HWSC_RCO2M_RSPC_SFM_SFSS_SFVSC_SSPC_VOADM_V - SSPC - VOADM - VMADC + +AHU_CHWSC_ECON_FDPM_HWSC_SFSS_SFVSC_SSPC_SDHC_RTM: + description: "Multi-zone AHU with dehumidifier and return temperature monitoring" + is_canonical: true + implements: + - AHU + - CHWSC + - ECON + - FDPM + - HWSC + - SFSS + - SFVSC + - SSPC + - SDHC + - RTM + opt_uses: + - smoke_alarm \ No newline at end of file diff --git a/ontology/yaml/resources/HVAC/entity_types/ASHP.yaml b/ontology/yaml/resources/HVAC/entity_types/ASHP.yaml new file mode 100644 index 000000000..37ca2dd68 --- /dev/null +++ b/ontology/yaml/resources/HVAC/entity_types/ASHP.yaml @@ -0,0 +1,32 @@ +# 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 ### +######################## + +ASHP_SS_HP6SWC_CPC2X_RWISOVM: + description: "Six-stage air source heat pump with 2 circulation pumps and return isolation valve." + is_canonical: true + implements: + - ASHP + - SS + - HP6SWC + - CPC2X + - RWISOVM + opt_uses: + - low_refrigerant_pressure_alarm_1 + - low_refrigerant_pressure_alarm_2 + - high_refrigerant_pressure_alarm_1 + - high_refrigerant_pressure_alarm_2 \ No newline at end of file diff --git a/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml index 99d62a793..834b866a0 100644 --- a/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml @@ -163,3 +163,14 @@ CDWS_NONCANONICAL_1: - return_water_isolation_valve_status_3 - supply_water_isolation_valve_status_4 - return_water_isolation_valve_status_4 + +CDWS_SWTC_BYPVPM_WFRM_MWFRM_BWFRM: + description: "Condensing water system (temp control) with bypass control, flow monitoring and basin water system" + is_canonical: true + implements: + - CDWS + - SWTC + - BYPVPM + - WFRM + - MWFRM + - BWFRM \ No newline at end of file diff --git a/ontology/yaml/resources/HVAC/entity_types/CH.yaml b/ontology/yaml/resources/HVAC/entity_types/CH.yaml index 9220847cd..86cdf039b 100644 --- a/ontology/yaml/resources/HVAC/entity_types/CH.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/CH.yaml @@ -661,3 +661,36 @@ CH_SS_CHWSWISOVM_CWSISOVM_CWRISOVM_CHWRWISOVM_CHWDT: opt_uses: - lost_power_alarm - run_mode + +CH_SS_VSC_CHDXSC_SCHWTC_CWSISOVPM_CHWSWISOVM_CHWDPM_CWDT_REFPM_REFSM: + description: "Water cooled chiller with condensing and chilled supply water isolation valves, condensing water temperature differential monitoring, + chilled water differential pressure monitoring and single circuit refrigerant pressure and temperature monitoring." + is_canonical: true + implements: + - CH + - SS + - VSC + - CHDXSC + - SCHWTC + - CWSISOVPM + - CHWSWISOVM + - CHWDPM + - CWDT + - REFPM + - REFSM + +CH_SS_DX3SCHWC_CWSISOVM_CWRISOVM_CHWSWISOVM_CHWDPM_CWDT_CHWDT_RCKTM: + description: "Water cooled chiller with three compressors, refrigeration circuit monitoring, condensing supply and return water isolation valve, + chilled supply water islation valve, chilled and condensing water differential pressure monitoring and condensing water temperature differential monitoring." + is_canonical: true + implements: + - CH + - SS + - DX3SCHWC + - CWSISOVM + - CWRISOVM + - CHWSWISOVM + - CHWDPM + - CWDT + - CHWDT + - RCKTM \ No newline at end of file diff --git a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml index a211f927e..5b796d519 100644 --- a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml @@ -336,3 +336,28 @@ CHWS_SWTC_WDPC_BYPVPM_WFRM_NONCANONICAL_1: uses: - production_differential_pressure_sensor - supply_water_flowrate_sensor # Need to rename to flowrate_sensor + +CHWS_SWTC_WDPM_WFRM: + description: "Chilled water system with supply temperature, differential pressure monitoring and water flowrate monitoring." + is_canonical: true + implements: + - CHWS + - SWTC + - WDPM + - WFRM + +CHWS_WDPC_SWISOVPM_BYPVPM_WSEBYPVPM_PWDT_PRWFRM_SEWTM_SEWFRM_CLPM: + description: "Chilled water system with water differential pressure control, bypass valve, water side economizer bypass valve, + primary water temperature differential monitoring, primary and secondary loop flow monitoring and cooling thermal power monitoring." + is_canonical: true + implements: + - CHWS + - WDPC + - SWISOVPM + - BYPVPM + - WSEBYPVPM + - PWDT + - PRWFRM + - SEWTM + - SEWFRM + - CLPM \ No newline at end of file diff --git a/ontology/yaml/resources/HVAC/entity_types/CT.yaml b/ontology/yaml/resources/HVAC/entity_types/CT.yaml index b4ebe016a..33c326d69 100644 --- a/ontology/yaml/resources/HVAC/entity_types/CT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/CT.yaml @@ -226,3 +226,18 @@ CT_SS_CWDT_OA_VSFC_CSWIVS_CRWIVS_CSWTC: - run_mode - lost_power_alarm +CT_SS_VSC_SWTM_RWISOVM_SWISOVM_FSISOVM_FRISOVM: + description: "Cooling tower with variable speed control, supply and return isolation valves and supply temp monitoring, supply and return filter isolation valves and supply water temperature monitoring." + is_canonical: true + implements: + - CT + - SS + - VSC + - SWTM + - RWISOVM + - SWISOVM + - FSISOVM + - FRISOVM + opt_uses: + - high_water_level_alarm + - low_water_level_alarm diff --git a/ontology/yaml/resources/HVAC/entity_types/DMP.yaml b/ontology/yaml/resources/HVAC/entity_types/DMP.yaml index 11c0fc978..2c56ee23b 100644 --- a/ontology/yaml/resources/HVAC/entity_types/DMP.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/DMP.yaml @@ -109,3 +109,11 @@ DMP_BPC_NONCANONICAL_1: uses: - east_exhaust_air_damper_percentage_command - west_exhaust_air_damper_percentage_command + +DMP_ZSPC_EFM: + description: "Stand-alone zone pressure control damper with exhaust air flowrate monitoring." + is_canonical: true + implements: + - DMP + - ZSPC + - EFM \ No newline at end of file diff --git a/ontology/yaml/resources/HVAC/entity_types/FAN.yaml b/ontology/yaml/resources/HVAC/entity_types/FAN.yaml index e1589ff0d..68f63ba9e 100644 --- a/ontology/yaml/resources/HVAC/entity_types/FAN.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/FAN.yaml @@ -796,3 +796,12 @@ FAN_VSMC: - FAN - VSMC +FAN_SS_CSP_VSC_REFM: + description: "Cooling fan with variable speed command (no feedback) and refrigerant monitoring." + is_canonical: true + implements: + - FAN + - SS + - CSP + - VSC + - REFM \ No newline at end of file diff --git a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml index 3afd33993..d2f3ca90c 100644 --- a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml @@ -1790,3 +1790,23 @@ FCU_RHDHS_DXDC_DFSS_RTM_DSPM_DFM: opt_uses: - water_leak_alarm - failed_alarm + +FCU_DFSS_DFMSC_CSP_CHWZC: + description: "Chilled water FCU with cooling-only (zone control) and discharge fan multi-speed control." + is_canonical: true + implements: + - FCU + - DFSS + - DFMSC + - CSP + - CHWZC + +FCU_DFSS_CSP_DXZC_RAIDC: + description: "Typical DX FCU with cooling-only (discharge control) with return air isolation damper control." + is_canonical: true + implements: + - FCU + - DFSS + - CSP + - DXZC + - RAIDC \ No newline at end of file diff --git a/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml b/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml index 49cb2e021..be4c6f556 100644 --- a/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml @@ -215,6 +215,12 @@ CDWS: - differential_pressure_specification - failed_communication_alarm +ASHP: + description: "Tag for air-source heat pumps." + is_abstract: true + opt_uses: + - failed_communication_alarm + CT: guid: "d3872cf4-a6c7-4baf-9115-4cbd92d62e64" description: "Tag for cooling tower. Cooling towers are devices which cool incoming fluid through the @@ -262,6 +268,12 @@ DMP: is_abstract: true opt_uses: - failed_communication_alarm + - high_building_air_static_pressure_alarm_1 + - high_building_air_static_pressure_alarm_2 + - high_building_air_static_pressure_alarm_3 + - low_building_air_static_pressure_alarm_1 + - low_building_air_static_pressure_alarm_2 + - low_building_air_static_pressure_alarm_3 implements: - EQUIPMENT diff --git a/ontology/yaml/resources/HVAC/entity_types/HWS.yaml b/ontology/yaml/resources/HVAC/entity_types/HWS.yaml index 7096582c7..5c2432959 100644 --- a/ontology/yaml/resources/HVAC/entity_types/HWS.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/HWS.yaml @@ -349,3 +349,21 @@ HWS_SWTC_CPC: - circulation_pump_speed_percentage_setpoint - failed_alarm +HWS_SWTC_WDPM_WFRM: + description: "Simple heating water system with supply temp, differential pressure monitoring and water flowrate monitoring." + is_canonical: true + implements: + - HWS + - SWTC + - WDPM + - WFRM + +HWS_SWTC_WDPC_WFRM_HWTTC: + description: "Simple heating water system with supply temp and differential pressure control and hot water tank temperature control." + is_canonical: true + implements: + - HWS + - SWTC + - WDPC + - WFRM + - HWTTC \ No newline at end of file diff --git a/ontology/yaml/resources/HVAC/entity_types/HX.yaml b/ontology/yaml/resources/HVAC/entity_types/HX.yaml index 70777e1fe..2d3b92124 100644 --- a/ontology/yaml/resources/HVAC/entity_types/HX.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/HX.yaml @@ -165,3 +165,23 @@ HX_RWISOVM: implements: - HX - RWISOVM + +HX_CWDT_CHWDT_CWBYPVPM_CHWBYPVPM: + description: "Condenser and chilled water heat exchanger." + is_canonical: true + implements: + - HX + - CWDT + - CHWDT + - CWBYPVPM + - CHWBYPVPM + +HX_CWDT_HSWTC_HWDPC_HWBYPVPM: + description: "Condenser and heating water heat exchanger with heating water bypass valve, heating supply water valve control and heating water temperature differentioal control." + is_canonical: true + implements: + - HX + - CWDT + - HSWTC + - HWDPC + - HWBYPVPM \ No newline at end of file diff --git a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml index 5b569ebcd..ecef79fe6 100644 --- a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml @@ -855,3 +855,20 @@ MAU_SFSS_SFVSC_HTSC_BPC_SHM_NONCANONICAL_2: uses: - humidification_run_command +MAU_SFSS2X_SFVSC2X_CHWSC_HWSC_SSPC_VOADM_FDPM_ZSPM_OAFM: + description: "Multi-zone chilled water and heating water MAU with supply air static pressure control, variable outside air damper and outside airflow monitoring, + filter differential pressure monitoring, zone static pressure monitoring." + is_canonical: true + implements: + - MAU + - SFSS2X + - SFVSC2X + - CHWSC + - HWSC + - SSPC + - VOADM + - FDPM + - ZSPM + - OAFM + opt_uses: + - smoke_alarm \ No newline at end of file diff --git a/ontology/yaml/resources/HVAC/entity_types/PMP.yaml b/ontology/yaml/resources/HVAC/entity_types/PMP.yaml index 7c519467e..01eebcb2f 100644 --- a/ontology/yaml/resources/HVAC/entity_types/PMP.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/PMP.yaml @@ -172,3 +172,12 @@ PMP_SS_VSC_NONCANONICAL_2: - mixing_valve_percentage_command - chilled_supply_water_temperature_setpoint - chilled_supply_water_temperature_sensor + +PMP_SS_VSC_HWBYPVM: + description: "Variable speed pump with heating water bypass valve binary control." + is_canonical: true + implements: + - PMP + - SS + - VSC + - HWBYPVM \ No newline at end of file diff --git a/ontology/yaml/resources/HVAC/entity_types/RP.yaml b/ontology/yaml/resources/HVAC/entity_types/RP.yaml index 7e13ac448..dff7ba160 100644 --- a/ontology/yaml/resources/HVAC/entity_types/RP.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/RP.yaml @@ -59,3 +59,44 @@ RP_CAM_DPHC4_ZTC: - DPHC4 - ZTC +RP_DSP_CHWVM: + description: "Cooling-only radiant panel, one pipe installation." + is_canonical: true + implements: + - RP + - DSP + - CHWVM + +RP_DSP_HWVM: + description: "Heating-only radiant panel, one pipe installation." + is_canonical: true + implements: + - RP + - DSP + - HWVM + +RP_DSP_CHWVM_CAM: + description: "Cooling-only one-pipe radiant panel with condensate monitoring." + is_canonical: true + implements: + - RP + - DSP + - CHWVM + - CAM + +RP_DSP_FPHC: + description: "Four-pipe radiant panel for room heating and cooling." + is_canonical: true + implements: + - RP + - DSP + - FPHC + +RP_DSP_FPHC_CAM: + description: "Four-pipe radiant panel for room heating and cooling with condensate monitoring." + is_canonical: true + implements: + - RP + - DSP + - FPHC + - CAM \ No newline at end of file diff --git a/ontology/yaml/resources/HVAC/entity_types/VAV.yaml b/ontology/yaml/resources/HVAC/entity_types/VAV.yaml index ee0404ece..b95b80196 100644 --- a/ontology/yaml/resources/HVAC/entity_types/VAV.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/VAV.yaml @@ -109,6 +109,7 @@ VAV_SD_DSP_HWZC: - DSP - HWZC + VAV_SD_DSP_HTZC: guid: "47b47e69-d873-4976-b578-a07cb3d85176" description: "Single duct reheat VAV with electric heat." @@ -597,3 +598,84 @@ VAV_CO2C_NONCANONICAL_1: uses: - supply_air_damper_percentage_sensor - supply_air_flowrate_sensor + +VAV_CSP_DFSS_DFVSC_SFM: + description: "Fan powered cooling only VAV with fan speed control and supply airflow monitoring." + is_canonical: true + implements: + - VAV + - CSP + - DFSS + - DFVSC + - SFM + +VAV_ED_ZSPC: + description: "Exhaust air zone pressure control VAV." + is_canonical: true + implements: + - VAV + - ED + - ZSPC + +VAV_DSP_PDSCV: + description: "VAV with pressure dependent supply valve control." + is_canonical: true + implements: + - VAV + - DSP + - PDSCV + +VAV_DSP_PDSCV_FPHC: + description: "VAV with pressure dependent supply valve control, paired with a four-pipe radiant panel." + is_canonical: true + implements: + - VAV + - DSP + - PDSCV + - FPHC + +VAV_DSP_PDSCV_CO2C: + description: "VAV with pressure dependent supply valve control and CO2 control." + is_canonical: true + implements: + - VAV + - DSP + - PDSCV + - CO2C + +VAV_DSP_PDSCV_HTZC: + description: "Reheat VAV with pressure dependent supply damper control." + is_canonical: true + implements: + - VAV + - DSP + - PDSCV + - HTZC + +VAV_DSP_PDSCV_FPHC_CAM: + description: "VAV with pressure dependent supply valve control and condensate monitoring, paired with a four-pipe radiant panel." + is_canonical: true + implements: + - VAV + - DSP + - PDSCV + - FPHC + - CAM + +VAV_DSP_PDSCV_HTZC_CO2C: + description: "Reheat VAV with pressure dependent supply damper control and CO2 control." + is_canonical: true + implements: + - VAV + - DSP + - PDSCV + - HTZC + - CO2C + +VAV_PDSCV_WDPC2X: + description: "VAV with pressure-dependent supply damper control and dual sensor differential pressure control." + is_canonical: true + implements: + - VAV + - PDSCV + - WDPC2X \ No newline at end of file diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml index d648f49b8..b9eee4ab5 100644 --- a/ontology/yaml/resources/fields/telemetry_fields.yaml +++ b/ontology/yaml/resources/fields/telemetry_fields.yaml @@ -15,6 +15,9 @@ # Original Field set literals: +- blowdown_water_flowrate_sensor: + flexible_min: -0.000315451 + flexible_max: 0.315451 - building_air_static_pressure_sensor: flexible_min: -249.080024 flexible_max: 249.080024 @@ -198,6 +201,18 @@ literals: - heater_run_command: - ON - OFF +- heating_water_bypass_valve_command: + - OPEN + - CLOSED +- heating_water_bypass_valve_status: + - OPEN + - CLOSED +- heating_water_bypass_valve_percentage_command: + fixed_min: 0 + fixed_max: 100 +- heating_water_bypass_valve_percentage_sensor: + fixed_min: 0 + fixed_max: 100 - heating_water_valve_percentage_command: fixed_min: 0.0 fixed_max: 100.0 @@ -440,6 +455,9 @@ literals: - zone_air_temperature_sensor: flexible_min: 255.9259259 flexible_max: 322.037037 +- zone_air_dewpoint_temperature_sensor: + flexible_min: 255.9259259 + flexible_max: 310.9259259 - outside_air_co_concentration_sensor: flexible_min: 0.00035 flexible_max: 0.0015 @@ -485,6 +503,12 @@ literals: - bypass_valve_percentage_sensor: fixed_min: 0.0 fixed_max: 100.0 +- economizer_bypass_valve_percentage_command: + fixed_min: 0 + fixed_max: 100 +- economizer_bypass_valve_percentage_sensor: + fixed_min: 0 + fixed_max: 100 - chilled_water_isolation_valve_status: - OPEN - CLOSED @@ -515,6 +539,9 @@ literals: - cooling_air_flowrate_setpoint: flexible_min: 0.0 flexible_max: 4.719474432 +- dehumidification_percentage_command: + fixed_min: 0 + fixed_max: 100 - dehumidification_run_command: - ON - OFF @@ -674,6 +701,9 @@ literals: - secondary_supply_water_temperature_sensor: flexible_min: 255.9259259 flexible_max: 380.3703704 +- secondary_supply_water_flowrate_sensor: + flexible_min: -0.000315451 + flexible_max: 0.315451 - shade_extent_percentage_command: fixed_min: 0.0 fixed_max: 100.0 @@ -804,6 +834,12 @@ literals: - leaving_cooling_coil_temperature_setpoint: flexible_min: 255.9259259 flexible_max: 338.7037037 +- leaving_dehumidifier_temperature_sensor: + flexible_min: 255.9259259 + flexible_max: 338.7037037 +- leaving_dehumidifier_temperature_setpoint: + flexible_min: 255.9259259 + flexible_max: 338.7037037 - heating_water_valve_command: - OPEN - CLOSED @@ -837,6 +873,9 @@ literals: - chilled_water_flowrate_sensor: flexible_min: -0.000315451 flexible_max: 0.315451 +- chilled_water_temperature_sensor: + flexible_min: 274.8148148 + flexible_max: 299.8148148 - compressor_speed_frequency_sensor: flexible_min: -0.5 flexible_max: 65.0 @@ -940,6 +979,9 @@ literals: - primary_supply_water_temperature_sensor: flexible_min: 255.9259259 flexible_max: 380.3703704 +- primary_supply_water_flowrate_sensor: + flexible_min: -0.000315451 + flexible_max: 0.315451 - supply_air_isolation_damper_status: - OPEN - CLOSED @@ -1196,9 +1238,6 @@ literals: - cooling_water_flowrate_sensor: flexible_min: -0.000315451 flexible_max: 0.315451 -- heating_water_flowrate_sensor: - flexible_min: -0.000315451 - flexible_max: 0.0315451 - zone_air_offset_temperature_setpoint: flexible_min: 254.8148148 flexible_max: 283.1481481 @@ -1211,6 +1250,9 @@ literals: - supply_water_isolation_valve_status: - OPEN - CLOSED +- filtration_supply_water_isolation_valve_command: + - OPEN + - CLOSED - return_water_isolation_valve_command: - OPEN - CLOSED @@ -1220,6 +1262,9 @@ literals: - chilled_return_water_isolation_valve_command: - OPEN - CLOSED +- filtration_return_water_isolation_valve_command: + - OPEN + - CLOSED - condensing_return_water_isolation_valve_percentage_command: fixed_min: 0.0 fixed_max: 100.0 @@ -1485,6 +1530,9 @@ literals: - failed_humidifier_alarm: - ACTIVE - INACTIVE +- failed_dehumidifier_alarm: + - ACTIVE + - INACTIVE - failed_heat_exchange_alarm: - ACTIVE - INACTIVE @@ -1720,9 +1768,15 @@ literals: - cooling_run_status: - ON - OFF +- high_refrigerant_pressure_alarm: + - ACTIVE + - INACTIVE - high_return_air_temperature_alarm: - ACTIVE - INACTIVE +- low_refrigerant_pressure_alarm: + - ACTIVE + - INACTIVE - low_return_air_temperature_alarm: - ACTIVE - INACTIVE @@ -1847,6 +1901,12 @@ literals: - heating_supply_water_isolation_valve_percentage_sensor: fixed_min: 0.0 fixed_max: 100.0 +- heating_supply_water_valve_percentage_command: + fixed_min: 0 + fixed_max: 100 +- heating_supply_water_valve_percentage_sensor: + fixed_min: 0 + fixed_max: 100 - heating_return_water_isolation_valve_percentage_sensor: fixed_min: 0.0 fixed_max: 100.0 @@ -2470,12 +2530,18 @@ literals: - transducer_failed_alarm: - ACTIVE - INACTIVE -- chilled_water_temperature_sensor: - flexible_min: 274.8148148 - flexible_max: 299.8148148 - heating_water_temperature_sensor: flexible_min: 255.9259259 flexible_max: 380.3703704 +- heating_water_flowrate_sensor: + flexible_min: -0.000315451 + flexible_max: 0.0315451 +- heating_water_differential_pressure_sensor: + flexible_min: -34473.78945 + flexible_max: 344737.8945 +- heating_water_differential_pressure_setpoint: + flexible_min: -34473.78945 + flexible_max: 344737.8945 - leaving_water_tank_temperature_sensor: flexible_min: 255.9259259 flexible_max: 380.3703704 @@ -2656,6 +2722,9 @@ literals: - low_exhaust_fan_speed_command: - ON - OFF +- high_exhaust_air_static_pressure_alarm: + - ACTIVE + - INACTIVE - high_exhaust_fan_speed_command: - ON - OFF @@ -2921,18 +2990,63 @@ literals: - failed_exhaust_air_temperature_alarm: - ACTIVE - INACTIVE +- failed_bypass_valve_alarm: + - ACTIVE + - INACTIVE +- failed_condensing_water_bypass_valve_alarm: + - ACTIVE + - INACTIVE +- failed_chilled_water_bypass_valve_alarm: + - ACTIVE + - INACTIVE +- failed_heating_water_bypass_valve_alarm: + - ACTIVE + - INACTIVE +- failed_economizer_bypass_valve_alarm: + - ACTIVE + - INACTIVE - failed_heating_water_valve_alarm: - ACTIVE - INACTIVE +- failed_heating_supply_water_valve_alarm: + - ACTIVE + - INACTIVE - failed_isolation_valve_alarm: - ACTIVE - INACTIVE +- failed_supply_water_isolation_valve_alarm: + - ACTIVE + - INACTIVE +- failed_chilled_supply_water_isolation_valve_alarm: + - ACTIVE + - INACTIVE +- failed_condensing_supply_water_isolation_valve_alarm: + - ACTIVE + - INACTIVE +- failed_return_water_isolation_valve_alarm: + - ACTIVE + - INACTIVE +- failed_condensing_return_water_isolation_valve_alarm: + - ACTIVE + - INACTIVE - failed_mixed_air_temperature_alarm: - ACTIVE - INACTIVE +- failed_outside_air_damper_alarm: + - ACTIVE + - INACTIVE +- failed_outside_air_flowrate_alarm: + - ACTIVE + - INACTIVE - failed_return_air_isolation_damper_alarm: - ACTIVE - INACTIVE +- failed_blowdown_water_flowrate_alarm: + - ACTIVE + - INACTIVE +- failed_makeup_water_flowrate_alarm: + - ACTIVE + - INACTIVE - failed_smoke_detection_alarm: - ACTIVE - INACTIVE @@ -2960,12 +3074,18 @@ literals: - high_zone_air_co2_concentration_alarm: - ACTIVE - INACTIVE +- high_zone_air_refrigerant_concentration_alarm: + - ACTIVE + - INACTIVE - high_zone_air_static_pressure_alarm: - ACTIVE - INACTIVE - high_zone_air_temperature_alarm: - ACTIVE - INACTIVE +- high_zone_air_relative_humidity_alarm: + - ACTIVE + - INACTIVE - local_alarm: - ACTIVE - INACTIVE @@ -3002,6 +3122,9 @@ literals: - low_zone_air_temperature_alarm: - ACTIVE - INACTIVE +- low_zone_air_relative_humidity_alarm: + - ACTIVE + - INACTIVE - failed_communication_alarm: - ACTIVE - INACTIVE @@ -3029,6 +3152,12 @@ literals: - high_water_temperature_alarm: - ACTIVE - INACTIVE +- high_water_level_alarm: + - ACTIVE + - INACTIVE +- low_water_level_alarm: + - ACTIVE + - INACTIVE - ultraviolet_irradiance_sensor: fixed_min: 0.0 flexible_max: 2000.0 @@ -3070,4 +3199,4 @@ literals: flexible_max: 80 - tamper_alarm: - ACTIVE - - INACTIVE + - INACTIVE \ No newline at end of file diff --git a/ontology/yaml/resources/subfields/subfields.yaml b/ontology/yaml/resources/subfields/subfields.yaml index 32c29f437..9122e6ea3 100644 --- a/ontology/yaml/resources/subfields/subfields.yaml +++ b/ontology/yaml/resources/subfields/subfields.yaml @@ -117,6 +117,7 @@ descriptor: panel: "An interface to control a device." fabric: "Textile material." failed: "Indicates that a point is not operating as intended or is incapable of operating." + filtration: "Component used for removing dust and other particulate matter from the air." fire: "a potential to cause physical damage through burning" floor: "Lower surface of a room or zone." flue: "Chimney for conveying exhaust gas." From 2e374c43efd9f2d10f46764470861e273292343c Mon Sep 17 00:00:00 2001 From: db-robot Date: Mon, 20 Nov 2023 19:19:53 +0000 Subject: [PATCH 2/5] Add GUIDs to new entity types --- .../resources/HVAC/entity_types/ABSTRACT.yaml | 17 +++++++++++++++++ .../yaml/resources/HVAC/entity_types/AHU.yaml | 1 + .../yaml/resources/HVAC/entity_types/ASHP.yaml | 1 + .../yaml/resources/HVAC/entity_types/CDWS.yaml | 1 + .../yaml/resources/HVAC/entity_types/CH.yaml | 2 ++ .../yaml/resources/HVAC/entity_types/CHWS.yaml | 2 ++ .../yaml/resources/HVAC/entity_types/CT.yaml | 1 + .../yaml/resources/HVAC/entity_types/DMP.yaml | 1 + .../yaml/resources/HVAC/entity_types/FAN.yaml | 1 + .../yaml/resources/HVAC/entity_types/FCU.yaml | 2 ++ .../HVAC/entity_types/GENERALTYPES.yaml | 1 + .../yaml/resources/HVAC/entity_types/HWS.yaml | 2 ++ .../yaml/resources/HVAC/entity_types/HX.yaml | 2 ++ .../yaml/resources/HVAC/entity_types/MAU.yaml | 1 + .../yaml/resources/HVAC/entity_types/PMP.yaml | 1 + .../yaml/resources/HVAC/entity_types/RP.yaml | 5 +++++ .../yaml/resources/HVAC/entity_types/VAV.yaml | 9 +++++++++ 17 files changed, 50 insertions(+) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index 5eea0dd27..f796378a2 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -6962,6 +6962,7 @@ PMDM: - MONITORING HSWTC: + guid: "d9cf672c-8081-4e2b-9bba-599d8ac2bbd2" description: "Heating water valve monitoring on supply water side." is_abstract: true opt_uses: @@ -6976,6 +6977,7 @@ HSWTC: - CONTROL WSEBYPVPM: + guid: "70e5c471-4b14-4d81-8bf2-ec8dcfbb29dd" description: "Water side economizer bypass valve monitoring." is_abstract: true opt_uses: @@ -6987,6 +6989,7 @@ WSEBYPVPM: - MONITORING FSISOVM: + guid: "58f0a5fb-fc3e-4384-91b1-ba7db225ec6c" description: "Filtration supply isolation valve monitoring." is_abstract: true uses: @@ -6995,6 +6998,7 @@ FSISOVM: - MONITORING FRISOVM: + guid: "6d8a9548-5879-493a-a991-cd3ed3eb80ac" description: "Filtration return isolation valve monitoring." is_abstract: true uses: @@ -7003,6 +7007,7 @@ FRISOVM: - MONITORING PRWFRM: + guid: "d24ca9da-2897-42ba-9010-59b65971613d" description: "Primary supply water flowrate monitoring" uses: - primary_supply_water_flowrate_sensor @@ -7010,6 +7015,7 @@ PRWFRM: - MONITORING SEWFRM: + guid: "de0de0fc-e634-4bbc-8ecc-4d413614c84d" description: "Secondary supply water flowrate monitoring" uses: - secondary_supply_water_flowrate_sensor @@ -7017,6 +7023,7 @@ SEWFRM: - MONITORING MWFRM: + guid: "c7683a09-8379-4951-aa1e-e5edc4e098cb" description: "Make-up water flowrate monitoring." is_abstract: true opt_uses: @@ -7027,6 +7034,7 @@ MWFRM: - MONITORING BWFRM: + guid: "2be49785-9467-4ddb-8aa8-9c2b77277d29" description: "Blowdown water flowrate monitoring." is_abstract: true opt_uses: @@ -7037,6 +7045,7 @@ BWFRM: - MONITORING DX3SCHWC: + guid: "917e4514-ed4d-468c-8a81-44d29a143935" description: "Three compressor run control on chilled supply water side." is_abstract: true uses: @@ -7052,6 +7061,7 @@ DX3SCHWC: - CONTROL CWBYPVPM: + guid: "88212fc0-0ddb-4cd9-99a3-e646dd20d528" description: "Condensing water bypass valve percentage monitoring." is_abstract: true opt_uses: @@ -7063,6 +7073,7 @@ CWBYPVPM: - MONITORING HWBYPVPM: + guid: "38b01712-d458-4e5c-bf41-71107ebe8ecd" description: "Heating water bypass valve percentage monitoring." is_abstract: true opt_uses: @@ -7074,6 +7085,7 @@ HWBYPVPM: - MONITORING HWBYPVM: + guid: "c4a7009c-1ccb-4162-8761-fd1e0acc5169" description: "Heating water bypass valve monitoring." is_abstract: true opt_uses: @@ -7085,6 +7097,7 @@ HWBYPVM: - MONITORING HWDPC: + guid: "46009d2e-eee4-4e0a-a775-157fa7193983" description: "Heating water differential pressure control." is_abstract: true uses: @@ -7094,6 +7107,7 @@ HWDPC: - OPERATIONAL HP6SWC: + guid: "5d2c6d94-ad64-41ef-bce0-78a9b40532b1" description: "Six-compressor heat pump control on supply water side." is_abstract: true opt_uses: @@ -7120,6 +7134,7 @@ HP6SWC: - CONTROL CPC2X: + guid: "a45b771d-0bc2-49a4-8a4f-5e3287f65ff0" description: "Circulation control for 2 pumps." is_abstract: true uses: @@ -7129,6 +7144,7 @@ CPC2X: - circulation_pump_run_status_2 SDHC: + guid: "de065843-b1a9-4d2e-b751-31d7af8e8991" description: "Supply dehumidification control with a temperature setpoint." is_abstract: true opt_uses: @@ -7144,6 +7160,7 @@ SDHC: - CONTROL FPHC: + guid: "bdd89332-3303-420d-a13c-ee38c398d9ff" description: "Four pipe heating and cooling control for radiant panels." is_abstract: true opt_uses: diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml index 95988d036..c0e54d151 100644 --- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml @@ -4934,6 +4934,7 @@ AHU_CHWSC_EFSS_EFVSC_FDPM3X_HTWHLSTC_HWSC_RCO2M_RSPC_SFM_SFSS_SFVSC_SSPC_VOADM_V - VMADC AHU_CHWSC_ECON_FDPM_HWSC_SFSS_SFVSC_SSPC_SDHC_RTM: + guid: "cff73d74-717b-4656-808e-95365ce9ad9b" description: "Multi-zone AHU with dehumidifier and return temperature monitoring" is_canonical: true implements: diff --git a/ontology/yaml/resources/HVAC/entity_types/ASHP.yaml b/ontology/yaml/resources/HVAC/entity_types/ASHP.yaml index 37ca2dd68..aaf9b5eed 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ASHP.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ASHP.yaml @@ -17,6 +17,7 @@ ######################## ASHP_SS_HP6SWC_CPC2X_RWISOVM: + guid: "11ecef31-d11d-496b-9d39-f35fe9307a82" description: "Six-stage air source heat pump with 2 circulation pumps and return isolation valve." is_canonical: true implements: diff --git a/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml index 834b866a0..d9281bc6d 100644 --- a/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml @@ -165,6 +165,7 @@ CDWS_NONCANONICAL_1: - return_water_isolation_valve_status_4 CDWS_SWTC_BYPVPM_WFRM_MWFRM_BWFRM: + guid: "0b9e1103-83e2-4445-a446-6eb69d127dc8" description: "Condensing water system (temp control) with bypass control, flow monitoring and basin water system" is_canonical: true implements: diff --git a/ontology/yaml/resources/HVAC/entity_types/CH.yaml b/ontology/yaml/resources/HVAC/entity_types/CH.yaml index 86cdf039b..b8eeb0da0 100644 --- a/ontology/yaml/resources/HVAC/entity_types/CH.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/CH.yaml @@ -663,6 +663,7 @@ CH_SS_CHWSWISOVM_CWSISOVM_CWRISOVM_CHWRWISOVM_CHWDT: - run_mode CH_SS_VSC_CHDXSC_SCHWTC_CWSISOVPM_CHWSWISOVM_CHWDPM_CWDT_REFPM_REFSM: + guid: "9fd7c871-3378-4a48-898d-3b47fb19d34c" description: "Water cooled chiller with condensing and chilled supply water isolation valves, condensing water temperature differential monitoring, chilled water differential pressure monitoring and single circuit refrigerant pressure and temperature monitoring." is_canonical: true @@ -680,6 +681,7 @@ CH_SS_VSC_CHDXSC_SCHWTC_CWSISOVPM_CHWSWISOVM_CHWDPM_CWDT_REFPM_REFSM: - REFSM CH_SS_DX3SCHWC_CWSISOVM_CWRISOVM_CHWSWISOVM_CHWDPM_CWDT_CHWDT_RCKTM: + guid: "8a648fa7-d065-4ff4-b524-626b4a23c238" description: "Water cooled chiller with three compressors, refrigeration circuit monitoring, condensing supply and return water isolation valve, chilled supply water islation valve, chilled and condensing water differential pressure monitoring and condensing water temperature differential monitoring." is_canonical: true diff --git a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml index 5b796d519..d8f46701f 100644 --- a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml @@ -338,6 +338,7 @@ CHWS_SWTC_WDPC_BYPVPM_WFRM_NONCANONICAL_1: - supply_water_flowrate_sensor # Need to rename to flowrate_sensor CHWS_SWTC_WDPM_WFRM: + guid: "26cc124e-80f4-4602-ad4c-ea41a92c2e6c" description: "Chilled water system with supply temperature, differential pressure monitoring and water flowrate monitoring." is_canonical: true implements: @@ -347,6 +348,7 @@ CHWS_SWTC_WDPM_WFRM: - WFRM CHWS_WDPC_SWISOVPM_BYPVPM_WSEBYPVPM_PWDT_PRWFRM_SEWTM_SEWFRM_CLPM: + guid: "2ddb95f1-5fd1-449a-b528-9ab4f744d9e2" description: "Chilled water system with water differential pressure control, bypass valve, water side economizer bypass valve, primary water temperature differential monitoring, primary and secondary loop flow monitoring and cooling thermal power monitoring." is_canonical: true diff --git a/ontology/yaml/resources/HVAC/entity_types/CT.yaml b/ontology/yaml/resources/HVAC/entity_types/CT.yaml index 33c326d69..8f14d45e4 100644 --- a/ontology/yaml/resources/HVAC/entity_types/CT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/CT.yaml @@ -227,6 +227,7 @@ CT_SS_CWDT_OA_VSFC_CSWIVS_CRWIVS_CSWTC: - lost_power_alarm CT_SS_VSC_SWTM_RWISOVM_SWISOVM_FSISOVM_FRISOVM: + guid: "9ca0256a-9d7f-4b4d-8289-e321e487a2a1" description: "Cooling tower with variable speed control, supply and return isolation valves and supply temp monitoring, supply and return filter isolation valves and supply water temperature monitoring." is_canonical: true implements: diff --git a/ontology/yaml/resources/HVAC/entity_types/DMP.yaml b/ontology/yaml/resources/HVAC/entity_types/DMP.yaml index 2c56ee23b..d201ae81a 100644 --- a/ontology/yaml/resources/HVAC/entity_types/DMP.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/DMP.yaml @@ -111,6 +111,7 @@ DMP_BPC_NONCANONICAL_1: - west_exhaust_air_damper_percentage_command DMP_ZSPC_EFM: + guid: "18dc78f6-6054-450f-b265-80d25f31b545" description: "Stand-alone zone pressure control damper with exhaust air flowrate monitoring." is_canonical: true implements: diff --git a/ontology/yaml/resources/HVAC/entity_types/FAN.yaml b/ontology/yaml/resources/HVAC/entity_types/FAN.yaml index 68f63ba9e..1a5bb9445 100644 --- a/ontology/yaml/resources/HVAC/entity_types/FAN.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/FAN.yaml @@ -797,6 +797,7 @@ FAN_VSMC: - VSMC FAN_SS_CSP_VSC_REFM: + guid: "8ad25499-4813-4634-91e0-cb77beaee01d" description: "Cooling fan with variable speed command (no feedback) and refrigerant monitoring." is_canonical: true implements: diff --git a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml index d2f3ca90c..e55456d20 100644 --- a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml @@ -1792,6 +1792,7 @@ FCU_RHDHS_DXDC_DFSS_RTM_DSPM_DFM: - failed_alarm FCU_DFSS_DFMSC_CSP_CHWZC: + guid: "3d8c3cf8-401f-45d4-89b2-b87f52e4efc9" description: "Chilled water FCU with cooling-only (zone control) and discharge fan multi-speed control." is_canonical: true implements: @@ -1802,6 +1803,7 @@ FCU_DFSS_DFMSC_CSP_CHWZC: - CHWZC FCU_DFSS_CSP_DXZC_RAIDC: + guid: "a1652130-9f2c-4d3b-8e89-c9e34d60533e" description: "Typical DX FCU with cooling-only (discharge control) with return air isolation damper control." is_canonical: true implements: diff --git a/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml b/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml index be4c6f556..afd684e3d 100644 --- a/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml @@ -216,6 +216,7 @@ CDWS: - failed_communication_alarm ASHP: + guid: "548532cf-e175-47e5-b6a1-82ac92362d38" description: "Tag for air-source heat pumps." is_abstract: true opt_uses: diff --git a/ontology/yaml/resources/HVAC/entity_types/HWS.yaml b/ontology/yaml/resources/HVAC/entity_types/HWS.yaml index 5c2432959..06241d413 100644 --- a/ontology/yaml/resources/HVAC/entity_types/HWS.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/HWS.yaml @@ -350,6 +350,7 @@ HWS_SWTC_CPC: - failed_alarm HWS_SWTC_WDPM_WFRM: + guid: "9f75791e-f814-4724-bd22-ba6538ce00d7" description: "Simple heating water system with supply temp, differential pressure monitoring and water flowrate monitoring." is_canonical: true implements: @@ -359,6 +360,7 @@ HWS_SWTC_WDPM_WFRM: - WFRM HWS_SWTC_WDPC_WFRM_HWTTC: + guid: "4601c41e-fe72-46fd-bde2-34f15a1e7730" description: "Simple heating water system with supply temp and differential pressure control and hot water tank temperature control." is_canonical: true implements: diff --git a/ontology/yaml/resources/HVAC/entity_types/HX.yaml b/ontology/yaml/resources/HVAC/entity_types/HX.yaml index 2d3b92124..8361b9c34 100644 --- a/ontology/yaml/resources/HVAC/entity_types/HX.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/HX.yaml @@ -167,6 +167,7 @@ HX_RWISOVM: - RWISOVM HX_CWDT_CHWDT_CWBYPVPM_CHWBYPVPM: + guid: "750775f1-b955-4224-a3b8-e5a1386399d0" description: "Condenser and chilled water heat exchanger." is_canonical: true implements: @@ -177,6 +178,7 @@ HX_CWDT_CHWDT_CWBYPVPM_CHWBYPVPM: - CHWBYPVPM HX_CWDT_HSWTC_HWDPC_HWBYPVPM: + guid: "909f4f23-f71d-4504-8052-efb435356e29" description: "Condenser and heating water heat exchanger with heating water bypass valve, heating supply water valve control and heating water temperature differentioal control." is_canonical: true implements: diff --git a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml index ecef79fe6..0a909ce49 100644 --- a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml @@ -856,6 +856,7 @@ MAU_SFSS_SFVSC_HTSC_BPC_SHM_NONCANONICAL_2: - humidification_run_command MAU_SFSS2X_SFVSC2X_CHWSC_HWSC_SSPC_VOADM_FDPM_ZSPM_OAFM: + guid: "32d6b258-48c1-4b2c-b6c9-f94430f763d2" description: "Multi-zone chilled water and heating water MAU with supply air static pressure control, variable outside air damper and outside airflow monitoring, filter differential pressure monitoring, zone static pressure monitoring." is_canonical: true diff --git a/ontology/yaml/resources/HVAC/entity_types/PMP.yaml b/ontology/yaml/resources/HVAC/entity_types/PMP.yaml index 01eebcb2f..1e0a911a2 100644 --- a/ontology/yaml/resources/HVAC/entity_types/PMP.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/PMP.yaml @@ -174,6 +174,7 @@ PMP_SS_VSC_NONCANONICAL_2: - chilled_supply_water_temperature_sensor PMP_SS_VSC_HWBYPVM: + guid: "aec25b2b-513d-474d-91b3-7cb756fe12ce" description: "Variable speed pump with heating water bypass valve binary control." is_canonical: true implements: diff --git a/ontology/yaml/resources/HVAC/entity_types/RP.yaml b/ontology/yaml/resources/HVAC/entity_types/RP.yaml index dff7ba160..44c6d11e9 100644 --- a/ontology/yaml/resources/HVAC/entity_types/RP.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/RP.yaml @@ -60,6 +60,7 @@ RP_CAM_DPHC4_ZTC: - ZTC RP_DSP_CHWVM: + guid: "08a82f9e-efff-47e5-b418-a5ade24b906a" description: "Cooling-only radiant panel, one pipe installation." is_canonical: true implements: @@ -68,6 +69,7 @@ RP_DSP_CHWVM: - CHWVM RP_DSP_HWVM: + guid: "c049cd6d-cf92-44d1-983b-7c04c2a000c3" description: "Heating-only radiant panel, one pipe installation." is_canonical: true implements: @@ -76,6 +78,7 @@ RP_DSP_HWVM: - HWVM RP_DSP_CHWVM_CAM: + guid: "1087d6a8-fa58-4083-89de-12cc6275de35" description: "Cooling-only one-pipe radiant panel with condensate monitoring." is_canonical: true implements: @@ -85,6 +88,7 @@ RP_DSP_CHWVM_CAM: - CAM RP_DSP_FPHC: + guid: "04bbeedd-75ba-4454-a49c-26bc0b802b86" description: "Four-pipe radiant panel for room heating and cooling." is_canonical: true implements: @@ -93,6 +97,7 @@ RP_DSP_FPHC: - FPHC RP_DSP_FPHC_CAM: + guid: "587a5a45-c7bb-415d-b75d-1b1aae4e09e2" description: "Four-pipe radiant panel for room heating and cooling with condensate monitoring." is_canonical: true implements: diff --git a/ontology/yaml/resources/HVAC/entity_types/VAV.yaml b/ontology/yaml/resources/HVAC/entity_types/VAV.yaml index b95b80196..f607c9756 100644 --- a/ontology/yaml/resources/HVAC/entity_types/VAV.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/VAV.yaml @@ -600,6 +600,7 @@ VAV_CO2C_NONCANONICAL_1: - supply_air_flowrate_sensor VAV_CSP_DFSS_DFVSC_SFM: + guid: "2f04436e-1df5-45a3-93b8-1975085cdbbc" description: "Fan powered cooling only VAV with fan speed control and supply airflow monitoring." is_canonical: true implements: @@ -610,6 +611,7 @@ VAV_CSP_DFSS_DFVSC_SFM: - SFM VAV_ED_ZSPC: + guid: "dd8d4eb7-7f29-408d-896e-42717a777a75" description: "Exhaust air zone pressure control VAV." is_canonical: true implements: @@ -618,6 +620,7 @@ VAV_ED_ZSPC: - ZSPC VAV_DSP_PDSCV: + guid: "26c15f25-e80a-4229-970b-3d3265ac65ad" description: "VAV with pressure dependent supply valve control." is_canonical: true implements: @@ -626,6 +629,7 @@ VAV_DSP_PDSCV: - PDSCV VAV_DSP_PDSCV_FPHC: + guid: "fc5ffbfb-5245-41d5-bf44-9c5a4e0111ec" description: "VAV with pressure dependent supply valve control, paired with a four-pipe radiant panel." is_canonical: true implements: @@ -635,6 +639,7 @@ VAV_DSP_PDSCV_FPHC: - FPHC VAV_DSP_PDSCV_CO2C: + guid: "8e9bb69a-459c-474f-9d35-494b0eb3fd40" description: "VAV with pressure dependent supply valve control and CO2 control." is_canonical: true implements: @@ -644,6 +649,7 @@ VAV_DSP_PDSCV_CO2C: - CO2C VAV_DSP_PDSCV_HTZC: + guid: "3d727b03-e945-4af3-822e-b8da662a26f6" description: "Reheat VAV with pressure dependent supply damper control." is_canonical: true implements: @@ -653,6 +659,7 @@ VAV_DSP_PDSCV_HTZC: - HTZC VAV_DSP_PDSCV_FPHC_CAM: + guid: "7a035aa6-0bf3-45ec-80a7-2be5485968bc" description: "VAV with pressure dependent supply valve control and condensate monitoring, paired with a four-pipe radiant panel." is_canonical: true implements: @@ -663,6 +670,7 @@ VAV_DSP_PDSCV_FPHC_CAM: - CAM VAV_DSP_PDSCV_HTZC_CO2C: + guid: "47431504-17c4-4b83-ae95-811f4b45bc76" description: "Reheat VAV with pressure dependent supply damper control and CO2 control." is_canonical: true implements: @@ -673,6 +681,7 @@ VAV_DSP_PDSCV_HTZC_CO2C: - CO2C VAV_PDSCV_WDPC2X: + guid: "cd3a50ce-83bf-4521-b67f-376eb8a2f336" description: "VAV with pressure-dependent supply damper control and dual sensor differential pressure control." is_canonical: true implements: From a4496642604c563673992aeaa768c5964cbe8eb1 Mon Sep 17 00:00:00 2001 From: Jane Date: Mon, 20 Nov 2023 18:07:09 -0800 Subject: [PATCH 3/5] Removed redundant VAV types with FPHC implement --- .../yaml/resources/HVAC/entity_types/VAV.yaml | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/VAV.yaml b/ontology/yaml/resources/HVAC/entity_types/VAV.yaml index f607c9756..c0c6e9018 100644 --- a/ontology/yaml/resources/HVAC/entity_types/VAV.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/VAV.yaml @@ -628,16 +628,6 @@ VAV_DSP_PDSCV: - DSP - PDSCV -VAV_DSP_PDSCV_FPHC: - guid: "fc5ffbfb-5245-41d5-bf44-9c5a4e0111ec" - description: "VAV with pressure dependent supply valve control, paired with a four-pipe radiant panel." - is_canonical: true - implements: - - VAV - - DSP - - PDSCV - - FPHC - VAV_DSP_PDSCV_CO2C: guid: "8e9bb69a-459c-474f-9d35-494b0eb3fd40" description: "VAV with pressure dependent supply valve control and CO2 control." @@ -658,17 +648,6 @@ VAV_DSP_PDSCV_HTZC: - PDSCV - HTZC -VAV_DSP_PDSCV_FPHC_CAM: - guid: "7a035aa6-0bf3-45ec-80a7-2be5485968bc" - description: "VAV with pressure dependent supply valve control and condensate monitoring, paired with a four-pipe radiant panel." - is_canonical: true - implements: - - VAV - - DSP - - PDSCV - - FPHC - - CAM - VAV_DSP_PDSCV_HTZC_CO2C: guid: "47431504-17c4-4b83-ae95-811f4b45bc76" description: "Reheat VAV with pressure dependent supply damper control and CO2 control." From 09b9ea0c44234bd6f6fc61f41ee54f31225cf4ee Mon Sep 17 00:00:00 2001 From: Jane Date: Mon, 20 Nov 2023 18:26:25 -0800 Subject: [PATCH 4/5] Renamed FSISOVM, FRISOVM and CT type with those implements, fixed filtration subfield description --- ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 4 ++-- ontology/yaml/resources/HVAC/entity_types/CT.yaml | 6 +++--- ontology/yaml/resources/subfields/subfields.yaml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index f796378a2..5136286a9 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -6988,7 +6988,7 @@ WSEBYPVPM: implements: - MONITORING -FSISOVM: +FSWISOVM: guid: "58f0a5fb-fc3e-4384-91b1-ba7db225ec6c" description: "Filtration supply isolation valve monitoring." is_abstract: true @@ -6997,7 +6997,7 @@ FSISOVM: implements: - MONITORING -FRISOVM: +FRWISOVM: guid: "6d8a9548-5879-493a-a991-cd3ed3eb80ac" description: "Filtration return isolation valve monitoring." is_abstract: true diff --git a/ontology/yaml/resources/HVAC/entity_types/CT.yaml b/ontology/yaml/resources/HVAC/entity_types/CT.yaml index 8f14d45e4..e8e6cf6cd 100644 --- a/ontology/yaml/resources/HVAC/entity_types/CT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/CT.yaml @@ -226,7 +226,7 @@ CT_SS_CWDT_OA_VSFC_CSWIVS_CRWIVS_CSWTC: - run_mode - lost_power_alarm -CT_SS_VSC_SWTM_RWISOVM_SWISOVM_FSISOVM_FRISOVM: +CT_SS_VSC_SWTM_RWISOVM_SWISOVM_FSWISOVM_FRWISOVM: guid: "9ca0256a-9d7f-4b4d-8289-e321e487a2a1" description: "Cooling tower with variable speed control, supply and return isolation valves and supply temp monitoring, supply and return filter isolation valves and supply water temperature monitoring." is_canonical: true @@ -237,8 +237,8 @@ CT_SS_VSC_SWTM_RWISOVM_SWISOVM_FSISOVM_FRISOVM: - SWTM - RWISOVM - SWISOVM - - FSISOVM - - FRISOVM + - FSWISOVM + - FRWISOVM opt_uses: - high_water_level_alarm - low_water_level_alarm diff --git a/ontology/yaml/resources/subfields/subfields.yaml b/ontology/yaml/resources/subfields/subfields.yaml index 9122e6ea3..87957b372 100644 --- a/ontology/yaml/resources/subfields/subfields.yaml +++ b/ontology/yaml/resources/subfields/subfields.yaml @@ -117,7 +117,7 @@ descriptor: panel: "An interface to control a device." fabric: "Textile material." failed: "Indicates that a point is not operating as intended or is incapable of operating." - filtration: "Component used for removing dust and other particulate matter from the air." + filtration: "Process of filtering contaminating elements from equipment or a system." fire: "a potential to cause physical damage through burning" floor: "Lower surface of a room or zone." flue: "Chimney for conveying exhaust gas." From 67f47c4655f9dcbe376bad2948dabf03b8bf6acd Mon Sep 17 00:00:00 2001 From: Jane Date: Tue, 21 Nov 2023 11:17:48 -0800 Subject: [PATCH 5/5] Revised type descriptions --- .../resources/HVAC/entity_types/ABSTRACT.yaml | 2 +- .../yaml/resources/HVAC/entity_types/CT.yaml | 2 +- .../yaml/resources/HVAC/entity_types/FCU.yaml | 16 ++-------------- .../HVAC/entity_types/GENERALTYPES.yaml | 5 ++++- ontology/yaml/resources/subfields/subfields.yaml | 2 +- 5 files changed, 9 insertions(+), 18 deletions(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index 5136286a9..0320faffc 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -6963,7 +6963,7 @@ PMDM: HSWTC: guid: "d9cf672c-8081-4e2b-9bba-599d8ac2bbd2" - description: "Heating water valve monitoring on supply water side." + description: "Heating supply water temperature control." is_abstract: true opt_uses: - heating_supply_water_valve_percentage_sensor diff --git a/ontology/yaml/resources/HVAC/entity_types/CT.yaml b/ontology/yaml/resources/HVAC/entity_types/CT.yaml index e8e6cf6cd..13d792065 100644 --- a/ontology/yaml/resources/HVAC/entity_types/CT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/CT.yaml @@ -241,4 +241,4 @@ CT_SS_VSC_SWTM_RWISOVM_SWISOVM_FSWISOVM_FRWISOVM: - FRWISOVM opt_uses: - high_water_level_alarm - - low_water_level_alarm + - low_water_level_alarm \ No newline at end of file diff --git a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml index e55456d20..e9496a076 100644 --- a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml @@ -1791,7 +1791,7 @@ FCU_RHDHS_DXDC_DFSS_RTM_DSPM_DFM: - water_leak_alarm - failed_alarm -FCU_DFSS_DFMSC_CSP_CHWZC: +FCU_DFSS_DFMSC_CHWZC: guid: "3d8c3cf8-401f-45d4-89b2-b87f52e4efc9" description: "Chilled water FCU with cooling-only (zone control) and discharge fan multi-speed control." is_canonical: true @@ -1799,16 +1799,4 @@ FCU_DFSS_DFMSC_CSP_CHWZC: - FCU - DFSS - DFMSC - - CSP - - CHWZC - -FCU_DFSS_CSP_DXZC_RAIDC: - guid: "a1652130-9f2c-4d3b-8e89-c9e34d60533e" - description: "Typical DX FCU with cooling-only (discharge control) with return air isolation damper control." - is_canonical: true - implements: - - FCU - - DFSS - - CSP - - DXZC - - RAIDC \ No newline at end of file + - CHWZC \ No newline at end of file diff --git a/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml b/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml index afd684e3d..72e816007 100644 --- a/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml @@ -217,10 +217,13 @@ CDWS: ASHP: guid: "548532cf-e175-47e5-b6a1-82ac92362d38" - description: "Tag for air-source heat pumps." + description: "Tag for air-source heat pumps. An ASHP is a device that transfers heat from the surrounding air into + a heating water system through the use of a reversed refrigeration cycle." is_abstract: true opt_uses: - failed_communication_alarm + implements: + - EQUIPMENT CT: guid: "d3872cf4-a6c7-4baf-9115-4cbd92d62e64" diff --git a/ontology/yaml/resources/subfields/subfields.yaml b/ontology/yaml/resources/subfields/subfields.yaml index 87957b372..7eb7a460d 100644 --- a/ontology/yaml/resources/subfields/subfields.yaml +++ b/ontology/yaml/resources/subfields/subfields.yaml @@ -168,7 +168,7 @@ descriptor: model: "Particular design version of an asset (e.g. model_label)." neutral: "Line in the electrical cirucit which carries current back to the source. Distinct from ground." next: "Something that occurs directly in time after the present or most recent one." - no: "Nitrogen monoxide, a colorless gas. It is a toxic air pollutant." + "no": "Nitrogen monoxide, a colorless gas. It is a toxic air pollutant." no2: "Nitrogen dioxide." north: "Cardinal direction; opposite of south" occupancy: "State of being occupied."