Merge branch 'master' into master

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

@@ -4524,6 +4524,51 @@ AHU_SFSS2X_SFVSC2X_RFSS2X_RFVSC2X_HWSC_CHWSC_SSPC_MOAFC_ECON_EDPM_RD_UV:
   - RD
   - UV
 
+AHU_SFSS_SFVSC_EFSS_EFVSC_CHW2XSC_SSVC_CO2CMAX_ECON_SSPC:
+  guid: "7bde22a0-19c3-4755-b9d4-a41fd4b54a8e"
+  description: "Multi-zone AHU with supply and exhaust fans, co2 control, two chilled water and one steam valve control to supply air, and economizing."
+  is_canonical: true
+  implements:
+  - AHU
+  - SFSS
+  - SFVSC
+  - EFSS
+  - EFVSC
+  - CHW2XSC
+  - SSVC
+  - CO2CMAX
+  - ECON
+  - SSPC
+
+AHU_SFSS_SFVSC_CHW2XSC_SSVC_ECON_SSPC:
+  guid: "4520481a-167e-4767-9e3e-cd5a21624776"
+  description: "Multi-zone AHU with supply fan control, two chilled water and one steam valve control to supply air, and economizing."
+  is_canonical: true
+  implements:
+  - AHU
+  - SFSS
+  - SFVSC
+  - CHW2XSC
+  - SSVC
+  - ECON
+  - SSPC
+
+AHU_SFSS_SFVSC_CHWSC_HTSC_ECON_SARC_SSPC_FDPM_ZTM:
+  guid: "b270b104-aed8-40c3-80b5-bd991e3ed102"
+  description: "Multi-zone AHU with supply fan control, chilled water and electric heater control to supply air, economizing, filter differential pressure and zone temperature monitoring."
+  is_canonical: true
+  implements:
+  - AHU
+  - SFSS
+  - SFVSC
+  - CHWSC
+  - HTSC
+  - ECON
+  - SARC
+  - SSPC
+  - FDPM
+  - ZTM
+
 AHU_BSPC_DX5SC_ECONM_EDM_EFSS_EFVSC_SFSS4X_SFVSC4X_SSPC_SARC:
   guid: "befd596e-5a4b-4c64-b045-7f546ada3e96"
   description: "Multi-zone AHU with 5 compressors, exhaust damper monitoring, economizer controlling to MAT setpoint, and variable speed exhaust and four supply fans."
@@ -5353,7 +5398,16 @@ AHU_NON_CANONICAL_TYPE_71:
   - supply_fan_speed_frequency_sensor
   - supply_fan_speed_percentage_command
   - supply_air_flowrate_sensor
-
+
+AHU_SFSS_NON_CANONICAL_72:
+  guid: "3473e1f2-390c-401f-ae2d-b2cdeb575fdd"
+  description: "Landlord system that only receives status/command and alarm"
+  implements:
+  - AHU
+  - SFSS
+  opt_uses:
+  - lost_power_alarm
+
 AHU_STDSPC_SSPC_EFFC_EFVSC_FDPM3X_HTWHLSTC_RHM_ETM:
   guid: "dbe00902-c2da-4efd-b8f2-2069ddd674c3"
   description: "Non-Standard (Swegon) Multi-Zone AHU with heat wheel, isolation damper and filter pressure monitoring"

ontology/yaml/resources/HVAC/entity_types/CU.yaml

@@ -75,6 +75,19 @@ CU_SFSS_SFVSC_CHWSC_HTSC_SSPC_SARC_MTM_FDPM_CAM:
   - FDPM
   - CAM
 
+CU_SFSS_SFVSC_CHWSDC_HTSDC_SSPC_RTM:
+  guid: "cc27b007-3427-4d17-b07b-31f4cdcbf700"
+  description: "Chilled water compartment unit on supply side with start/stop, status, cooling and heating (dual setpoint supply temp control)."
+  is_canonical: true
+  implements:
+  - CU
+  - SFSS
+  - SFVSC
+  - CHWSDC
+  - HTSDC
+  - SSPC
+  - RTM
+
 CU_SFSS_SFVSC_CHWSC_CHWDT_HTSC_SSPC_SARC_MTM_RTM:
   guid: "15e39197-05fa-4b52-9473-5e0bccb883e5"
   description: "Chilled water compartment unit on supply side with start/stop, status, cooling and heating (supply temp control), and differential temperature monitoring."
@@ -91,6 +104,78 @@ CU_SFSS_SFVSC_CHWSC_CHWDT_HTSC_SSPC_SARC_MTM_RTM:
   - RTM
   - CHWDT
 
+CU_SFSS_SFVSC_CHWSC_HTSC_SSPC_MTM_RTM:
+  guid: "6b48ff18-d05c-427e-8315-a792c01be753"
+  description: "Chilled water compartment unit with start/stop, status, cooling and heating (supply temp control)."
+  is_canonical: true
+  implements:
+  - CU
+  - SFSS
+  - SFVSC
+  - CHWSC
+  - HTSC
+  - SSPC
+  - MTM
+  - RTM
+
+CU_SFSS_SFVSC_CHWSC_CHWDT_HTSC_SSPC_SARC_MTM:
+  guid: "bb90002e-fe38-41b8-b9ba-5094928f676b"
+  description: "Chilled water compartment unit on supply side with start/stop, status, cooling and heating (supply temp control), and differential temperature monitoring."
+  is_canonical: true
+  implements:
+  - CU
+  - SFSS
+  - SFVSC
+  - CHWSC
+  - CHWDT
+  - HTSC
+  - SSPC
+  - SARC
+  - MTM
+
+CU_SFSS2X_SFVSC2X_CHWSC_CHWDT_HTSC_SSPC_MTM:
+  guid: "bccd555b-864f-4b66-a084-fa29ce28e770"
+  description: "Chilled water compartment unit with two fan start/stop, status, cooling and heating (supply temp control), and differential temperature monitoring."
+  is_canonical: true
+  implements:
+  - CU
+  - SFSS2X
+  - SFVSC2X
+  - CHWSC
+  - CHWDT
+  - HTSC
+  - SSPC
+  - MTM
+
+CU_DSP_DFSS_DFVSC_CHW2XDC_HTDC_FDPM_MTM_CAM_CO2M:
+  guid: "8af7abce-3d69-4380-bb90-d8690050b238"
+  description: "Single zone chilled water compartment unit with start/stop, status, cooling and heating (discharge temp control)."
+  is_canonical: true
+  implements:
+  - CU
+  - DSP
+  - DFSS
+  - DFVSC
+  - CHW2XDC
+  - HTDC
+  - FDPM
+  - MTM
+  - CAM
+  - CO2M
+
+CU_DSP_DFSS_DFVSC_CHWDC_HTDC_RTM_CO2M:
+  description: "Single zone chilled water compartment unit with start/stop, status, cooling and heating (discharge temp control)."
+  is_canonical: true
+  implements:
+  - CU
+  - DSP
+  - DFSS
+  - DFVSC
+  - CHWDC
+  - HTDC
+  - RTM
+  - CO2M
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################

ontology/yaml/resources/HVAC/entity_types/FCU.yaml

@@ -505,6 +505,18 @@ FCU_DFSS_ZTC_ZHDHC_DXZTC:
   - ZHDHC
   - DXZTC
 
+FCU_DFSS_CHWZTC_CHWDT_HTZTC_ZHDHC:
+  guid: "98df75a0-f985-4b76-a78d-3a2e9d3b791c"
+  description: "Chilled water fan coil with zone humidity and temp control."
+  is_canonical: true
+  implements:
+  - FCU
+  - DFSS
+  - CHWZTC
+  - CHWDT
+  - HTZTC
+  - ZHDHC
+
 FCU_DFSS_CSP_ZHC_DXZC:
   guid: "a705848f-4a8e-4ed5-9197-f8f10e039f53"
   description: "DX fan coil with zone temp and humidity control."
@@ -1176,6 +1188,32 @@ FCU_DFSS_CHWZTC_CHWDT_CAM_ZHC:
   - CAM
   - ZHC
 
+FCU_DFSS_CHWZTC_CHWDT_ZHC_DTM_RTM:
+  guid: "e1d8907d-d1f6-4492-bf6f-bc5e38601b36"
+  description: "Chilled water FCU with zone temperature control and chilled water valve control"
+  is_canonical: true
+  implements:
+  - FCU
+  - DFSS
+  - CHWZTC
+  - CHWDT
+  - ZHC
+  - DTM
+  - RTM
+
+FCU_DFSS2X_CHWZC_CHWDT_ZHM_DTM_RTM:
+  guid: "ea6137f5-0218-479e-83fb-3ab2efca7d29"
+  description: "Chilled water FCU with zone temperature control and chilled water valve control"
+  is_canonical: true
+  implements:
+  - FCU
+  - DFSS2X
+  - CHWZC
+  - CHWDT
+  - ZHM
+  - DTM
+  - RTM
+
 FCU_DFSS_ZTC:
   guid: "62c81f76-c539-461d-837d-d01b89a4e9da"
   description: "Chilled water FCU with binary mode (open/closed) and zone temperature control"
@@ -1516,6 +1554,48 @@ FCU_DFSS_CSP_DX4ZC_RTM_CATM2X_HATM2X:
   - CATM2X
   - HATM2X
 
+FCU_DSP_DFVSC_DTM_RTM:
+  is_canonical: true
+  guid: "ff0b58c2-8446-47f9-913d-068fd3b43ae7"
+  description: "Hybrid variable refrigerant flow unit with discharge and return air temperature monitoring, zone cooling and heating setpoints, discharge fan speed command"
+  implements:
+  - FCU
+  - DSP
+  - DFVSC
+  - DTM
+  - RTM
+
+FCU_DFSS_DFSMC_HWRC:
+  is_canonical: true
+  guid: "1388eea8-a039-4b33-8613-24ae9de719dd"
+  description: "Warm air curtain with return air temperature control."
+  implements:
+  - FCU
+  - DFSS
+  - DFSMC
+  - HWRC
+
+FCU_DFVSC_RTM_CO2M_HWZTC_CHWZTC:
+  is_canonical: true
+  guid: "6f6fd049-576c-4f0a-894d-a6433575b8dd"
+  description: "Fan coil unit with zone temperature control, heating water and chilled water valve monitoring."
+  implements:
+  - FCU
+  - DFVSC
+  - RTM
+  - CO2M
+  - HWZTC
+  - CHWZTC
+
+FCU_DFMSC_CHWZTC:
+  is_canonical: true
+  guid: "2b7cde44-9553-405b-b186-0fdf126a9a8c"
+  description: "Fan coil unit with chilled water valve monitoring on zone side (ZTC) and discharge fan multi-speed control."
+  implements:
+  - FCU
+  - DFMSC
+  - CHWZTC
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################
@@ -1957,40 +2037,13 @@ FCU_RTC_RHDHS_DTM_DFSS:
   - fire_alarm
   - schedule_run_command
 
-FCU_DSP_DFVSC_DTM_RTM:
-  guid: "ff0b58c2-8446-47f9-913d-068fd3b43ae7"
-  description: "Hybrid variable refrigerant flow unit with discharge and return air temperature monitoring, zone cooling and heating setpoints, discharge fan speed command"
-  implements:
-  - FCU
-  - DSP
-  - DFVSC
-  - DTM
-  - RTM
-
-FCU_DFSS_DFSMC_HWRC:
-  guid: "1388eea8-a039-4b33-8613-24ae9de719dd"
-  description: "Warm air curtain with return air temperature control."
+FCU_DFSS_DFRMM_CSP_CHWDC:
+  guid: "c03c0745-9d98-41e7-abfa-c6c0ef164f5d"
+  description: "Typical chilled water FCU with cooling-only (discharge control) and Run mode monitoring."
+  is_canonical: true
   implements:
   - FCU
   - DFSS
-  - DFSMC
-  - HWRC
-
-FCU_DFVSC_RTM_CO2M_HWZTC_CHWZTC:
-  guid: "6f6fd049-576c-4f0a-894d-a6433575b8dd"
-  description: "Fan coil unit with zone temperature control, heating water and chilled water valve monitoring."
-  implements:
-  - FCU
-  - DFVSC
-  - RTM
-  - CO2M
-  - HWZTC
-  - CHWZTC
-
-FCU_DFMSC_CHWZTC:
-  guid: "2b7cde44-9553-405b-b186-0fdf126a9a8c"
-  description: "Fan coil unit with Chilled water valve monitoring on zone side (ZTC) and discharge fan multi-speed control."
-  implements:
-  - FCU
-  - DFMSC
-  - CHWZTC
+  - DFRMM
+  - CSP
+  - CHWDC

ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml

@@ -54,6 +54,8 @@ FCU:
   - lost_power_alarm
   - smoke_alarm
   - failed_alarm
+  - emergency_alarm
+  - fire_alarm
   implements:
   - EQUIPMENT
 
@@ -67,6 +69,7 @@ AHU:
   - outside_air_flowrate_requirement # Included at AHU because, regardless of avaiable data for OAD, it will have ventilation requirements.
   - failed_communication_alarm
   - smoke_alarm
+  - emergency_alarm
 
 HX:
   guid: "9aa0dd1a-851c-4d4e-90da-6804c4f8b9f9"
@@ -102,6 +105,7 @@ MAU:
   opt_uses:
   - failed_communication_alarm
   - failed_alarm
+  - emergency_alarm
   implements:
   - EQUIPMENT
 

ontology/yaml/resources/HVAC/entity_types/HX.yaml

@@ -134,7 +134,7 @@ HX_HWSWC_SSSPC:
   - HWSWC
   - SSSPC
 
-HX_CWRWISOVM_TWRWISOVM_CWTWRTM:
+HX_CWRWISOVM_OCWRWISOVM_CWTWRTM:
   guid: "ba604692-f750-4075-917d-658383ec8a8c"
   description: "Heat exchanger between closed-loop condensing water and open-loop (tower) water."
   is_canonical: true
@@ -146,7 +146,7 @@ HX_CWRWISOVM_TWRWISOVM_CWTWRTM:
   - condensing_return_water_temperature_sensor
   - outside_condensing_loop_return_water_temperature_sensor
 
-HX_CWRWISOVPM_TWRWISOVPM_CWTWRTM:
+HX_CWRWISOVPM_OCWRWISOVPM_CWTWRTM:
   guid: "0422fc9c-f491-45c0-a70f-d67c8b781b91"
   description: "Heat exchanger between closed-loop condensing water and open-loop (tower) water."
   is_canonical: true
@@ -234,4 +234,4 @@ HX_CWRISOVPM_CHWRWDVPM_CWDT_CHWDT:
   - CWRISOVPM
   - CHWRWDVPM
   - CWDT
-  - CHWDT
+  - CHWDT