Merge pull request #1386 from DaoChen701/master

Add a new abstract to a new AHU type
google · Aug 15, 2024 · c816b63 · c816b63
2 parents 14d808a + 8fc8ac9
commit c816b63
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 0 deletions.
diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -2518,6 +2518,8 @@ DX2SC:
   is_abstract: true
   opt_uses:
   - compressor_speed_percentage_command
+  - compressor_speed_percentage_command_1
+  - compressor_speed_percentage_command_2
   - cooling_percentage_command
   - cooling_request_count
   - cooling_thermal_power_capacity
@@ -2569,6 +2571,10 @@ DX4SC:
   is_abstract: true
   opt_uses:
   - compressor_speed_percentage_command
+  - compressor_speed_percentage_command_1
+  - compressor_speed_percentage_command_2
+  - compressor_speed_percentage_command_3
+  - compressor_speed_percentage_command_4
   - cooling_percentage_command
   - cooling_request_count
   - cooling_thermal_power_capacity
@@ -4374,6 +4380,8 @@ EFSS2X:
   - exhaust_fan_power_capacity
   - exhaust_fan_power_sensor_1
   - exhaust_fan_power_sensor_2
+  - failed_exhaust_fan_alarm_1
+  - failed_exhaust_fan_alarm_2
   uses:
   - exhaust_fan_run_command_1
   - exhaust_fan_run_command_2
@@ -6054,6 +6062,9 @@ HTWHLSTC:
   implements:
   - CONTROL
   opt_uses:
+  - leaving_heat_wheel_temperature_sensor
+  - high_leaving_heat_wheel_temperature_alarm
+  - low_leaving_heat_wheel_temperature_alarm
   - exhaust_air_temperature_sensor
   - heat_wheel_speed_percentage_sensor
   - return_air_temperature_sensor

diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
@@ -5428,6 +5428,22 @@ AHU_STDSPC_SSPC_EFFC_EFVSC_FDPM3X_HTWHLSTC_RHM_ETM:
   - exhaust_air_isolation_damper_command
   - exhaust_air_isolation_damper_status
 
+AHU_SFSS_SFVSC_EFSS_EFVSC_EDBPC_DX2SC_ECON_SSPC_SARC:
+  guid: "0df5aeb5-fe49-43f7-84f6-b0ddb1156c31"
+  description: "AHU with supply and exhaust fans, two stage compressor, building pressure control"
+  is_canonical: true
+  implements:
+  - AHU
+  - SFSS
+  - SFVSC
+  - EFSS
+  - EFVSC
+  - EDBPC
+  - DX2SC
+  - ECON
+  - SSPC
+  - SARC
+
 AHU_BSPC_DX4SC_ECON_EFSS_EFVSC_SFSS_SFVSC_SSPC_RHHC_NONCANONICAL_1:
   guid: "4f641024-9959-4ab3-9869-97fdf93ed47b"
   description: "Non-Standard AHU with humidification and heating water coils on return duct."

diff --git a/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml b/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml
@@ -219,3 +219,19 @@ DOAS_SFVSC_EFVSC_HTWHLSTC_CHWVM_HWVM_SFM_FDPSM_ACO2C_SDM2X_EDM2X:
   - SDM2X
   - EDM2X
 
+DOAS_SFSS2X_SFVSC2X_EFSS2X_EFVSC2X_DX4SC_EDBPC_SSPC_SARC_VOADM_HTWHLSTC:
+  guid: "a3451f6d-f562-4715-85be-2d169b4dc3cb"
+  description: "DOAS with dual supply and exhaust fans, four stage compressor, building pressure control and energy recovery wheel"
+  is_canonical: true
+  implements:
+  - DOAS
+  - SFSS2X
+  - SFVSC2X
+  - EFSS2X
+  - EFVSC2X
+  - EDBPC
+  - DX4SC
+  - SSPC
+  - SARC
+  - VOADM
+  - HTWHLSTC
diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -2247,6 +2247,15 @@ literals:
 - heat_wheel_run_status:
   - ON
   - OFF
+- leaving_heat_wheel_temperature_sensor:
+    flexible_min: 255.9259259
+    flexible_max: 338.7037037
+- high_leaving_heat_wheel_temperature_alarm:
+  - ACTIVE
+  - INACTIVE
+- low_leaving_heat_wheel_temperature_alarm:
+  - ACTIVE
+  - INACTIVE
 - outside_air_isolation_damper_command:
   - OPEN
   - CLOSED