From b57e8d52f98c3d90f146b07ccacbc966ee744dd3 Mon Sep 17 00:00:00 2001
From: Jane <rivenomg@gmail.com>
Date: Thu, 10 Oct 2024 08:38:20 -0700
Subject: [PATCH] new abstract, ASHP and HWS types

---
 .../resources/HVAC/entity_types/ABSTRACT.yaml   |  5 +++++
 .../yaml/resources/HVAC/entity_types/ASHP.yaml  | 17 +++++++++++++++++
 .../yaml/resources/HVAC/entity_types/HWS.yaml   | 11 +++++++++++
 3 files changed, 33 insertions(+)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 886a02d24..200d7771a 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -2005,6 +2005,11 @@ PWDT:
   - low_primary_return_water_temperature_alarm
   - low_primary_supply_water_temperature_alarm
 
+PRRWTM:
+  description: "Primary return water temperature monitoring."
+  is_abstract: true
+  uses:
+  - primary_return_water_temperature_sensor
 
 CHPM:
   guid: "83b25b74-a334-4297-89b3-30ce005e12fe"
diff --git a/ontology/yaml/resources/HVAC/entity_types/ASHP.yaml b/ontology/yaml/resources/HVAC/entity_types/ASHP.yaml
index 994325c60..e529581bd 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ASHP.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ASHP.yaml
@@ -32,6 +32,23 @@ ASHP_SS_HP6SWC_CPC2X_RWISOVM:
   - high_refrigerant_pressure_alarm_1
   - high_refrigerant_pressure_alarm_2
 
+ASHP_SS_HP6SWC_CPC2X_RWISOVM_WDT_WDPC:
+  description: "Six-stage air source heat pump with 2 circulation pumps, return isolation valve, water temperature differential monitoring and differential pressure control."
+  is_canonical: true
+  implements:
+  - ASHP
+  - SS
+  - HP6SWC
+  - CPC2X
+  - RWISOVM
+  - WDT
+  - WDPC
+  opt_uses:
+  - low_refrigerant_pressure_alarm_1
+  - low_refrigerant_pressure_alarm_2
+  - high_refrigerant_pressure_alarm_1
+  - high_refrigerant_pressure_alarm_2
+
 ASHP_SS_SHWTC_SCHWTC_HWRWISOVM_CHWRWISOVM_HCPC2X_CHCPC2X:
   guid: "8f9741a1-1066-406b-86fa-6ca239e215f4"
   description: "Air source heat pump for a hydronic system providing chilled and heating water."
diff --git a/ontology/yaml/resources/HVAC/entity_types/HWS.yaml b/ontology/yaml/resources/HVAC/entity_types/HWS.yaml
index b43f25847..36d427bd8 100644
--- a/ontology/yaml/resources/HVAC/entity_types/HWS.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/HWS.yaml
@@ -377,6 +377,17 @@ HWS_SEWDPC_SESWTC_SERWFRM_PRWFRM_PWDT_BYPVPM:
   - PWDT
   - BYPVPM
 
+HWS_PRRWTM_SESWTC_SEWDPC_SERWFRM_SEWTM:
+  description: "Heating water system with primary return water temperature monitoring, secondary loop supply water temperature and differential pressure control, and secondary flowrate monitoring."
+  is_canonical: true
+  implements:
+  - HWS
+  - PRRWTM
+  - SESWTC
+  - SEWDPC
+  - SERWFRM
+  - SEWTM
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################