From 3c4f2011ee886d8f0cd9b164f8146111bf1dcbcd Mon Sep 17 00:00:00 2001
From: Jane <rivenomg@gmail.com>
Date: Thu, 15 Feb 2024 12:21:29 -0800
Subject: [PATCH] =?UTF-8?q?More=20new=20=C2=81AHU=20types?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yaml/resources/HVAC/entity_types/AHU.yaml | 60 +++++++++++++++----
 .../yaml/resources/HVAC/entity_types/MAU.yaml | 14 +++++
 2 files changed, 62 insertions(+), 12 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
index 428faed92..d6060fb6f 100644
--- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
@@ -4405,7 +4405,7 @@ AHU_SFSS_SFVSC_EFSS_EFVSC_CHWSC_HWSC_ECON_EDBPC_SARC_SSPC_OAFMC:
 
 AHU_SFSS2X_SFVSC2X_RFSS2X_RFVSC2X_LHC_CHW2XSC_DH2XSDPC_SSPC_SARC_MOAFC_ECON_EDPM2X_RD_UV_SHM:
   guid: "da6d6f64-ca90-4a5c-bf20-275779b58e23"
-  description: "Multi-zone AHU with dual supply and return fans, dual chilled water coil cooling and dehumidification control, leaving temperature heating water valve control, dual exhaust damper, minimum ventilation control, return damper flow control, ultraviolet lamp and supply air humidity monitoring."
+  description: "Multi-zone AHU with dual supply and return fans, dual chilled water coil cooling and dehumidification control, leaving temperature heating water valve control, dual exhaust damper monitoring, minimum ventilation control, return damper flow control, ultraviolet lamp and supply air humidity monitoring."
   is_canonical: true
   implements:
   - AHU
@@ -4425,9 +4425,50 @@ AHU_SFSS2X_SFVSC2X_RFSS2X_RFVSC2X_LHC_CHW2XSC_DH2XSDPC_SSPC_SARC_MOAFC_ECON_EDPM
   - UV
   - SHM
 
+AHU_SFSS2X_SFVSC2X_RFSS2X_RFVSC2X_CHW2XSC_DH2XSDPC_SSPC_SARC_MOAFC_ECON_EDPM2X_RD_UV_SHM:
+  guid: "5acb1bda-0e3f-4f33-8c1f-ee64be72cf1d"
+  description: "Multi-zone AHU with dual supply and return fans, dual chilled water coil cooling and dehumidification control, dual exhaust damper, minimum ventilation control, return damper flow control, ultraviolet lamp and supply air humidity monitoring."
+  is_canonical: true
+  implements:
+  - AHU
+  - SFSS2X
+  - SFVSC2X
+  - RFSS2X
+  - RFVSC2X
+  - CHW2XSC
+  - DH2XSDPC
+  - SSPC
+  - SARC
+  - MOAFC
+  - ECON
+  - EDPM2X
+  - RD
+  - UV
+  - SHM
+
+AHU_SFSS2X_SFVSC2X_RFSS2X_RFVSC2X_LHC_CHW2XSC_DH2XSDPC_SSPC_SARC_MOAFC_ECON_EDPM_RD_UV_SHM:
+  description: "Multi-zone AHU with dual supply and return fans, dual chilled water coil cooling and dehumidification control, leaving temperature heating water valve control, exhaust damper monitoring, minimum ventilation control, return damper flow control, ultraviolet lamp and supply air humidity monitoring."
+  is_canonical: true
+  implements:
+  - SFSS2X
+  - SFVSC2X
+  - RFSS2X
+  - RFVSC2X
+  - LHC
+  - CHW2XSC
+  - DH2XSDPC
+  - SSPC
+  - SARC
+  - MOAFC
+  - ECON
+  - EDPM
+  - RD
+  - UV
+  - SHM
+
 AHU_SFSS_SFVSC_RFSS_RFVSC_HWSC_CHWSC_SSPC_SARC_MOAFC_ECON_EDPM_RD_UV:
   guid: "db33e650-dda4-43f6-bbc5-1844d6b97a0b"
-  description: "Multi-zone AHU with supply and return fans, chilled water valve control, leaving temperature heating water valve control, exhaust damper, minimum ventilation control, return damper flow control and ultraviolet lamp."
+  description: "Multi-zone AHU with supply and return fans, chilled and heating water valve control, exhaust damper monitoring, minimum ventilation control, return damper flow control and ultraviolet lamp."
   is_canonical: true
   implements:
   - AHU
@@ -4445,27 +4486,22 @@ AHU_SFSS_SFVSC_RFSS_RFVSC_HWSC_CHWSC_SSPC_SARC_MOAFC_ECON_EDPM_RD_UV:
   - RD
   - UV
 
-AHU_SFSS2X_SFVSC2X_RFSS2X_RFVSC2X_CHW2XSC_DH2XSDPC_SSPC_SARC_MOAFC_ECON_EDPM2X_RD_UV_SHM:
-  guid: "5acb1bda-0e3f-4f33-8c1f-ee64be72cf1d"
-  description: "Multi-zone AHU with dual supply and return fans, dual chilled water coil cooling and dehumidification control, dual exhaust damper, minimum ventilation control, return damper flow control, ultraviolet lamp and supply air humidity monitoring."
+AHU_SFSS2X_SFVSC2X_RFSS2X_RFVSC2X_HWSC_CHWSC_SSPC_MOAFC_ECON_EDPM_RD_UV:
+  description: "Multi-zone AHU with dual supply and return fans, chilled and heating water valve control, exhaust damper monitoring, minimum ventilation control, return damper flow control and ultraviolet lamp."
   is_canonical: true
   implements:
-  - AHU
   - SFSS2X
   - SFVSC2X
   - RFSS2X
   - RFVSC2X
-  - CHW2XSC
-  - DH2XSDPC
+  - HWSC
+  - CHWSC
   - SSPC
-  - SARC
   - MOAFC
   - ECON
-  - EDPM2X
+  - EDPM
   - RD
   - UV
-  - SHM
-
 
 ###################################
 ### Existing Non-standard Types ###
diff --git a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
index b3bec3639..f1eb0f3a6 100644
--- a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
@@ -743,6 +743,20 @@ MAU_DFSS_DFVSC_DSP_CHWZC_HWZC_OADM:
   opt_uses:
   - smoke_alarm
 
+MAU_SFSS2X_SFVSC2X_PHWSC_LCC_HWSC_SSPC_UV_SHM:
+  description: "Multi-zone MAU with preheating water control, chilled water coil control, heating water valve monitoring, and supply air static pressure control"
+  is_canonical: true
+  implements:
+  - MAU
+  - SFSS2X
+  - SFVSC2X
+  - PHWSC
+  - LCC
+  - HWSC
+  - SSPC
+  - UV
+  - SHM
+
 ############################
 ###   Remap These Types  ###
 ############################