Merge pull request #1272 from evgeniya-engel/master

New AHU and MAU types
google · Feb 21, 2024 · da1f472 · da1f472
2 parents e98555c + 307d7b7
commit da1f472
Show file tree

Hide file tree

Showing 4 changed files with 226 additions and 3 deletions.
diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -107,6 +107,8 @@ MOAFC:
   - ventilation_request_count
   - low_ventilation_outside_air_flowrate_alarm
   - failed_ventilation_outside_air_flowrate_alarm
+  - failed_ventilation_outside_air_damper_alarm
+  - ventilation_outside_air_damper_percentage_sensor
   uses:
   - ventilation_outside_air_damper_percentage_command
   - ventilation_outside_air_flowrate_sensor
@@ -390,10 +392,28 @@ EDPM:
   guid: "6051d016-4a78-42f4-aeaf-3701417b8773"
   description: "Exhaust air damper percentage monitoring."
   is_abstract: true
+  implements:
+  - MONITORING
+  opt_uses:
+  - failed_exhaust_air_damper_alarm
   uses:
   - exhaust_air_damper_percentage_command
   - exhaust_air_damper_percentage_sensor
 
+EDPM2X:
+  guid: "20f6ee70-f651-4c3b-a528-7750ef5f6001"
+  description: "Dual exhaust air damper percentage monitoring."
+  is_abstract: true
+  implements:
+  - MONITORING
+  opt_uses:
+  - failed_exhaust_air_damper_alarm_1
+  - failed_exhaust_air_damper_alarm_2
+  uses:
+  - exhaust_air_damper_percentage_command_1
+  - exhaust_air_damper_percentage_command_2
+  - exhaust_air_damper_percentage_sensor_1
+  - exhaust_air_damper_percentage_sensor_2
 
 EDM:
   guid: "e765d413-988e-4524-99b6-9869cff2f02e"
@@ -899,6 +919,18 @@ LCC2X:
   - CONTROL
 
 
+LHC:
+  guid: "df1b4263-c5c1-4c30-bf64-04de04f8a013"
+  description: "Leaving heating coil temperature control."
+  is_abstract: true
+  uses:
+  - heating_water_valve_percentage_command
+  - leaving_heating_coil_temperature_sensor
+  - leaving_heating_coil_temperature_setpoint
+  implements:
+  - CONTROL
+
+
 SFSS:
   guid: "1e8dd2f7-192a-430b-af2c-db6065664deb"
   description: "Basic combination of supply fan run command and status (start/stop)."
@@ -1311,6 +1343,9 @@ RD:
   guid: "0aecbeb0-8b01-44a2-a0b6-027a034fb2a5"
   description: "Return damper flow control."
   is_abstract: true
+  opt_uses:
+  - return_air_damper_percentage_sensor
+  - failed_return_air_damper_alarm
   uses:
   - return_air_damper_percentage_command
   - return_air_flowrate_sensor
@@ -1441,6 +1476,20 @@ RHDHC:
   implements:
   - CONTROL
 
+DH2XSDPC:
+  guid: "2e83d32e-360e-4ac2-afa4-5adb333ded0b"
+  description: "Supply air dewpoint temperature dehumidification control on dual cooling coil."
+  is_abstract: true
+  opt_uses:
+  - supply_air_relative_humidity_sensor
+  uses:
+  - dehumidification_run_command
+  - chilled_water_valve_percentage_command_1
+  - chilled_water_valve_percentage_command_2
+  - supply_air_dewpoint_temperature_sensor
+  - supply_air_dewpoint_temperature_setpoint
+  implements:
+  - CONTROL
 
 ZHDHC:
   guid: "0d8a499a-4934-4860-9d35-277381890e2d"
@@ -1494,6 +1543,10 @@ SHM:
   guid: "9b5089f5-e0a1-420d-bad9-682ac34d2516"
   description: "Supply air relative humidity monitoring."
   is_abstract: true
+  opt_uses:
+  - high_supply_air_relative_humidity_alarm
+  - low_supply_air_relative_humidity_alarm
+  - failed_supply_air_relative_humidity_alarm
   uses:
   - supply_air_relative_humidity_sensor
   implements:
@@ -1870,6 +1923,7 @@ CHWSC:
   - cooling_request_count
   - cooling_thermal_power_capacity
   - leaving_cooling_coil_temperature_sensor
+  - failed_leaving_cooling_coil_temperature_alarm
   - supply_air_relative_humidity_sensor
   - failed_supply_air_temperature_alarm
   - high_supply_air_temperature_alarm
@@ -1906,13 +1960,20 @@ CHW2XSC:
   description: "Two chilled water valves."
   is_abstract: true
   opt_uses:
-  - chilled_supply_water_temperature_sensor
-  - chilled_water_valve_percentage_sensor
   - cooling_request_count
   - cooling_thermal_power_capacity
+  - chilled_supply_water_temperature_sensor
+  - chilled_water_valve_percentage_sensor
+  - chilled_water_valve_percentage_sensor_1
+  - chilled_water_valve_percentage_sensor_2
   - leaving_cooling_coil_temperature_sensor
+  - leaving_cooling_coil_temperature_sensor_1
+  - leaving_cooling_coil_temperature_sensor_2
+  - failed_leaving_cooling_coil_temperature_alarm_1
+  - failed_leaving_cooling_coil_temperature_alarm_2
   - high_supply_air_temperature_alarm
   - low_supply_air_temperature_alarm
+  - failed_supply_air_temperature_alarm
   uses:
   - chilled_water_valve_percentage_command_1
   - chilled_water_valve_percentage_command_2
@@ -4319,6 +4380,10 @@ SFVSC2X:
   - supply_fan_speed_frequency_sensor_2
   - supply_fan_speed_percentage_sensor_1
   - supply_fan_speed_percentage_sensor_2
+  - supply_fan_torque_sensor_1
+  - supply_fan_torque_sensor_2
+  - supply_fan_voltage_sensor_1
+  - supply_fan_voltage_sensor_2
   uses:
   - supply_fan_run_command_1
   - supply_fan_run_command_2
@@ -5393,6 +5458,7 @@ UV:
   is_abstract: true
   opt_uses:
   - ultraviolet_lamp_run_mode
+  - failed_ultraviolet_lamp_alarm
   uses:
   - ultraviolet_lamp_run_command
   - ultraviolet_lamp_run_status
@@ -7018,6 +7084,8 @@ RFVSC:
   opt_uses:
   - return_fan_current_sensor
   - return_fan_power_sensor
+  - return_fan_voltage_sensor
+  - return_fan_torque_sensor
   - return_fan_speed_frequency_sensor
   - return_fan_speed_percentage_sensor
   uses:
@@ -7027,7 +7095,6 @@ RFVSC:
   implements:
   - OPERATIONAL
 
-
 RFVSC2X:
   guid: "3326bd01-506e-4dba-a410-9a34252b2d59"
   description: "Return fan variable speed control with feedback and sensoring for two fans."
@@ -7037,6 +7104,10 @@ RFVSC2X:
   - return_fan_current_sensor_2
   - return_fan_power_sensor_1
   - return_fan_power_sensor_2
+  - return_fan_voltage_sensor_1
+  - return_fan_voltage_sensor_2
+  - return_fan_torque_sensor_1
+  - return_fan_torque_sensor_2
   - return_fan_speed_frequency_sensor_1
   - return_fan_speed_frequency_sensor_2
   - return_fan_speed_percentage_sensor_1

diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
@@ -4403,6 +4403,110 @@ AHU_SFSS_SFVSC_EFSS_EFVSC_CHWSC_HWSC_ECON_EDBPC_SARC_SSPC_OAFMC:
   - SSPC
   - OAFMC
 
+AHU_SFSS2X_SFVSC2X_RFSS2X_RFVSC2X_LHC_CHW2XSC_DH2XSDPC_SSPC_SARC_MOAFC_ECON_EDPM2X_RD_UV_SHM:
+  guid: "da6d6f64-ca90-4a5c-bf20-275779b58e23"
+  description: "Multi-zone AHU with dual supply and return fans, dual chilled water coil cooling and dehumidification control, leaving temperature heating water valve control, dual exhaust damper monitoring, minimum ventilation control, return damper flow control, ultraviolet lamp and supply air humidity monitoring."
+  is_canonical: true
+  implements:
+  - AHU
+  - SFSS2X
+  - SFVSC2X
+  - RFSS2X
+  - RFVSC2X
+  - LHC
+  - CHW2XSC
+  - DH2XSDPC
+  - SSPC
+  - SARC
+  - MOAFC
+  - ECON
+  - EDPM2X
+  - RD
+  - UV
+  - SHM
+
+AHU_SFSS2X_SFVSC2X_RFSS2X_RFVSC2X_CHW2XSC_DH2XSDPC_SSPC_SARC_MOAFC_ECON_EDPM2X_RD_UV_SHM:
+  guid: "5acb1bda-0e3f-4f33-8c1f-ee64be72cf1d"
+  description: "Multi-zone AHU with dual supply and return fans, dual chilled water coil cooling and dehumidification control, dual exhaust damper, minimum ventilation control, return damper flow control, ultraviolet lamp and supply air humidity monitoring."
+  is_canonical: true
+  implements:
+  - AHU
+  - SFSS2X
+  - SFVSC2X
+  - RFSS2X
+  - RFVSC2X
+  - CHW2XSC
+  - DH2XSDPC
+  - SSPC
+  - SARC
+  - MOAFC
+  - ECON
+  - EDPM2X
+  - RD
+  - UV
+  - SHM
+
+AHU_SFSS2X_SFVSC2X_RFSS2X_RFVSC2X_LHC_CHW2XSC_DH2XSDPC_SSPC_SARC_MOAFC_ECON_EDPM_RD_UV_SHM:
+  guid: "136897bb-8b58-47cb-aeff-4d1a9518dcc8"
+  description: "Multi-zone AHU with dual supply and return fans, dual chilled water coil cooling and dehumidification control, leaving temperature heating water valve control, exhaust damper monitoring, minimum ventilation control, return damper flow control, ultraviolet lamp and supply air humidity monitoring."
+  is_canonical: true
+  implements:
+  - AHU
+  - SFSS2X
+  - SFVSC2X
+  - RFSS2X
+  - RFVSC2X
+  - LHC
+  - CHW2XSC
+  - DH2XSDPC
+  - SSPC
+  - SARC
+  - MOAFC
+  - ECON
+  - EDPM
+  - RD
+  - UV
+  - SHM
+
+AHU_SFSS_SFVSC_RFSS_RFVSC_HWSC_CHWSC_SSPC_SARC_MOAFC_ECON_EDPM_RD_UV:
+  guid: "db33e650-dda4-43f6-bbc5-1844d6b97a0b"
+  description: "Multi-zone AHU with supply and return fans, chilled and heating water valve control, exhaust damper monitoring, minimum ventilation control, return damper flow control and ultraviolet lamp."
+  is_canonical: true
+  implements:
+  - AHU
+  - SFSS
+  - SFVSC
+  - RFSS
+  - RFVSC
+  - HWSC
+  - CHWSC
+  - SSPC
+  - SARC
+  - MOAFC
+  - ECON
+  - EDPM
+  - RD
+  - UV
+
+AHU_SFSS2X_SFVSC2X_RFSS2X_RFVSC2X_HWSC_CHWSC_SSPC_MOAFC_ECON_EDPM_RD_UV:
+  guid: "09017cb5-0a96-49e6-ba9a-b4a7004eee1f"
+  description: "Multi-zone AHU with dual supply and return fans, chilled and heating water valve control, exhaust damper monitoring, minimum ventilation control, return damper flow control and ultraviolet lamp."
+  is_canonical: true
+  implements:
+  - AHU
+  - SFSS2X
+  - SFVSC2X
+  - RFSS2X
+  - RFVSC2X
+  - HWSC
+  - CHWSC
+  - SSPC
+  - MOAFC
+  - ECON
+  - EDPM
+  - RD
+  - UV
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################

diff --git a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
@@ -743,6 +743,21 @@ MAU_DFSS_DFVSC_DSP_CHWZC_HWZC_OADM:
   opt_uses:
   - smoke_alarm
 
+MAU_SFSS2X_SFVSC2X_PHWSC_LCC_HWSC_SSPC_UV_SHM:
+  guid: "dc62c78a-d25b-470f-be3a-c40c1e457b6e"
+  description: "Multi-zone MAU with preheating water control, chilled water coil control, heating water valve monitoring, and supply air static pressure control"
+  is_canonical: true
+  implements:
+  - MAU
+  - SFSS2X
+  - SFVSC2X
+  - PHWSC
+  - LCC
+  - HWSC
+  - SSPC
+  - UV
+  - SHM
+
 ############################
 ###   Remap These Types  ###
 ############################

diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -316,6 +316,9 @@ literals:
 - return_fan_current_sensor:
     fixed_min: 0.0
     flexible_max: 500.0
+- return_fan_voltage_sensor:
+    flexible_min: 0.0
+    flexible_max: 500.0
 - return_fan_power_sensor:
     flexible_min: 0.0
     flexible_max: 100000.0
@@ -642,6 +645,9 @@ literals:
 - leaving_heating_coil_temperature_sensor:
     flexible_min: 255.9259259
     flexible_max: 338.7037037
+- leaving_heating_coil_temperature_setpoint:
+    flexible_min: 255.9259259
+    flexible_max: 338.7037037
 - low_discharge_fan_speed_command:
   - ON
   - OFF
@@ -669,6 +675,9 @@ literals:
 - outside_air_damper_percentage_sensor:
     fixed_min: 0.0
     fixed_max: 100.0
+- ventilation_outside_air_damper_percentage_sensor:
+    fixed_min: 0.0
+    fixed_max: 100.0
 - outside_air_dewpoint_temperature_sensor:
     flexible_min: 255.9259259
     flexible_max: 310.9259259
@@ -1817,6 +1826,15 @@ literals:
 - low_return_air_temperature_alarm:
   - ACTIVE
   - INACTIVE
+- high_supply_air_relative_humidity_alarm:
+  - ACTIVE
+  - INACTIVE
+- low_supply_air_relative_humidity_alarm:
+  - ACTIVE
+  - INACTIVE
+- failed_supply_air_relative_humidity_alarm:
+  - ACTIVE
+  - INACTIVE
 - high_return_air_relative_humidity_alarm:
   - ACTIVE
   - INACTIVE
@@ -3042,6 +3060,9 @@ literals:
 - failed_supply_air_temperature_alarm:
   - ACTIVE
   - INACTIVE
+- failed_leaving_cooling_coil_temperature_alarm:
+  - ACTIVE
+  - INACTIVE
 - failed_bypass_valve_alarm:
   - ACTIVE
   - INACTIVE
@@ -3087,6 +3108,15 @@ literals:
 - failed_outside_air_damper_alarm:
   - ACTIVE
   - INACTIVE
+- failed_return_air_damper_alarm:
+  - ACTIVE
+  - INACTIVE
+- failed_exhaust_air_damper_alarm:
+  - ACTIVE
+  - INACTIVE
+- failed_ventilation_outside_air_damper_alarm:
+  - ACTIVE
+  - INACTIVE
 - failed_outside_air_flowrate_alarm:
   - ACTIVE
   - INACTIVE
@@ -3108,6 +3138,9 @@ literals:
 - failed_zone_air_temperature_alarm:
   - ACTIVE
   - INACTIVE
+- failed_ultraviolet_lamp_alarm:
+  - ACTIVE
+  - INACTIVE
 - high_differential_pressure_alarm:
   - ACTIVE
   - INACTIVE