From 8cfcb03f27c3ee19cb38732f3867c35981e5d47d Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Wed, 27 Mar 2024 09:35:36 -0700
Subject: [PATCH 01/10] New AHU Type

---
 .../yaml/resources/HVAC/entity_types/AHU.yaml    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
index cd9a453b9..db7d621bf 100644
--- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
@@ -4508,6 +4508,22 @@ AHU_SFSS2X_SFVSC2X_RFSS2X_RFVSC2X_HWSC_CHWSC_SSPC_MOAFC_ECON_EDPM_RD_UV:
   - RD
   - UV
 
+AHU_FDPM_DFVSC_RTM_OADM_CAM_WSHPZTC_CDCPC_CDWT_CDWISOVM:
+  guid: "185ef011-7530-4e27-9981-6c9e2b5221c0"
+  description: "Single-zone AHU with water-source heat pump that rejects heat to condesing water."
+  is_canonical: true
+  implements:
+  - AHU
+  - FDPM
+  - DFVSC
+  - RTM
+  - OADM
+  - CAM
+  - WSHPZTC
+  - CDCPC
+  - CDWT
+  - CDWISOVM
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################

From d5ab7c8093c53670096449ca9791907207925954 Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Wed, 27 Mar 2024 09:45:52 -0700
Subject: [PATCH 02/10] Add heat pump abstract

---
 .../resources/HVAC/entity_types/ABSTRACT.yaml | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 9d718c16f..3278cc20e 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -2844,6 +2844,25 @@ HP3ZC:
   implements:
   - CONTROL
 
+CWSHPZTC:
+  guid: "0506375b-4a48-4d5d-92ba-5bd1e9ef087b"
+  description: "Water-source heat pump (rejection to condensing water) with dual-setpoint zone temp control (DSP)."
+  is_abstract: true
+  opt_uses:
+  - cooling_thermal_power_capacity
+  - discharge_air_temperature_sensor
+  - failed_discharge_air_temperature_alarm
+  - failed_zone_air_temperature_alarm
+  - high_zone_air_temperature_alarm
+  - low_zone_air_temperature_alarm
+  uses:
+  - condensing_water_circulation_pump_run_status
+  - condensing_water_circulation_pump_run_command
+  - zone_air_temperature_sensor
+  - zone_air_cooling_temperature_setpoint
+  - zone_air_heating_temperature_setpoint
+  implements:
+  - CONTROL
 
 HWDC:
   guid: "353bd503-92eb-4f72-8a82-ec1a91413f89"
@@ -7935,4 +7954,4 @@ DTPM:
   - detergent_pump_run_status
   - detergent_pump_run_command
   implements:
-  - MONITORING
\ No newline at end of file
+  - MONITORING

From 5ed71dc4fe944a897cfbf358c435f363f9408734 Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Wed, 27 Mar 2024 09:49:36 -0700
Subject: [PATCH 03/10] Update AHU.yaml

---
 ontology/yaml/resources/HVAC/entity_types/AHU.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
index db7d621bf..727330150 100644
--- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
@@ -4508,7 +4508,7 @@ AHU_SFSS2X_SFVSC2X_RFSS2X_RFVSC2X_HWSC_CHWSC_SSPC_MOAFC_ECON_EDPM_RD_UV:
   - RD
   - UV
 
-AHU_FDPM_DFVSC_RTM_OADM_CAM_WSHPZTC_CDCPC_CDWT_CDWISOVM:
+AHU_FDPM_DFVSC_RTM_OADM_CAM_CWSHPZTC_CDCPC_CDWT_CDWISOVM:
   guid: "185ef011-7530-4e27-9981-6c9e2b5221c0"
   description: "Single-zone AHU with water-source heat pump that rejects heat to condesing water."
   is_canonical: true
@@ -4519,8 +4519,7 @@ AHU_FDPM_DFVSC_RTM_OADM_CAM_WSHPZTC_CDCPC_CDWT_CDWISOVM:
   - RTM
   - OADM
   - CAM
-  - WSHPZTC
-  - CDCPC
+  - CWSHPZTC
   - CDWT
   - CDWISOVM
 

From 67e17fee5e1da67d16d6c0afefd42491f54656f2 Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Wed, 27 Mar 2024 09:50:00 -0700
Subject: [PATCH 04/10] Update ABSTRACT.yaml

---
 ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 3278cc20e..d6cc810f4 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -5842,7 +5842,7 @@ HTWHLSTC:
 
 CAM:
   guid: "c37a0e19-19c0-4246-8a8b-f376aa089d56"
-  description: "ztc alarm monitoring based on moisture sensor on coil or in pan."
+  description: "Alarm monitoring based on moisture sensor on coil or in pan."
   is_abstract: true
   implements:
   - MONITORING

From e4f38b05034a7cb412c4d1fcfc67d5f4be9209d4 Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Wed, 27 Mar 2024 09:51:57 -0700
Subject: [PATCH 05/10] Update ABSTRACT.yaml

---
 ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index d6cc810f4..c6a3ba961 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -2845,8 +2845,8 @@ HP3ZC:
   - CONTROL
 
 CWSHPZTC:
-  guid: "0506375b-4a48-4d5d-92ba-5bd1e9ef087b"
-  description: "Water-source heat pump (rejection to condensing water) with dual-setpoint zone temp control (DSP)."
+  guid: "f976c1eb-4043-4234-b567-e82943653c96"
+  description: "Air-side water-source heat pump (heat rejection to condensing water) with dual-setpoint zone temp control (DSP)."
   is_abstract: true
   opt_uses:
   - cooling_thermal_power_capacity

From 85582cc15dbd24160f338c0f7499f99014d8e2a6 Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Wed, 27 Mar 2024 09:55:06 -0700
Subject: [PATCH 06/10] Update AHU.yaml

---
 ontology/yaml/resources/HVAC/entity_types/AHU.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
index 727330150..ba3549627 100644
--- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
@@ -4508,7 +4508,7 @@ AHU_SFSS2X_SFVSC2X_RFSS2X_RFVSC2X_HWSC_CHWSC_SSPC_MOAFC_ECON_EDPM_RD_UV:
   - RD
   - UV
 
-AHU_FDPM_DFVSC_RTM_OADM_CAM_CWSHPZTC_CDCPC_CDWT_CDWISOVM:
+AHU_FDPM_DFVSC_RTM_OADM_CAM_CWSHPZTC_CWDT_CDWISOVM:
   guid: "185ef011-7530-4e27-9981-6c9e2b5221c0"
   description: "Single-zone AHU with water-source heat pump that rejects heat to condesing water."
   is_canonical: true
@@ -4520,7 +4520,7 @@ AHU_FDPM_DFVSC_RTM_OADM_CAM_CWSHPZTC_CDCPC_CDWT_CDWISOVM:
   - OADM
   - CAM
   - CWSHPZTC
-  - CDWT
+  - CWDT
   - CDWISOVM
 
 ###################################

From 419f8cbbb05497b6e5694ccb7bed816534757f3e Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Wed, 27 Mar 2024 09:59:17 -0700
Subject: [PATCH 07/10] Update FCU.yaml

---
 ontology/yaml/resources/HVAC/entity_types/FCU.yaml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
index da0037b23..6e416c734 100644
--- a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
@@ -1465,6 +1465,20 @@ FCU_DFSS_RHDHC_HT2RC_DX2RC_ZTM:
   - DX2RC
   - ZTM
 
+FCU_FDPM_DFVSC_RTM_CAM_CWSHPZTC_CWDT_CDWISOVM:
+  guid: "0ea0b3e6-03ac-44e2-b1e8-58d3e4737c55"
+  description: "FCU with water-source heat pump that rejects heat to condesing water."
+  is_canonical: true
+  implements:
+  - FCU
+  - FDPM
+  - DFVSC
+  - RTM
+  - CAM
+  - CWSHPZTC
+  - CWDT
+  - CDWISOVM
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################

From d2d059271ba00f2493d7c8d84b6d0ec12eb1965a Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Wed, 27 Mar 2024 10:01:15 -0700
Subject: [PATCH 08/10] Update ABSTRACT.yaml

---
 ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index c6a3ba961..6cb96902c 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -2844,9 +2844,9 @@ HP3ZC:
   implements:
   - CONTROL
 
-CWSHPZTC:
+CWSHPZC:
   guid: "f976c1eb-4043-4234-b567-e82943653c96"
-  description: "Air-side water-source heat pump (heat rejection to condensing water) with dual-setpoint zone temp control (DSP)."
+  description: "Air-side water-source heat pump (heat rejection to condensing water) with zone temp control."
   is_abstract: true
   opt_uses:
   - cooling_thermal_power_capacity
@@ -2855,12 +2855,12 @@ CWSHPZTC:
   - failed_zone_air_temperature_alarm
   - high_zone_air_temperature_alarm
   - low_zone_air_temperature_alarm
+  - zone_air_heating_temperature_setpoint
   uses:
   - condensing_water_circulation_pump_run_status
   - condensing_water_circulation_pump_run_command
   - zone_air_temperature_sensor
   - zone_air_cooling_temperature_setpoint
-  - zone_air_heating_temperature_setpoint
   implements:
   - CONTROL
 

From 452b862fec2bd78aefd564d405ac24cb532be1a7 Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Wed, 27 Mar 2024 10:01:38 -0700
Subject: [PATCH 09/10] Update AHU.yaml

---
 ontology/yaml/resources/HVAC/entity_types/AHU.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
index ba3549627..0d45bef65 100644
--- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
@@ -4508,7 +4508,7 @@ AHU_SFSS2X_SFVSC2X_RFSS2X_RFVSC2X_HWSC_CHWSC_SSPC_MOAFC_ECON_EDPM_RD_UV:
   - RD
   - UV
 
-AHU_FDPM_DFVSC_RTM_OADM_CAM_CWSHPZTC_CWDT_CDWISOVM:
+AHU_FDPM_DFVSC_RTM_OADM_CAM_CWSHPZC_CWDT_CDWISOVM:
   guid: "185ef011-7530-4e27-9981-6c9e2b5221c0"
   description: "Single-zone AHU with water-source heat pump that rejects heat to condesing water."
   is_canonical: true
@@ -4519,7 +4519,7 @@ AHU_FDPM_DFVSC_RTM_OADM_CAM_CWSHPZTC_CWDT_CDWISOVM:
   - RTM
   - OADM
   - CAM
-  - CWSHPZTC
+  - CWSHPZC
   - CWDT
   - CDWISOVM
 

From c394e751bfec622d123e384497ff49be3d9a371f Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Wed, 27 Mar 2024 10:02:12 -0700
Subject: [PATCH 10/10] Update FCU.yaml

---
 ontology/yaml/resources/HVAC/entity_types/FCU.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
index 6e416c734..6a5edc976 100644
--- a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
@@ -1465,7 +1465,7 @@ FCU_DFSS_RHDHC_HT2RC_DX2RC_ZTM:
   - DX2RC
   - ZTM
 
-FCU_FDPM_DFVSC_RTM_CAM_CWSHPZTC_CWDT_CDWISOVM:
+FCU_FDPM_DFVSC_RTM_CAM_CWSHPZC_CWDT_CDWISOVM:
   guid: "0ea0b3e6-03ac-44e2-b1e8-58d3e4737c55"
   description: "FCU with water-source heat pump that rejects heat to condesing water."
   is_canonical: true
@@ -1475,7 +1475,7 @@ FCU_FDPM_DFVSC_RTM_CAM_CWSHPZTC_CWDT_CDWISOVM:
   - DFVSC
   - RTM
   - CAM
-  - CWSHPZTC
+  - CWSHPZC
   - CWDT
   - CDWISOVM