Merge pull request #1499 from ccquigley/master

dehumidifier addtions
google · Jan 24, 2025 · c0ce951 · c0ce951
2 parents 5abc8ec + 2b5d3da
commit c0ce951
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 0 deletions.
diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -100,9 +100,19 @@ OADM:
   is_abstract: true
   opt_uses:
   - failed_outside_air_damper_alarm
+  - outside_air_damper_status
   uses:
   - outside_air_damper_command
 
+RADM:
+  guid: "2819ae14-dc0c-4c73-8bdf-fdf12fa13f52"
+  description: "Return air damper monitoring."
+  is_abstract: true
+  opt_uses:
+  - failed_return_air_damper_alarm
+  uses:
+  - return_air_damper_command
+  - return_air_damper_status
 
 MOAFC:
   guid: "76994bbd-4395-4a19-914f-d5c9a21fc99b"
@@ -1796,6 +1806,8 @@ ZHC:
   - low_zone_air_relative_humidity_alarm
   - zone_air_dewpoint_temperature_sensor
   - zone_air_dewpoint_temperature_setpoint
+  - dehumidification_run_command
+  - dehumidification_run_status
   implements:
   - OPERATIONAL
 
@@ -1925,6 +1937,21 @@ SHM:
   - MONITORING
 
 
+DHM:
+  guid: "3436956c-47df-4312-bcc3-9730f479c757"
+  description: "Discharge air relative humidity monitoring."
+  is_abstract: true
+  opt_uses:
+  - high_discharge_air_relative_humidity_alarm
+  - low_discharge_air_relative_humidity_alarm
+  - failed_discharge_air_relative_humidity_alarm
+  - discharge_air_dewpoint_temperature_sensor
+  uses:
+  - discharge_air_relative_humidity_sensor
+  implements:
+  - MONITORING
+
+
 REFC:
   guid: "e043f5e2-fcc4-44b1-818f-0f4e7584adf5"
   description: "Refrigerant leak control."
@@ -3217,6 +3244,8 @@ HPHCZC:
   - failed_zone_air_temperature_alarm
   - high_zone_air_temperature_alarm
   - low_zone_air_temperature_alarm
+  - cooling_request_count
+  - heating_request_count
   uses:
   - cooling_run_command
   - heating_run_command

diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
@@ -4834,6 +4834,24 @@ AHU_SFSS4X_ECON_SFVSC4X_CHWRC_SSPC_FDPSM:
   - SSPC
   - FDPSM
 
+AHU_DFMSC_DHM_EFSS_HPHCZC_MTM_OA_OADM_RADM_RMM_RTM_ZHC:
+  guid: "08bce8b9-2b68-431c-854f-84142a2906ce"
+  description: "Single zone AHU with multi speed discharge fan controlling to zone humidity for a room with a pool and uses a WSHP for chilled or heating water which controls to zone temperature with dual setpoint. Contains monitoring points for MAT, RAT, OAD, RAD, discharge air humiditiy, and an exhuast fan with start/stop"
+  is_canonical: true
+  implements:
+  - AHU
+  - DFMSC
+  - DHM
+  - EFSS
+  - HPHCZC
+  - MTM
+  - OA
+  - OADM
+  - RADM
+  - RMM
+  - RTM
+  - ZHC
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################

diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -2127,12 +2127,21 @@ literals:
 - high_supply_air_relative_humidity_alarm:
   - ACTIVE
   - INACTIVE
+- high_discharge_air_relative_humidity_alarm:
+  - ACTIVE
+  - INACTIVE
 - low_supply_air_relative_humidity_alarm:
   - ACTIVE
   - INACTIVE
+- low_discharge_air_relative_humidity_alarm:
+  - ACTIVE
+  - INACTIVE
 - failed_supply_air_relative_humidity_alarm:
   - ACTIVE
   - INACTIVE
+- failed_discharge_air_relative_humidity_alarm:
+  - ACTIVE
+  - INACTIVE
 - failed_discharge_air_static_pressure_alarm:
   - ACTIVE
   - INACTIVE
@@ -4052,3 +4061,6 @@ literals:
 - zone_air_dewpoint_temperature_setpoint:
     flexible_min: 255.9259259
     flexible_max: 310.9259259
+- discharge_air_dewpoint_temperature_sensor:
+    flexible_min: 255.9259259
+    flexible_max: 338.7037037