From ccbd0b09e0de66d07fca990779d8652e30477713 Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 4 Apr 2023 15:14:33 +0100 Subject: [PATCH 1/4] added air source heat pump --- .../yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 11 ++++++++++- ontology/yaml/resources/HVAC/entity_types/PMP.yaml | 13 +++++++++++++ .../yaml/resources/fields/telemetry_fields.yaml | 4 ++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index 846be0f02..09cffbcab 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -6605,4 +6605,13 @@ VMADC: - mixed_air_damper_percentage_command - mixed_air_damper_percentage_sensor implements: - - CONTROL \ No newline at end of file + - CONTROL + +EPM2X: + description: "evaporator pump monitoring X2" + is_abstract: true + uses: + - evaporator_pump_run_status_1 + - evaporator_pump_run_status_2 + implements: + - MONITORING \ No newline at end of file diff --git a/ontology/yaml/resources/HVAC/entity_types/PMP.yaml b/ontology/yaml/resources/HVAC/entity_types/PMP.yaml index dedcb1dfb..be04236d1 100644 --- a/ontology/yaml/resources/HVAC/entity_types/PMP.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/PMP.yaml @@ -162,3 +162,16 @@ PMP_SS_VSC_NONCANONICAL_2: - mixing_valve_percentage_command - chilled_supply_water_temperature_setpoint - chilled_supply_water_temperature_sensor + + +PMP_SS_REFPM_REFSM_OA_EPM2X: + description: "air source heat pump with refrigerant temperature and pressure monitoring, 2 evaporator pumps" + is_canonical: true + implements: + - PMP + - SS + - REFM + - REFSM + - OA + - EPM2X + \ No newline at end of file diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml index 6e7fbe427..48a7b2ca8 100644 --- a/ontology/yaml/resources/fields/telemetry_fields.yaml +++ b/ontology/yaml/resources/fields/telemetry_fields.yaml @@ -3102,3 +3102,7 @@ literals: - ultraviolet_irradiance_sensor: fixed_min: 0.0 flexible_max: 2000.0 + +- evaporator_pump_run_status: + - ON + - OFF \ No newline at end of file From 20adba38a676e1252e964cbf386da9bc38904f9f Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 4 Apr 2023 15:28:10 +0100 Subject: [PATCH 2/4] changed field names --- ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 8 ++++---- ontology/yaml/resources/HVAC/entity_types/PMP.yaml | 2 +- ontology/yaml/resources/fields/telemetry_fields.yaml | 4 ---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index 09cffbcab..82c21dd6f 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -6607,11 +6607,11 @@ VMADC: implements: - CONTROL -EPM2X: - description: "evaporator pump monitoring X2" +CPM2X: + description: "circulation pump monitoring X2" is_abstract: true uses: - - evaporator_pump_run_status_1 - - evaporator_pump_run_status_2 + - circulation_pump_run_status_1 + - circulation_pump_run_status_2 implements: - MONITORING \ No newline at end of file diff --git a/ontology/yaml/resources/HVAC/entity_types/PMP.yaml b/ontology/yaml/resources/HVAC/entity_types/PMP.yaml index be04236d1..2d2a657f6 100644 --- a/ontology/yaml/resources/HVAC/entity_types/PMP.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/PMP.yaml @@ -164,7 +164,7 @@ PMP_SS_VSC_NONCANONICAL_2: - chilled_supply_water_temperature_sensor -PMP_SS_REFPM_REFSM_OA_EPM2X: +PMP_SS_REFPM_REFSM_OA_CPM2X: description: "air source heat pump with refrigerant temperature and pressure monitoring, 2 evaporator pumps" is_canonical: true implements: diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml index 48a7b2ca8..6e7fbe427 100644 --- a/ontology/yaml/resources/fields/telemetry_fields.yaml +++ b/ontology/yaml/resources/fields/telemetry_fields.yaml @@ -3102,7 +3102,3 @@ literals: - ultraviolet_irradiance_sensor: fixed_min: 0.0 flexible_max: 2000.0 - -- evaporator_pump_run_status: - - ON - - OFF \ No newline at end of file From bf30840c2fa6cb9c14d82de297166c5826ac73cb Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 4 Apr 2023 15:31:39 +0100 Subject: [PATCH 3/4] fixed implemented ttype --- ontology/yaml/resources/HVAC/entity_types/PMP.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/PMP.yaml b/ontology/yaml/resources/HVAC/entity_types/PMP.yaml index 2d2a657f6..27121cdb5 100644 --- a/ontology/yaml/resources/HVAC/entity_types/PMP.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/PMP.yaml @@ -173,5 +173,5 @@ PMP_SS_REFPM_REFSM_OA_CPM2X: - REFM - REFSM - OA - - EPM2X + - CPM2X \ No newline at end of file From 5f74dd340fd2a65138c96b947b1963f1c45e431c Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 25 Jul 2023 16:12:08 +0100 Subject: [PATCH 4/4] moved to chiller --- ontology/yaml/resources/HVAC/entity_types/CH.yaml | 11 +++++++++++ ontology/yaml/resources/HVAC/entity_types/PMP.yaml | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/CH.yaml b/ontology/yaml/resources/HVAC/entity_types/CH.yaml index 5dead7f3a..b3dc0289f 100644 --- a/ontology/yaml/resources/HVAC/entity_types/CH.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/CH.yaml @@ -566,6 +566,17 @@ CH_SS_SCHWTC_CDWFRM_CHWSWISOVM_CWSISOVM_CHWDPM_CHWFRM_CWDT_REFPM_IGM_DXSWC: - IGM - DXSWC +CH_SS_REFPM_REFSM_OA_CPM2X: + description: "air source heat pump with refrigerant temperature and pressure monitoring, 2 evaporator pumps" + is_canonical: true + implements: + - CH + - SS + - REFM + - REFSM + - OA + - CPM2X + ################################### ### Existing Non-standard Types ### ################################### diff --git a/ontology/yaml/resources/HVAC/entity_types/PMP.yaml b/ontology/yaml/resources/HVAC/entity_types/PMP.yaml index 03f4aaba9..1d680ea0b 100644 --- a/ontology/yaml/resources/HVAC/entity_types/PMP.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/PMP.yaml @@ -173,15 +173,4 @@ PMP_SS_VSC_NONCANONICAL_2: - chilled_supply_water_temperature_setpoint - chilled_supply_water_temperature_sensor - -PMP_SS_REFPM_REFSM_OA_CPM2X: - description: "air source heat pump with refrigerant temperature and pressure monitoring, 2 evaporator pumps" - is_canonical: true - implements: - - PMP - - SS - - REFM - - REFSM - - OA - - CPM2X \ No newline at end of file