From 5c5c69663a2ffc9729033420fc91441857cd96e7 Mon Sep 17 00:00:00 2001
From: "Ciaran O'Flannagain (Hereworks)" <ciaran.oflannagain@mckeon.ie>
Date: Wed, 21 Aug 2024 15:35:45 +0100
Subject: [PATCH] New DWHT, update previous DHWT description

---
 .../resources/HVAC/entity_types/ABSTRACT.yaml    | 16 ++++++++++++++++
 .../yaml/resources/HVAC/entity_types/DHWT.yaml   | 12 +++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 0b296bd07..c6777041c 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -3175,6 +3175,22 @@ HWSWC:
   implements:
   - CONTROL
 
+HWRWC:
+  guid: "1805f8ee-1425-4b51-9a3d-563be38c7c13"
+  description: "Heating water valve monitoring on return water side."
+  is_abstract: true
+  opt_uses:
+  - heating_thermal_power_capacity
+  - heating_water_valve_percentage_sensor
+  - supply_water_temperature_sensor
+  - high_return_water_temperature_alarm
+  - low_return_water_temperature_alarm
+  uses:
+  - heating_water_valve_percentage_command
+  - return_water_temperature_sensor
+  - return_water_temperature_setpoint
+  implements:
+  - CONTROL
 
 PHWSC:
   guid: "0f2f9a53-6aab-4c9c-801f-bb11b021e42a"
diff --git a/ontology/yaml/resources/HVAC/entity_types/DHWT.yaml b/ontology/yaml/resources/HVAC/entity_types/DHWT.yaml
index 19a9e2fd1..cbbb89374 100644
--- a/ontology/yaml/resources/HVAC/entity_types/DHWT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/DHWT.yaml
@@ -16,9 +16,19 @@
 ### Canonical Types  ###
 ########################
 
+DHWT_HWTTC_CPC_HWRWC:
+  guid: "cdf9abad-348f-4969-a00b-426bbf67eb21"
+  description: "Standard calorifier with return pump."
+  is_canonical: true
+  implements:
+  - DHWT
+  - HWTTC
+  - CPC
+  - HWRWC
+
 DHWT_HTSWC_HWTTC_CPC_HWSWC:
   guid: "a7075251-5beb-41da-9a05-61496f6fcb4e"
-  description: "Standard calorifier with return pump."
+  description: "Standard calorifier with return pump and immersion heater."
   is_canonical: true
   implements:
   - DHWT