Merge pull request #1522 from hhunterr71/master

building onboarding addtions

Author: shambergoldstein

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

@@ -535,6 +535,35 @@ BSPC:
   implements:
   - CONTROL
 
+BSPC4X:
+  guid: "ceba44bb-d69f-4651-ba9a-b7abdf188996"
+  description: "Four exhaust fan building static pressure control (as part of a composite device)."
+  is_abstract: true
+  opt_uses:
+  - exhaust_air_damper_percentage_command
+  - exhaust_fan_run_status_1
+  - exhaust_fan_run_status_2
+  - exhaust_fan_run_status_3
+  - exhaust_fan_run_status_4
+  - exhaust_fan_speed_percentage_command_1
+  - exhaust_fan_speed_percentage_command_2
+  - exhaust_fan_speed_percentage_command_3
+  - exhaust_fan_speed_percentage_command_4
+  - failed_exhaust_fan_alarm_1
+  - failed_exhaust_fan_alarm_2
+  - failed_exhaust_fan_alarm_3
+  - failed_exhaust_fan_alarm_4
+  - high_building_air_static_pressure_alarm
+  - low_building_air_static_pressure_alarm
+  uses:
+  - building_air_static_pressure_sensor
+  - building_air_static_pressure_setpoint
+  - exhaust_fan_run_command_1
+  - exhaust_fan_run_command_2
+  - exhaust_fan_run_command_3
+  - exhaust_fan_run_command_4
+  implements:
+  - CONTROL
 
 VSC:
   guid: "5ac998b4-d72e-40f1-9c8f-c905ec8b5cc6"
@@ -923,6 +952,7 @@ DFSS:
   - discharge_fan_lost_power_alarm
   - failed_discharge_fan_alarm
   - overload_discharge_fan_alarm
+  - zone_occupancy_status
   uses:
   - discharge_fan_run_command
   - discharge_fan_run_status
@@ -1149,6 +1179,16 @@ RTM:
   uses:
   - return_air_temperature_sensor
 
+HATM:
+  guid: "6addca4d-030f-4f7f-96c5-ffa710ceb14f"
+  description: "Single sensor hot aisle temperature monitoring."
+  is_abstract: true
+  implements:
+  - MONITORING
+  opt_uses:
+  - failed_hot_aisle_air_temperature_alarm
+  uses:
+  - hot_aisle_air_temperature_sensor
 
 HATM2X:
   guid: "9e1b1915-866a-4a9d-b4e2-cc74071f84b7"
@@ -1163,6 +1203,16 @@ HATM2X:
   - hot_aisle_air_temperature_sensor_1
   - hot_aisle_air_temperature_sensor_2
 
+CATM:
+  guid: "0051d3b6-b74d-45fb-aaba-827b61145b46"
+  description: "Single sensor cold aisle temperature monitoring."
+  is_abstract: true
+  implements:
+  - MONITORING
+  opt_uses:
+  - failed_cold_aisle_air_temperature_alarm
+  uses:
+  - cold_aisle_air_temperature_sensor
 
 CATM2X:
   guid: "35cd8ffc-f4c5-433e-9c42-b0127ad841da"
@@ -1364,6 +1414,8 @@ SWTC:
   - cooling_request_count
   - heating_request_count
   - return_water_temperature_sensor
+  - return_water_temperature_sensor_1
+  - return_water_temperature_sensor_2
   - low_return_water_temperature_alarm
   - high_return_water_temperature_alarm
   - run_command
@@ -2495,6 +2547,7 @@ CHWZC:
   - chilled_water_valve_percentage_sensor
   - cooling_thermal_power_capacity
   - discharge_air_temperature_sensor
+  - high_discharge_air_temperature_alarm
   - leaving_cooling_coil_temperature_sensor
   - failed_discharge_air_temperature_alarm
   - failed_zone_air_temperature_alarm

ontology/yaml/resources/HVAC/entity_types/AHU.yaml

@@ -2497,6 +2497,24 @@ AHU_BPC_CHWSC_ECONM_EFSS4X_EFVSC4X_FDPM_HWSC_MOAFC_SFSS2X_SFVSC2X_SSPC:
   - SFVSC2X
   - SSPC
 
+AHU_SFSS2X_SFVSC2X_EFSS4X_EFVSC4X_ECON_CHWSC_MOAFC_BSPC4X_SSPC_SARC_FDPM:
+  guid: "3606d81f-628c-4785-aac5-95c7c6a586ed"
+  description: "Multi-zone AHU."
+  is_canonical: true
+  implements:
+  - AHU
+  - SFSS2X
+  - SFVSC2X
+  - EFSS4X
+  - EFVSC4X
+  - ECON
+  - CHWSC
+  - MOAFC
+  - BSPC4X
+  - SSPC
+  - SARC
+  - FDPM
+
 AHU_BSPC_CO2M_DX4SC_ECON_EFSS_EFVSC_FDPM4X_HTSC_MOAFC_OAFC_SFSS_SFVSC_SSPC:
   guid: "3bd06ead-f794-4bd3-8388-f1d2a6dc3868"
   description: "Multi-zone AHU."

ontology/yaml/resources/HVAC/entity_types/DHWT.yaml

@@ -83,6 +83,15 @@ DHWT_HWTTC:
   - DHWT
   - HWTTC
 
+DHWT_SS_HWTTC:
+  guid: "13bbe03f-e01e-43f5-8232-6950ada48055"
+  description: "Domestic hot water tank."
+  is_canonical: true
+  implements:
+  - DHWT
+  - SS
+  - HWTTC
+
 DHWT_PHWTTC:
   guid: "1bf4aee2-1f3b-462a-9ccd-12eac4494eb3"
   description: "Preheating domestic hot water tank."

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

@@ -12,6 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+DWST_SWTC:
+  guid: "5f4e3653-79ab-4017-96fd-92167ae1594c"
+  description: "Domestic water system with supply water temperature control."
+  implements:
+  - DWST
+  - SWTC
 
 DWST_CWDT_SWTC_CPC:
   guid: "0357108f-fddd-46e6-a532-e8550f8bbe54"

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

@@ -1620,6 +1620,16 @@ FCU_DFSS_CHWDC_CSP_RTM_DXZC:
   - filter_alarm
   - run_mode
 
+FCU_DFSS_CHWDC_ZTM:
+  guid: "79e8f113-e1e0-4dfd-9eb1-d773f0788b9b"
+  description: "FCU with cooling-only chilled water discharge air temperature control, and zone temperature monitoring."
+  is_canonical: true
+  implements:
+  - FCU
+  - DFSS
+  - CHWDC
+  - ZTM
+
 FCU_SS_HTRC_DTM_ZTM:
   guid: "3d9b6b87-0770-4ae6-9bfc-8f729341ccac"
   description: "FCU with return temperature control, discharge temperature monitoring, zone temperature monitorning and start/stop control."

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

@@ -46,6 +46,9 @@ FCU:
   is_abstract: true
   opt_uses:
   - return_air_temperature_sensor
+  - low_return_air_temperature_alarm
+  - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - return_air_relative_humidity_sensor
   - discharge_air_temperature_sensor
   - failed_communication_alarm

ontology/yaml/resources/HVAC/entity_types/HUM.yaml

@@ -16,6 +16,12 @@
 ### Canonical Types  ###
 ########################
 
+HUM_RHHC:
+  guid: "44f8269a-c7ad-4405-9c93-5312a1c69b65"
+  description: "Standard humidifier."
+  implements:
+  - HUM
+  - RHHC
 
 ###################################
 ### Existing Non-standard Types ###

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

@@ -49,6 +49,16 @@ HX_CHWDT_PRWDT:
   - CHWDT
   - PRWDT
 
+HX_CHWDT_PSWTC_PSWISOVPM:
+  guid: "c15c5667-344f-45df-a0ed-4d21c2558c4a"
+  description: 'Chilled/process water heat exchanger with isolation.'
+  is_canonical: true
+  implements:
+  - HX
+  - CHWDT
+  - PSWTC
+  - PSWISOVPM
+
 HX_CHWDT_CHWRWISOVM:
   guid: "fb065fab-e208-4bad-b5fc-a373d8e91566"
   description: 'Chilled water heat exchanger with isolation.'

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

@@ -257,6 +257,22 @@ SENSOR_PCM:
   - /SENSOR
   - PCM
 
+SENSOR_HATM:
+  guid: "a0c88aaf-6125-4eb5-9197-d7ef411ea169"
+  description: "Cold aisle temperature matter monitoring."
+  is_canonical: true
+  implements:
+  - /SENSOR
+  - HATM
+
+SENSOR_CATM:
+  guid: "17eaa9a0-6657-44c0-b495-4fefd243eac9"
+  description: "Cold aisle temperature matter monitoring."
+  is_canonical: true
+  implements:
+  - /SENSOR
+  - CATM
+
 SENSOR_ZTM_ZHM_CO2M_PMM_HCHO:
   guid: "9e1b054e-3ae8-4c8c-9393-ba2c855dc8b6"
   description: "Sensor with zone temperature, humidity, CO2, HCHO and particulate matter monitoring"