Merge branch 'master' into master

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

@@ -757,6 +757,20 @@ AHU_DFSS_DSP_DXZC_ECOND_HTZC:
   - ECOND
   - HTZC
 
+AHU_ECOND_DFSS_DFVSC_DSP_CHWDC_HWDC_CO2C:
+  guid: "67d4ec22-42d3-45c5-8f51-ac4bfb7e789f"
+  description: "Single Zone AHU with economizer and CO2 control"
+  is_canonical: true
+  implements:
+  - AHU
+  - ECOND
+  - DFSS
+  - DFVSC
+  - DSP
+  - CHWDC
+  - HWDC
+  - CO2C
+
 AHU_CO2C_DFSS_DSP_DXZC_ECONZ_EFSS_HTZC:
   guid: "06019e28-c9e1-448f-8d11-775cbba3bf67"
   description: "Single zone AHU."

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

@@ -19,6 +19,17 @@
 # This file defines fan-coil unit types. Valid types must include a fan and a coil of some type.
 # They must also include some control scheme (e.g. ZTC, DSP, etc.).
 
+FCU_RTM_DFVSC2X_CHWZTC_HWZTC_DTM:
+  description: "FCU in a trench, with heating and cooling valves, and two fans."
+  is_canonical: true
+  implements:
+  - FCU
+  - RTM
+  - DFVSC2X
+  - CHWZTC
+  - HWZTC
+  - DTM
+
 FCU_DFSS_CSP_CHWDC:
   guid: "e0270205-c4be-4c74-9c54-a79afd332a9c"
   description: "Typical chilled water FCU with cooling-only (discharge control)."
@@ -62,6 +73,29 @@ FCU_DFSS_DFVSC_DXRC_DFRMM:
   - DXRC
   - DFRMM
 
+FCU_DFSS_DFVSC_DSP_CHWDC_HWDC_CO2M:
+  description: "Hydronic variable speed fan coil with heating and cooling (zone control, discharge coil control and CO2 monitoring)."
+  is_canonical: true
+  implements:
+  - FCU
+  - DFSS
+  - DFVSC
+  - DSP
+  - CHWDC
+  - HWDC
+  - CO2M
+
+FCU_DFSS_DFVSC_DSP_CHWDC_CO2M:
+  description: "Hydronic variable speed fan coil with cooling (zone temp control, discharge coil control and CO2 monitoring)."
+  is_canonical: true
+  implements:
+  - FCU
+  - DFSS
+  - DFVSC
+  - DSP
+  - CHWDC
+  - CO2M
+
 FCU_DFSS_CSP_DX2ZC:
   guid: "1e95273d-598a-41ae-88a4-021f8320444c"
   description: "Typical 2-stage DX FCU with cooling-only (zone control)."