Repository: google/digitalbuildings
Pull request #1560: Building Onboarding PR
Author: login: hhunterr71
Created: 2025-05-20T16:25:29Z | Merged: 2025-05-28T14:45:45Z

PR affects the following types:
ABSTRACT, AHU, CDWS, CH, CHWS, CT, DHWT, FAN, FCU, HWS, MAU, SENSOR,UH.


Diff:
diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 78d2cadeee..1e077e5317 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -167,6 +167,15 @@ ZTM:
   implements:
   - MONITORING
 
+ZTM2X:
+  guid: "6d7fa302-16ce-442b-ae96-ee50e1f62994"
+  description: "Dual zone temperature monitoring."
+  is_abstract: true
+  uses:
+  - zone_air_temperature_sensor_1
+  - zone_air_temperature_sensor_2
+  implements:
+  - MONITORING
 
 REFM:
   guid: "df97ad55-5e8f-4cc2-89b7-c07b7a6f28b4"
@@ -504,6 +513,26 @@ EDBPC:
   implements:
   - CONTROL
 
+EDBPC2X:
+  guid: "852516de-6f2e-4852-b08e-ccde5350e0ad"
+  description: "Building static pressure control with dual exhaust dampers."
+  is_abstract: true
+  opt_uses:
+  - exhaust_air_damper_percentage_sensor_1
+  - exhaust_air_damper_percentage_sensor_2
+  - failed_exhaust_air_damper_alarm_1
+  - failed_exhaust_air_damper_alarm_2
+  - exhaust_air_differential_pressure_sensor
+  - high_building_air_static_pressure_alarm
+  - low_building_air_static_pressure_alarm
+  uses:
+  - building_air_static_pressure_sensor
+  - building_air_static_pressure_setpoint
+  - exhaust_air_damper_percentage_command_1
+  - exhaust_air_damper_percentage_command_2
+  implements:
+  - CONTROL
+
 
 EDRPC:
   guid: "79013451-90f3-412c-bde5-425c455b2de5"
@@ -866,6 +895,8 @@ SS:
   - power_capacity
   - power_sensor
   - powerfactor_sensor
+  - voltage_sensor
+  - energy_accumulator
   - run_time_accumulator
   - failed_alarm
   - local_override_alarm
@@ -3128,6 +3159,8 @@ DXRC:
   opt_uses:
   - compressor_run_time_accumulator
   - compressor_speed_percentage_command
+  - refrigerant_suction_pressure_sensor
+  - refrigerant_discharge_pressure_sensor
   - cooling_percentage_command
   - cooling_thermal_power_capacity
   - discharge_air_temperature_sensor
@@ -3483,6 +3516,29 @@ HWSC:
   implements:
   - CONTROL
 
+HWSDC:
+  guid: "59293e75-75a7-4e20-9d59-8a08404aa5a9"
+  description: "Heating water valve dual setpoint control on supply side."
+  is_abstract: true
+  opt_uses:
+  - heating_supply_water_temperature_sensor
+  - heating_request_count
+  - heating_thermal_power_capacity
+  - heating_water_valve_percentage_sensor
+  - leaving_heating_coil_temperature_sensor
+  - failed_supply_air_temperature_alarm
+  - high_supply_air_temperature_alarm
+  - low_supply_air_temperature_alarm
+  - warmup_request_count
+  - warmup_run_command
+  uses:
+  - heating_water_valve_percentage_command
+  - supply_air_temperature_sensor
+  - supply_air_cooling_temperature_setpoint
+  - supply_air_heating_temperature_setpoint
+  implements:
+  - CONTROL
+
 
 HW2SC:
   guid: "6fed45fd-aa9b-4613-baaa-ed5c44c64f12"
@@ -4061,6 +4117,7 @@ ECON:
   - outside_air_flowrate_setpoint
   - outside_air_relative_humidity_sensor
   - outside_air_specificenthalpy_sensor
+  - failed_return_air_damper_alarm
   - return_air_damper_percentage_command
   - return_air_damper_percentage_sensor
   - supply_air_temperature_sensor
@@ -4085,19 +4142,67 @@ ECON:
   implements:
   - CONTROL
 
+ECON2X:
+  guid: "4c9fa88d-0162-4db5-aa1c-9c3cd8a66615"
+  description: "Economizer mode control on supply side, with dual outside and return air dampers"
+  is_abstract: true
+  opt_uses:
+  - low_limit_outside_air_damper_percentage_command
+  - outside_air_damper_percentage_sensor
+  - failed_outside_air_damper_alarm_1
+  - failed_outside_air_damper_alarm_2
+  - failed_outside_air_flowrate_alarm
+  - outside_air_flowrate_sensor
+  - outside_air_flowrate_setpoint
+  - outside_air_relative_humidity_sensor
+  - outside_air_specificenthalpy_sensor
+  - outside_air_damper_percentage_sensor_1
+  - outside_air_damper_percentage_sensor_2
+  - return_air_damper_percentage_command_1
+  - return_air_damper_percentage_sensor_1
+  - return_air_damper_percentage_command_2
+  - return_air_damper_percentage_sensor_2
+  - failed_return_air_damper_alarm_1
+  - failed_return_air_damper_alarm_2
+  - supply_air_temperature_sensor
+  - failed_mixed_air_temperature_alarm
+  - high_mixed_air_temperature_alarm
+  - low_mixed_air_temperature_alarm
+  - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
+  - failed_supply_air_temperature_alarm
+  - high_supply_air_temperature_alarm
+  - low_return_air_temperature_alarm
+  - low_supply_air_temperature_alarm
+  - failed_outside_air_temperature_alarm
+  - ventilation_request_count
+  uses:
+  - economizer_mode
+  - mixed_air_temperature_sensor
+  - outside_air_damper_percentage_command_1
+  - outside_air_damper_percentage_command_2
+  - outside_air_temperature_sensor
+  - return_air_temperature_sensor
+  - supply_air_temperature_setpoint
+  implements:
+  - CONTROL
+
 
 ECOND:
   guid: "2640d584-7b8e-4523-b894-beaf4b13e4c0"
   description: "Economizer mode control on discharge side - single zone"
   is_abstract: true
   opt_uses:
+  - outside_air_specificenthalpy_sensor
   - low_limit_outside_air_damper_percentage_command
   - mixed_air_temperature_sensor
   - outside_air_damper_percentage_sensor
   - outside_air_flowrate_sensor
   - outside_air_flowrate_setpoint
+  - failed_return_air_damper_alarm
   - outside_air_relative_humidity_sensor
   - return_air_damper_percentage_command
+  - return_air_damper_percentage_sensor
   - return_air_temperature_sensor
   - failed_discharge_air_temperature_alarm
   - failed_mixed_air_temperature_alarm
@@ -8363,6 +8468,7 @@ RFVSC:
   - return_fan_torque_sensor
   - return_fan_speed_frequency_sensor
   - return_fan_speed_percentage_sensor
+  - failed_return_fan_alarm
   uses:
   - return_fan_run_command
   - return_fan_run_status
@@ -9248,6 +9354,17 @@ COC2XDSP:
   implements:
   - CONTROL
 
+COC2X:
+  guid: "8063062f-5b5c-47f7-a6c5-b8a1c4dfcd8b"
+  description: "CO concentration control with 2 sensors."
+  is_abstract: true
+  uses:
+  - zone_air_co_concentration_setpoint
+  - zone_air_co_concentration_sensor_1
+  - zone_air_co_concentration_sensor_2
+  implements:
+  - CONTROL
+
 NO2C2XDSP:
   guid: "7a76fa65-88d2-4cea-8297-3bdb4ca507e4"
   description: "Dual setpoint NO2 concentration control with 2 sensors."
diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
index 7b157fe97f..76a7587be6 100644
--- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
@@ -4566,6 +4566,49 @@ AHU_CHWSC_ECON_EDBPC_RFSS_RFVSC_SFSS_SFVSC_SSPC:
   - SFVSC
   - SSPC
 
+AHU_CHWSC_ECON2X_EDBPC_RFVSC_SFVSC_SSPC_SARC:
+  guid: "888554c0-92d3-4f61-b28f-07c7414550a9"
+  description: "Multi-zone chilled water AHU with supply air static pressure control and building static pressure control."
+  is_canonical: true
+  implements:
+  - AHU
+  - CHWSC
+  - ECON2X
+  - EDBPC
+  - RFVSC
+  - SFVSC
+  - SSPC
+  - SARC
+
+AHU_CHWDC_HWDC_ECOND_EDBPC_RFVSC_DFVSC_DSP:
+  guid: "219a196e-fbef-464b-8963-4b45c5d9ef84"
+  description: "Multi-zone chilled water and heating water AHU with discharge air static pressure control and building static pressure control."
+  is_canonical: true
+  implements:
+  - AHU
+  - CHWDC
+  - HWDC
+  - ECOND
+  - EDBPC
+  - RFVSC
+  - DFVSC
+  - DSP
+
+AHU_CHWSC_HWSC_ECON2X_EDBPC2X_RFVSC_SFVSC_SSPC_SARC:
+  guid: "54b27e82-3dc2-4eb4-96c3-199189abb992"
+  description: "Multi-zone chilled water and heating water AHU with supply air static pressure control and building static pressure control."
+  is_canonical: true
+  implements:
+  - AHU
+  - CHWSC
+  - HWSC
+  - ECON2X
+  - EDBPC2X
+  - RFVSC
+  - SFVSC
+  - SSPC
+  - SARC
+
 AHU_CHWSC_HWSC_ECON_EDBPC_RFSS2X_RFVSC2X_SFSS2X_SFVSC2X_SSPC:
   guid: "4aaac7e3-e781-47ff-92a1-8a27d8cc868a"
   description: "Multi-zone chilled water and heating water AHU with supply air static pressure control and building static pressure control."
diff --git a/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml
index f15d392e31..634614285b 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml
@@ -32,6 +32,15 @@ CDWS_SWTC:
   - CDWS
   - SWTC
 
+CDWS_SWTC_WFRM:
+  guid: "9ed71803-1584-4dc6-89e8-899b84deab11"
+  description: "Simple condenser water system with supply control, and flowrate monitoring."
+  is_canonical: true
+  implements:
+  - CDWS
+  - SWTC
+  - WFRM
+
 CDWS_SWTC_WDPC:
   guid: "5bc2261e-6294-498a-b690-d673afb6da2e"
   description: "Condenser water system with supply temperature and differential pressure control."
diff --git a/ontology/yaml/resources/HVAC/entity_types/CH.yaml b/ontology/yaml/resources/HVAC/entity_types/CH.yaml
index ecbd8dd72c..4843d0ef96 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CH.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CH.yaml
@@ -48,9 +48,9 @@ CH_SS_SWTC_DXSWC_WDPM_RCKTM_RWISOVPM:
   - RCKTM
   - RWISOVPM
 
-CH_SS_SCHWTC_RWISOVPM:
-  guid: "69ac8219-82ca-46d1-88dc-7fc8ce0f16d3"
-  description: "Simple water-cooled chiller with condenser isolation."
+CH_SS_SWTC_RWISOVPM:
+  guid: "dbd37e91-f519-4754-9d30-daf41376d4bb"
+  description: "Simple air-cooled chiller with return water isolation."
   is_canonical: true
   implements:
   - CH
@@ -58,6 +58,20 @@ CH_SS_SCHWTC_RWISOVPM:
   - SWTC
   - RWISOVPM
 
+CH_SS_SCHWTC_CHWRWISOVPM_CWSISOVPM_REFPM_REFSM_CWDT:
+  guid: "c3547a02-44fa-4a53-b1d7-62ce2f301c86"
+  description: "Simple water-cooled chiller with condenser supply water isolation, chilled return water isolation, plus refrigerant and thermal power monitoring."
+  is_canonical: true
+  implements:
+  - CH
+  - SS
+  - SCHWTC
+  - CHWRWISOVPM
+  - CWSISOVPM
+  - REFPM
+  - REFSM
+  - CWDT
+
 CH_SS_SWTC_DX4SWC_CHWDPM: # HERE
   guid: "29d217b2-a914-4495-9c6c-34684a73bdf6"
   description: "Air-cooled chiller with four-stage cooling."
diff --git a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
index 731589b278..222c356c1b 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
@@ -591,6 +591,18 @@ CHWS_PWDT_PRWFRM_SESWTC_SEWDPC_SEWFRM:
   - SEWDPC
   - SEWFRM
 
+CHWS_PWDT_SESWTC_SEWDPC_SEWFRM_CLPM:
+  guid: "95706d27-2e2e-4c72-a86b-d669c520d6a6"
+  description: "Chilled water system with primary loop supply water flowrate and temperature monitoring, secondary loop supply water temperature and pressure control."
+  is_canonical: true
+  implements:
+  - CHWS
+  - PWDT
+  - SESWTC
+  - SEWDPC
+  - SEWFRM
+  - CLPM
+
 CHWS_PWDT_SESWTC_SEWDPC_SERWFRM_WSEBYPVM:
   guid: "2b33f2bf-5b2f-4d73-b8ee-1f35cc08ceb8"
   description: "Chilled water system with primary water temperature differential monitoring, secondary supply water temperature and dirrefertial pressure control and water flowrate monitoring, and waterside economizer bypass valve."
diff --git a/ontology/yaml/resources/HVAC/entity_types/CT.yaml b/ontology/yaml/resources/HVAC/entity_types/CT.yaml
index 5f8c4ad303..5608ba7819 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CT.yaml
@@ -222,6 +222,16 @@ CT_SS_VSC_SPSS_SWTC_RWISOVM:
   - SWTC
   - RWISOVM
 
+CT_VSC_SWTC_RWISOVPM:
+  guid: "14932589-23cd-4139-a29d-15617833dbdc"
+  description: "Cooling tower with variable speed control, return isolation valve, and supply temp control."
+  is_canonical: true
+  implements:
+  - CT
+  - VSC
+  - SWTC
+  - RWISOVPM
+
 CT_SS_VSC_SPSS_SWTC_SWISOVM_BWFRM:
   guid: "368e7cef-75e2-407c-ac2b-3904a357b825"
   description: "Cooling tower with onboard spray pump, variable speed control, isolation on supply side and blowdown water flow monitoring."
diff --git a/ontology/yaml/resources/HVAC/entity_types/DHWT.yaml b/ontology/yaml/resources/HVAC/entity_types/DHWT.yaml
index 99329e3d57..f0e0d18dab 100644
--- a/ontology/yaml/resources/HVAC/entity_types/DHWT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/DHWT.yaml
@@ -26,6 +26,17 @@ DHWT_HWTTC_CPC_HWRWC:
   - CPC
   - HWRWC
 
+DHWT_SS_SWTM_HWTTC_CPC:
+  guid: "602ae256-6652-43fe-9865-c92e51219670"
+  description: "Standard calorifier with circulation pump, and supply water temperature monitoring."
+  is_canonical: true
+  implements:
+  - DHWT
+  - SS
+  - SWTM
+  - HWTTC
+  - CPC
+
 DHWT_SS_HWTTC_CPC:
   guid: "0aab25ad-58e1-48df-ae95-a12804b7c765"
   description: "Standard calorifier with run control and return pump."
diff --git a/ontology/yaml/resources/HVAC/entity_types/FAN.yaml b/ontology/yaml/resources/HVAC/entity_types/FAN.yaml
index 48efb9a99e..105fb11208 100644
--- a/ontology/yaml/resources/HVAC/entity_types/FAN.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/FAN.yaml
@@ -47,6 +47,15 @@ FAN_SS_VSC:
   - SS
   - VSC
 
+FAN_SS_COC2X:
+  guid: "2fd2e3b3-d87e-43d0-a915-f8b456d1f0a0"
+  description: "Basic fan with start/stop and status, and carbon monxide control."
+  is_canonical: true
+  implements:
+  - FAN
+  - SS
+  - COC2X
+
 FAN_SS_VSC_EFM:
   guid: "b8fd64cb-f012-46ee-95e0-cd2fd27f4c92"
   description: "Fan with start/stop status, open-loop speed control and exhaust air flowrate monitoring."
@@ -294,6 +303,15 @@ FAN_SS_VSC_EPC_EDPM:
   - EPC
   - EDPM
 
+FAN_VSC_EDPM:
+  guid: "d75f0c74-822a-4436-8881-f68786d8e4ca"
+  description: "Fan with run control, and exhaust damper monitoring."
+  is_canonical: true
+  implements:
+  - FAN
+  - VSC
+  - EDPM
+
 FAN_SS_DSP_VSC:
   guid: "660d42d5-15b3-4cb4-9af1-506f31b0aa0e"
   description: "Fan with dual setpoint control and variable speed."
diff --git a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
index 8b98dee78a..a4939e3007 100644
--- a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
@@ -473,6 +473,15 @@ FCU_DFSS_DFVSC_RTC_CHWRC:
   - RTC
   - CHWRC
 
+FCU_DFVSC_DXRC:
+  guid: "51f318e1-ccb3-451a-881a-8ca2885fda00"
+  description: "DX fan coil with return temperature control, and variable speed fan."
+  is_canonical: true
+  implements:
+  - FCU
+  - DFVSC
+  - DXRC
+
 FCU_DFSS_DFVSC_DTM_RHC_CHWRC:
   guid: "5d32b824-a099-40d0-bff0-772de1ffe8bb"
   description: "Hydronic variable speed fan coil with return controlled cooling and humidity control."
@@ -2163,7 +2172,6 @@ FCU_DFSS_DFVSC_ZTC_CHWZTC_HWZTC_NONCANONICAL_2:
   - run_mode
   - exercise_mode
 
-
 FCU_NONCANONICAL_1:
   guid: "45cd4430-5899-47f3-9319-8f942c5c1ddb"
   description: "Non-standard type."
@@ -2288,6 +2296,28 @@ FCU_NONCANONICAL_3:
   - zone_occupancy_status_1
   - zone_occupancy_status_2
   - zone_occupancy_status_3
+
+FCU_NONCANONICAL_4:
+  guid: "9b75ffe5-358c-47d1-acc6-8f5df097f1e0"
+  description: "Non-standard type."
+  implements:
+  - FCU
+  uses:
+  - compressor_run_command
+  - compressor_run_status
+  - cooling_request_count
+  - discharge_air_isolation_damper_percentage_command
+  - discharge_air_isolation_damper_percentage_sensor
+  - discharge_air_relative_humidity_sensor
+  - discharge_air_temperature_sensor
+  - discharge_air_temperature_setpoint
+  - failed_compressor_alarm
+  - failed_discharge_air_isolation_damper_alarm
+  - high_discharge_air_relative_humidity_alarm
+  - high_discharge_air_temperature_alarm
+  - low_discharge_air_relative_humidity_alarm
+  - zone_occupancy_status
+
   
 FCU_DFSS_RTC_CHWRC_RHC_NONCANONICAL_1:
   guid: "025c2764-2de6-4839-ade6-0cf8551cd91c"
diff --git a/ontology/yaml/resources/HVAC/entity_types/HWS.yaml b/ontology/yaml/resources/HVAC/entity_types/HWS.yaml
index 0ba367ee2b..872e23f43f 100644
--- a/ontology/yaml/resources/HVAC/entity_types/HWS.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/HWS.yaml
@@ -462,6 +462,18 @@ HWS_PWDT_SESWTC_SEWDPC_SERWFRM_SEWTM:
   - SERWFRM
   - SEWTM
 
+HWS_PWDT_SESWTC_SEWDPC_SEWFRM_SEWTM:
+  guid: "c4b12289-b658-4a9e-ad78-aedc76671d7e"
+  description: "Heating water system with primary water temperature differential monitoring, secondary loop supply water temperature and differential pressure control, and secondary supply flowrate monitoring."
+  is_canonical: true
+  implements:
+  - HWS
+  - PWDT
+  - SESWTC
+  - SEWDPC
+  - SEWFRM
+  - SEWTM
+
 HWS_SS_SWTC_WDPC_WFRM_HWTTC_HLPM:
   guid: "b203359c-877b-4c46-903e-57c4c5b4d634"
   description: "Heating water system with schedule run command, heating thermal power monitoring, supply water temperature control, differential pressure control, flowrate monitoring, and hot water tank temperature control."
diff --git a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
index ea047ab08d..630d3ae1fe 100644
--- a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
@@ -323,6 +323,18 @@ MAU_SFSS_SFVSC_SSPC_HWSC_CHWSC:
   - HWSC
   - CHWSC
 
+MAU_SFVSC_SSPC_HWSDC_CHWSDC_OADM:
+  guid: "441d6994-1722-4780-8d38-5bc7ac169580"
+  description: "Heating and cooling make-up air unit."
+  is_canonical: true
+  implements:
+  - MAU
+  - SFVSC
+  - SSPC
+  - HWSDC
+  - CHWSDC
+  - OADM
+
 MAU_SFSS_SFVSC_CHWSC_HTSC_BPC:
   guid: "eac5d682-5787-4ae2-ab3b-fe01764513a9"
   description: "Building static control heating and cooling make-up air unit."
diff --git a/ontology/yaml/resources/HVAC/entity_types/SENSOR.yaml b/ontology/yaml/resources/HVAC/entity_types/SENSOR.yaml
index de06cd3968..c5098e53ce 100644
--- a/ontology/yaml/resources/HVAC/entity_types/SENSOR.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/SENSOR.yaml
@@ -70,7 +70,15 @@ SENSOR_ZTM_ZHM:
   - /SENSOR # Inherits from global namespace
   - ZTM
   - ZHM
-  
+
+SENSOR_COM:
+  guid: "b3d929e0-d934-4a6a-8c86-921fa7804cef"
+  description: "Zone CO monitoring."
+  is_canonical: true
+  implements:
+  - /SENSOR # Inherits from global namespace
+  - COM
+
 SENSOR_OA:
   guid: "93c71f11-56c3-4180-91b9-4aec7b4a8cd6"
   description: "Outside air property sensor (humidity, temperature)."
diff --git a/ontology/yaml/resources/HVAC/entity_types/UH.yaml b/ontology/yaml/resources/HVAC/entity_types/UH.yaml
index a6897c02e1..82ad67ff74 100644
--- a/ontology/yaml/resources/HVAC/entity_types/UH.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/UH.yaml
@@ -41,6 +41,16 @@ UH_SS_DSP_HWZC:
   - DSP
   - HWZC
 
+UH_DFSS_DSP_HWZC:
+  guid: "a58995e1-6089-445e-bc98-b9211ce145c3"
+  description: "Heating water zone unit heater."
+  is_canonical: true
+  implements:
+  - UH
+  - DFSS
+  - DSP
+  - HWZC
+
 UH_SS_DSP_HTZC:
   guid: "1ad15f10-19ee-4f8a-9d05-a4dd52d72cca"
   description: "Electric/gas zone unit heater."


Reviews:
user: login: evgeniya-engel
state: COMMENTED
author_association: COLLABORATOR
submitted_at: 2025-05-20T17:51:42Z
user: login: shambersafai
state: CHANGES_REQUESTED
author_association: MEMBER
submitted_at: 2025-05-21T16:30:58Z
user: login: hhunterr71
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-05-22T15:06:19Z
user: login: hhunterr71
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-05-22T20:18:37Z
user: login: hhunterr71
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-05-22T20:21:14Z
user: login: hhunterr71
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-05-22T20:22:30Z
user: login: hhunterr71
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-05-22T20:26:39Z
user: login: hhunterr71
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-05-22T20:29:05Z
user: login: shambersafai
body: generally, we want to model the devices with types that represent how they physically work in the real world regardless of what points are bacnet available. anything not available we should just mark missing
state: CHANGES_REQUESTED
author_association: MEMBER
submitted_at: 2025-05-22T22:04:04Z
user: login: hhunterr71
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-05-23T16:25:41Z
user: login: ccquigley
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-05-23T20:08:02Z
user: login: ccquigley
state: APPROVED
author_association: CONTRIBUTOR
submitted_at: 2025-05-23T20:23:50Z
user: login: shambersafai
state: APPROVED
author_association: MEMBER
submitted_at: 2025-05-27T14:49:55Z
user: login: shambersafai
body: please address validator errors
state: CHANGES_REQUESTED
author_association: MEMBER
submitted_at: 2025-05-27T14:54:06Z
user: login: shambersafai
state: APPROVED
author_association: MEMBER
submitted_at: 2025-05-28T14:45:34Z

Review comments:
diff_hunk: @@ -222,6 +222,17 @@ CT_SS_VSC_SPSS_SWTC_RWISOVM:
   - SWTC
   - RWISOVM
 
+CT_SS_VSC_SWTC_RWISOVPM:
+  guid: "14932589-23cd-4139-a29d-15617833dbdc"
+  description: "Cooling tower with variable speed control, return isolation valves, and supply temp control."
path: ontology/yaml/resources/HVAC/entity_types/CT.yaml
user: login: evgeniya-engel
body: nit:  there is only one valve, please adjust the description
created_at: 2025-05-20T17:43:43Z
author_association: COLLABORATOR
diff_hunk: @@ -48,16 +48,30 @@ CH_SS_SWTC_DXSWC_WDPM_RCKTM_RWISOVPM:
   - RCKTM
   - RWISOVPM
 
-CH_SS_SCHWTC_RWISOVPM:
+CH_SS_SWTC_RWISOVPM:
   guid: "69ac8219-82ca-46d1-88dc-7fc8ce0f16d3"
-  description: "Simple water-cooled chiller with condenser isolation."
+  description: "Simple air-cooled chiller with condenser isolation."
   is_canonical: true
   implements:
   - CH
   - SS
   - SWTC
   - RWISOVPM
 
+CH_SS_SCHWTC_CHWRWISOVPM_CWSISOVPM_REFPM_REFSM_CWDT:
+  guid: "c3547a02-44fa-4a53-b1d7-62ce2f301c86"
+  description: "Simple water-cooled chiller with condenser isolation."
path: ontology/yaml/resources/HVAC/entity_types/CH.yaml
user: login: evgeniya-engel
body: please update description to also capture chilled water side isolation, and add refrigerant and thermal power monitoring
created_at: 2025-05-20T17:44:47Z
author_association: COLLABORATOR
diff_hunk: @@ -4493,6 +4493,56 @@ AHU_CHWSC_ECON_EDBPC_RFSS_RFVSC_SFSS_SFVSC_SSPC:
   - SFVSC
   - SSPC
 
+AHU_CHWSC_ECON2X_EDBPC_RFSS_RFVSC_SFSS_SFVSC_SSPC_SARC:
+  guid: "888554c0-92d3-4f61-b28f-07c7414550a9"
+  description: "Multi-zone chilled water AHU with supply air static pressure control and building static pressure control."
+  is_canonical: true
+  implements:
+  - AHU
+  - CHWSC
+  - ECON2X
+  - EDBPC
+  - RFSS
+  - RFVSC
+  - SFSS
+  - SFVSC
+  - SSPC
+  - SARC
+
+AHU_CHWDC_HWDC_ECOND_EDBPC_RFSS_RFVSC_DFSS_DFVSC_DSPM_DSP:
+  guid: "219a196e-fbef-464b-8963-4b45c5d9ef84"
+  description: "Multi-zone chilled water AHU with discharge air static pressure control and building static pressure control."
+  is_canonical: true
+  implements:
+  - AHU
+  - CHWDC
+  - HWDC
+  - ECOND
+  - EDBPC
+  - RFSS
+  - RFVSC
+  - DFSS
+  - DFVSC
+  - DSPM
+  - DSP
+
+AHU_CHWSC_HWSC_ECON2X_EDBPC2X_RFSS_RFVSC_SFSS_SFVSC_SSPC_SARC:
+  guid: "54b27e82-3dc2-4eb4-96c3-199189abb992"
+  description: "Multi-zone chilled water AHU with supply air static pressure control and building static pressure control."
path: ontology/yaml/resources/HVAC/entity_types/AHU.yaml
user: login: evgeniya-engel
body: chilled and heating water
created_at: 2025-05-20T17:45:26Z
author_association: COLLABORATOR
diff_hunk: @@ -4493,6 +4493,56 @@ AHU_CHWSC_ECON_EDBPC_RFSS_RFVSC_SFSS_SFVSC_SSPC:
   - SFVSC
   - SSPC
 
+AHU_CHWSC_ECON2X_EDBPC_RFSS_RFVSC_SFSS_SFVSC_SSPC_SARC:
+  guid: "888554c0-92d3-4f61-b28f-07c7414550a9"
+  description: "Multi-zone chilled water AHU with supply air static pressure control and building static pressure control."
+  is_canonical: true
+  implements:
+  - AHU
+  - CHWSC
+  - ECON2X
+  - EDBPC
+  - RFSS
+  - RFVSC
+  - SFSS
+  - SFVSC
+  - SSPC
+  - SARC
+
+AHU_CHWDC_HWDC_ECOND_EDBPC_RFSS_RFVSC_DFSS_DFVSC_DSPM_DSP:
+  guid: "219a196e-fbef-464b-8963-4b45c5d9ef84"
+  description: "Multi-zone chilled water AHU with discharge air static pressure control and building static pressure control."
path: ontology/yaml/resources/HVAC/entity_types/AHU.yaml
user: login: evgeniya-engel
body: chilled and heating water
created_at: 2025-05-20T17:46:00Z
author_association: COLLABORATOR
diff_hunk: @@ -2152,6 +2163,13 @@ FCU_DFSS_DFVSC_ZTC_CHWZTC_HWZTC_NONCANONICAL_2:
   - run_mode
   - exercise_mode
 
+# FCU_DFSS_CSP_DXZC_DAIDC_NONCANONICAL_1:
path: ontology/yaml/resources/HVAC/entity_types/FCU.yaml
user: login: evgeniya-engel
body: please remove this commented out type
created_at: 2025-05-20T17:50:23Z
author_association: COLLABORATOR
diff_hunk: @@ -167,6 +167,15 @@ ZTM:
   implements:
   - MONITORING
 
+ZTM2X:
+  guid: "6d7fa302-16ce-442b-ae96-ee50e1f62994"
+  description: "Zone temperature monitoring."
path: ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
user: login: shambersafai
body: please specify that this is dual sensor single zone temp monitoring
created_at: 2025-05-21T14:47:00Z
author_association: MEMBER
diff_hunk: @@ -505,6 +514,26 @@ EDBPC:
   implements:
   - CONTROL
 
+EDBPC2X:
+  guid: "852516de-6f2e-4852-b08e-ccde5350e0ad"
+  description: "Building static pressure control with dual exhaust damper."
path: ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
user: login: shambersafai
body: nit: dampers
created_at: 2025-05-21T14:47:46Z
author_association: MEMBER
diff_hunk: @@ -4493,6 +4493,50 @@ AHU_CHWSC_ECON_EDBPC_RFSS_RFVSC_SFSS_SFVSC_SSPC:
   - SFVSC
   - SSPC
 
+AHU_CHWSC_ECON2X_EDBPC_RFVSC_SFVSC_SSPC_SARC:
+  guid: "888554c0-92d3-4f61-b28f-07c7414550a9"
+  description: "Multi-zone chilled water AHU with supply air static pressure control and building static pressure control."
+  is_canonical: true
+  implements:
+  - AHU
+  - CHWSC
+  - ECON2X
+  - EDBPC
+  - RFVSC
+  - SFVSC
+  - SSPC
+  - SARC
+
+AHU_CHWDC_HWDC_ECOND_EDBPC_RFVSC_DFVSC_DSPM_DSP:
path: ontology/yaml/resources/HVAC/entity_types/AHU.yaml
user: login: shambersafai
body: please confirm the control logic here. building pressure control on a single zone unit is suspicious to me.
created_at: 2025-05-21T16:03:41Z
author_association: MEMBER
path: ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
user: login: shambersafai
body: Can you confirm that all of the dual damper types your adding control independently? If they are controlled as a unit, i.e. if both damper commands are always the same as each other, then we can treat them as a single damper similarly to fan arrays,
created_at: 2025-05-21T16:08:47Z
author_association: MEMBER
diff_hunk: @@ -48,16 +48,30 @@ CH_SS_SWTC_DXSWC_WDPM_RCKTM_RWISOVPM:
   - RCKTM
   - RWISOVPM
 
-CH_SS_SCHWTC_RWISOVPM:
+CH_SS_SWTC_RWISOVPM:
   guid: "69ac8219-82ca-46d1-88dc-7fc8ce0f16d3"
path: ontology/yaml/resources/HVAC/entity_types/CH.yaml
user: login: shambersafai
body: please assign a new guid for tracking purposes; essentially treating it as removing the incorrect type and creating a new one
created_at: 2025-05-21T16:13:02Z
author_association: MEMBER
diff_hunk: @@ -48,16 +48,30 @@ CH_SS_SWTC_DXSWC_WDPM_RCKTM_RWISOVPM:
   - RCKTM
   - RWISOVPM
 
-CH_SS_SCHWTC_RWISOVPM:
+CH_SS_SWTC_RWISOVPM:
   guid: "69ac8219-82ca-46d1-88dc-7fc8ce0f16d3"
-  description: "Simple water-cooled chiller with condenser isolation."
+  description: "Simple air-cooled chiller with condenser isolation."
path: ontology/yaml/resources/HVAC/entity_types/CH.yaml
user: login: shambersafai
body: should be return water isolation instead of condenser isolation
created_at: 2025-05-21T16:15:23Z
author_association: MEMBER
diff_hunk: @@ -26,6 +26,16 @@ DHWT_HWTTC_CPC_HWRWC:
   - CPC
   - HWRWC
 
+DHWT_SS_SWTM_CPC:
path: ontology/yaml/resources/HVAC/entity_types/DHWT.yaml
user: login: shambersafai
body: does the tank perform any heating? any temp control?
created_at: 2025-05-21T16:20:26Z
author_association: MEMBER
diff_hunk: @@ -473,6 +473,16 @@ FCU_DFSS_DFVSC_RTC_CHWRC:
   - RTC
   - CHWRC
 
+FCU_DFVSC_RTC_DXRC:
path: ontology/yaml/resources/HVAC/entity_types/FCU.yaml
user: login: shambersafai
body: do you need `RTC` if you already have `DXRC`?
created_at: 2025-05-21T16:23:57Z
author_association: MEMBER
diff_hunk: @@ -71,6 +71,14 @@ SENSOR_ZTM_ZHM:
   - ZTM
   - ZHM
   
+SENSOR_ZTM2X:
path: ontology/yaml/resources/HVAC/entity_types/SENSOR.yaml
user: login: shambersafai
body: can these just be onboarded as two individual sensors instead?
created_at: 2025-05-21T16:28:29Z
author_association: MEMBER
diff_hunk: @@ -4493,6 +4493,50 @@ AHU_CHWSC_ECON_EDBPC_RFSS_RFVSC_SFSS_SFVSC_SSPC:
   - SFVSC
   - SSPC
 
+AHU_CHWSC_ECON2X_EDBPC_RFVSC_SFVSC_SSPC_SARC:
+  guid: "888554c0-92d3-4f61-b28f-07c7414550a9"
+  description: "Multi-zone chilled water AHU with supply air static pressure control and building static pressure control."
+  is_canonical: true
+  implements:
+  - AHU
+  - CHWSC
+  - ECON2X
+  - EDBPC
+  - RFVSC
+  - SFVSC
+  - SSPC
+  - SARC
+
+AHU_CHWDC_HWDC_ECOND_EDBPC_RFVSC_DFVSC_DSPM_DSP:
path: ontology/yaml/resources/HVAC/entity_types/AHU.yaml
user: login: hhunterr71
body: There is EDBPC control on this unit, but no DSPM so will be removing that. 
created_at: 2025-05-22T15:06:19Z
author_association: CONTRIBUTOR
diff_hunk: @@ -167,6 +167,15 @@ ZTM:
   implements:
   - MONITORING
 
+ZTM2X:
+  guid: "6d7fa302-16ce-442b-ae96-ee50e1f62994"
+  description: "Zone temperature monitoring."
path: ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
user: login: hhunterr71
body: Fixed
created_at: 2025-05-22T20:18:37Z
author_association: CONTRIBUTOR
diff_hunk: @@ -48,16 +48,30 @@ CH_SS_SWTC_DXSWC_WDPM_RCKTM_RWISOVPM:
   - RCKTM
   - RWISOVPM
 
-CH_SS_SCHWTC_RWISOVPM:
+CH_SS_SWTC_RWISOVPM:
   guid: "69ac8219-82ca-46d1-88dc-7fc8ce0f16d3"
-  description: "Simple water-cooled chiller with condenser isolation."
+  description: "Simple air-cooled chiller with condenser isolation."
path: ontology/yaml/resources/HVAC/entity_types/CH.yaml
user: login: hhunterr71
body: Fixed
created_at: 2025-05-22T20:21:14Z
author_association: CONTRIBUTOR
diff_hunk: @@ -26,6 +26,16 @@ DHWT_HWTTC_CPC_HWRWC:
   - CPC
   - HWRWC
 
+DHWT_SS_SWTM_CPC:
path: ontology/yaml/resources/HVAC/entity_types/DHWT.yaml
user: login: hhunterr71
body: Yes it can provide heating, but ive included all available points for the unit.
created_at: 2025-05-22T20:22:30Z
author_association: CONTRIBUTOR
diff_hunk: @@ -473,6 +473,16 @@ FCU_DFSS_DFVSC_RTC_CHWRC:
   - RTC
   - CHWRC
 
+FCU_DFVSC_RTC_DXRC:
path: ontology/yaml/resources/HVAC/entity_types/FCU.yaml
user: login: hhunterr71
body: Removed
created_at: 2025-05-22T20:26:39Z
author_association: CONTRIBUTOR
diff_hunk: @@ -71,6 +71,14 @@ SENSOR_ZTM_ZHM:
   - ZTM
   - ZHM
   
+SENSOR_ZTM2X:
path: ontology/yaml/resources/HVAC/entity_types/SENSOR.yaml
user: login: hhunterr71
body: They are technically HOODs but given they are just two temperature sensors we decide to onboard them as just sensors.
created_at: 2025-05-22T20:29:05Z
author_association: CONTRIBUTOR
diff_hunk: @@ -47,6 +47,15 @@ FAN_SS_VSC:
   - SS
   - VSC
 
+FAN_SS_COC2X:
+  guid: "2fd2e3b3-d87e-43d0-a915-f8b456d1f0a0"
+  description: "Basic fan with start/stop and status."
path: ontology/yaml/resources/HVAC/entity_types/FAN.yaml
user: login: shambersafai
body: please add co control to the description
created_at: 2025-05-22T21:58:11Z
author_association: MEMBER
diff_hunk: @@ -71,6 +71,14 @@ SENSOR_ZTM_ZHM:
   - ZTM
   - ZHM
   
+SENSOR_ZTM2X:
path: ontology/yaml/resources/HVAC/entity_types/SENSOR.yaml
user: login: shambersafai
body: I'm guessing the hoods have fans in them that we just dont have bacnet points for? If so i would prefer to onboard them as hoods with the appropriate fan abstract(s) and mark the fields as missing
created_at: 2025-05-22T22:01:12Z
author_association: MEMBER
diff_hunk: @@ -26,6 +26,16 @@ DHWT_HWTTC_CPC_HWRWC:
   - CPC
   - HWRWC
 
+DHWT_SS_SWTM_CPC:
path: ontology/yaml/resources/HVAC/entity_types/DHWT.yaml
user: login: shambersafai
body: please add the appropriate heating abstract and mark the fields as missing
created_at: 2025-05-22T22:02:27Z
author_association: MEMBER
diff_hunk: @@ -26,6 +26,16 @@ DHWT_HWTTC_CPC_HWRWC:
   - CPC
   - HWRWC
 
+DHWT_SS_SWTM_CPC:
path: ontology/yaml/resources/HVAC/entity_types/DHWT.yaml
user: login: hhunterr71
body: DHWT_SS_SWTM_HWTTC_CPC
created_at: 2025-05-23T16:25:41Z
author_association: CONTRIBUTOR
diff_hunk: @@ -71,6 +71,14 @@ SENSOR_ZTM_ZHM:
   - ZTM
   - ZHM
   
+SENSOR_ZTM2X:
path: ontology/yaml/resources/HVAC/entity_types/SENSOR.yaml
user: login: ccquigley
body: @hhunterr71, are these going to be onboarded as fans instead of sensors?
created_at: 2025-05-23T20:08:02Z
author_association: CONTRIBUTOR
diff_hunk: @@ -473,6 +473,15 @@ FCU_DFSS_DFVSC_RTC_CHWRC:
   - RTC
   - CHWRC
 
+FCU_DFVSC_DXRC:
+  guid: "51f318e1-ccb3-451a-881a-8ca2885fda00"
+  description: "Hydronic variable speed fan coil with cooling (return control)."
path: ontology/yaml/resources/HVAC/entity_types/FCU.yaml
user: login: ccquigley
body: update description to be DX instead of Hydronic
created_at: 2025-05-23T20:11:08Z
author_association: CONTRIBUTOR

PR comments:
user: login: hhunterr71
created_at: 2025-05-22T20:55:46Z
body: @shambergoldstein Few comments back for you, but should be ready for review!
author_association: CONTRIBUTOR
user: login: hhunterr71
created_at: 2025-05-23T18:12:01Z
body: @ccquigley  Ready for your review! Just wrapped up the other comments. 
author_association: CONTRIBUTOR
user: login: shambersafai
created_at: 2025-05-27T19:21:42Z
body: @hhunterr71 the validation is still failing, please remove the duplicate fields on ECOND
author_association: MEMBER
user: login: hhunterr71
created_at: 2025-05-27T22:41:34Z
body: @shambergoldstein Fixed
author_association: CONTRIBUTOR