Merge pull request google#1185 from evgeniya-engel/master

New subfields, fields, abstracts, canonical types and a general type.
onboard-data · Nov 22, 2023 · ec21f81 · ec21f81
2 parents ea8db32 + 433703b
commit ec21f81
Show file tree

Hide file tree

Showing 19 changed files with 750 additions and 10 deletions.
diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -145,6 +145,8 @@ REFM:
   is_abstract: true
   implements:
   - MONITORING
+  opt_uses:
+  - high_zone_air_refrigerant_concentration_alarm
   uses:
   - zone_air_refrigerant_concentration_sensor
 
@@ -263,6 +265,8 @@ DSP:
   opt_uses:
   - discharge_air_temperature_sensor
   - zone_air_relative_humidity_sensor
+  - high_zone_air_relative_humidity_alarm
+  - low_zone_air_relative_humidity_alarm
   - failed_discharge_air_temperature_alarm
   - failed_zone_air_temperature_alarm
   - high_zone_air_temperature_alarm
@@ -1470,6 +1474,8 @@ EPC:
   - exhaust_air_static_pressure_setpoint
   opt_uses:
   - exhaust_air_flowrate_sensor
+  - high_exhaust_air_static_pressure_alarm
+  - low_exhaust_air_static_pressure_alarm
   implements:
   - OPERATIONAL
 
@@ -1759,6 +1765,7 @@ CHWDC:
   - cooling_thermal_power_capacity
   - leaving_cooling_coil_temperature_sensor
   - failed_discharge_air_temperature_alarm
+  - failed_chilled_water_valve_alarm
   uses:
   - chilled_water_valve_percentage_command
   - discharge_air_temperature_sensor
@@ -1866,6 +1873,7 @@ CHWZC:
   - leaving_cooling_coil_temperature_sensor
   - failed_discharge_air_temperature_alarm
   - failed_zone_air_temperature_alarm
+  - failed_chilled_water_valve_alarm
   - high_zone_air_temperature_alarm
   - low_zone_air_temperature_alarm
   uses:
@@ -2702,6 +2710,7 @@ HWZC:
   - failed_zone_air_temperature_alarm
   - high_zone_air_temperature_alarm
   - low_zone_air_temperature_alarm
+  - failed_heating_water_valve_alarm
   uses:
   - heating_water_valve_percentage_command
   - zone_air_heating_temperature_setpoint
@@ -3139,6 +3148,8 @@ ECON:
   opt_uses:
   - low_limit_outside_air_damper_percentage_command
   - outside_air_damper_percentage_sensor
+  - failed_outside_air_damper_alarm
+  - failed_outside_air_flowrate_alarm
   - outside_air_flowrate_sensor
   - outside_air_flowrate_setpoint
   - outside_air_relative_humidity_sensor
@@ -3308,6 +3319,7 @@ VOADM:
   - mixed_air_temperature_sensor
   - outside_air_damper_percentage_sensor
   - failed_mixed_air_temperature_alarm
+  - failed_outside_air_damper_alarm
   uses:
   - outside_air_damper_percentage_command
   - outside_air_temperature_sensor
@@ -3332,6 +3344,7 @@ OAFM:
   opt_uses:
   - outside_air_damper_percentage_sensor
   - outside_air_temperature_sensor
+  - failed_outside_air_flowrate_alarm
   uses:
   - outside_air_flowrate_sensor
   implements:
@@ -3519,6 +3532,7 @@ BYPVPM:
   is_abstract: true
   opt_uses:
   - bypass_valve_percentage_sensor
+  - failed_bypass_valve_alarm
   uses:
   - bypass_valve_percentage_command
   implements:
@@ -3615,18 +3629,18 @@ CHWBZC:
   - high_zone_air_temperature_alarm
   - low_zone_air_temperature_alarm
 
-
 CHWBYPVPM:
   guid: "68cd5104-bf2e-48f3-8b88-c12192509393"
   description: "Chilled water bypass valve percentage monitoring."
   is_abstract: true
+  opt_uses:
+  - failed_chilled_water_bypass_valve_alarm
   uses:
   - chilled_water_bypass_valve_percentage_command
   - chilled_water_bypass_valve_percentage_sensor
   implements:
   - MONITORING
 
-
 MXVPM:
   guid: "4bb25777-d661-4fd3-9f8f-a84b349ada87"
   description: "Mixing valve percent monitoring."
@@ -4268,13 +4282,16 @@ SWISOVM:
   - MONITORING
   opt_uses:
   - failed_isolation_valve_alarm
+  - failed_supply_water_isolation_valve_alarm
   - local_override_isolation_valve_alarm
 
 
 SWISOVPM:
   guid: "33856563-ebe5-42ee-a928-e8b46d81772d"
   description: "Supply side isolation valve monitoring."
   is_abstract: true
+  opt_uses:
+  - failed_supply_water_isolation_valve_alarm
   uses:
   - supply_water_isolation_valve_percentage_command
   - supply_water_isolation_valve_percentage_sensor
@@ -4286,6 +4303,8 @@ RWISOVM:
   guid: "2d35bbb0-bcad-4f36-a8cb-0c9031d81886"
   description: "Return side isolation valve monitoring."
   is_abstract: true
+  opt_uses:
+  - failed_return_water_isolation_valve_alarm
   uses:
   - return_water_isolation_valve_command
   - return_water_isolation_valve_status
@@ -4353,6 +4372,8 @@ CHWSWISOVM:
   guid: "1a187792-767f-4132-9333-161c6db07ce4"
   description: "Supply side isolation valve monitoring."
   is_abstract: true
+  opt_uses:
+  - failed_chilled_supply_water_isolation_valve_alarm
   uses:
   - chilled_supply_water_isolation_valve_command
   - chilled_supply_water_isolation_valve_status
@@ -4446,6 +4467,8 @@ CWRISOVM:
   guid: "cb8b8c1e-30c2-48fc-b6c0-44d73468d994"
   description: "Condensing water return isolation monitoring."
   is_abstract: true
+  opt_uses:
+  - failed_condensing_return_water_isolation_valve_alarm
   uses:
   - condensing_return_water_isolation_valve_command
   - condensing_return_water_isolation_valve_status
@@ -4457,6 +4480,8 @@ CWSISOVPM:
   guid: "3221aa75-8df4-4964-82dd-9a5c59c3a73b"
   description: "Condensing water supply isolation monitoring."
   is_abstract: true
+  opt_uses:
+  - failed_condensing_supply_water_isolation_valve_alarm
   uses:
   - condensing_supply_water_isolation_valve_percentage_command
   - condensing_supply_water_isolation_valve_percentage_sensor
@@ -4468,6 +4493,8 @@ CWSISOVM:
   guid: "6284c4c0-1261-44f7-bebb-ab6aa11443ca"
   description: "Condensing water supply isolation monitoring."
   is_abstract: true
+  opt_uses:
+  - failed_condensing_supply_water_isolation_valve_alarm
   uses:
   - condensing_supply_water_isolation_valve_command
   - condensing_supply_water_isolation_valve_status
@@ -6933,3 +6960,214 @@ PMDM:
   - zone_air_pm10pt0_density_sensor
   implements:
   - MONITORING
+
+HSWTC:
+  guid: "d9cf672c-8081-4e2b-9bba-599d8ac2bbd2"
+  description: "Heating supply water temperature control."
+  is_abstract: true
+  opt_uses:
+  - heating_supply_water_valve_percentage_sensor
+  - heating_return_water_temperature_sensor
+  - failed_heating_supply_water_valve_alarm
+  uses:
+  - heating_supply_water_valve_percentage_command
+  - heating_supply_water_temperature_sensor
+  - heating_supply_water_temperature_setpoint
+  implements:
+  - CONTROL
+
+WSEBYPVPM:
+  guid: "70e5c471-4b14-4d81-8bf2-ec8dcfbb29dd"
+  description: "Water side economizer bypass valve monitoring."
+  is_abstract: true
+  opt_uses:
+  - economizer_bypass_valve_percentage_sensor
+  - failed_economizer_bypass_valve_alarm
+  uses:
+  - economizer_bypass_valve_percentage_command
+  implements:
+  - MONITORING
+
+FSWISOVM:
+  guid: "58f0a5fb-fc3e-4384-91b1-ba7db225ec6c"
+  description: "Filtration supply isolation valve monitoring."
+  is_abstract: true
+  uses:
+  - filtration_supply_water_isolation_valve_command
+  implements:
+  - MONITORING
+
+FRWISOVM:
+  guid: "6d8a9548-5879-493a-a991-cd3ed3eb80ac"
+  description: "Filtration return isolation valve monitoring."
+  is_abstract: true
+  uses:
+  - filtration_return_water_isolation_valve_command
+  implements:
+  - MONITORING
+
+PRWFRM:
+  guid: "d24ca9da-2897-42ba-9010-59b65971613d"
+  description: "Primary supply water flowrate monitoring"
+  uses:
+  - primary_supply_water_flowrate_sensor
+  implements:
+  - MONITORING
+
+SEWFRM:
+  guid: "de0de0fc-e634-4bbc-8ecc-4d413614c84d"
+  description: "Secondary supply water flowrate monitoring"
+  uses:
+  - secondary_supply_water_flowrate_sensor
+  implements:
+  - MONITORING
+
+MWFRM:
+  guid: "c7683a09-8379-4951-aa1e-e5edc4e098cb"
+  description: "Make-up water flowrate monitoring."
+  is_abstract: true
+  opt_uses:
+  - failed_makeup_water_flowrate_alarm
+  uses:
+  - makeup_water_flowrate_sensor
+  implements:
+  - MONITORING
+
+BWFRM:
+  guid: "2be49785-9467-4ddb-8aa8-9c2b77277d29"
+  description: "Blowdown water flowrate monitoring."
+  is_abstract: true
+  opt_uses:
+  - failed_blowdown_water_flowrate_alarm
+  uses:
+  - blowdown_water_flowrate_sensor
+  implements:
+  - MONITORING
+
+DX3SCHWC:
+  guid: "917e4514-ed4d-468c-8a81-44d29a143935"
+  description: "Three compressor run control on chilled supply water side."
+  is_abstract: true
+  uses:
+  - compressor_run_command_1
+  - compressor_run_command_2
+  - compressor_run_command_3
+  - compressor_run_status_1
+  - compressor_run_status_2
+  - compressor_run_status_3
+  - chilled_supply_water_temperature_sensor
+  - chilled_supply_water_temperature_setpoint
+  implements:
+  - CONTROL
+
+CWBYPVPM:
+  guid: "88212fc0-0ddb-4cd9-99a3-e646dd20d528"
+  description: "Condensing water bypass valve percentage monitoring."
+  is_abstract: true
+  opt_uses:
+  - failed_condensing_water_bypass_valve_alarm
+  uses:
+  - condensing_water_bypass_valve_percentage_command
+  - condensing_water_bypass_valve_percentage_sensor
+  implements:
+  - MONITORING
+
+HWBYPVPM:
+  guid: "38b01712-d458-4e5c-bf41-71107ebe8ecd"
+  description: "Heating water bypass valve percentage monitoring."
+  is_abstract: true
+  opt_uses:
+  - failed_heating_water_bypass_valve_alarm
+  uses:
+  - heating_water_bypass_valve_percentage_command
+  - heating_water_bypass_valve_percentage_sensor
+  implements:
+  - MONITORING
+
+HWBYPVM:
+  guid: "c4a7009c-1ccb-4162-8761-fd1e0acc5169"
+  description: "Heating water bypass valve monitoring."
+  is_abstract: true
+  opt_uses:
+  - failed_heating_water_bypass_valve_alarm
+  uses:
+  - heating_water_bypass_valve_command
+  - heating_water_bypass_valve_status
+  implements:
+  - MONITORING
+
+HWDPC:
+  guid: "46009d2e-eee4-4e0a-a775-157fa7193983"
+  description: "Heating water differential pressure control."
+  is_abstract: true
+  uses:
+  - heating_water_differential_pressure_sensor
+  - heating_water_differential_pressure_setpoint
+  implements:
+  - OPERATIONAL
+
+HP6SWC:
+  guid: "5d2c6d94-ad64-41ef-bce0-78a9b40532b1"
+  description: "Six-compressor heat pump control on supply water side."
+  is_abstract: true
+  opt_uses:
+  - heating_percentage_command
+  - heating_thermal_power_capacity
+  - high_supply_water_temperature_alarm
+  - low_supply_water_temperature_alarm
+  uses:
+  - compressor_run_command_1
+  - compressor_run_command_2
+  - compressor_run_command_3
+  - compressor_run_command_4
+  - compressor_run_command_5
+  - compressor_run_command_6
+  - compressor_run_status_1
+  - compressor_run_status_2
+  - compressor_run_status_3
+  - compressor_run_status_4
+  - compressor_run_status_5
+  - compressor_run_status_6
+  - supply_water_temperature_sensor
+  - supply_water_temperature_setpoint
+  implements:
+  - CONTROL
+
+CPC2X:
+  guid: "a45b771d-0bc2-49a4-8a4f-5e3287f65ff0"
+  description: "Circulation control for 2 pumps."
+  is_abstract: true
+  uses:
+  - circulation_pump_run_command_1
+  - circulation_pump_run_status_1
+  - circulation_pump_run_command_2
+  - circulation_pump_run_status_2
+
+SDHC:
+  guid: "de065843-b1a9-4d2e-b751-31d7af8e8991"
+  description: "Supply dehumidification control with a temperature setpoint."
+  is_abstract: true
+  opt_uses:
+  - dehumidification_percentage_command
+  - zone_air_dewpoint_temperature_sensor
+  - supply_air_relative_humidity_sensor
+  - failed_dehumidifier_alarm
+  uses:
+  - dehumidification_run_command
+  - leaving_dehumidifier_temperature_sensor
+  - leaving_dehumidifier_temperature_setpoint
+  implements:
+  - CONTROL
+
+FPHC:
+  guid: "bdd89332-3303-420d-a13c-ee38c398d9ff"
+  description: "Four pipe heating and cooling control for radiant panels."
+  is_abstract: true
+  opt_uses:
+  - heating_supply_water_isolation_valve_command
+  - chilled_supply_water_isolation_valve_command
+  - heating_water_valve_percentage_sensor
+  - chilled_water_valve_percentage_sensor
+  uses:
+  - heating_water_valve_percentage_command
+  - chilled_water_valve_percentage_command