Merge pull request #794 from josephedwardchang/master

New devices HDS, WSR, etc

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/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)."
@@ -330,6 +329,7 @@ COC:
   - high_zone_air_co_concentration_alarm
 
 COM:
+  guid: "bd9a1e2d-0710-4c58-8a56-3890af55f6b3"
   description: "Carbon monoxide monitoring."
   is_abstract: true
   implements:
@@ -1127,6 +1127,7 @@ SCHWTC:
   - chilled_supply_water_temperature_setpoint
 
 RCHWTC:
+  guid: "6babdc1e-edae-49b3-98e4-ca0b675b7f0f"
   description: "Return chilled water temperature control."
   is_abstract: true
   implements:
@@ -4495,7 +4496,6 @@ WDPM:
   - high_differential_pressure_alarm
   - low_differential_pressure_alarm
 
-
 CHWDPM:
   guid: "dcdb66fc-576b-4475-a1cd-f143e16edcde"
   description: "Differential pressure monitoring for chilled water."
@@ -4583,7 +4583,6 @@ CHDXVSC:
   - failed_compressor_alarm
   - overload_compressor_alarm
 
-
 CDWFRM:
   guid: "b4cd6a63-df02-4c7b-bf81-3902cd827241"
   description: "Condenser water flowrate monitoring."
@@ -5096,6 +5095,7 @@ SWTM:
 
 
 RWTM:
+  guid: "c317c88d-f090-4cd9-9289-6e03e24e496f"
   description: "Return water temperature monitoring."
   is_abstract: true
   implements:
@@ -6481,7 +6481,6 @@ SWCM:
   - valve_command
   - valve_status
 
-
 SCRSS:
   guid: "636b1262-b08b-4e1b-b130-e1a510b79a0c"
   description: "Scurbber start stop monitoring."
@@ -6579,7 +6578,6 @@ CO2M6X:
   implements:
   - MONITORING
 
-
 MIPCVM:
   guid: "17630266-40d3-4bc5-a9cd-9d70f10ef839"
   description: "Motor phase-level input current and voltage monitoring."
@@ -6867,6 +6865,7 @@ VSMC:
   - schedule_run_command
 
 ZOC:
+  guid: "822b78b6-1eb4-4d4b-9f4e-089ef57011aa"
   description: "Occupancy counter monitoring"
   is_abstract: true
   uses:
@@ -6875,6 +6874,7 @@ ZOC:
   - MONITORING
 
 SPLM:
+  guid: "d92998e1-1091-4291-a1f9-b8cc0e3aa334"
   description: "Sound pressure level monitoring"
   is_abstract: true
   uses:
@@ -6883,6 +6883,7 @@ SPLM:
   - MONITORING
 
 ZAQIM:
+  guid: "3ce06a65-9e5c-4862-9571-a2d59792c86a"
   description: "Zone air quality indexes monitoring"
   is_abstract: true
   uses:
@@ -6894,6 +6895,7 @@ ZAQIM:
   - MONITORING  
 
 PMDM:
+  guid: "8247354f-bedb-4ccd-8f62-238c025277bc"
   description: "Particulate matter density monitoring"
   is_abstract: true
   uses:

ontology/yaml/resources/HVAC/entity_types/BLR.yaml

@@ -283,6 +283,7 @@ BLR_SS_RWTC_HTRWC:
   - HTRWC
 
 BLR_HT2SWC_RWTM:
+  guid: "e72cfc15-8544-4a9c-bc0a-89f33384ebeb"
   description: "Two-stage boiler with supply control, return temperature monitoring."
   is_canonical: true
   implements:

ontology/yaml/resources/HVAC/entity_types/CH.yaml

@@ -97,6 +97,7 @@ CH_SS_SCHWTC_CWDT:
   - CWDT
 
 CH_SS_RCHWTC_CWDT:
+  guid: "1f0accb9-f2d8-4258-a048-8d3c7a7510d0"
   description: "Simple water cooled chiller, return water temperature control."
   is_canonical: true
   implements:

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/FAN.yaml

@@ -25,8 +25,6 @@ FAN_SS:
   implements:
   - FAN
   - SS
-  opt_uses:
-  - air_pressure_sensor
 
 FAN_SS_VSC:
   guid: "b58b9431-ff2c-4cc2-adab-a8c51c4ee6ab"
@@ -795,3 +793,4 @@ FAN_VSMC:
   implements:
   - FAN
   - VSMC
+

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

@@ -1200,7 +1200,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"
@@ -1442,7 +1442,7 @@ FCU_NONCANONICAL_1:
   - zone_occupancy_status_1
   - zone_occupancy_status_2
   - zone_occupancy_status_3
-  
+
 FCU_DFSS_CSP_ZHC_DXZC_NONCANONICAL_1:
   guid: "0bca6899-fa9a-40ff-a3bd-8828991b39c1"
   description: "Non-standard type."
@@ -1761,3 +1761,32 @@ FCU_DFVSC_RTM_CO2M_HWZTC_CHWZTC:
   - CO2M
   - HWZTC
   - CHWZTC
+
+
+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_DSPM_DFM:
+  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
+  - DSPM
+  - DFM
+  opt_uses:
+  - water_leak_alarm
+  - failed_alarm

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

@@ -39,6 +39,7 @@ FAN:
   - failed_communication_alarm
   - failed_exhaust_air_temperature_alarm
   - failed_smoke_detection_alarm
+  - lost_power_alarm
   implements:
   - EQUIPMENT
 

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

@@ -854,3 +854,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,7 @@ SENSOR_ZA_CO2M_PMM_HCHO:
   - CO2M
   - PMM
   uses:
-  - zone_air_formaldehyde_concentration_sensor  
+  - zone_air_formaldehyde_concentration_sensor
 
 SENSOR_CO2M_VOCM:
   guid: "3eca4fc4-0a66-4a12-bbc1-88fedeb9ede5"
@@ -257,6 +257,7 @@ SENSOR_ZTM_ZHM_CO2M_VOCM_PMM:
   - PMM
 
 SENSOR_ZTM_ZHM_ZOC:
+  guid: "cf04e900-0c65-4bb5-b769-6926f88c88dc"
   description: "Zone occupant counter with zone temperature & humidity monitoring."
   is_canonical: true
   implements:
@@ -266,6 +267,7 @@ SENSOR_ZTM_ZHM_ZOC:
   - ZOC
 
 SENSOR_ZTM_ZHM_CO2M_VOCM_PMDM_SPLM_ZAQIM:
+  guid: "d1abcda3-d6a1-477d-b690-a993d7a3947f"
   description: "Indoor Air Quality sensor with temperature, humidity, CO2, VOC, particulates (density), illuminance and sound monitoring."
   is_canonical: true
   implements:
@@ -281,6 +283,7 @@ SENSOR_ZTM_ZHM_CO2M_VOCM_PMDM_SPLM_ZAQIM:
   - illuminance_sensor
 
 SENSOR_ZTM_ZHM_CO2M_VOCM_PMDM:
+  guid: "f96985ff-f152-4053-8453-85d557fd534b"
   description: "Indoor Air Quality sensor with temperature, humidity, CO2, VOC, particulates (density) monitoring."
   is_canonical: true
   implements:
@@ -292,6 +295,7 @@ SENSOR_ZTM_ZHM_CO2M_VOCM_PMDM:
   - PMDM
 
 SENSOR_ZTM_ZHM_CO2M_SPLM_PMDM_COM_ZSPM_VOCM_ZAQIM_MS_TMPR:
+  guid: "ba5e0fb0-b20c-4bb8-a178-3c57ef261ed7"
   description: "Indoor Air Quality sensor with temperature, humidity, CO2, CO, sound, particulates (density), illuminance, formaldehyde, pressure sensors with air quality, vape, TVOC indexes and motion & tamper detection."
   is_canonical: true
   implements:
@@ -311,6 +315,7 @@ SENSOR_ZTM_ZHM_CO2M_SPLM_PMDM_COM_ZSPM_VOCM_ZAQIM_MS_TMPR:
   - tamper_alarm
 
 SENSOR_ZOC:
+  guid: "29e14ea6-4bdc-40b7-8af2-98ffe12ecc4c"
   description: "Zone occupant counter sensor."
   is_canonical: true
   implements:

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,19 @@ 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:
+  - 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,27 @@
+# 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
+  - /SS
+  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,10 @@ 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

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