diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml index 695cc64dc..db0e3aa05 100644 --- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml @@ -4627,66 +4627,6 @@ AHU_BSPC_DX5SC_ECONM_EDM_EFSS_EFVSC_SFSS_SFVSC_SSPC_SARC: # TODO: Every AHU must have outside_air_temperature_sensor, so almost every AHU is currently incomplete. # See b/148117417 for details -AHU_UNDEFINED: - guid: "7d70f11b-ad04-4576-b974-bc3df9c9109e" - description: "An AHU with no telemetry data. Note this is non-canonical, as it is typically expected that telemetry will normally be available." - implements: - - AHU - -AHU_NON_CANONICAL_TYPE_1: - guid: "48831bff-5e24-4920-a961-f0d14845ea87" - description: "Datapoint from for Ahu's on Landlords side." - implements: - - AHU - - LANDLORD - uses: - - run_command - - supply_air_temperature_setpoint - - master_alarm - - run_status - - supply_air_temperature_sensor - -AHU_NON_CANONICAL_TYPE_2: - guid: "c963f0f3-c19a-4447-b768-0d6b948864b7" - description: "Ahu with variable speed supply and exhaust air fans, air cooler, hair heater, and hru." - implements: - - AHU - - VOADM - - SFVSC - - SSPC - - SFSS - - STC - - HHRU - - HWSC - - CHWSC - - EFVSC - - ESPC - - EDPM - - EFSS - - RTM - - ZHM - -AHU_NON_CANONICAL_TYPE_3: - guid: "84559bca-4a3e-4f13-9801-8e9632703e4f" - description: "Ahu with variable speed supply and exhaust air fans, air cooler, hair heater, and hru.-Incomplete" - implements: - - AHU - - INCOMPLETE - - VOADM - - SFVSC - - SSPC - - SFSS - - STC - - PHRU - - HWSC - - CHWSC - - EFVSC - - ESPC - - EDPM - - EFSS - - RTM - - ZHM - AHU_NON_CANONICAL_TYPE_4: guid: "372a3f62-36b6-439f-b2d6-8d2c3968d361" description: "Non-standard type 4" @@ -4703,27 +4643,6 @@ AHU_NON_CANONICAL_TYPE_4: - zone_air_cooling_temperature_setpoint - zone_air_temperature_sensor -AHU_NON_CANONICAL_TYPE_5: - guid: "64d9c1dd-7322-47eb-ad07-c529941939a4" - description: "Non-standard type 5" - implements: - - AHU_BSPC_DX4SC_ECON_EFSS_SFSS_SFVSC_SSPC - - INCOMPLETE - uses: - - zone_air_temperature_sensor - - zone_air_cooling_temperature_setpoint - - zone_air_heating_temperature_setpoint - -AHU_NON_CANONICAL_TYPE_6: - guid: "c76dfc36-ac54-4f85-93d6-ded0b563a679" - description: "Non-standard type 6" - implements: - - AHU_BSPC_DX4SC_ECON_EFSS_SFSS_SFVSC_SSPC - - INCOMPLETE - uses: - - supply_air_damper_command - - supply_air_damper_status - AHU_NON_CANONICAL_TYPE_7: guid: "58e4ffc1-f4ee-4401-9070-34897ff82ed6" description: "Non-standard type 7" @@ -4799,24 +4718,6 @@ AHU_NON_CANONICAL_TYPE_14: - supply_air_static_pressure_setpoint # Remove - supply_air_static_pressure_sensor # Remove -AHU_NON_CANONICAL_TYPE_15: - guid: "ae903e3a-4438-460d-af4c-58eff89780e1" - description: "Non-standard type 15" - implements: - - AHU_BYPSSPC_DXSC_ECON_HP2SC_SFSS - - INCOMPLETE - uses: - - zone_air_co2_concentration_setpoint - -AHU_NON_CANONICAL_TYPE_16: - guid: "25f1eda5-8c88-4bc2-aa3e-6a083ec968c8" - description: "Non-standard type 16" - implements: - - AHU_BYPSSPC_ECON_HP2SC_HT2SC_SFSS - - INCOMPLETE - uses: - - zone_air_co2_concentration_setpoint # Remove - AHU_NON_CANONICAL_TYPE_17: guid: "71a21aca-2d0b-4d17-a2d4-9cd33738fbbb" description: "Non-standard type 17" @@ -4826,112 +4727,6 @@ AHU_NON_CANONICAL_TYPE_17: uses: - zone_air_temperature_sensor -AHU_NON_CANONICAL_TYPE_18: - guid: "d1c35f45-fd26-4f4e-be91-9fec3d7e92ef" - description: "Non-standard type 18" - implements: - - AHU_BSPC_CHWSC_ECON_EFSS_EFVSC_HWSC_PHWSC_SFSS_SFVSC_SSPC - - INCOMPLETE - uses: - - supply_air_damper_percentage_command - -AHU_NON_CANONICAL_TYPE_19: - guid: "9a984218-f71d-4267-b470-90c65f089285" - description: "Non-standard type 19" - implements: - - AHU_BSPC_CHWSC_ECON_EFSS_EFVSC_SFSS_SFVSC_SSPC - - INCOMPLETE - uses: - - supply_air_damper_percentage_command - -AHU_NON_CANONICAL_TYPE_20: - guid: "3e24e23d-dbf9-421e-9f65-93b0d4cbfe52" - description: "Non-standard type 20" - implements: - - AHU_BSPC_DX4SC_ECONM_EFSS_EFVSC_SFSS2X_SFVSC_SSPC - - INCOMPLETE - uses: - - supply_air_damper_command - - supply_air_damper_status - -AHU_NON_CANONICAL_TYPE_21: - guid: "599ec1ea-7930-479c-a239-c5cf20e041a5" - description: "Non-standard type 21" - implements: - - AHU_CHWSC_ECON_HWSC_SFSS_SFVSC_SSPC - - INCOMPLETE - uses: - - zone_air_relative_humidity_sensor_1 - - zone_air_relative_humidity_sensor_2 - -AHU_NON_CANONICAL_TYPE_22: - guid: "8d873d00-689a-47da-ac14-d2f8205ae098" - description: "Non-standard type 22" - implements: - - AHU_CHWSC_ECON_SFC_SFSS_SFVSC_SSPC - - INCOMPLETE - uses: - - outside_air_damper_command - -AHU_NON_CANONICAL_TYPE_23: - guid: "b1f99eb9-b7f4-4863-be07-5c4cb0f823b5" - description: "Non-standard type 23" - implements: - - AHU_BSPC_CHWSC_ECON_EFSS_EFVSC_SFSS_SFVSC_SSPC - - INCOMPLETE - uses: - - zone_air_temperature_sensor - - zone_air_cooling_temperature_setpoint - - zone_air_heating_temperature_setpoint - - exhaust_air_flowrate_sensor - - supply_air_damper_percentage_command - -AHU_NON_CANONICAL_TYPE_24: - guid: "33716ad8-3d76-4767-a309-a624f25f7245" - description: "Non-standard type 24" - implements: - - AHU_BSPC_DXSC_ECON_EFSS_EFVSC_SFSS_SFVSC_SSPC - - INCOMPLETE - uses: - - compressor_speed_percentage_command - -AHU_NON_CANONICAL_TYPE_25: - guid: "19c1edc6-1584-4694-a139-cff5914765a4" - description: "Non-standard type 25" - implements: - - AHU_BSPC_CHWSC_ECON_EFSS_HWSC_SFSS_SSPC - - INCOMPLETE - uses: - - zone_air_cooling_temperature_setpoint - -AHU_NON_CANONICAL_TYPE_26: - guid: "d61f1e83-fe50-40f8-8fc3-7cffa11d3db9" - description: "Non-standard type 26" - implements: - - AHU_CHWZC_DFSS_DSP_ECONZ - - INCOMPLETE - uses: - - exhaust_air_damper_percentage_command - -AHU_NON_CANONICAL_TYPE_27: - guid: "6f2107b2-0299-4f4d-bb76-a21d88863e8f" - description: "Non-standard type 27" - implements: - - AHU_BSPC_CHWSC_ECON_EFSS_EFVSC_SFSS_SFVSC_SSPC - - INCOMPLETE - uses: - - zone_air_temperature_sensor - -AHU_NON_CANONICAL_TYPE_28: - guid: "5ade27ec-a2a1-4699-a881-d68dffde8c05" - description: "Non-standard type 28" - implements: - - AHU_BSPC_DX4SC_ECON_EFSS_EFVSC_SFSS_SFVSC_SSPC - - INCOMPLETE - uses: - - zone_air_temperature_sensor - - zone_air_cooling_temperature_setpoint - AHU_NON_CANONICAL_TYPE_29: guid: "9d73460d-d4aa-46ec-82ab-323774ab3013" description: "Non-standard type 29" @@ -4943,16 +4738,6 @@ AHU_NON_CANONICAL_TYPE_29: - supply_fan_run_status - supply_air_temperature_sensor -AHU_NON_CANONICAL_TYPE_30: - guid: "013a1f35-c3dd-4a14-a5f7-cf4fd7312329" - description: "Non-standard type 30" - implements: - - AHU_DSP_DFSS_DXZC_ECONMD - - INCOMPLETE - uses: - - outside_air_temperature_sensor - - ventilation_outside_air_damper_percentage_command - AHU_NON_CANONICAL_TYPE_31: guid: "b258e547-4315-45a0-8cf8-a39dfc160e9d" description: "Non-standard type 31" @@ -4963,18 +4748,6 @@ AHU_NON_CANONICAL_TYPE_31: - zone_air_temperature_sensor - outside_air_damper_command -AHU_NON_CANONICAL_TYPE_32: - guid: "5867ea9c-4357-49d8-9e92-779d775c99ee" - description: "Non-standard type 32" - implements: - - AHU_BSPC_DXSC_ECON_EFSS_EFVSC_FDPM_SFSS3X_SFVSC2X_SSPC - - INCOMPLETE - uses: - - condensing_fan_speed_percentage_command_1 - - compressor_speed_percentage_command_1 - - condensing_fan_speed_percentage_command_2 - - compressor_speed_percentage_command_2 - AHU_NON_CANONICAL_TYPE_33: guid: "46dd8e55-bbaf-4daf-9dbb-40a73bdddaf8" description: "Non-standard type 33" @@ -5013,16 +4786,6 @@ AHU_NON_CANONICAL_TYPE_35: - supply_fan_run_command - supply_fan_run_status -AHU_NON_CANONICAL_TYPE_36: - guid: "42dc8beb-76a0-4bee-a913-1d37f89dc34d" - description: "Non-standard type 36" - implements: - - AHU_DFSS_DSP_DX2ZC_ECONZ - - INCOMPLETE - uses: - - zone_air_temperature_sensor_1 - - zone_air_temperature_sensor_2 - AHU_NON_CANONICAL_TYPE_37: guid: "1e34b20e-77b1-4985-ad65-32ef6085e172" description: "Non-standard type 37" @@ -5032,22 +4795,6 @@ AHU_NON_CANONICAL_TYPE_37: - supply_fan_current_sensor_1 - supply_fan_current_sensor_2 -AHU_NON_CANONICAL_TYPE_38: - guid: "649cc471-16a4-490a-a366-90744b5fd43b" - description: "Non-standard type 38" - implements: - - REMAP_REQUIRED - uses: - - supply_fan_run_status - -AHU_NON_CANONICAL_TYPE_39: - guid: "84342497-9ed0-49c6-86d3-eb55e005f03e" - description: "Non-standard type 39" - implements: - - REMAP_REQUIRED - uses: - - outside_air_damper_percentage_command - AHU_NON_CANONICAL_TYPE_40: guid: "1ffb1601-cfa6-43b5-b512-f5a7f4783beb" description: "Non-standard type 40" @@ -5152,33 +4899,6 @@ AHU_NON_CANONICAL_TYPE_50: uses: - discharge_air_damper_command -AHU_NON_CANONICAL_TYPE_51: - guid: "533ed589-adbf-4151-9afb-b4455313b58f" - description: "Non-standard type 51" - implements: - - AHU_CHWSC_ECONM2X_MOAFC_SFSS_SFVSC_SSPC - - INCOMPLETE - uses: - - return_air_flowrate_sensor - -AHU_NON_CANONICAL_TYPE_52: - guid: "ffc90d01-7f05-4f78-b3c6-9207469df92e" - description: "Non-standard type 52" - implements: - - AHU_CHWSC_ECON_FDPM_SFSS_SFVSC_SSPC - - INCOMPLETE - uses: - - outside_air_damper_command - -AHU_NON_CANONICAL_TYPE_53: - guid: "f4770c34-4186-4ba8-8301-10f99e11f815" - description: "Non-standard type 53" - implements: - - AHU_CHWSC_ECON_EFSS_EFVSC_FDPM_RFC_SFSS_SFVSC_SSPC - - INCOMPLETE - uses: - - outside_air_damper_command - AHU_NON_CANONICAL_TYPE_54: guid: "cd258658-29ee-404e-939d-fdbc05ca5ce8" description: "Non-standard type 54" @@ -5188,24 +4908,6 @@ AHU_NON_CANONICAL_TYPE_54: uses: - run_command -AHU_NON_CANONICAL_TYPE_55: - guid: "6804e5f9-627c-4a81-a277-353086b8d1f4" - description: "Non-standard type 55" - implements: - - AHU_DX4ZC_ECON_EFSS_HT3ZC_SFSS_SFVSC_ZHC - - INCOMPLETE - uses: - - zone_air_dehumidification_relative_humidity_setpoint - -AHU_NON_CANONICAL_TYPE_56: - guid: "89de4191-2deb-479d-b3cf-0ecdc851576d" - description: "Non-standard type 56" - implements: - - AHU_DFSS_DFVSC_DX4ZC_ECONZ_HT3ZC_ZHM - - INCOMPLETE - uses: - - zone_air_dehumidification_relative_humidity_setpoint - AHU_NON_CANONICAL_TYPE_57: guid: "bc8f9357-22cd-4b9e-becd-9d1949aec990" description: "Non-standard type 57" @@ -5301,16 +5003,6 @@ AHU_NON_CANONICAL_TYPE_65: - zone_air_heating_temperature_setpoint - zone_air_temperature_sensor -AHU_NON_CANONICAL_TYPE_66: - guid: "fe969bce-99b8-46cb-8880-4ba91ca83e39" - description: "Non-standard type 66" - implements: - - AHU_BPC_CHWSC_ECONM_EFSS4X_EFVSC4X_FDPM_HWSC_MOAFC_SFSS2X_SFVSC2X_SSPC - - INCOMPLETE - uses: - - heating_water_valve_status - - chilled_water_valve_command - AHU_NON_CANONICAL_TYPE_67: guid: "a1ca7b56-7cb7-4c05-8a4e-fc118acc55c5" description: "Non-standard type 67" @@ -5365,16 +5057,6 @@ AHU_NON_CANONICAL_TYPE_69: - zone_air_temperature_sensor - zone_air_temperature_setpoint -AHU_NON_CANONICAL_TYPE_70: - guid: "f87c0b51-f63c-4125-b044-c97d0fbe6b87" - description: "Non-standard type 70" - implements: - - AHU_BSPC_ECON_EFSS_SARC_SFSS_SFVSC_SSPC - - INCOMPLETE - uses: - - supply_fan_speed_frequency_command - - ventilation_outside_air_flowrate_setpoint - AHU_NON_CANONICAL_TYPE_71: guid: "06ba3a10-2c56-4ed6-b306-f6a7a4b20dcf" description: "Non-standard type 71" diff --git a/ontology/yaml/resources/HVAC/entity_types/BLR.yaml b/ontology/yaml/resources/HVAC/entity_types/BLR.yaml index b92ed34f7..e3c0939af 100644 --- a/ontology/yaml/resources/HVAC/entity_types/BLR.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/BLR.yaml @@ -295,15 +295,6 @@ BLR_HT2SWC_RWTM: ### Existing Non-standard Types ### ################################### -BLR_SS_SWTC_NONCANONICAL_1: - guid: "bf45f546-498d-422e-bf6f-15242360e3af" - description: "Non-standard type." - implements: - - BLR_SS_SWTC - - INCOMPLETE - uses: - - bypass_valve_percentage_command - BLR_SS_SWTC_NONCANONICAL_2: guid: "19af4bb1-af89-4aef-a63a-a2729bb4ee6a" description: "Non-standard type." @@ -313,15 +304,6 @@ BLR_SS_SWTC_NONCANONICAL_2: uses: - heating_stage_run_count -BLR_SS_SWTC_SWISOVM_NONCANONICAL_1: - guid: "7dcb33d4-70ee-4f0a-9ba3-2cb4f66f83b2" - description: "Non-standard type." - implements: - - BLR_SS_SWTC_SWISOVM - - INCOMPLETE - uses: - - heating_stage_run_count - BLR_SS_SWTC_SWISOVM_NONCANONICAL_2: guid: "46c2e8d8-a26b-4e30-b809-8d8780485ad8" description: "Non-standard type." diff --git a/ontology/yaml/resources/HVAC/entity_types/CH.yaml b/ontology/yaml/resources/HVAC/entity_types/CH.yaml index 6dcd4ffa8..fc079679e 100644 --- a/ontology/yaml/resources/HVAC/entity_types/CH.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/CH.yaml @@ -689,85 +689,3 @@ CH_SS_SCHWTC_CWDT_CHWRISOVPM_CWRISOVPM_REFPM_REFSM_MIPVCM_MIPWM_CHCPC_CDCPC_OTPM ################################### ### Existing Non-standard Types ### ################################### - -CH_SS_SWTC_DX4SWC_SWISOVPM_NONCANONICAL_1: - guid: "d4bef12c-c41b-4ba8-9d06-035e9e9ba431" - description: "Non-standard type." - implements: - - CH_SS_SWTC_DX4SWC_SWISOVPM - - INCOMPLETE - -CH_SS_SWTC_NONCANONICAL_1: - guid: "ae202987-6078-455c-8ee0-dfe43e223329" - description: "Non-standard type." - implements: - - CH_SS_SWTC - - INCOMPLETE - uses: - - cooling_percentage_sensor - -CH_SS_SCHWTC_CWDT_NONCANONICAL_1: - guid: "30db6609-b1e4-40ac-8d03-12d38d41a64d" - description: "Non-standard type." - implements: - - CH_SS_SCHWTC_CWDT - - INCOMPLETE - uses: - - cooling_percentage_sensor - -CH_SS_CHWDT_CWDT_CWDPM_CHWDPM_REFM: - guid: "48f951c0-42ca-4714-a3ef-e384fa1485d2" - description: "Non-standard type." - is_canonical: false - implements: - - CH - - SS - - CHWDT - - CWDT - - CWDPM - - CHWDPM - - REFM - -CH_SS_CHWDT2X_CWDT_CWDPM_CHWDPM_REFM: - guid: "d6b6a0e5-a5a1-4634-9792-0ba39cb3e1fd" - description: "Non-standard type." - is_canonical: false - implements: - - CH - - SS - - CHWDT2X - - CWDT - - CWDPM - - CHWDPM - - REFM - -CH_SS_CHWDT: - guid: "471edb03-6731-4fe3-862e-c7ab9825e7e9" - description: "Non-standard chiller." - implements: - - CH - - INCOMPLETE - - SS - - CHWDT - opt_uses: - - lost_power_alarm - - run_mode - -CH_SS_CHWSWISOVM_CWSISOVM_CWRISOVM_CHWRWISOVM_CHWDT: - guid: "bec266d2-2046-4142-a55a-fb7917d6d74f" - description: "Non standard chiller with chilled/condensing supply/return water isolation valve control. Chilled water flowrate status " - implements: - - CH - - SS - - CHWSWISOVM - - CWSISOVM - - CWRISOVM - - CHWRWISOVM - - CHWDT - uses: - - chilled_water_flowrate_status - - condensing_water_flowrate_status - - condensing_supply_water_temperature_sensor - opt_uses: - - lost_power_alarm - - run_mode diff --git a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml index 62dce26fd..a064353a3 100644 --- a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml @@ -426,13 +426,3 @@ CHWS_SWTC_WDPC_WFRM_PSWTC_PWVPM_MINFC_CLPM_NONCANONICAL_1: - return_water_isolation_valve_status - process_water_flowrate_setpoint - process_cooling_thermal_power_sensor - -CHWS_SWTC_WDPC_BYPVPM_WFRM_NONCANONICAL_1: - guid: "ba993791-6878-4e7b-91a1-d7c0aac04e6f" - description: "Non-standard type." - implements: - - CHWS_SWTC_WDPC_BYPVPM_WFRM - - INCOMPLETE - uses: - - production_differential_pressure_sensor - - supply_water_flowrate_sensor # Need to rename to flowrate_sensor diff --git a/ontology/yaml/resources/HVAC/entity_types/CT.yaml b/ontology/yaml/resources/HVAC/entity_types/CT.yaml index e809ba52b..8c3fbf976 100644 --- a/ontology/yaml/resources/HVAC/entity_types/CT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/CT.yaml @@ -208,49 +208,3 @@ CT_SS_VSC_SWTM_RWISOVM_SWISOVM_FSWISOVM_FRWISOVM: ################################### ### Existing Non-standard Types ### ################################### - -CT_SS_SWTC_NONCANONICAL_1: - guid: "1a4475ad-f918-40e7-bb50-a3a688c80e80" - description: "Non-standard type." - implements: - - CT_SS_SWTC - - INCOMPLETE - uses: - - fan_speed_mode - -CT_SS_VSC_SWTC_NONCANONICAL_1: - guid: "0eee9ffb-cad6-408a-b1ef-85ac2cf3e1e9" - description: "Non-standard type." - implements: - - CT_SS_VSC_SWTC - - INCOMPLETE - uses: - - speed_frequency_command - - -CT_SS_VSC_SWTM: - guid: "cb5d9702-fdf0-44be-9857-21ef98ad5739" - description: "Cooling tower with variable speed control and supply water temperature monitoring" - is_canonical: false - implements: - - CT - - SS - - VSC - - SWTM - -CT_SS_CWDT_OA_VSFC_CSWIVS_CRWIVS_CSWTC: - guid: "503f5a06-47f3-4215-8ec2-fe634ad8e874" - description: "CT with multi considering water isolation valve control, condensing return/supply water monitor and outside air monitor" - implements: - - CT - - SS - - CWDT - - OA - - VSFC - - CSWIVS - - CRWIVS - - CSWTC - opt_uses: - - control_mode - - run_mode - - lost_power_alarm diff --git a/ontology/yaml/resources/HVAC/entity_types/DFR.yaml b/ontology/yaml/resources/HVAC/entity_types/DFR.yaml index ce6db3e30..89458d962 100644 --- a/ontology/yaml/resources/HVAC/entity_types/DFR.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/DFR.yaml @@ -64,16 +64,6 @@ DFR_SFSS_SFVSC_BYPSSPC_HTSC: ### Existing Non-standard Types ### ################################### -DFR_SFSS_BYPSSPC_HT2SC_RTM_NONCANONICAL_1: - guid: "0539ecd5-d85c-4abd-9d1f-855b0180dbaf" - description: "Non-standard type." - implements: - - DFR_SFSS_BYPSSPC_HT2SC_RTM - - DEPRECATED - uses: - - heating_percentage_command_1 - - heating_percentage_command_2 - DFR_SFSS_BYPSSPC_HT2SC_RTM_NONCANONICAL_2: guid: "34afae9b-41bc-4432-87ca-fe59c74413bc" description: "Non-standard type." diff --git a/ontology/yaml/resources/HVAC/entity_types/DH.yaml b/ontology/yaml/resources/HVAC/entity_types/DH.yaml index 3eb3dc1e8..1695135d4 100644 --- a/ontology/yaml/resources/HVAC/entity_types/DH.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/DH.yaml @@ -52,24 +52,3 @@ DH_SS_HTSC: - DH - SS - HTSC - -############################ -### Need to Remap These ### -############################ - -DFR_NONCANONICAL_1: - guid: "294ea391-5e4c-4867-aba7-a50658e74660" - description: "Non-standard type." - uses: - - discharge_air_relative_humidity_sensor - - discharge_air_temperature_sensor - - discharge_air_temperature_setpoint - - heater_run_command - - heating_percentage_command - - humidification_percentage_command - - zone_air_relative_humidity_sensor_1 - - zone_air_relative_humidity_sensor_2 - - zone_air_relative_humidity_sensor_3 - implements: - - HUM - - REMAP_REQUIRED diff --git a/ontology/yaml/resources/HVAC/entity_types/DMP.yaml b/ontology/yaml/resources/HVAC/entity_types/DMP.yaml index d8d220358..7369ecc78 100644 --- a/ontology/yaml/resources/HVAC/entity_types/DMP.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/DMP.yaml @@ -114,14 +114,3 @@ DMP_NONCANONICAL_1: - supply_air_damper_percentage_command_1 - supply_air_damper_percentage_command_2 - west_building_air_static_pressure_sensor - -DMP_BPC_NONCANONICAL_1: - guid: "c7bba727-0cec-4348-9343-b7a9072d98dc" - description: "Non-standard type." - implements: - - DMP - - BPC - - REMAP_REQUIRED # Should probably be split into two separate dampers. Will then match canonical. - uses: - - east_exhaust_air_damper_percentage_command - - west_exhaust_air_damper_percentage_command diff --git a/ontology/yaml/resources/HVAC/entity_types/DWST.yaml b/ontology/yaml/resources/HVAC/entity_types/DWST.yaml index 2196fcbf2..2ad42c7d9 100644 --- a/ontology/yaml/resources/HVAC/entity_types/DWST.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/DWST.yaml @@ -77,18 +77,6 @@ DWST_SWTC_CPVSC2X_WSHP2X: - potable_hot_leaving_water_temperature_sensor_2 - potable_hot_leaving_water_temperature_setpoint -DWST_SS_PWDT_HWTTC_SEWTM: - guid: "bbde1c7a-fd21-410f-969a-65ebcf65234d" - description: "DWST with primary, secondary temperature monitoring, tank temperature sensor" - is_canonical: false - implements: - - SS - - PWDT - - HWTTC - - SEWTM - uses: - - heater_run_command - DWST_HWDT_CPC_SWTC2X_HWFM_HSWPM: guid: "cd74f84e-969a-422c-8c84-d40ca6281352" description: "Non-standard domestic water system with two heating water heat exhangers that are manually opened/closed, @@ -121,4 +109,4 @@ DWST_HWDT_CPC2X_SWTC2X_HWFM_HSWPM: - supply_water_temperature_sensor_1 - supply_water_temperature_sensor_2 - supply_water_temperature_setpoint - - heating_water_flowrate_sensor \ No newline at end of file + - heating_water_flowrate_sensor diff --git a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml index baf3857a7..481349294 100644 --- a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml @@ -1700,49 +1700,7 @@ FCU_DFSS_RHDHC_HT2RC_DX2RC: ################################### ### Existing Non-standard Types ### ################################### - -FCU_DFS_CH_RTC_RRHM_HMDHMM: - guid: "330833da-f1df-479b-aa25-edfa1f24c14a" - description: "CHW fan coil unit with return temperature control." - implements: - - FCU_DFSS_DFVSC_RTC_CHWRC - - INCOMPLETE - uses: - - humidification_run_status - - dehumidification_run_status - - return_air_relative_humidity_sensor - -FCU_DFSS_DTC_CHWDC_NONCANONICAL_1: - guid: "5b507a68-810c-4584-81fa-f82ea371074a" - description: "Non-standard type." - implements: - - FCU_DFSS_DTC_CHWDC - - INCOMPLETE - uses: - - discharge_air_cooling_temperature_setpoint - - discharge_air_heating_temperature_setpoint - -FCU_DFSS_ZTC_ZHDHC_DXZTC_NONCANONICAL_1: - guid: "10052149-6aa4-4b6f-aef7-236df7d05e95" - description: "Non-standard type." - implements: - - FCU_DFSS_ZTC_ZHDHC_DXZTC - - INCOMPLETE - uses: - - economizer_mode - -FCU_DFSS_DSP_HWZC_CHWZC_NONCANONICAL_1: - guid: "75d41b44-a33f-4c47-a1a8-5d1cb3438db2" - description: "Non-standard type." - implements: - - FCU_DFSS_DSP_HWZC_CHWZC - - INCOMPLETE - uses: - - discharge_air_temperature_sensor_1 - - discharge_air_temperature_sensor_2 - - discharge_air_temperature_sensor_3 - - discharge_air_temperature_sensor_4 - + FCU_DFSS_CSP_DXZC_NONCANONICAL_1: guid: "16c44e1d-4a63-4fcf-a762-ff16d823f04c" description: "Non-standard type." @@ -1780,15 +1738,6 @@ FCU_DFSS_DFVSC_RTC_RHC_RHDHC_DXRC_NONCANONICAL_1: uses: - humidification_percentage_command -FCU_DFSS_DFVSC_DSP_HWDC_CHWDC_NONCANONICAL_1: - guid: "ed15a187-3d25-4c34-a571-95a90c404387" - description: "Non-standard type." - implements: - - FCU_DFSS_DFVSC_DSP_HWDC_CHWDC - uses: - - heating_water_valve_status - - chilled_water_valve_command - FCU_DFSS_DFVSC_DSP_HWDC_CHWDC_NONCANONICAL_2: guid: "99823266-a32c-4f51-bf3c-ecc5b24ee7ea" description: "Non-standard type." @@ -1810,25 +1759,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." @@ -1856,7 +1786,6 @@ FCU_DFSS_DFVSC_ZTC_CHWZTC_HWZTC_NONCANONICAL_2: - run_mode - exercise_mode - FCU_NONCANONICAL_1: guid: "45cd4430-5899-47f3-9319-8f942c5c1ddb" description: "Non-standard type." @@ -1893,24 +1822,6 @@ FCU_DFSS_CSP_ZHC_DXZC_NONCANONICAL_1: uses: - zone_air_relative_humidity_setpoint -FCU_DFSS_CSP_DXZC_NONCANONICAL_3: - guid: "23258e44-88e6-4ff4-93d0-65cd0445a8a1" - description: "Non-standard type." - implements: - - FCU_DFSS_CSP_DXZC - - INCOMPLETE - 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." @@ -2169,4 +2080,4 @@ FCU_DFSS_DFRMM_CHWBZC_DAIDC_RAIDC: - DFRMM - CHWBZC - DAIDC - - RAIDC \ No newline at end of file + - RAIDC diff --git a/ontology/yaml/resources/HVAC/entity_types/HUM.yaml b/ontology/yaml/resources/HVAC/entity_types/HUM.yaml index 62fcb95d8..cc883bd30 100644 --- a/ontology/yaml/resources/HVAC/entity_types/HUM.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/HUM.yaml @@ -30,14 +30,3 @@ HUM_NONCANONICAL_1: - discharge_air_relative_humidity_sensor - humidification_percentage_command - humidification_percentage_sensor - -HUM_NONCANONICAL_2: - guid: "2ae8e262-a092-48bf-92ac-e5c0079e8db2" - description: "Non-standard type." - implements: - - HUM - uses: - - humidification_percentage_command - - humidification_run_command - - zone_air_relative_humidity_sensor - - zone_air_temperature_sensor diff --git a/ontology/yaml/resources/HVAC/entity_types/HWS.yaml b/ontology/yaml/resources/HVAC/entity_types/HWS.yaml index 79c4545b6..5d5a7f1bf 100644 --- a/ontology/yaml/resources/HVAC/entity_types/HWS.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/HWS.yaml @@ -377,25 +377,3 @@ HWS_SWTC_WDPC2X_NONCANONICAL_1: uses: - return_water_temperature_sensor_1 - return_water_temperature_sensor_2 - -HWS_RWTC_MXVPM_NONCANONICAL_1: - guid: "5c99f349-15ce-4908-b3b2-185e758ca0ad" - description: "Non-standard type." - implements: - - HWS_RWTC_MXVPM - - DEPRECATED - uses: - - mixing_valve_percentage_command - - heat_exchange_supply_water_isolation_valve_command - -HWS_SWTC_CPC: - guid: "e8ea2064-a575-4c7d-957b-948f83edc8a8" - description: "Simple hot water system with circulation pump" - implements: - - HWS - - SWTC - - CPC - uses: - - circulation_pump_speed_percentage_command - - circulation_pump_speed_percentage_setpoint - - failed_alarm diff --git a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml index 50e31c9e8..8a95af43c 100644 --- a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml @@ -887,41 +887,6 @@ MAU_DFSS2X_DFVSC2X_DXDC_HWDC: ### Remap These Types ### ############################ -MAU_NONCANONICAL_1: - guid: "58a4d4ec-c0c3-4623-8f59-5dcb2298db53" - description: "Non-standard type." - implements: - - REMAP_REQUIRED # Actually an AHU. - uses: - - building_air_static_pressure_setpoint - - compressor_run_command_1 - - compressor_run_command_2 - - compressor_run_command_3 - - compressor_run_command_4 - - economizer_mode - - exhaust_fan_run_status - - return_air_temperature_sensor - - supply_air_static_pressure_sensor - - supply_fan_run_command - - supply_fan_run_status - - supply_air_flowrate_sensor - -MAU_NONCANONICAL_2: - guid: "f0419402-555b-47a3-8f68-b9fbf8e40965" - description: "Non-standard type." - implements: - - REMAP_REQUIRED - uses: - - exhaust_fan_run_status - -MAU_NONCANONICAL_3: - guid: "4cd8493e-0917-4485-b0e3-f5875e3245db" - description: "Non-standard type." - implements: - - REMAP_REQUIRED - uses: - - supply_fan_run_status - MAU_NONCANONICAL_4: guid: "c8be4225-c20c-4c54-86b0-9a153825a84a" description: "Non-standard type." @@ -958,34 +923,6 @@ MAU_DFSS2X_DFVSC2X_CHWZC_HWZC_VOADM: ### Existing Non-standard Types ### ################################### -MAU_DFSS_DFVSC_BPC_DXDC_HTDC_DSP_NONCANONICAL_1: - guid: "9821db96-8384-4139-81f7-c3890ecf8202" - description: "Non-standard type." - implements: - - MAU_DFSS_DFVSC_BPC_DXDC_HTDC_DSP - - INCOMPLETE - uses: - - outside_air_damper_percentage_command - -MAU_DFSS_DFVSC_DSP_CHWZC_HWZC_NONCANONICAL_1: - guid: "e97a8505-bd80-4935-9057-9aee241bb146" - description: "Non-standard type." - implements: - - MAU_DFSS_DFVSC_DSP_CHWZC_HWZC - - DEPRECATED - uses: - - discharge_air_flowrate_sensor - - discharge_air_static_pressure_sensor - -MAU_SFSS_SFVSC_HWSC_DX2SC_HT4SC_SSPC_NONCANONICAL_1: - guid: "f2c4cc02-e86a-43d1-8c9c-7cc0a9a26ae7" - description: "Non-standard type." - implements: - - MAU_SFSS_SFVSC_HWSC_DX2SC_HT4SC_SSPC - - INCOMPLETE - uses: - - zone_air_temperature_sensor - MAU_SFSS_SFVSC_DXSC_SSPC_HTSC_NONCANONICAL_1: guid: "33a0a938-a15c-467f-9cf2-3e0bb8139aa0" description: "Non-standard type." @@ -1004,24 +941,6 @@ MAU_SFSS_SFVSC_DXSC_HTSC_NONCANONICAL_2: uses: - outside_air_damper_percentage_command -MAU_SFSS_CHWSC_HT4SC_NONCANONICAL_1: - guid: "e3767b30-7299-44ed-b879-cfd22a1ee656" - description: "Non-standard type." - implements: - - MAU_SFSS_CHWSC_HT4SC - - INCOMPLETE - uses: - - zone_air_temperature_sensor - -MAU_DFSS_DFVSC_DSP_HTSC_NONCANONICAL_1: - guid: "adbab15e-0fc6-4df4-bd48-bb6359c40d5b" - description: "Non-standard type." - implements: - - MAU_DFSS_DFVSC_DSP_HTSC - - INCOMPLETE - uses: - - spray_pump_run_command - MAU_SFSS_SFVSC_HTSC_BPC_NONCANONICAL_1: guid: "f5fe11ba-0947-4021-86b0-d7955ab40093" description: "Non-standard type." @@ -1031,16 +950,6 @@ MAU_SFSS_SFVSC_HTSC_BPC_NONCANONICAL_1: uses: - evaporative_cooler_run_command -MAU_SFSS_SFVSC_SSPC_HT2SC_DX2SC_NONCANONICAL_1: - guid: "c80e09ab-0518-47f2-9055-dc10aa250599" - description: "Non-standard type." - implements: - - MAU_SFSS_SFVSC_SSPC_HT2SC_DX2SC - - INCOMPLETE - uses: - - zone_air_temperature_sensor - - zone_air_temperature_setpoint # Has static control - MAU_SFSS_SFVSC_HTSC_DX2SC_SSPC_NONCANONICAL_1: guid: "14a26393-4f00-48a2-a916-8fb80fe0cfd8" description: "Non-standard type." diff --git a/ontology/yaml/resources/HVAC/entity_types/PMP.yaml b/ontology/yaml/resources/HVAC/entity_types/PMP.yaml index 3211d40b5..783214215 100644 --- a/ontology/yaml/resources/HVAC/entity_types/PMP.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/PMP.yaml @@ -190,22 +190,3 @@ PMP_SS_VSC_HWBYPVM: ################################### ### Existing Non-standard Types ### ################################### - -PMP_SS_VSC_NONCANONICAL_1: - guid: "026231f9-fae5-4250-8d4b-c8b33948dc5d" - description: "Non-standard variable speed pump." - implements: - - PMP_SS_VSC - - INCOMPLETE - uses: - - speed_frequency_command - -PMP_SS_VSC_NONCANONICAL_2: - guid: "f9ffc542-75a0-4159-9b19-2b72fd1b4396" - description: "One-off pump that performs chilled water blending." - implements: - - PMP_SS_VSC - uses: - - mixing_valve_percentage_command - - chilled_supply_water_temperature_setpoint - - chilled_supply_water_temperature_sensor diff --git a/ontology/yaml/resources/HVAC/entity_types/RP.yaml b/ontology/yaml/resources/HVAC/entity_types/RP.yaml index 44c6d11e9..9a2d9d64b 100644 --- a/ontology/yaml/resources/HVAC/entity_types/RP.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/RP.yaml @@ -23,13 +23,6 @@ RP_CAM_DPHCC_ZTC: - DPHCC - ZTC -RSR_HHCDM: - guid: "c562fd61-d92b-4493-a290-ef35a11f34b8" - description: "Cooling or heating changeover function for radiant panels or fcu's." - implements: - - RSR - - HHCDM - RP_DPBHCC_FTC: guid: "c83f158e-a4e5-4e14-ab93-e711e9af7aa5" description: "Radiant panel for room heating and cooling, along with floor temperature control." @@ -104,4 +97,4 @@ RP_DSP_FPHC_CAM: - RP - DSP - FPHC - - CAM \ No newline at end of file + - CAM diff --git a/ontology/yaml/resources/HVAC/entity_types/RSR.yaml b/ontology/yaml/resources/HVAC/entity_types/RSR.yaml index 54bbbb734..6bf37efc8 100644 --- a/ontology/yaml/resources/HVAC/entity_types/RSR.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/RSR.yaml @@ -12,6 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. +RSR_HHCDM: + guid: "c562fd61-d92b-4493-a290-ef35a11f34b8" + description: "Cooling or heating changeover function for radiant panels or fcu's." + implements: + - RSR + - HHCDM + FARSR_UNDEFINED: guid: "cd83cffe-fb37-4138-9ff0-9da7958eccf2" description: "Fresh air distribution riser without any data points." diff --git a/ontology/yaml/resources/HVAC/entity_types/VAV.yaml b/ontology/yaml/resources/HVAC/entity_types/VAV.yaml index 8f0245e53..af0f95264 100644 --- a/ontology/yaml/resources/HVAC/entity_types/VAV.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/VAV.yaml @@ -422,12 +422,6 @@ VAV_ED_RMM: - ED - RMM -VAV_UNDEFINED: - guid: "ef0afedd-fe0d-43fd-b0e0-f1c3c1310d87" - description: "VAV with no defined fields. Note this is non-canonical, as it is typically expected that telemetry will normally be available." - implements: - - VAV - VAV_SD_DSP_HWDC_DSPZDHC: guid: "00ca117a-0405-41d8-a73c-639457644db4" description: "Single duct reheat VAV with dual setpoint temperature and humidity control." @@ -747,32 +741,6 @@ VAV_DFSS_DFVSC_DSP_HWZC: ### Existing Non-standard Types ### ################################### -VAV_SD_DSP_HWDC_NONCANONICAL_1: - guid: "9b2cd4b7-3a7b-470c-abe5-66f51f84bc88" - description: "Non-standard type." - implements: - - VAV_SD_DSP_HWDC - - INCOMPLETE - uses: - - heating_percentage_command - -VAV_SD_DSP_HTDC_NONCANONICAL_1: - guid: "93c44e94-464c-40c5-bc02-7e21e40dc564" - description: "Non-standard type." - implements: - - VAV_SD_DSP_HTDC - - INCOMPLETE - uses: - - heating_percentage_command - -VAV_SD_CSP_NONCANONICAL_1: - guid: "ca0001c2-e4b1-46cf-95c3-d7c1d1420b4a" - description: "Non-standard type." - implements: - - VAV_SD_CSP - uses: - - discharge_air_temperature_setpoint # Needs to be removed from this device. Then deprecate. - VAV_SD_CSP_NONCANONICAL_2: guid: "949df16e-ff6d-4aac-846e-682b755b6364" description: "Non-standard type." @@ -781,15 +749,6 @@ VAV_SD_CSP_NONCANONICAL_2: uses: - supply_air_isolation_damper_command -VAV_SD_DDSP_NONCANONICAL_1: - guid: "9dda1f6d-eac3-416e-8d3f-00edb1abbf5b" - description: "Non-standard type." - implements: - - VAV - - SD - - DDSP - - INCOMPLETE - VAV_CO2C_NONCANONICAL_1: guid: "3b852c32-e7d5-4e1e-b0f8-2762a6e6d8e1" description: "Non-standard type with CO2 control and flowrate monitoring."