Merge branch 'google:master' into new-ups-type

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

@@ -181,6 +181,7 @@ ZTC:
   - failed_zone_air_temperature_alarm
   - high_zone_air_temperature_alarm
   - low_zone_air_temperature_alarm
+  - zone_occupancy_status
   uses:
   - zone_air_temperature_sensor
   - zone_air_temperature_setpoint
@@ -540,6 +541,7 @@ DFVSC:
   - discharge_fan_voltage_sensor
   - discharge_fan_lost_power_alarm
   - failed_discharge_fan_alarm
+  - discharge_air_flowrate_sensor
   uses:
   - discharge_fan_run_command
   - discharge_fan_run_status
@@ -3078,6 +3080,7 @@ ECON:
   - outside_air_flowrate_sensor
   - outside_air_flowrate_setpoint
   - outside_air_relative_humidity_sensor
+  - outside_air_specificenthalpy_sensor
   - return_air_damper_percentage_command
   - supply_air_temperature_sensor
   - failed_mixed_air_temperature_alarm
@@ -5802,6 +5805,34 @@ CC2XM:
   - compressor_run_command_1
   - compressor_run_command_2
 
+CFCM:
+  guid: "6e4901e4-67f5-44d9-8239-84a1a2379419"
+  description: "Condenser fan current monitoring for a single fan."
+  is_abstract: true
+  uses:
+  - condensing_fan_current_sensor
+
+CFCM4X:
+  guid: "3b5df213-0616-400f-a025-69e72cda4d7b"
+  description: "Condenser fan current monitoring for 4 fans."
+  is_abstract: true
+  uses:
+  - condensing_fan_current_sensor_1
+  - condensing_fan_current_sensor_2
+  - condensing_fan_current_sensor_3
+  - condensing_fan_current_sensor_4
+
+CFCM6X:
+  guid: "47dcd13d-d95c-44bf-988b-ce8ec32cebe2"
+  description: "Condenser fan current monitoring for 6 fans."
+  is_abstract: true
+  uses:
+  - condensing_fan_current_sensor_1
+  - condensing_fan_current_sensor_2
+  - condensing_fan_current_sensor_3
+  - condensing_fan_current_sensor_4
+  - condensing_fan_current_sensor_5
+  - condensing_fan_current_sensor_6
 
 SSSPC:
   guid: "f933f42e-faf1-4039-801a-83f3eff24461"
@@ -6332,6 +6363,18 @@ EFHLC:
   implements:
   - OPERATIONAL
 
+HLC:
+  guid: "c225f8c3-1bd8-4f59-aabe-012c1eb992b5"
+  description: "Two-speed motor (high/low)."
+  is_abstract: true
+  opt_uses:
+  - high_speed_status
+  - low_speed_status
+  uses:
+  - high_speed_command
+  - low_speed_command
+  implements:
+  - OPERATIONAL
 
 SWCM:
   guid: "b82c4b84-96ae-48ee-a36b-29f274f6a41a"

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

@@ -415,6 +415,21 @@ AHU_DFSS_DSP_DX2ZC_ECONZ_HT2ZC:
   - ECONZ
   - HT2ZC
 
+AHU_DFSS_DSP_DX2ZC_ECONZ_HT2ZC_RHM_RCKTM2X_CFCM:
+  guid: "838369c9-e666-43ac-ab8b-e2564a51476f"
+  description: "Single zone AHU with return air humidity monitoring, 2-circuit refrigeration monitoring and condenser fan current monitoring."
+  is_canonical: true
+  implements:
+  - AHU
+  - DFSS
+  - DSP
+  - DX2ZC
+  - ECONZ
+  - HT2ZC
+  - RHM
+  - RCKTM2X
+  - CFCM
+
 AHU_DFSS_DSP_DXZC_ECONZ_ZHC:
   guid: "11ee2619-0647-4d96-8f98-fd0629e15cb7"
   description: "Single zone AHU."
@@ -1174,7 +1189,6 @@ AHU_DX2SC_ECON_HT2SC_SFSS_SFVSC_SSPC:
   - SFVSC
   - SSPC
 
-
 AHU_BYPSSPC_DXSC_ECON_EFSS_HTSC_SFSS:
   guid: "750d0b4e-4b60-42c4-b5ba-16d97bd8982d"
   description: "Multi-zone AHU"
@@ -1396,6 +1410,23 @@ AHU_BSPC_DX4SC_ECON_EFSS_SFSS_SFVSC_SSPC:
   - SFVSC
   - SSPC
 
+AHU_BSPC_DX4SC_ECON_EFSS_SFSS_SFVSC_SSPC_RHM_RCKTM2X_CFCM6X:
+  guid: "3bcd9e9b-4d88-4885-84f1-38c21c9f5cf5"
+  description: "Multi-zone AHU with return air humidity monitoring, condenser fan current monitoring and 2-circuit refrigeration monitoring."
+  is_canonical: true
+  implements:
+  - AHU
+  - BSPC
+  - DX4SC
+  - ECON
+  - EFSS
+  - SFSS
+  - SFVSC
+  - SSPC
+  - RHM
+  - RCKTM2X
+  - CFCM6X
+
 AHU_DX2SC_ECON_EFSS_HT2SC_SFSS_SFVSC_SSPC:
   guid: "ffd0eedd-7d0c-4b33-9d9b-f26a7bb4c29f"
   description: "Multi-zone AHU."
@@ -1566,6 +1597,24 @@ AHU_BSPC_DX4SC_ECON_EFSS_EFVSC_SFSS_SFVSC_SSPC:
   - SFVSC
   - SSPC
 
+AHU_BSPC_DX4SC_ECON_EFSS_EFVSC_SFSS_SFVSC_SSPC_RHM_RCKTM2X_CFCM6X:
+  guid: "32ec0c99-e99f-4351-86b2-4513c4ca13f4"
+  description: "Multi-zone AHU with return air humidity monitoring, condenser fan current monitoring and 2-circuit refrigeration monitoring."
+  is_canonical: true
+  implements:
+  - AHU
+  - BSPC
+  - DX4SC
+  - ECON
+  - EFSS
+  - EFVSC
+  - SFSS
+  - SFVSC
+  - SSPC
+  - RHM
+  - RCKTM2X
+  - CFCM6X
+
 AHU_DX2SC_ECON_EFSS_EFVSC_HTSC_SFSS_SFVSC_SSPC:
   guid: "d3d965e0-47d9-4194-b1a6-d2fffa088a87"
   description: "Multi-zone AHU."
@@ -1747,6 +1796,24 @@ AHU_BSPC_DX4SC_ECON_EFSS_OAFMC_SFSS_SFVSC_SSPC:
   - SFVSC
   - SSPC
 
+AHU_BSPC_DX4SC_ECON_EFSS_OAFMC_SFSS_SFVSC_SSPC_RHM_RCKTM2X_CFCM6X:
+  guid: "ab92eece-75ee-4500-8ab2-f675260db2e6"
+  description: "Multi-zone AHU with return air humidity monitoring, 2-circuit refrigeration monitoring and condenser fan current monitoring."
+  is_canonical: true
+  implements:
+  - AHU
+  - BSPC
+  - DX4SC
+  - ECON
+  - EFSS
+  - OAFMC
+  - SFSS
+  - SFVSC
+  - SSPC
+  - RHM
+  - RCKTM2X
+  - CFCM6X
+
 AHU_BSPC_DX2SC_ECON_EFSS_HWSC_SFSS_SFVSC_SSPC:
   guid: "ce6690b6-f809-4fbf-ac5d-4ae57e733f3c"
   description: "Multi-zone AHU."
@@ -1998,6 +2065,26 @@ AHU_BSPC_DX4SC_ECON_EFSS_EFVSC_SARC_SFSS_SFVSC_SSPC:
   - SFVSC
   - SSPC
 
+AHU_BSPC_DX3SC_ECON_EFSS_EFVSC_SARC_SFSS_SFVSC_SSPC_EDM_RHM_RCKTM2X_CFCM4X:
+  guid: "4e6d95c5-0e95-4f5c-9bb1-a885fc8d8df9"
+  description: "Multi-zone AHU with exhaust air damper monitoring, return air humidity monitoring, 2-circuit refrigerant monitoring and condenser fan monitoring"
+  is_canonical: true
+  implements:
+  - AHU
+  - BSPC
+  - DX3SC
+  - ECON
+  - EFSS
+  - EFVSC
+  - SARC
+  - SFSS
+  - SFVSC
+  - SSPC
+  - EDM
+  - RHM
+  - RCKTM2X
+  - CFCM4X
+
 AHU_BSPC_DX4SC_ECON_EFSS_EFVSC_HWSC_SFSS_SFVSC_SSPC:
   guid: "980f6cbc-80ec-4a38-8e06-d38478ff3bdb"
   description: "Multi-zone AHU."

ontology/yaml/resources/HVAC/entity_types/CU.yaml

@@ -30,6 +30,19 @@ CU_SFSS_SFVSC_CHWSC_HTSC_SSPC_SARC_MTM:
   - SARC
   - MTM
 
+CU_DFSS_DFVSC_CHWZTC_HWZTC_RTM_ZHM:
+  guid: "e17b91f8-99be-4870-8ee3-50250999e6d6"
+  description: "Compartment unit on discharge side with start/stop, status, cooling and heating (zone temp control)."
+  is_canonical: true
+  implements:
+  - CU
+  - DFSS
+  - DFVSC
+  - CHWZTC
+  - HWZTC
+  - RTM
+  - ZHM
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################

ontology/yaml/resources/HVAC/entity_types/FAN.yaml

@@ -483,6 +483,16 @@ FAN_EFHLC_COCDSP_NOCDSP:
   - COCDSP
   - NOCDSP
 
+FAN_HLC_COCDSP_NOCDSP:
+  guid: "b630f2bd-46cb-4cb5-afec-66fa38e0617a"
+  description: "Two-speed fan (low/high) with CO concentration dual setpoint control and NO concentration dual setpoint control."
+  is_canonical: true
+  implements:
+  - FAN
+  - HLC
+  - COCDSP
+  - NOCDSP
+
 FAN_SS_VSC_SCRSS:
   guid: "3696faf3-2a9c-4202-856b-80d48bd19f10"
   description: "Fan with scrubber start/stop and status."

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

@@ -1430,7 +1430,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."
@@ -1489,6 +1489,46 @@ FCU_NONCANONICAL_2: # Weird dehumidification unit. Complete one-off.
   - zone_air_heating_temperature_setpoint
   - zone_air_temperature_sensor
 
+FCU_NONCANONICAL_3:
+  guid: "8c41b0a5-c0a0-40bf-8367-13887fb04064"
+  description: "Non-standard type."
+  implements:
+  - FCU
+  uses:
+  - chilled_water_valve_percentage_command
+  - discharge_air_flowrate_sensor_1
+  - discharge_air_flowrate_sensor_2
+  - discharge_air_flowrate_sensor_3
+  - discharge_air_temperature_sensor_1
+  - discharge_air_temperature_sensor_2
+  - discharge_air_temperature_sensor_3
+  - discharge_fan_run_status_1
+  - discharge_fan_run_status_2
+  - discharge_fan_run_status_3
+  - discharge_fan_speed_percentage_command_1
+  - discharge_fan_speed_percentage_command_2
+  - discharge_fan_speed_percentage_command_3
+  - heating_water_valve_percentage_command
+  - return_air_temperature_sensor
+  - thermal_power_sensor_1
+  - thermal_power_sensor_2
+  - thermal_power_sensor_3
+  - zone_air_occupied_deadband_temperature_setpoint_1
+  - zone_air_occupied_deadband_temperature_setpoint_2
+  - zone_air_occupied_deadband_temperature_setpoint_3
+  - zone_air_temperature_sensor_1
+  - zone_air_temperature_sensor_2
+  - zone_air_temperature_sensor_3
+  - zone_air_temperature_setpoint_1
+  - zone_air_temperature_setpoint_2
+  - zone_air_temperature_setpoint_3
+  - zone_air_unoccupied_deadband_temperature_setpoint_1
+  - zone_air_unoccupied_deadband_temperature_setpoint_2
+  - zone_air_unoccupied_deadband_temperature_setpoint_3
+  - zone_occupancy_status_1
+  - zone_occupancy_status_2
+  - zone_occupancy_status_3
+
 FCU_DFSS_RTC_CHWRC_RHC_NONCANONICAL_1:
   guid: "025c2764-2de6-4839-ade6-0cf8551cd91c"
   description: "Non-standard type."

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

@@ -53,6 +53,8 @@ FCU:
   - return_air_relative_humidity_sensor
   - discharge_air_temperature_sensor
   - failed_communication_alarm
+  - master_alarm
+  - filter_alarm
   implements:
   - EQUIPMENT
 

ontology/yaml/resources/fields/telemetry_fields.yaml

@@ -1722,6 +1722,12 @@ literals:
 - zone_air_occupied_heating_temperature_setpoint:
     flexible_min: 255.9259259
     flexible_max: 308.1481481
+- zone_air_unoccupied_deadband_temperature_setpoint:
+    flexible_min: 255.372
+    flexible_max: 272.039
+- zone_air_occupied_deadband_temperature_setpoint:
+    flexible_min: 255.372
+    flexible_max: 272.039
 - mixed_air_relative_humidity_sensor:
     fixed_min: 0.0
     fixed_max: 100.0
@@ -3120,6 +3126,18 @@ literals:
 - failed_discharge_air_isolation_damper_alarm:
   - ACTIVE
   - INACTIVE
+- high_speed_command:
+  - ON
+  - OFF
+- low_speed_command:
+  - ON
+  - OFF
+- high_speed_status:
+  - ON
+  - OFF
+- low_speed_status:
+  - ON
+  - OFF
 
 - high_water_temperature_alarm:
   - ACTIVE