New fields, abstract, FCU, CHW, CDW types

evgeniya-engel · Jun 17, 2024 · f7cf626 · f7cf626
1 parent 97efde3
commit f7cf626
Show file tree

Hide file tree

Showing 6 changed files with 108 additions and 0 deletions.
diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -1000,6 +1000,7 @@ RTM:
   implements:
   - MONITORING
   opt_uses:
+  - failed_return_air_temperature_sensor
   - return_air_relative_humidity_sensor
   - return_air_specificenthalpy_sensor
   - high_return_air_relative_humidity_alarm
@@ -1010,6 +1011,32 @@ RTM:
   - return_air_temperature_sensor
 
 
+HATM2X:
+  description: "Dual sensor hot aisle temperature monitoring"
+  is_abstract: true
+  implements:
+  - MONITORING
+  opt_uses:
+  - failed_hot_aisle_air_temperature_alarm_1
+  - failed_hot_aisle_air_temperature_alarm_2
+  uses:
+  - hot_aisle_air_temperature_sensor_1
+  - hot_aisle_air_temperature_sensor_2
+
+
+CATM2X:
+  description: "Dual sensor cold aisle temperature monitoring"
+  is_abstract: true
+  implements:
+  - MONITORING
+  opt_uses:
+  - failed_cold_aisle_air_temperature_alarm_1
+  - failed_cold_aisle_air_temperature_alarm_2
+  uses:
+  - cold_aisle_air_temperature_sensor_1
+  - cold_aisle_air_temperature_sensor_2
+
+
 DTC:
   guid: "fa2354f6-694c-4fd6-b5b5-6352eff50fe4"
   description: "Discharge air temperature control"
@@ -4754,6 +4781,8 @@ CHWSWISOVPM:
   guid: "5f1963bf-1148-4881-8c6f-a20b39600e7e"
   description: "Supply side isolation valve monitoring."
   is_abstract: true
+  opt_uses:
+  - failed_chilled_supply_water_isolation_valve_alarm
   uses:
   - chilled_supply_water_isolation_valve_percentage_command
   - chilled_supply_water_isolation_valve_percentage_sensor
@@ -7752,6 +7781,7 @@ WSEBYPVPM:
   description: "Water side economizer bypass valve monitoring."
   is_abstract: true
   opt_uses:
+  - economizer_mode
   - economizer_bypass_valve_percentage_sensor
   - failed_economizer_bypass_valve_alarm
   uses:
@@ -7816,6 +7846,17 @@ BWFRM:
   implements:
   - MONITORING
 
+BWECM:
+  description: "Blowdown water electricconductivity monitoring."
+  is_abstract: true
+  opt_uses:
+  - high_blowdown_water_electricconductivity_alarm
+  uses:
+  - blowdown_water_electricconductivity_sensor
+  - blowdown_water_electricconductivity_setpoint
+  implements:
+  - MONITORING
+
 BWECVC:
   guid: "2ebf7b84-a26f-4238-90c0-a630c753883b"
   description: "Blowdown water electricconductivity drain valve control."

diff --git a/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml
@@ -178,6 +178,15 @@ CDWS_SWTC_CMWDT_BYPVPM_BWECVC_BWFRM_MWFRM:
   - BWFRM
   - MWFRM
 
+CDWS_SWTC_WSEBYPVPM_BWECM:
+  description: "Condensing water system with ."
+  is_canonical: true
+  implements:
+  - CDWS
+  - SWTC
+  - WSEBYPVPM
+  - BWECM
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################

diff --git a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
@@ -362,6 +362,15 @@ CHWS_SWTC_WDPC_WFRM_CMSWFRM_BYPVPM_WSEBYPVPM_WSERWTM:
   - WSERWTM
 
 
+CHWS_SWTC_WDPC_BYPVPM_WSEBYPVPM:
+  description: "."
+  implements:
+  - CHWS
+  - SWTC
+  - WDPC
+  - BYPVPM
+  - WSEBYPVPM
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################
@@ -380,6 +389,19 @@ CHWS_SWTC_WDPC_BYPVPM_NONCANONICAL_1:
   - west_flowrate_sensor
   - east_flowrate_sensor
 
+CHWS_SWTC_WDPC_BYPVPM_WSEBYPVPM_NONCANONICAL_1:
+  description: "Non-standard type."
+  implements:
+  - CHWS_SWTC_WDPC_BYPVPM_WSEBYPVPM
+  - INCOMPLETE
+  uses:
+  - west_supply_water_temperature_sensor
+  - east_supply_water_temperature_sensor
+  - west_differential_pressure_sensor
+  - east_differential_pressure_sensor
+  - west_flowrate_sensor
+  - east_flowrate_sensor
+
 CHWS_SWTC_WDPC2X_BYPVPM_WFRM_NONCANONICAL_1:
   guid: "b4e9ea71-b415-4fb8-a1b6-b282c1397b30"
   description: "Non-standard type."

diff --git a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
@@ -1503,6 +1503,18 @@ FCU_DFSS_RHDHC_HT2RC_DX2RC_ZTM:
   - DX2RC
   - ZTM
 
+FCU_DFSS_CSP_DX4ZC_RTM_CATM2X_HATM2X:
+  description: "Fan coil with 4-stage compressor, cold and hot aisle temperature monitoring and return temperature monitoring."
+  is_canonical: true
+  implements:
+  - FCU
+  - DFSS
+  - CSP
+  - DX4ZC
+  - RTM
+  - CATM2X
+  - HATM2X
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################

diff --git a/ontology/yaml/resources/HVAC/entity_types/HX.yaml b/ontology/yaml/resources/HVAC/entity_types/HX.yaml
@@ -177,6 +177,21 @@ HX_CWDT_CHWDT_CWBYPVPM_CHWBYPVPM:
   - CWBYPVPM
   - CHWBYPVPM
 
+HX_CWDT_SCHWTC_CHWFRM_CWSISOVPM_CWBYPVPM_CHWSWISOVPM_CHWBYPVPM_CWDPM:
+  description: "Condenser and chilled water heat exchanger with isolation and bypass valves, chilled supply water temperature control, chilled water flowrate monitoring and condensing water differential pressure monitoring."
+  is_canonical: true
+  implements:
+  - HX
+  - CWDT
+  - SCHWTC
+  - CHWFRM
+  - CWSISOVPM
+  - CWBYPVPM
+  - CHWSWISOVPM
+  - CHWBYPVPM
+  - CWDPM
+
+
 HX_CWDT_HSWTC_HWDPC_HWBYPVPM:
   guid: "909f4f23-f71d-4504-8052-efb435356e29"
   description: "Condenser and heating water heat exchanger with heating water bypass valve, heating supply water valve control and heating water temperature differentioal control."

diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -3141,6 +3141,12 @@ literals:
 - failed_leaving_cooling_coil_temperature_alarm:
   - ACTIVE
   - INACTIVE
+- failed_hot_aisle_air_temperature_alarm:
+  - ACTIVE
+  - INACTIVE
+- failed_cold_aisle_air_temperature_alarm:
+  - ACTIVE
+  - INACTIVE
 - failed_bypass_valve_alarm:
   - ACTIVE
   - INACTIVE
@@ -3180,6 +3186,9 @@ literals:
 - failed_condensing_return_water_isolation_valve_alarm:
   - ACTIVE
   - INACTIVE
+- failed_return_air_temperature_sensor:
+  - ACTIVE
+  - INACTIVE
 - failed_mixed_air_temperature_alarm:
   - ACTIVE
   - INACTIVE