From f8dc6a905eab43fb38cccbbdf7ce4444f6159cdf Mon Sep 17 00:00:00 2001 From: Dao Chen Date: Tue, 6 Aug 2024 14:24:00 -0700 Subject: [PATCH 1/7] add new abstract and new ahu types --- .../resources/HVAC/entity_types/ABSTRACT.yaml | 17 +++++++++++ .../yaml/resources/HVAC/entity_types/AHU.yaml | 29 +++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index dda997125e..3d46feae20 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -2500,6 +2500,8 @@ DX2SC: is_abstract: true opt_uses: - compressor_speed_percentage_command + - compressor_speed_percentage_command_1 + - compressor_speed_percentage_command_2 - cooling_percentage_command - cooling_request_count - cooling_thermal_power_capacity @@ -2548,6 +2550,10 @@ DX4SC: is_abstract: true opt_uses: - compressor_speed_percentage_command + - compressor_speed_percentage_command_1 + - compressor_speed_percentage_command_2 + - compressor_speed_percentage_command_3 + - compressor_speed_percentage_command_4 - cooling_percentage_command - cooling_request_count - cooling_thermal_power_capacity @@ -4350,6 +4356,8 @@ EFSS2X: - exhaust_fan_power_capacity - exhaust_fan_power_sensor_1 - exhaust_fan_power_sensor_2 + - failed_exhaust_fan_alarm_1 + - failed_exhaust_fan_alarm_2 uses: - exhaust_fan_run_command_1 - exhaust_fan_run_command_2 @@ -6048,6 +6056,15 @@ HTWHLSTC: - supply_air_temperature_sensor - supply_air_temperature_setpoint +HTWHLSS: + description: "Heat wheel with simply start/stop control." + is_abstract: true + implements: + - CONTROL + uses: + - heat_wheel_run_command + - heat_wheel_run_status + CAM: guid: "c37a0e19-19c0-4246-8a8b-f376aa089d56" description: "ztc alarm monitoring based on moisture sensor on coil or in pan." diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml index 699d71ec77..1a406a0fb8 100644 --- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml @@ -5428,6 +5428,35 @@ AHU_STDSPC_SSPC_EFFC_EFVSC_FDPM3X_HTWHLSTC_RHM_ETM: - exhaust_air_isolation_damper_command - exhaust_air_isolation_damper_status +AHU_SFSS_SFVSC_EFSS_EFVSC_EDBPC_DX2SC_ECON_SSPC_SARC: + description: "AHU with supply and exhaust fans, two stage compressor, building pressure control" + implements: + - AHU + - SFSS + - SFVSC + - EFSS + - EFVSC + - EDBPC + - DX2SC + - ECON + - SSPC + - SARC + +AHU_SFSS2X_SFVSC2X_EFSS2X_EFVSC2X_DX4SC_EDBPC_SSPC_SARC_ECON_HTWHLSS: + description: "AHU with dual supply and exhaust fans, four stage compressor, building pressure control and energy recovery wheel" + implements: + - AHU + - SFSS2X + - SFVSC2X + - EFSS2X + - EFVSC2X + - EDBPC + - DX4SC + - ECON + - SSPC + - SARC + - HTWHLSS + AHU_BSPC_DX4SC_ECON_EFSS_EFVSC_SFSS_SFVSC_SSPC_RHHC_NONCANONICAL_1: guid: "4f641024-9959-4ab3-9869-97fdf93ed47b" description: "Non-Standard AHU with humidification and heating water coils on return duct." From 302b0d9ddec9d80d5365127e016d451c5fd88f21 Mon Sep 17 00:00:00 2001 From: db-robot Date: Tue, 6 Aug 2024 21:26:52 +0000 Subject: [PATCH 2/7] Add GUIDs to new entity types --- ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 1 + ontology/yaml/resources/HVAC/entity_types/AHU.yaml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index 3d46feae20..97323e32ae 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -6057,6 +6057,7 @@ HTWHLSTC: - supply_air_temperature_setpoint HTWHLSS: + guid: "8cdae157-c3a8-4f71-8e27-b1a74a71a96b" description: "Heat wheel with simply start/stop control." is_abstract: true implements: diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml index 1a406a0fb8..7557efd969 100644 --- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml @@ -5429,6 +5429,7 @@ AHU_STDSPC_SSPC_EFFC_EFVSC_FDPM3X_HTWHLSTC_RHM_ETM: - exhaust_air_isolation_damper_status AHU_SFSS_SFVSC_EFSS_EFVSC_EDBPC_DX2SC_ECON_SSPC_SARC: + guid: "0df5aeb5-fe49-43f7-84f6-b0ddb1156c31" description: "AHU with supply and exhaust fans, two stage compressor, building pressure control" implements: - AHU @@ -5443,6 +5444,7 @@ AHU_SFSS_SFVSC_EFSS_EFVSC_EDBPC_DX2SC_ECON_SSPC_SARC: - SARC AHU_SFSS2X_SFVSC2X_EFSS2X_EFVSC2X_DX4SC_EDBPC_SSPC_SARC_ECON_HTWHLSS: + guid: "a3451f6d-f562-4715-85be-2d169b4dc3cb" description: "AHU with dual supply and exhaust fans, four stage compressor, building pressure control and energy recovery wheel" implements: - AHU From dc45447903ab0342b82fa23719031c3458b49c8a Mon Sep 17 00:00:00 2001 From: Dao Chen Date: Wed, 7 Aug 2024 09:18:22 -0700 Subject: [PATCH 3/7] remove one ahu type, remove heat wheel type and add a doas type --- .../yaml/resources/HVAC/entity_types/AHU.yaml | 16 ---------------- .../yaml/resources/HVAC/entity_types/DOAS.yaml | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml index 7557efd969..ce63691b3a 100644 --- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml @@ -5443,22 +5443,6 @@ AHU_SFSS_SFVSC_EFSS_EFVSC_EDBPC_DX2SC_ECON_SSPC_SARC: - SSPC - SARC -AHU_SFSS2X_SFVSC2X_EFSS2X_EFVSC2X_DX4SC_EDBPC_SSPC_SARC_ECON_HTWHLSS: - guid: "a3451f6d-f562-4715-85be-2d169b4dc3cb" - description: "AHU with dual supply and exhaust fans, four stage compressor, building pressure control and energy recovery wheel" - implements: - - AHU - - SFSS2X - - SFVSC2X - - EFSS2X - - EFVSC2X - - EDBPC - - DX4SC - - ECON - - SSPC - - SARC - - HTWHLSS - AHU_BSPC_DX4SC_ECON_EFSS_EFVSC_SFSS_SFVSC_SSPC_RHHC_NONCANONICAL_1: guid: "4f641024-9959-4ab3-9869-97fdf93ed47b" description: "Non-Standard AHU with humidification and heating water coils on return duct." diff --git a/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml b/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml index b792968856..80a71b530f 100644 --- a/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml @@ -219,3 +219,18 @@ DOAS_SFVSC_EFVSC_HTWHLSTC_CHWVM_HWVM_SFM_FDPSM_ACO2C_SDM2X_EDM2X: - SDM2X - EDM2X +DOAS_SFSS2X_SFVSC2X_EFSS2X_EFVSC2X_DX4SC_EDBPC_SSPC_SARC_ECON_HTWHLSTC: + guid: "a3451f6d-f562-4715-85be-2d169b4dc3cb" + description: "DOAS with dual supply and exhaust fans, four stage compressor, building pressure control and energy recovery wheel" + implements: + - DOAS + - SFSS2X + - SFVSC2X + - EFSS2X + - EFVSC2X + - EDBPC + - DX4SC + - ECON + - SSPC + - SARC + - HTWHLSTC \ No newline at end of file From 9be385e60bdcf09ade53abd4937416aa0ca8c0c5 Mon Sep 17 00:00:00 2001 From: Dao Chen Date: Wed, 7 Aug 2024 09:27:52 -0700 Subject: [PATCH 4/7] remove heat wheel --- .../yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index 4ac90c4e85..c4fbb97349 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -6080,16 +6080,6 @@ HTWHLSTC: - supply_air_temperature_sensor - supply_air_temperature_setpoint -HTWHLSS: - guid: "8cdae157-c3a8-4f71-8e27-b1a74a71a96b" - description: "Heat wheel with simply start/stop control." - is_abstract: true - implements: - - CONTROL - uses: - - heat_wheel_run_command - - heat_wheel_run_status - CAM: guid: "c37a0e19-19c0-4246-8a8b-f376aa089d56" description: "ztc alarm monitoring based on moisture sensor on coil or in pan." From c6aa177a7d792c3403b2008db2a81fd349c33244 Mon Sep 17 00:00:00 2001 From: Dao Chen Date: Wed, 14 Aug 2024 13:54:57 -0700 Subject: [PATCH 5/7] I updated canonical true for DOAS --- ontology/yaml/resources/HVAC/entity_types/DOAS.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml b/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml index 80a71b530f..70d91e3d05 100644 --- a/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml @@ -222,6 +222,7 @@ DOAS_SFVSC_EFVSC_HTWHLSTC_CHWVM_HWVM_SFM_FDPSM_ACO2C_SDM2X_EDM2X: DOAS_SFSS2X_SFVSC2X_EFSS2X_EFVSC2X_DX4SC_EDBPC_SSPC_SARC_ECON_HTWHLSTC: guid: "a3451f6d-f562-4715-85be-2d169b4dc3cb" description: "DOAS with dual supply and exhaust fans, four stage compressor, building pressure control and energy recovery wheel" + is_canonical: true implements: - DOAS - SFSS2X From 00bfd346e0da5eeb86226fbdae5233bf1c42f772 Mon Sep 17 00:00:00 2001 From: Dao Chen Date: Wed, 14 Aug 2024 14:35:32 -0700 Subject: [PATCH 6/7] I updated the ABSTRACT, DOAS and telemetry field --- ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 3 +++ ontology/yaml/resources/HVAC/entity_types/DOAS.yaml | 4 ++-- ontology/yaml/resources/fields/telemetry_fields.yaml | 9 +++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index c4fbb97349..6f3d8c6241 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -6062,6 +6062,9 @@ HTWHLSTC: implements: - CONTROL opt_uses: + - leaving_heat_wheel_temperature_sensor + - high_leaving_heat_wheel_temperature_alarm + - low_leaving_heat_wheel_temperature_alarm - exhaust_air_temperature_sensor - heat_wheel_speed_percentage_sensor - return_air_temperature_sensor diff --git a/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml b/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml index 70d91e3d05..ae8113f520 100644 --- a/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml @@ -219,7 +219,7 @@ DOAS_SFVSC_EFVSC_HTWHLSTC_CHWVM_HWVM_SFM_FDPSM_ACO2C_SDM2X_EDM2X: - SDM2X - EDM2X -DOAS_SFSS2X_SFVSC2X_EFSS2X_EFVSC2X_DX4SC_EDBPC_SSPC_SARC_ECON_HTWHLSTC: +DOAS_SFSS2X_SFVSC2X_EFSS2X_EFVSC2X_DX4SC_EDBPC_SSPC_SARC_VOADM_HTWHLSTC: guid: "a3451f6d-f562-4715-85be-2d169b4dc3cb" description: "DOAS with dual supply and exhaust fans, four stage compressor, building pressure control and energy recovery wheel" is_canonical: true @@ -231,7 +231,7 @@ DOAS_SFSS2X_SFVSC2X_EFSS2X_EFVSC2X_DX4SC_EDBPC_SSPC_SARC_ECON_HTWHLSTC: - EFVSC2X - EDBPC - DX4SC - - ECON - SSPC - SARC + - VOADM - HTWHLSTC \ 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 c13d33c299..ae73815833 100644 --- a/ontology/yaml/resources/fields/telemetry_fields.yaml +++ b/ontology/yaml/resources/fields/telemetry_fields.yaml @@ -2247,6 +2247,15 @@ literals: - heat_wheel_run_status: - ON - OFF +- leaving_heat_wheel_temperature_sensor: + flexible_min: 255.9259259 + flexible_max: 338.7037037 +- high_leaving_heat_wheel_temperature_alarm: + - ACTIVE + - INACTIVE +- low_leaving_heat_wheel_temperature_alarm: + - ACTIVE + - INACTIVE - outside_air_isolation_damper_command: - OPEN - CLOSED From 8fc8ac9e42971cfd5a50867f0c98e32376aaf4a7 Mon Sep 17 00:00:00 2001 From: Dao Chen Date: Thu, 15 Aug 2024 08:52:07 -0700 Subject: [PATCH 7/7] add canconical true for ahu --- ontology/yaml/resources/HVAC/entity_types/AHU.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml index ce63691b3a..18b7ddf8b7 100644 --- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml @@ -5431,6 +5431,7 @@ AHU_STDSPC_SSPC_EFFC_EFVSC_FDPM3X_HTWHLSTC_RHM_ETM: AHU_SFSS_SFVSC_EFSS_EFVSC_EDBPC_DX2SC_ECON_SSPC_SARC: guid: "0df5aeb5-fe49-43f7-84f6-b0ddb1156c31" description: "AHU with supply and exhaust fans, two stage compressor, building pressure control" + is_canonical: true implements: - AHU - SFSS