Merge pull request #1270 from ccquigley/master

adding new fan, fcu, and vav types, fields, subfields.
google · Feb 15, 2024 · 20d0507 · 20d0507
2 parents 1cf5798 + 39f7344
commit 20d0507
Show file tree

Hide file tree

Showing 5 changed files with 144 additions and 0 deletions.
diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -36,6 +36,7 @@ SD:
   - purge_command
   - high_supply_air_flowrate_alarm
   - low_supply_air_flowrate_alarm
+  - failed_supply_air_damper_alarm
   uses:
   - supply_air_damper_percentage_command
   - supply_air_flowrate_sensor
@@ -277,6 +278,8 @@ DSP:
   - high_zone_air_relative_humidity_alarm
   - low_zone_air_relative_humidity_alarm
   - failed_discharge_air_temperature_alarm
+  - low_discharge_air_temperature_alarm    
+  - high_discharge_air_temperature_alarm
   - failed_zone_air_temperature_alarm
   - high_zone_air_temperature_alarm
   - low_zone_air_temperature_alarm
@@ -341,6 +344,7 @@ COC:
   - zone_air_co_concentration_setpoint
   opt_uses:
   - high_zone_air_co_concentration_alarm
+  - failed_zone_air_co_concentration_alarm
 
 COM:
   guid: "bd9a1e2d-0710-4c58-8a56-3890af55f6b3"
@@ -637,6 +641,18 @@ ZHM:
   uses:
   - zone_air_relative_humidity_sensor
 
+ZHM2X:
+  guid: "1e5c95b5-bbf8-42ab-b68f-08bd3fc7638e"
+  description: "Dual sensor zone humidity monitoring."
+  is_abstract: true
+  implements:
+  - MONITORING
+  opt_uses:
+  - failed_zone_air_relative_humidity_alarm_1
+  - failed_zone_air_relative_humidity_alarm_2
+  uses:
+  - zone_air_relative_humidity_sensor_1
+  - zone_air_relative_humidity_sensor_2
 
 DTM:
   guid: "576e2b80-1711-4bac-abed-c54f2db5351d"
@@ -1488,6 +1504,8 @@ REFC:
   guid: "e043f5e2-fcc4-44b1-818f-0f4e7584adf5"
   description: "Refrigerant leak control."
   is_abstract: true
+  opt_uses: 
+  - failed_zone_air_refrigerant_concentration_alarm
   uses:
   - zone_air_refrigerant_concentration_sensor
   - zone_air_refrigerant_concentration_setpoint
@@ -1702,6 +1720,17 @@ ZSPM:
   - high_zone_air_static_pressure_alarm
   - low_zone_air_static_pressure_alarm
 
+MSSPC:
+  guid: "bd480ae4-6184-466e-ba95-3bd8bb2f76f3"
+  description: "Minimum supply air static pressure control."
+  is_abstract: true
+  opt_uses:
+  - low_supply_air_static_pressure_alarm
+  uses:
+  - supply_air_static_pressure_sensor
+  - low_limit_supply_air_static_pressure_setpoint
+  implements:
+  - OPERATIONAL
 
 RSPC:
   guid: "5b27a493-430f-4a61-8604-0a672ce3fd55"
@@ -6362,6 +6391,17 @@ VOADC2X:
   implements:
   - OPERATIONAL
 
+IDPC:
+  guid: "10d271bb-1e25-47a8-ac62-920ba534ca5e"
+  description: "Isolation damper percentage control."
+  is_abstract: true
+  uses:
+  - isolation_damper_percentage_command
+  - isolation_damper_percentage_sensor
+  implements:
+  - MONITORING
+  opt_uses:
+  - failed_isolation_damper_alarm
 
 RAIDC:
   guid: "07b8b6ca-5fb7-471d-a50e-2ad266eb4a31"

diff --git a/ontology/yaml/resources/HVAC/entity_types/FAN.yaml b/ontology/yaml/resources/HVAC/entity_types/FAN.yaml
@@ -613,6 +613,25 @@ FAN_SS_VSC_FDPM_DRSM2X:
   - FDPM
   - DRSM2X
 
+FAN_SS_VSC_IDPC:
+  guid: "9808ad45-3d7a-4564-9542-8743a9fca8ac"
+  description: "Fan with start/stop status, variable speed control and isolation damper percentage control."
+  is_canonical: true
+  implements:
+  - FAN
+  - SS
+  - VSC
+  - IDPC
+
+FAN_SS_VSC_REFC:
+  guid: "1cc110bf-d3a9-4be9-8fb1-8534b270424c"
+  description: "Fan with start/stop status, variable speed control and refrigerant concentration control."
+  is_canonical: true
+  implements:
+  - FAN
+  - SS
+  - VSC
+  - REFC
 ###################################
 ### Existing Non-standard Types ###
 ###################################

diff --git a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
@@ -1441,6 +1441,17 @@ FCU_DFSS_CSP_RTM_DXZC:
   - water_leak_alarm
   - failed_alarm
 
+FCU_DFSS_DSP_HWZC_CHWZC_CO2M:
+  guid: "5bb94562-6c8b-43e5-a7e4-9e412f03b7dd"
+  description: "Hydronic fan coil with heating and cooling (zone temp control) and CO2 monitoring."
+  is_canonical: true
+  implements:
+  - FCU
+  - DFSS
+  - DSP
+  - HWZC
+  - CHWZC
+  - CO2M
 ###################################
 ### Existing Non-standard Types ###
 ###################################

diff --git a/ontology/yaml/resources/HVAC/entity_types/VAV.yaml b/ontology/yaml/resources/HVAC/entity_types/VAV.yaml
@@ -21,6 +21,14 @@
 # Some exceptions may exist for the control method (e.g. VAV_ED), and
 # should be avoided if possible.
 
+VAV_SD:
+  guid: "7c7d4347-7604-4baf-81fa-b3bbd19f7880"
+  description: "Simple VAV with basic airflow control and no temperature control."
+  is_canonical: true
+  implements:
+  - VAV
+  - SD
+
 VAV_SD_CSP:
   guid: "89fa1c88-ffc3-4b62-a3bf-e185926b1d4f"
   description: "Simple IDF room unit."
@@ -373,6 +381,19 @@ VAV_PDSCV_CO2C_VOCPC_ZHM_RMM:
   - ZHM
   - RMM
 
+VAV_SD_DSP_HWDC_MSSPC_CO2C_ZHM2X:
+  guid: "bfc7f274-0d33-457d-bfb9-6f9eef55de2c"
+  description: "Single duct reheat VAV with CO2, temp, minimum supply air static pressure control and zone humidity monitoring."
+  is_canonical: true
+  implements:
+  - VAV
+  - SD
+  - DSP
+  - HWDC
+  - MSSPC
+  - CO2C
+  - ZHM2X
+
 VAV_ED_RMM:
   guid: "271eb93a-f6f3-4b1e-9cda-a681bc9fb31a"
   description: "Exhaust control VAV."
@@ -671,6 +692,38 @@ VAV_SD_DTM:
   - SD
   - DTM
 
+VAV_DSP_DFSS_DFVSC:
+  guid: "1ebe9a29-9650-4e84-978a-b86b70cb3862"
+  description: "Fan powered VAV with variable speed control and dual zone temperature setpoints."
+  is_canonical: true
+  implements:
+  - VAV
+  - DSP
+  - DFSS
+  - DFVSC
+
+VAV_DSP_HTZC_DFSS_DFVSC: 
+  guid: "2d73d3ca-836b-43e2-b474-5262a9cf5e52"
+  description: "Fan powered VAV with variable speed control and electric heating controlling to dual zone temperature setpoints."
+  is_canonical: true
+  implements:
+  - VAV
+  - DSP
+  - HTZC
+  - DFSS
+  - DFVSC
+
+VAV_DFSS_DFVSC_DSP_HWZC:
+  guid: "e469b8c9-3f77-4fce-afdf-128837dd0941"
+  description: "Fan powered VAV with variable speed control and hydronic heating controlling to dual zone temperature." 
+  is_canonical: true
+  implements:
+  - VAV
+  - DFSS
+  - DFVSC
+  - DSP
+  - HWZC
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################

diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -3352,3 +3352,24 @@ literals:
 - low_heating_supply_water_temperature_alarm:
   - ACTIVE
   - INACTIVE
+- isolation_damper_percentage_command:
+    fixed_min: 0.0
+    fixed_max: 100.0
+- failed_isolation_damper_alarm:
+  - ACTIVE
+  - INACTIVE
+- failed_zone_air_refrigerant_concentration_alarm:
+  - ACTIVE
+  - INACTIVE
+- failed_zone_air_co_concentration_alarm:
+  - ACTIVE
+  - INACTIVE
+- failed_zone_air_relative_humidity_alarm:
+  - ACTIVE
+  - INACTIVE
+- failed_supply_air_damper_alarm:
+  - ACTIVE
+  - INACTIVE
+- low_limit_supply_air_static_pressure_setpoint:
+    flexible_min: -249.080024
+    flexible_max: 249.080024