Merge pull request #1336 from ccquigley/master

adding new SDC, AHU, HWS, FAN, MAU types. New fields for SDC. Updates to opt uses for ECONM

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

@@ -3499,9 +3499,12 @@ ECONM:
   - outside_air_damper_percentage_sensor
   - 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
+  - failed_outside_air_damper_alarm
   - high_mixed_air_temperature_alarm
   - low_mixed_air_temperature_alarm
   - high_return_air_temperature_alarm

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

@@ -4508,6 +4508,57 @@ AHU_SFSS2X_SFVSC2X_RFSS2X_RFVSC2X_HWSC_CHWSC_SSPC_MOAFC_ECON_EDPM_RD_UV:
   - RD
   - UV
 
+AHU_BSPC_DX5SC_ECONM_EDM_EFSS_EFVSC_SFSS4X_SFVSC4X_SSPC_SARC:
+  guid: "befd596e-5a4b-4c64-b045-7f546ada3e96"
+  description: "Multi-zone AHU with 5 compressors, exhaust damper monitoring, economizer controlling to MAT setpoint, and variable speed exhaust and four supply fans."
+  is_canonical: true
+  implements:
+  - AHU
+  - BSPC
+  - DX5SC
+  - ECONM
+  - EDM
+  - EFSS
+  - EFVSC
+  - SFSS4X
+  - SFVSC4X
+  - SSPC
+  - SARC
+
+AHU_BSPC_DX4SC_ECONM_EDM_EFSS_EFVSC_SFSS_SFVSC_SSPC_SARC:
+  guid: "2de3849a-ad73-426b-b4e6-91a09c28b0ad"
+  description: "Multi-zone AHU with 4 compressors, exhaust damper monitoring, economizer controlling to MAT setpoint, and variable speed exhaust and supply fans."
+  is_canonical: true
+  implements:
+  - AHU
+  - BSPC
+  - DX4SC
+  - ECONM
+  - EDM
+  - EFSS
+  - EFVSC
+  - SFSS
+  - SFVSC
+  - SSPC
+  - SARC
+
+AHU_BSPC_DX5SC_ECONM_EDM_EFSS_EFVSC_SFSS_SFVSC_SSPC_SARC:
+  guid: "17587a07-ce9e-4298-abce-736d2669c3c8"
+  description: "Multi-zone AHU with 5 compressors, exhaust damper monitoring, economizer controlling to MAT setpoint, and variable speed exhaust and supply fans."
+  is_canonical: true
+  implements:
+  - AHU
+  - BSPC
+  - DX5SC
+  - ECONM
+  - EDM
+  - EFSS
+  - EFVSC
+  - SFSS
+  - SFVSC
+  - SSPC
+  - SARC
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################

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

@@ -67,6 +67,16 @@ FAN_SS_VSC_ZSPC:
   - VSC
   - ZSPC
 
+FAN_SS_VSC_ZSPM:
+  guid: "9936851f-f434-407a-8671-941630a02883"
+  description: "Fan with start/stop status, open-loop speed control & zone static pressure monitoring."
+  is_canonical: true
+  implements:
+  - FAN
+  - SS
+  - VSC
+  - ZSPM
+
 FAN_SS_WDPM:
   guid: "d12cbe88-243a-40a5-b624-3a2f355e7cfc"
   description: "Fan with start/stop and differential pressure monitoring."
@@ -662,6 +672,7 @@ FAN_SS_VSC_REFC:
   - SS
   - VSC
   - REFC
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################

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

@@ -242,6 +242,16 @@ HWS_SWTC_BYPVPM_WDPC_WFRC:
   - WDPC
   - WFRC
 
+HWS_SWTC_WDPC_MINFC:
+  guid: "f13b4124-8003-4a9c-8730-edf62d83f614"
+  description: "Heating water system (temp/pressure control) with bypass controlling to minimum flow sensor and setpoint."
+  is_canonical: true
+  implements:
+  - HWS
+  - SWTC
+  - WDPC
+  - MINFC
+
 HWS_SWTM_WDPC_BYPVPM:
   guid: "5cc7fe32-46bc-429c-b6d0-c2c41799be80"
   description: "Heating water system with supply temperature monitoring, differential pressure control and bypass valve control."

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

@@ -792,6 +792,17 @@ MAU_SFSS2X_SFVSC2X_PHWSC_LCC_HWSC_SSPC_UV_SHM:
   - UV
   - SHM
 
+MAU_DFSS2X_DFVSC2X_DXDC_HWDC:
+  guid: "7132bf0f-160a-4b3d-aaed-ad313787fe61"
+  description: "Variable speed with two discharge fans, hydronic heating and dx cooling make-up air unit."
+  is_canonical: true
+  implements:
+  - MAU
+  - DFSS2X
+  - DFVSC2X
+  - DXDC
+  - HWDC
+
 ############################
 ###   Remap These Types  ###
 ############################

ontology/yaml/resources/HVAC/entity_types/SDC.yaml

@@ -92,4 +92,23 @@ SDC_UDEC:
   is_canonical: true
   implements:
   - SDC
-  - UDEC
+  - UDEC
+
+SDC_EXT_TLT_NORTH:
+  guid: "bb69d3c2-5063-425c-90c4-636f31d03a57"
+  description: "Directional shade (North). Illuminance sensor not required due to minimal heat gain from solar loads on the northern side of a building."
+  is_canonical: true
+  implements:
+  - SDC_EXT_TLT
+  uses:
+  - north_wind_linearvelocity_sensor
+
+SDC_EXT_TLT_SOUTH:
+  guid: "426eace1-f4c8-49d0-acef-0fad52d9cc44"
+  description: "Directional shade (South)."
+  is_canonical: true
+  implements:
+  - SDC_EXT_TLT
+  uses:
+  - south_illuminance_sensor
+  - south_wind_linearvelocity_sensor

ontology/yaml/resources/fields/telemetry_fields.yaml

@@ -3577,3 +3577,12 @@ literals:
 - circulation_pump_speed_frequency_sensor:
     flexible_min: -0.5
     flexible_max: 65.0
+- south_illuminance_sensor:
+    flexible_min: 0.0
+    flexible_max: 5000.0
+- north_wind_linearvelocity_sensor:
+    flexible_min: 0.0
+    flexible_max: 44.704
+- south_wind_linearvelocity_sensor:
+    flexible_min: 0.0
+    flexible_max: 44.704