Merge branch 'master' into master

ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml

@@ -456,6 +456,7 @@ EDBPC:
   is_abstract: true
   opt_uses:
   - exhaust_air_damper_percentage_sensor
+  - failed_exhaust_air_damper_alarm
   - exhaust_air_differential_pressure_sensor
   - high_building_air_static_pressure_alarm
   - low_building_air_static_pressure_alarm
@@ -3607,6 +3608,7 @@ ECON:
   - outside_air_relative_humidity_sensor
   - outside_air_specificenthalpy_sensor
   - return_air_damper_percentage_command
+  - return_air_damper_percentage_sensor
   - supply_air_temperature_sensor
   - failed_mixed_air_temperature_alarm
   - high_mixed_air_temperature_alarm
@@ -5102,6 +5104,13 @@ CHWDPM:
   uses:
   - chilled_water_differential_pressure_sensor
 
+CHWDPC:
+  guid: "ea883ebb-51f0-4ea3-9f6c-e3dae016e325"
+  description: "Differential pressure control for chilled water."
+  is_abstract: true
+  uses:
+  - chilled_water_differential_pressure_sensor
+  - chilled_water_differential_pressure_setpoint
 
 CHDX4SC:
   guid: "52c7a4a2-d587-46d5-96c9-d1bdf60daa81"
@@ -5432,6 +5441,8 @@ SDM:
   guid: "40dc57c7-1efd-483d-a2c0-46077595b2b8"
   description: "Supply air damper monitoring."
   is_abstract: true
+  opt_uses:
+  - failed_supply_air_damper_alarm
   uses:
   - supply_air_damper_command
   - supply_air_damper_status
@@ -7457,6 +7468,8 @@ RDC:
   guid: "ca7914b6-f639-4d67-a6fc-22f5a4e613ff"
   description: "Return air damper percentage monitoring"
   is_abstract: true
+  opt_uses:
+  - failed_return_air_damper_alarm
   uses:
   - return_air_damper_percentage_command
   - return_air_damper_percentage_sensor
@@ -8005,6 +8018,14 @@ SEWFRM:
   implements:
   - MONITORING
 
+SERWFRM:
+  guid: "f2e172dd-e0f5-46e5-97ee-6510610b0794"
+  description: "Secondary return water flowrate monitoring"
+  uses:
+  - secondary_return_water_flowrate_sensor
+  implements:
+  - MONITORING
+
 MWFRM:
   guid: "c7683a09-8379-4951-aa1e-e5edc4e098cb"
   description: "Make-up water flowrate monitoring."
@@ -8103,6 +8124,15 @@ HWDPC:
   implements:
   - OPERATIONAL
 
+HWDPM:
+  guid: "7931fcc6-6dee-4f8c-8da9-af8ad4a77561"
+  description: "Heating water differential pressure monitoring."
+  is_abstract: true
+  uses:
+  - heating_water_differential_pressure_sensor
+  implements:
+  - OPERATIONAL
+
 HP6SWC:
   guid: "5d2c6d94-ad64-41ef-bce0-78a9b40532b1"
   description: "Six-compressor heat pump control on supply water side."
@@ -8309,6 +8339,35 @@ DTPM:
   implements:
   - MONITORING
 
+CFVSC:
+  guid: "b4aa442f-e7fa-4bc6-811a-fe2925e7255f"
+  description: "Variable speed control for condensing fan."
+  is_abstract: true
+  uses:
+  - condensing_fan_run_command
+  - condensing_fan_run_status
+  - condensing_fan_speed_percentage_command
+
+RVINJM2X:
+  guid: "4bcc49eb-6a3c-450a-8357-5dd1f5a8ce4d"
+  description: "Refrigerant vapor injection monitoring for two circuits."
+  is_abstract: true
+  uses:
+  - refrigerant_condenser_pressure_sensor_1
+  - refrigerant_condenser_pressure_sensor_2
+  - refrigerant_discharge_temperature_sensor_1
+  - refrigerant_discharge_temperature_sensor_2
+  - refrigerant_evaporator_pressure_sensor_1
+  - refrigerant_evaporator_pressure_sensor_2
+  - refrigerant_injection_pressure_sensor_1
+  - refrigerant_injection_pressure_sensor_2
+  - refrigerant_injection_suction_superheat_temperature_sensor_1
+  - refrigerant_injection_suction_superheat_temperature_sensor_2
+  - refrigerant_injection_suction_temperature_sensor_1
+  - refrigerant_injection_suction_temperature_sensor_2
+  - refrigerant_liquid_temperature_sensor_1
+  - refrigerant_liquid_temperature_sensor_2
+
 ZWVDM:
   guid: "58921c49-ae96-48f9-a3fb-faa389d37322"
   description: "Water vapor density monitoring, equivalent to absolute humidity monitoring"

ontology/yaml/resources/HVAC/entity_types/AHU.yaml

@@ -5444,6 +5444,24 @@ AHU_SFSS_SFVSC_EFSS_EFVSC_EDBPC_DX2SC_ECON_SSPC_SARC:
   - SSPC
   - SARC
 
+AHU_ECON_EDBPC_RFSS_RFVSC_SFSS_SFVSC_CHWSC_HWSC_SDM_RDC_SSPC:
+  guid: "68c643a4-5cf2-4ef4-beb1-7ffb9fced0c9"
+  description: "AHU with supply and return fans, chilled water and heating water, building pressure control"
+  is_canonical: true
+  implements:
+  - AHU
+  - ECON
+  - EDBPC
+  - RFSS
+  - RFVSC
+  - SFSS
+  - SFVSC
+  - CHWSC
+  - HWSC
+  - SDM
+  - RDC
+  - SSPC
+
 AHU_BSPC_DX4SC_ECON_EFSS_EFVSC_SFSS_SFVSC_SSPC_RHHC_NONCANONICAL_1:
   guid: "4f641024-9959-4ab3-9869-97fdf93ed47b"
   description: "Non-Standard AHU with humidification and heating water coils on return duct."

ontology/yaml/resources/HVAC/entity_types/ASHP.yaml

@@ -44,4 +44,22 @@ ASHP_SS_SHWTC_SCHWTC_HWRWISOVM_CHWRWISOVM_HCPC2X_CHCPC2X:
   - HWRWISOVM
   - CHWRWISOVM
   - HCPC2X
-  - CHCPC2X
+  - CHCPC2X
+
+ASHP_SS_CHWRISOVPM_CHWDT_CHDX2SC_CFVSC_RVINJM2X_CPC2X_CHWDPC_HWDPM_SHWTC_HWRWISOVPM:
+  guid: "d14e8ca6-9f28-45a0-9d16-97fe9c9b4c72"
+  description: "Air source heat pump with return side isolation valve percentage control for chilled and heating water, temperature differential accross chilled water, refrigerant vapor injection monitoring, differential pressure monitoring for heating water, and supply heating water temperature control."
+  is_canonical: true
+  implements:
+  - ASHP
+  - SS
+  - CHWRISOVPM
+  - CHWDT
+  - CHDX2SC
+  - CFVSC
+  - RVINJM2X
+  - CPC2X
+  - HWDPM
+  - CHWDPC
+  - SHWTC
+  - HWRWISOVPM

ontology/yaml/resources/HVAC/entity_types/CH.yaml

@@ -686,6 +686,22 @@ CH_SS_SCHWTC_CWDT_CHWRISOVPM_CWRISOVPM_REFPM_REFSM_MIPVCM_MIPWM_CHCPC_CDCPC_OTPM
   - CDCPC
   - OTPM
 
+CH_SS_CHWDPC_CHWDT_CHWISOVM_HWDT_HWDPM_REFPM2X_REFSM2X_CPC2X:
+  guid: "aa1f0cf1-759d-4645-8cda-18e2b2639e4f"
+  description: "Temperature differential across heating water for heat recovery chiller, differential pressure control with chilled and heating water, isolation valve monitoring for chilling water, and refrigerant pressure and temperature monitoring."
+  is_canonical: true
+  implements:
+  - CH
+  - SS
+  - CHWDPC
+  - CHWDT
+  - CHWISOVM
+  - HWDT
+  - HWDPM
+  - REFPM2X
+  - REFSM2X
+  - CPC2X
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################

ontology/yaml/resources/HVAC/entity_types/CHWS.yaml

@@ -373,6 +373,19 @@ CHWS_SWTC_WDPC_BYPVPM_WSEBYPVPM:
   - BYPVPM
   - WSEBYPVPM
 
+CHWS_SEWDPC_SESWTC_SERWFRM_PRWFRM_PWDT:
+  guid: "3461657c-4b79-4207-9c9b-fcc15a17049d"
+  description: "Chilled water system with secondary loop supply water temperature and differential pressure control, primary and secondary flowrate monitoring."
+  is_canonical: true
+  implements:
+  - CHWS
+  - SEWDPC
+  - SESWTC
+  - SERWFRM
+  - PRWFRM
+  - PWDT
+
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################

ontology/yaml/resources/HVAC/entity_types/HWS.yaml

@@ -364,6 +364,19 @@ HWS_PWDT_PRWFRM_SESWTC_SEWDPC_SEWFRM:
   - SEWDPC
   - SEWFRM
 
+HWS_SEWDPC_SESWTC_SERWFRM_PRWFRM_PWDT_BYPVPM:
+  guid: "cee39637-6b7b-404e-80a6-a5787ab4dff8"
+  description: "Heating water system with secondary loop supply water temperature and differential pressure control, primary and secondary flowrate monitoring."
+  is_canonical: true
+  implements:
+  - HWS
+  - SEWDPC
+  - SESWTC
+  - SERWFRM
+  - PRWFRM
+  - PWDT
+  - BYPVPM
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################

ontology/yaml/resources/fields/telemetry_fields.yaml

@@ -774,6 +774,9 @@ literals:
 - secondary_supply_water_flowrate_sensor:
     flexible_min: -0.000315451
     flexible_max: 0.315451
+- secondary_return_water_flowrate_sensor:
+    flexible_min: -0.000315451
+    flexible_max: 0.315451
 - shade_extent_percentage_command:
     fixed_min: 0.0
     fixed_max: 100.0
@@ -934,6 +937,12 @@ literals:
 - condensing_fan_speed_percentage_command:
     fixed_min: 0.0
     fixed_max: 100.0
+- condensing_fan_run_command:
+  - ON
+  - OFF    
+- condensing_fan_run_status:
+  - ON
+  - OFF
 - boost_fan_run_command:
   - ON
   - OFF
@@ -1485,6 +1494,9 @@ literals:
 - refrigerant_condenser_pressure_sensor:
     flexible_min: 0.0
     flexible_max: 2068427.367
+- refrigerant_injection_pressure_sensor:
+    flexible_min: 0.0
+    flexible_max: 2068427.367
 - refrigerant_suction_temperature_sensor:
     flexible_min: 255.9259259
     flexible_max: 422.037037
@@ -2686,6 +2698,12 @@ literals:
 - refrigerant_suction_superheat_temperature_sensor:
     flexible_min: 255.9259259
     flexible_max: 422.037037
+- refrigerant_injection_suction_superheat_temperature_sensor:
+    flexible_min: 255.9259259
+    flexible_max: 422.037037
+- refrigerant_injection_suction_temperature_sensor:
+    flexible_min: 255.9259259
+    flexible_max: 422.037037
 - return_air_specificenthalpy_sensor:
     flexible_min: 11630.0
     flexible_max: 93040.0

ontology/yaml/resources/subfields/subfields.yaml

@@ -146,6 +146,7 @@ descriptor:
   id: "An identification or identifier."
   inlet: "Area of media entrance."
   inhibit: "Prohibit from executing a function or starting an operation."
+  injection: "A process that introduces a substance, such as refrigerant, water, or air, into the system by using pressure or vacuum, to enhance performance, improve efficiency, or maintain proper operation."
   input: "The input to a system."
   intensity: "The relative magnitude or strength of something (i.e., high_intensity_* indicates something is strong or forceful)."
   inter: "Represents something in between references (e.g. average_inter_line_voltage, the average voltage between lines)."