Merge branch 'master' into UPSAddBattTime

ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml

@@ -1124,6 +1124,9 @@ CWDT:
   is_abstract: true
   implements:
   - MONITORING
+  opt_uses:
+  - high_condensing_return_water_temperature_alarm
+  - low_condensing_return_water_temperature_alarm
   uses:
   - condensing_return_water_temperature_sensor
   - condensing_supply_water_temperature_sensor
@@ -1819,6 +1822,12 @@ PWDT:
   uses:
   - primary_return_water_temperature_sensor
   - primary_supply_water_temperature_sensor
+  opt_uses:
+  - primary_water_heating_thermal_power_sensor
+  - high_primary_return_water_temperature_alarm
+  - high_primary_supply_water_temperature_alarm
+  - low_primary_return_water_temperature_alarm
+  - low_primary_supply_water_temperature_alarm
 
 
 CHPM:
@@ -4529,6 +4538,18 @@ SWISOVM:
   - failed_supply_water_isolation_valve_alarm
   - local_override_isolation_valve_alarm
 
+CHWRWDVPM:
+  guid: "ac21d1e5-1e01-4612-af36-e71f0a0b58b2"
+  description: "Chilled return water diverting valve percentage monitoring."
+  is_abstract: true
+  opt_uses:
+  - failed_chilled_return_water_diverting_valve_alarm
+  uses:
+  - chilled_return_water_diverting_valve_percentage_command
+  - chilled_return_water_diverting_valve_percentage_sensor
+  implements:
+  - MONITORING
+
 SWDVPM:
   guid: "4a848219-0fdd-4f99-ae7d-5604cbf27bd9"
   description: "Supply water diverting valve percentage monitoring."
@@ -4571,6 +4592,8 @@ RWISOVPM:
   guid: "a20fce9d-f8c0-4324-9ffd-8aaa3729b32d"
   description: "Return side isolation valve monitoring."
   is_abstract: true
+  opt_uses:
+  - failed_return_water_isolation_valve_alarm
   uses:
   - return_water_isolation_valve_percentage_command
   - return_water_isolation_valve_percentage_sensor
@@ -4592,8 +4615,10 @@ CICHVISOVM3X:
 
 CHWRWISOVPM:
   guid: "0a8333ee-fdc9-440b-9ebc-fb0e19e8cf5c"
-  description: "Return side isolation valve monitoring."
+  description: "Return side isolation valve percentage monitoring."
   is_abstract: true
+  opt_uses:
+  - failed_chilled_return_water_isolation_valve_alarm
   uses:
   - chilled_return_water_isolation_valve_percentage_command
   - chilled_return_water_isolation_valve_percentage_sensor
@@ -4711,8 +4736,10 @@ PWDPM2X:
 
 CWRISOVPM:
   guid: "ec4e3b78-417d-47a3-bbbf-d031f31d2d3d"
-  description: "Condensing water return isolation monitoring."
+  description: "Condensing water return isolation valve percentage monitoring."
   is_abstract: true
+  opt_uses:
+  - failed_condensing_return_water_isolation_valve_alarm
   uses:
   - condensing_return_water_isolation_valve_percentage_command
   - condensing_return_water_isolation_valve_percentage_sensor
@@ -5611,6 +5638,41 @@ SWTCSCM:
   - supervisor_alarm
 
 
+SESWTC:
+  guid: "ac0191bf-f1ba-4dd9-ba81-d31515589c2c"
+  description: "Secondary loop supply water temperature control."
+  is_abstract: true
+  implements:
+  - OPERATIONAL
+  opt_uses:
+  - cooling_request_count
+  - heating_request_count
+  - secondary_return_water_temperature_sensor
+  - high_secondary_return_water_temperature_alarm
+  - low_secondary_return_water_temperature_alarm
+  - run_command
+  - high_secondary_supply_water_temperature_alarm
+  - low_secondary_supply_water_temperature_alarm
+  - secondary_water_heating_thermal_power_sensor
+  uses:
+  - secondary_supply_water_temperature_sensor
+  - secondary_supply_water_temperature_setpoint
+
+
+SEWDPC:
+  guid: "6b3687c0-a8c1-4df4-8f2b-05eaccfbdf45"
+  description: "Secondary water loop differential pressure control."
+  is_abstract: true
+  implements:
+  - OPERATIONAL
+  opt_uses:
+  - high_secondary_water_differential_pressure_alarm
+  - low_secondary_water_differential_pressure_alarm
+  uses:
+  - secondary_water_differential_pressure_sensor
+  - secondary_water_differential_pressure_setpoint
+
+
 WDPCSCM:
   guid: "40d1d42d-50b9-4c13-8213-fa836e3069de"
   description: "Water differential pressure control for supervisor control (Machine learning)."
@@ -7743,3 +7805,30 @@ CHCPC2X:
   - chilled_water_circulation_pump_run_status_2
   - chilled_water_circulation_pump_run_command_1
   - chilled_water_circulation_pump_run_command_2
+
+ESM2X:
+  guid: "3d2d7498-e741-4690-aab6-f2e14e11cfeb"
+  description: "Dual electrostatic scrubber monitoring."
+  is_abstract: true
+  opt_uses:
+  - failed_electrostatic_scrubber_alarm_1
+  - failed_electrostatic_scrubber_alarm_2
+  uses:
+  - electrostatic_scrubber_run_command_1
+  - electrostatic_scrubber_run_command_2
+  - electrostatic_scrubber_run_status_1
+  - electrostatic_scrubber_run_status_2
+  implements:
+  - MONITORING
+
+DTPM:
+  guid: "898b43c5-c051-4fbf-8366-4c1fefda40b6"
+  description: "Detergent pump monitoring."
+  is_abstract: true
+  opt_uses:
+  - low_detergent_alarm
+  uses:
+  - detergent_pump_run_status
+  - detergent_pump_run_command
+  implements:
+  - MONITORING

ontology/yaml/resources/HVAC/entity_types/CDWS.yaml

@@ -16,6 +16,14 @@
 ### Canonical Types  ###
 ########################
 
+CDWS_WDT:
+  guid: "0293ed37-4fda-4b4e-8926-488b0de826e1"
+  description: "Condenser water system with temperature differential monitoring across condenser water."
+  is_canonical: true
+  implements:
+  - CDWS
+  - WDT
+
 CDWS_SWTC:
   guid: "618090ae-c5bb-4a60-8433-c150654e482f"
   description: "Simple condenser water system with supply control."

ontology/yaml/resources/HVAC/entity_types/CHWRSR.yaml

@@ -0,0 +1,27 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the License);
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an AS IS BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+CHWRSR_UNDEFINED:
+  guid: "17800c9e-afac-4966-88af-d6aa2b1e1f30"
+  description: "Chilled water distribution riser without any data points."
+  implements:
+  - CHWRSR
+
+CHWRSR_WDPC:
+  guid: "fd7e9b2a-44f1-4199-be74-72f8cc5f92d8"
+  description: "Chilled water distribution riser with differential pressure control."
+  is_canonical: true
+  implements:
+  - CHWRSR
+  - WDPC

ontology/yaml/resources/HVAC/entity_types/CT.yaml

@@ -99,6 +99,18 @@ CT_SS_VSC_SWTC_SWISOVM_RWISOVM:
   - SWISOVM
   - RWISOVM
 
+CT_SS_VSC_SWTM_SWISOVPM_RWISOVPM:
+  guid: "3495bfd1-74af-431c-bddb-0f4ab80a156b"
+  description: "Cooling tower with variable speed control, supply and return isolation valves and supply temp monitoring."
+  is_canonical: true
+  implements:
+  - CT
+  - SS
+  - VSC
+  - SWTM
+  - SWISOVPM
+  - RWISOVPM
+
 CT_SS_VSC_SWTC_SWISOVPM_RWISOVPM_MWVPM:
   guid: "72dd74b5-7228-4459-a48e-8645b7c9d457"
   description: "Variable speed supply temp controlling cooling tower with isolation valves on both the supply and return sides and a mixing valve."

ontology/yaml/resources/HVAC/entity_types/DWST.yaml

@@ -39,6 +39,26 @@ DWST_SWTC_CPC_BYPVPM:
   - potable_water_medium_temperature_sensor
   - potable_water_low_temperature_sensor
 
+DWST_PWDT:
+  guid: "a537d6c5-8187-4868-9918-18ed74052a26"
+  description: "Domestic water system with primary side delta-T monitoring."
+  is_canonical: true
+  implements:
+  - DWST
+  - PWDT
+
+DWST_WDT:
+  guid: "f14e1dfa-9d12-4b6d-8ba3-262e3a62cd13"
+  description: "Domestic water system with delta-T monitoring."
+  is_canonical: true
+  implements:
+  - DWST
+  - WDT
+
+###################################
+### Existing Non-standard Types ###
+###################################
+
 # TODO: remove if we get more examples of water-to-water heat pumps
 DWST_SWTC_CPVSC2X_WSHP2X:
   guid: "7f92f630-cd94-40a0-aa48-9d702bc50b30"
@@ -57,22 +77,6 @@ DWST_SWTC_CPVSC2X_WSHP2X:
   - potable_hot_leaving_water_temperature_sensor_2
   - potable_hot_leaving_water_temperature_setpoint
 
-DWST_PWDT:
-  guid: "a537d6c5-8187-4868-9918-18ed74052a26"
-  description: "Domestic water system with primary side delta-T monitoring."
-  is_canonical: true
-  implements:
-  - DWST
-  - PWDT
-
-DWST_WDT:
-  guid: "f14e1dfa-9d12-4b6d-8ba3-262e3a62cd13"
-  description: "Domestic water system with delta-T monitoring."
-  is_canonical: true
-  implements:
-  - DWST
-  - WDT
-
 DWST_SS_PWDT_HWTTC_SEWTM:
   guid: "bbde1c7a-fd21-410f-969a-65ebcf65234d"
   description: "DWST with primary, secondary temperature monitoring, tank temperature sensor"
@@ -84,3 +88,37 @@ DWST_SS_PWDT_HWTTC_SEWTM:
   - SEWTM
   uses:
   - heater_run_command
+
+DWST_HWDT_CPC_SWTC2X_HWFM_HSWPM:
+  guid: "cd74f84e-969a-422c-8c84-d40ca6281352"
+  description: "Non-standard domestic water system with two heating water heat exhangers that are manually opened/closed, 
+  one circulation pump, and heating water system flow and btu monitoring"
+  is_canonical: false
+  implements:
+  - DWST
+  - HWDT
+  - CPC
+  - HLPM
+  uses:
+  - supply_water_temperature_sensor_1
+  - supply_water_temperature_sensor_2
+  - supply_water_temperature_setpoint
+  - heating_water_flowrate_sensor
+
+DWST_HWDT_CPC2X_SWTC2X_HWFM_HSWPM:
+  guid: "21d3d1b0-ace7-4623-a103-58164929c6b6"
+  description: "Non-standard domestic water system with two heating water heat exhangers that are manually opened/closed, 
+  two circulation pumps, and heating water system flow and btu monitoring"
+  is_canonical: false
+  implements:
+  - DWST
+  - HWDT
+  - CPC2X
+  - HLPM
+  uses:
+  - return_water_temperature_sensor
+  - supply_water_temperature_sensor
+  - supply_water_temperature_sensor_1
+  - supply_water_temperature_sensor_2
+  - supply_water_temperature_setpoint
+  - heating_water_flowrate_sensor

ontology/yaml/resources/HVAC/entity_types/FCU.yaml

@@ -1632,7 +1632,6 @@ FCU_NONCANONICAL_1:
   - zone_air_temperature_sensor_1
   - zone_air_temperature_sensor_2
   - zone_air_temperature_sensor_3
-  - zone_air_temperature_setpoint
   - zone_air_temperature_setpoint_1
   - zone_air_temperature_setpoint_2
   - zone_air_temperature_setpoint_3

ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml

@@ -430,3 +430,12 @@ WSHP:
   - EQUIPMENT
   opt_uses:
   - failed_communication_alarm
+
+PCU:
+  guid: "f8fc8268-873f-4ae7-a98f-581052261c7d"
+  description: "Tag for pollution control unit. PCUs remove pollutants from exhuast air."
+  is_abstract: true
+  implements:
+  - EQUIPMENT
+  opt_uses:
+  - failed_communication_alarm

ontology/yaml/resources/HVAC/entity_types/HWS.yaml

@@ -342,6 +342,18 @@ HWS_SWTC_WDPC_WFRM_HWTTC:
   - WFRM
   - HWTTC
 
+HWS_PWDT_PRWFRM_SESWTC_SEWDPC_SEWFRM:
+  guid: "f90cf897-105e-413e-b12a-97d2d7b6d6df"
+  description: "Primary/secondary heating water system with secondary loop temperature and differential pressure control and flowrate monitoring."
+  is_canonical: true
+  implements:
+  - HWS
+  - PWDT
+  - PRWFRM
+  - SESWTC
+  - SEWDPC
+  - SEWFRM
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################

ontology/yaml/resources/HVAC/entity_types/HWSRSR.yaml

@@ -0,0 +1,27 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the License);
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an AS IS BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+HWSRSR_UNDEFINED:
+  guid: "037e42ec-3826-49f5-84a2-3b71858b53dc"
+  description: "Heating water distribution riser without any data points."
+  implements:
+  - HWSRSR
+
+HWSRSR_WDPC:
+  guid: "afbd880e-7f1d-42b2-ae42-096de0e2d3cf"
+  description: "Heating water distribution riser with differential pressure control."
+  is_canonical: true
+  implements:
+  - HWSRSR
+  - WDPC

ontology/yaml/resources/HVAC/entity_types/HX.yaml

@@ -206,4 +206,15 @@ HX_CHWDT_PRWDT_CHWDPM_PWDPM:
   - CHWDT
   - PRWDT
   - CHWDPM
-  - PWDPM
+  - PWDPM
+
+HX_CWRISOVPM_CHWRWDVPM_CWDT_CHWDT:
+  guid: "993e124b-b666-46ee-95ee-e958423ada9e"
+  description: "Heat exchanger with condensing return isolation valve, chilled return diverting valve, and chilled and condensing temperature differential monitoring."
+  is_canonical: true
+  implements:
+  - HX
+  - CWRISOVPM
+  - CHWRWDVPM
+  - CWDT
+  - CHWDT