New devices HDS, WSR, etc

ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml

@@ -183,3 +183,12 @@ SRC2:
   - source2_phase3_phase1_over_voltage_status
   - source2_over_voltage_status
   - source2_lost_power_alarm
+
+BBM:
+  guid: "6ea6a214-a12f-4f8c-b97b-512538566611"
+  description: "For UPS with Battery status and alarm."
+  is_abstract: true
+  uses:
+  - battery_status
+  opt_uses:
+  - low_battery_charge_alarm

ontology/yaml/resources/ELECTRICAL/entity_types/GENERALTYPES.yaml

@@ -44,15 +44,10 @@ GEN:
 ATS:
   guid: "f2e50348-ce8d-4c2e-9e82-0d6056d4c89c"
   description: "Tag for automatic transfer switch (ATS) units."
-
   is_abstract: true
   implements:
   - EQUIPMENT
 
-
-
-
-
 CB:
   guid: "245e084f-a577-441d-a88e-662fd8396271"
   description: "Tag for all circuit breakers."

ontology/yaml/resources/ELECTRICAL/entity_types/UPS.yaml

@@ -66,6 +66,15 @@ UPS_IOBM_PPWM_UPSBM:
   - IOBM
   - PPWM
   - UPSBM
+
+UPS_SS_BBM:
+  guid: "adcf545f-eb61-4130-a0f1-d611ab303d17"
+  description: "UPS unit with load bypass and battery mode and alarm."
+  is_canonical: true
+  implements:
+  - UPS
+  - SS
+  - BBM
 
 UPS_PWM:
   guid: "64f90598-969d-4cf6-ace6-50793a46aed8"

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

@@ -51,7 +51,6 @@ RDM:
   implements:
   - MONITORING
 
-
 DD:
   guid: "5b09f1bd-f526-4d77-b1a3-1fceda2ba041"
   description: "Dual duct flow control (hot deck, cold deck)."
@@ -1677,7 +1676,6 @@ FDPM:
   implements:
   - MONITORING
 
-
 FDPSM:
   guid: "9cbbf1cf-51ae-44fd-a5ec-ef9ee7a3fcdf"
   description: "Filter pressure status monitoring."
@@ -4431,7 +4429,6 @@ WDPM:
   - high_differential_pressure_alarm
   - low_differential_pressure_alarm
 
-
 CHWDPM:
   guid: "dcdb66fc-576b-4475-a1cd-f143e16edcde"
   description: "Differential pressure monitoring for chilled water."
@@ -4519,7 +4516,6 @@ CHDXVSC:
   - failed_compressor_alarm
   - overload_compressor_alarm
 
-
 CDWFRM:
   guid: "b4cd6a63-df02-4c7b-bf81-3902cd827241"
   description: "Condenser water flowrate monitoring."
@@ -6332,7 +6328,6 @@ EFHLC:
   implements:
   - OPERATIONAL
 
-
 SWCM:
   guid: "b82c4b84-96ae-48ee-a36b-29f274f6a41a"
   description: "Solenoid water valve control and monitoring."
@@ -6341,7 +6336,6 @@ SWCM:
   - valve_command
   - valve_status
 
-
 SCRSS:
   guid: "636b1262-b08b-4e1b-b130-e1a510b79a0c"
   description: "Scurbber start stop monitoring."
@@ -6439,7 +6433,6 @@ CO2M6X:
   implements:
   - MONITORING
 
-
 MIPCVM:
   guid: "17630266-40d3-4bc5-a9cd-9d70f10ef839"
   description: "Motor phase-level input current and voltage monitoring."

ontology/yaml/resources/HVAC/entity_types/DMP.yaml

@@ -83,7 +83,6 @@ DMP_EDBPC_ZTM:
   - EDBPC
   - ZTM
 
-
 ###################################
 ### Existing Non-standard Types ###
 ###################################

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

@@ -1188,7 +1188,7 @@ FCU_DFSS_DXRC_RHDHC_AL:
   - filter_alarm
   - master_alarm
   - failed_heat_exchange_alarm 
-  - water_leak_alarm 
+  - water_leak_alarm
 
 FCU_DFVSC_CHWRC_FDPSM2X:
   guid: "26ec8491-3ccd-42f6-86e7-9d69afeb87bd"
@@ -1699,3 +1699,34 @@ FCU_DSP_DFVSC_DTM_RTM:
   - DTM
   - RTM
 
+
+FCU_DXZTC_DFSS:
+  guid: "5688519e-f88e-4620-8bd5-89d91467028d"
+  description: "FCU with SS, discharge temp sensors, zone control and sensor, filter change"
+  is_canonical: true
+  implements:
+  - FCU
+  - DXZTC
+  - DFSS
+  opt_uses:
+  - failed_alarm
+  - filter_alarm
+
+FCU_RHDHS_DXDC_DFSS_RTM:
+  guid: "f60a2563-da8f-4360-b2d9-f471c065356c"
+  description: "FCU with temperature & pressure monitor, humidity monitor and water leak & status alarm."
+  is_canonical: true
+  implements:
+  - FCU
+  - RHDHS
+  - DXDC
+  - DFSS
+  - RTM
+  uses:
+  - run_status
+  opt_uses:
+  - water_leak_alarm
+  - failed_alarm
+  - high_discharge_air_static_pressure_alarm
+  - low_discharge_air_static_pressure_alarm
+  - low_discharge_air_flowrate_alarm

ontology/yaml/resources/HVAC/entity_types/MAU.yaml

@@ -841,3 +841,4 @@ MAU_SFSS_SFVSC_HTSC_BPC_SHM_NONCANONICAL_2:
   - DEPRECATED
   uses:
   - humidification_run_command
+

ontology/yaml/resources/HVAC/entity_types/SENSOR.yaml

@@ -233,7 +233,15 @@ SENSOR_ZA_CO2M_PMM_HCHO:
   - CO2M
   - PMM
   uses:
-  - zone_air_formaldehyde_concentration_sensor  
+  - zone_air_formaldehyde_concentration_sensor
+
+SENSOR_WDPM:
+  guid: "c0eb13ea-8495-46de-8443-9a3b5696d084"
+  description: "Sensor with differential pressure monitor"
+  is_canonical: true
+  implements:
+  - /SENSOR
+  - WDPM
 
 SENSOR_CO2M_VOCM:
   guid: "3eca4fc4-0a66-4a12-bbc1-88fedeb9ede5"

ontology/yaml/resources/METERS/entity_types/WM.yaml

@@ -35,4 +35,3 @@ WM_WF:
   opt_uses:
   - supply_water_volume_accumulator
   - water_linearvelocity_sensor
-  - water_volume_accumulator

ontology/yaml/resources/PLUMBING/entity_types/ABSTRACT.yaml

@@ -34,4 +34,11 @@ LVLM:
   - level_status
   opt_uses:
   - percentage_sensor
+
+WVCM:
+  description: "Water valve control and monitoring."
+  is_abstract: true
+  uses:
+  - valve_command
+  - valve_status
 

ontology/yaml/resources/PLUMBING/entity_types/GENERALTYPES.yaml

@@ -40,4 +40,20 @@ RO:
   is_abstract: true
   implements:
   - EQUIPMENT
-
+
+VLV:
+  guid: "396ab9cc-500d-4e0a-b09c-be249cb3e420"
+  description: "Tag for valves. Valves are devices which control the flow of water. "
+  is_abstract: true
+  opt_uses:
+  - failed_communication_alarm
+  implements:
+  - EQUIPMENT
+
+WSR:
+  guid: "178274c8-ec3d-4c5a-b2f3-f5ae7cb894dc"
+  description: "Water softener"
+  is_abstract: true
+  implements:
+  - /SS
+  - EQUIPMENT

ontology/yaml/resources/PLUMBING/entity_types/VLV.yaml

@@ -0,0 +1,25 @@
+# Copyright 2023 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.
+
+########################
+### Canonical Types  ###
+########################
+
+VLV_WVCM:
+  guid: "63e9ccb7-67f6-4547-aff8-d3cf30d1ab40"
+  description: "Solenoid water valve control and monitoring."
+  is_canonical: true
+  implements:
+  - VLV
+  - WVCM

ontology/yaml/resources/PLUMBING/entity_types/WSR.yaml

@@ -0,0 +1,26 @@
+# Copyright 2022 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.
+
+### CANONICAL TYPES
+
+WSR_STD:
+  guid: "c406cac4-2e0c-4396-8963-db72b7f1ccb6"
+  description: "Standard water softener."
+  is_canonical: true
+  implements:
+  - WSR
+  uses:
+  - water_flowrate_status
+  opt_uses:
+  - lost_power_alarm

ontology/yaml/resources/SAFETY/entity_types/ABSTRACT.yaml

@@ -35,6 +35,8 @@ H2M:
   is_abstract: true
   uses:
   - zone_air_h2_concentration_sensor
+  opt_uses:
+  - high_zone_air_h2_concentration_alarm 
 
 WLDS:
   guid: "6530f835-51a6-45c0-9130-382c297c2a01"
@@ -86,11 +88,27 @@ WLS:
   is_abstract: true
   uses:
   - water_leak_cable_distance_sensor
-  
+
 LM:
   guid: "25887ceb-f2d8-4b25-be80-36e8b37f5ae9"
   description: "Tank level monitoring."
   is_abstract: true
   uses:
-  - level_status 
+  - level_status
 
+MDC:
+  guid: "ec1aab74-c961-40fd-87b7-ce219c9c6d3a"
+  description: "Motorized binary damper control."
+  is_abstract: true
+  uses:
+  - damper_status
+  - damper_command
+
+ASD:
+  guid: "d5829c05-fc88-4ac4-8587-8c75ed0d0486"
+  description: "Aspirating type, smoke detector."
+  is_abstract: true
+  opt_uses:
+  - low_smoke_alarm
+  - medium_smoke_alarm
+  - fire_alarm

ontology/yaml/resources/SAFETY/entity_types/EHT.yaml

@@ -0,0 +1,26 @@
+# Copyright 2022 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.
+
+########################
+### Canonical Types  ###
+########################
+
+
+EHT_SS:
+  guid: "fd135e80-a15b-4c3f-8fa8-31c0641933a3"
+  description: "Basic heat tracer with start/stop"
+  is_canonical: true
+  implements:
+  - EHT
+  - SS

ontology/yaml/resources/SAFETY/entity_types/FACP.yaml

@@ -23,6 +23,8 @@ FACP_STD:
   - FACP
   uses:
   - fire_alarm
+  opt_uses:
+  - failed_panel_alarm
 
 FACP_FA2X:
   guid: "a29a1bdd-0f8c-498e-b4ed-d09789f2487c"
@@ -42,6 +44,18 @@ FACP_PAS:
   - FACP
   uses:
   - fire_alarm
-  - supervisor_alarm
   - water_flowrate_status
   - air_pressure_status
+  opt_uses:
+  - supervisor_alarm
+  - failed_panel_alarm
+
+FACP_ASD:
+  guid: "3f21bbad-15ad-4253-982d-fed1324543d3"
+  description: "Basic aspirating type, fire detection with alarms."
+  is_canonical: true
+  implements:
+  - FACP
+  - ASD
+  opt_uses:
+  - failed_panel_alarm

ontology/yaml/resources/SAFETY/entity_types/FD.yaml

@@ -31,4 +31,11 @@ FD_SD:
   uses:
   - damper_percentage_sensor
   - damper_percentage_command
-
+
+FD_MDC:
+  guid: "a731be05-13de-43a5-9edc-9fd89c6cfffc"
+  description: "Fire dampers with motorized binary dampers (open/closed)"
+  is_canonical: true
+  implements:
+  - FD
+  - MDC

ontology/yaml/resources/SAFETY/entity_types/FSS.yaml

@@ -23,3 +23,14 @@ FSS_STD:
   - FSS
   uses:
   - fire_alarm
+
+FSS_FA2X_GS:
+  guid: "637223a2-1c85-4ba3-b28f-ba5c96ffce9d"
+  description: "Fire Suppression System with with 2-level alarm and gas suppression."
+  is_canonical: true
+  implements:
+  - FSS
+  - FA2X
+  uses:
+  - failed_panel_alarm
+  - gas_release_status