Merge branch 'master' into damper-voltage

google · Nov 4, 2024 · 480945e · 480945e
2 parents f93909f + 94d5e3e
commit 480945e
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 1 deletion.
diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -1783,6 +1783,20 @@ RHHC:
   - return_air_relative_humidity_sensor
   - return_air_relative_humidity_setpoint
 
+EDHC:
+  guid: "d15d63a4-9fea-49f9-a0eb-9399012cbe93"
+  description: "Exhaust air humidification/dehumidification control."
+  is_abstract: true
+  opt_uses:
+  - humidification_percentage_command
+  - failed_humidifier_alarm
+  uses:
+  - dehumidification_run_command
+  - humidification_run_command
+  - exhaust_air_relative_humidity_sensor
+  - exhaust_air_relative_humidity_setpoint
+  implements:
+  - OPERATIONAL
 
 SHC:
   guid: "c27f33dc-19bc-47f4-937a-eab3293b920f"
@@ -7051,6 +7065,15 @@ OCWRWISOVPM:
   implements:
   - MONITORING
 
+OCWSWISOVPM:
+  guid: "751499e7-56c7-4ec2-8edd-d642c8e9d653"
+  description: "Open-loop CDW supply side isolation valve percentage control."
+  is_abstract: true
+  uses:
+  - outside_condensing_loop_supply_water_isolation_valve_percentage_command
+  - outside_condensing_loop_supply_water_isolation_valve_percentage_sensor
+  implements:
+  - MONITORING
 
 HWRWISOVM:
   guid: "a2ca0c24-c44d-44ea-95cb-728da67d7c78"
@@ -8437,6 +8460,16 @@ CPC2X:
   - failed_circulation_pump_alarm_1
   - failed_circulation_pump_alarm_2
 
+OCWCPC2X:
+  guid: "c1a4812d-d458-48ae-9fb9-cb92048ab6c9"
+  description: "Circulation control for 2 open loop condenser water pumps."
+  is_abstract: true
+  uses:
+  - outside_condensing_loop_water_circulation_pump_run_command_1
+  - outside_condensing_loop_water_circulation_pump_run_command_2
+  - outside_condensing_loop_water_circulation_pump_run_status_1
+  - outside_condensing_loop_water_circulation_pump_run_status_2
+
 SDHC:
   guid: "de065843-b1a9-4d2e-b751-31d7af8e8991"
   description: "Supply dehumidification control with a temperature setpoint."
@@ -8451,7 +8484,7 @@ SDHC:
   - leaving_dehumidifier_temperature_sensor
   - leaving_dehumidifier_temperature_setpoint
   implements:
-  - CONTROL
+  - CONTROL  
 
 FPHC:
   guid: "bdd89332-3303-420d-a13c-ee38c398d9ff"

diff --git a/ontology/yaml/resources/HVAC/entity_types/DMP.yaml b/ontology/yaml/resources/HVAC/entity_types/DMP.yaml
@@ -99,6 +99,14 @@ DMP_ZSPC_EFM:
   - ZSPC
   - EFM
 
+DMP_OAFC:
+  guid: "35d72afa-47e3-48ba-8f59-51c74ebbbddd"
+  description: "Stand-alone damper with outside air flowrate control."
+  is_canonical: true
+  implements:
+  - DMP
+  - OAFC
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################

diff --git a/ontology/yaml/resources/HVAC/entity_types/HX.yaml b/ontology/yaml/resources/HVAC/entity_types/HX.yaml
@@ -158,6 +158,20 @@ HX_CWRWISOVPM_OCWRWISOVPM_CWTWRTM:
   - condensing_return_water_temperature_sensor
   - outside_condensing_loop_return_water_temperature_sensor
 
+HX_CWSWISOVPM_OCWSWISOVPM_CWBYPVPM_OCWCPC2X_CWTWSTM:
+  guid: "c6982fd1-9301-4c91-b4a9-1b359ff1b17c"
+  description: "Heat exchanger between closed-loop condensing water and open-loop (tower) water with circulation pumps."
+  is_canonical: true
+  implements:
+  - HX
+  - CWSWISOVPM
+  - OCWSWISOVPM
+  - CWBYPVPM
+  - OCWCPC2X
+  uses:
+  - condensing_supply_water_temperature_sensor
+  - outside_condensing_loop_supply_water_temperature_sensor
+
 HX_RWISOVM:
   guid: "2385f180-c38d-48a1-9604-1d822dfe99ff"
   description: "Simple return water isolating heat exchanger."

diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -2862,6 +2862,15 @@ literals:
 - outside_condensing_loop_return_water_temperature_sensor:
     flexible_min: 255.9259259
     flexible_max: 308.1481481
+- outside_condensing_loop_supply_water_isolation_valve_percentage_command:
+    fixed_min: 0.0
+    fixed_max: 100.0
+- outside_condensing_loop_supply_water_isolation_valve_percentage_sensor:
+    fixed_min: 0.0
+    fixed_max: 100.0
+- outside_condensing_loop_supply_water_temperature_sensor:
+    flexible_min: 255.9259259
+    flexible_max: 308.1481481
 - transducer_failed_alarm:
   - ACTIVE
   - INACTIVE
@@ -3763,6 +3772,12 @@ literals:
 - condensing_water_circulation_pump_run_status:
   - ON
   - OFF
+- outside_condensing_loop_water_circulation_pump_run_command:
+  - ON
+  - OFF
+- outside_condensing_loop_water_circulation_pump_run_status:
+  - ON
+  - OFF
 # Four fields below are for ASHP.
 - heating_run_command:
   - ON
@@ -3944,6 +3959,12 @@ literals:
 - supply_air_damper_voltage_sensor:
     flexible_min: 0.0
     flexible_max: 120.0
+- exhaust_air_relative_humidity_sensor:
+    fixed_min: 0.0
+    fixed_max: 100.0
+- exhaust_air_relative_humidity_setpoint:
+    fixed_min: 0.0
+    fixed_max: 100.0
 - glycol_differential_pressure_sensor:
     flexible_min: -34473.78945
     flexible_max: 344737.8945