Consolidate DF2XSS and DFSS2X

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

@@ -763,7 +763,7 @@ DFSS:
 
 DFSS2X:
   guid: "dddfd3fa-86a8-4cf9-b1ca-8026ab54f991"
-  description: "Two discharge fan run command and status (start/stop). With dampers"
+  description: "Two discharge fan run command and status (start/stop)."
   is_abstract: true
   implements:
   - OPERATIONAL
@@ -4118,23 +4118,6 @@ EFSS4X:
   - OPERATIONAL
 
 
-DF2XSS:
-  guid: "d869bbc9-3715-498f-a923-94f436664cd0"
-  description: "Discharge fan start-stop and feedback (2 pts)."
-  is_abstract: true
-  opt_uses:
-  - discharge_fan_current_sensor
-  - discharge_fan_power_sensor
-  - discharge_fan_lost_power_alarm
-  uses:
-  - discharge_fan_run_command_1
-  - discharge_fan_run_command_2
-  - discharge_fan_run_status_1
-  - discharge_fan_run_status_2
-  implements:
-  - OPERATIONAL
-
-
 SFSS2X:
   guid: "85ace121-6411-41f7-aea0-03440c7d1352"
   description: "Supply fan start-stop and feedback for two fans."

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

@@ -254,23 +254,23 @@ FCU_DFSS_DTC_HT2DC:
   - DTC
   - HT2DC
 
-FCU_DF2XSS_DSP_DXZC:
+FCU_DFSS2X_DSP_DXZC:
   guid: "0f451e9f-2c77-4baf-aa09-a25fd94374b9"
   description: "Two-fan DX fan coil with zone temp control."
   is_canonical: true
   implements:
   - FCU
-  - DF2XSS
+  - DFSS2X
   - DSP
   - DXZC
 
-FCU_DF2XSS_RTC_DXRC:
+FCU_DFSS2X_RTC_DXRC:
   guid: "838ae963-a18d-474e-b677-d01fa766486d"
   description: "Two-fan DX fan coil with zone temp control."
   is_canonical: true
   implements:
   - FCU
-  - DF2XSS
+  - DFSS2X
   - RTC
   - DXRC
 
@@ -1565,25 +1565,6 @@ FCU_DFSS_DFVSC_DSP_HWDC_CHWDC_NONCANONICAL_3:
   - zone_air_co2_concentration_setpoint
   - mixed_air_temperature_sensor
 
-FCU_DF2XSS_RTC_DXRC_NONCANONICAL_1:
-  guid: "4e7ff576-17dc-4b99-b8ec-76599114e3bd"
-  description: "Non-standard type."
-  implements:
-  - FCU_DF2XSS_RTC_DXRC
-  - INCOMPLETE
-  uses:
-  - discharge_fan_run_command
-
-FCU_DF2XSS_RTC_DXRC_NONCANONICAL_2:
-  guid: "228ee623-a396-4939-9264-f5f83dbbc3bd"
-  description: "Non-standard type."
-  implements:
-  - FCU_DFSS_RTC_DXRC
-  - INCOMPLETE
-  uses:
-  - discharge_air_temperature_setpoint
-  - zone_air_relative_humidity_sensor
-
 FCU_DFSS_DFVSC_ZTC_CHWZTC_HWZTC_NONCANONICAL_1:
   guid: "b7d8e6c6-454a-4d40-bc45-9589620b5617"
   description: "Non-standard type."
@@ -1658,15 +1639,6 @@ FCU_DFSS_CSP_DXZC_NONCANONICAL_3:
   uses:
   - condensing_water_isolation_valve_command
 
-FCU_DF2XSS_DSP_DXZC_NONCANONICAL_1:
-  guid: "56e8417a-9e15-48c6-97c7-be558b7f38a3"
-  description: "Non-standard type."
-  implements:
-  - FCU_DF2XSS_DSP_DXZC
-  - INCOMPLETE
-  uses:
-  - discharge_fan_run_status
-
 FCU_DFSS_CSP_DXZC_NONCANONICAL_4:
   guid: "c4a459f4-2d26-4300-91fa-c08b5105197c"
   description: "Non-standard type."

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

@@ -511,25 +511,25 @@ MAU_DFSS_DFVSC_DX2DDC_HTDDC_OAFC_ZTM:
   - OAFC
   - ZTM
 
-MAU_DF2XSS_DFVSC2X_HP2ZC_HTZC_OAFC:
+MAU_DFSS2X_DFVSC2X_HP2ZC_HTZC_OAFC:
   guid: "c20f2186-66bd-41cd-a19f-08b20045d91c"
   description: "Single zone with dual zone setpoint control for heating and cooling."
   is_canonical: true
   implements:
   - MAU
-  - DF2XSS
+  - DFSS2X
   - DFVSC2X
   - HP2ZC
   - HTZC
   - OAFC
 
-MAU_DF2XSS_DFVSC2X_DSP_HTZC:
+MAU_DFSS2X_DFVSC2X_DSP_HTZC:
   guid: "889b1215-4f1a-4962-a0b9-928a80b57737"
   description: "Single zone with dual zone setpoint control."
   is_canonical: true
   implements:
   - MAU
-  - DF2XSS
+  - DFSS2X
   - DFVSC2X
   - DSP
   - HTZC