From 03cd20e2ec545e3e5a139379d6a69d7ec8a5ccba Mon Sep 17 00:00:00 2001 From: Kevin Date: Mon, 21 Aug 2023 16:21:20 +0100 Subject: [PATCH 1/8] ahu with heat wheel --- .../yaml/resources/HVAC/entity_types/AHU.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml index 110a6e31ad..a6e3c83635 100644 --- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml @@ -4100,6 +4100,21 @@ AHU_CHWSC_HWSC_ECON_EDBPC_RFSS2X_RFVSC2X_SFSS2X_SFVSC2X_SSPC: - SFVSC2X - SSPC +AHU_SFVSC_EFVSC_HTWHLSTC_CHWVM_HWVM_SDM_EDM_SFM_FDPSM_CO2C: + description: "Multi-zone chilled water and heating water AHU with heat wheel, supply, exhaust fan speed control" + is_canonical: true + implements: + - AHU + - SFVSC + - EFVSC + - HTWHLSTC + - CHWVM + - HWVM + - SDM + - EDM + - SFM + - FDPSM + - CO2C ################################### ### Existing Non-standard Types ### From c642b986eb393cf7aa2b66305663be1d2da5c092 Mon Sep 17 00:00:00 2001 From: Kevin Date: Thu, 31 Aug 2023 12:34:58 +0100 Subject: [PATCH 2/8] added air danper fields --- .../resources/HVAC/entity_types/ABSTRACT.yaml | 22 ++++++++++++++++++- .../resources/fields/telemetry_fields.yaml | 3 +++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index cf053e0d26..3a6313bc24 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -6804,4 +6804,24 @@ VSMC: opt_uses: - low_speed_status - high_speed_status - - schedule_run_command \ No newline at end of file + - schedule_run_command + +SDM2X: + description: "Supply air damper monitoring, dual status fields." + is_abstract: true + opt_uses: + - low_supply_air_static_pressure_alarm + uses: + - supply_air_damper_command + - supply_air_damper_status_1 + - supply_air_damper_status_2 + +EDM2X: + description: "Exhaust air damper monitoring, dual status fields." + is_abstract: true + opt_uses: + - low_exhaust_air_static_pressure_alarm + uses: + - exhaust_air_damper_command + - exhaust_air_damper_status_1 + - exhaust_air_damper_status_2 \ 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 2a84b37f70..56854a7eeb 100644 --- a/ontology/yaml/resources/fields/telemetry_fields.yaml +++ b/ontology/yaml/resources/fields/telemetry_fields.yaml @@ -3115,6 +3115,9 @@ literals: - low_supply_air_static_pressure_alarm: - ACTIVE - INACTIVE +- low_exhaust_air_static_pressure_alarm: + - ACTIVE + - INACTIVE - low_supply_air_temperature_alarm: - ACTIVE - INACTIVE From bd5de17895e0a6ed6f0b55580b19dbdaf572423c Mon Sep 17 00:00:00 2001 From: Kevin Date: Thu, 31 Aug 2023 14:46:00 +0100 Subject: [PATCH 3/8] updated dampers --- ontology/yaml/resources/HVAC/entity_types/AHU.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml index a6e3c83635..da9a8b0caf 100644 --- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml @@ -4100,7 +4100,7 @@ AHU_CHWSC_HWSC_ECON_EDBPC_RFSS2X_RFVSC2X_SFSS2X_SFVSC2X_SSPC: - SFVSC2X - SSPC -AHU_SFVSC_EFVSC_HTWHLSTC_CHWVM_HWVM_SDM_EDM_SFM_FDPSM_CO2C: +AHU_SFVSC_EFVSC_HTWHLSTC_CHWVM_HWVM_SDM_EDM_SFM_FDPSM_CO2C_SDM2X_EDM2X: description: "Multi-zone chilled water and heating water AHU with heat wheel, supply, exhaust fan speed control" is_canonical: true implements: @@ -4115,6 +4115,8 @@ AHU_SFVSC_EFVSC_HTWHLSTC_CHWVM_HWVM_SDM_EDM_SFM_FDPSM_CO2C: - SFM - FDPSM - CO2C + - SDM2X + - EDM2X ################################### ### Existing Non-standard Types ### From 19e02e2edfa9844544b1b5ce594f6179381c3b8b Mon Sep 17 00:00:00 2001 From: Kevin Date: Thu, 14 Sep 2023 09:33:27 +0100 Subject: [PATCH 4/8] changed to DOAS --- .../yaml/resources/HVAC/entity_types/AHU.yaml | 17 ----------------- .../yaml/resources/HVAC/entity_types/DOAS.yaml | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml index da9a8b0caf..110a6e31ad 100644 --- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml @@ -4100,23 +4100,6 @@ AHU_CHWSC_HWSC_ECON_EDBPC_RFSS2X_RFVSC2X_SFSS2X_SFVSC2X_SSPC: - SFVSC2X - SSPC -AHU_SFVSC_EFVSC_HTWHLSTC_CHWVM_HWVM_SDM_EDM_SFM_FDPSM_CO2C_SDM2X_EDM2X: - description: "Multi-zone chilled water and heating water AHU with heat wheel, supply, exhaust fan speed control" - is_canonical: true - implements: - - AHU - - SFVSC - - EFVSC - - HTWHLSTC - - CHWVM - - HWVM - - SDM - - EDM - - SFM - - FDPSM - - CO2C - - SDM2X - - EDM2X ################################### ### Existing Non-standard Types ### diff --git a/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml b/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml index 54139bad6e..764cb7c38e 100644 --- a/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml @@ -114,3 +114,21 @@ DOAS_CHWDC_EFSS_EFVSC_EFDPM_PHRUD_HWDC_DFSS_DFVSC_DSPM_DFDPM: - DFVSC - DSPM - DFDPM + +DOAS_SFVSC_EFVSC_HTWHLSTC_CHWVM_HWVM_SDM_EDM_SFM_FDPSM_CO2C_SDM2X_EDM2X: + description: "Multi-zone chilled water and heating water DOAS with heat wheel, supply, exhaust fan speed control" + is_canonical: true + implements: + - AHU + - SFVSC + - EFVSC + - HTWHLSTC + - CHWVM + - HWVM + - SDM + - EDM + - SFM + - FDPSM + - CO2C + - SDM2X + - EDM2X From 6d9e0cd99a9bb6e86e4143320a1d440804a8858b Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 26 Sep 2023 09:01:22 +0100 Subject: [PATCH 5/8] implemented doas, removed edm, sdm --- ontology/yaml/resources/HVAC/entity_types/DOAS.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml b/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml index 7d900e85ee..f4d4c26de2 100644 --- a/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml @@ -151,18 +151,16 @@ DOAS_CHWDC_EFSS_EFVSC_EFDPM_PHRUD_HWDC_DFSS_DFVSC_DSPM_DFDPM: - DSPM - DFDPM -DOAS_SFVSC_EFVSC_HTWHLSTC_CHWVM_HWVM_SDM_EDM_SFM_FDPSM_CO2C_SDM2X_EDM2X: +DOAS_SFVSC_EFVSC_HTWHLSTC_CHWVM_HWVM_SFM_FDPSM_CO2C_SDM2X_EDM2X: description: "Multi-zone chilled water and heating water DOAS with heat wheel, supply, exhaust fan speed control" is_canonical: true implements: - - AHU + - DOAS - SFVSC - EFVSC - HTWHLSTC - CHWVM - HWVM - - SDM - - EDM - SFM - FDPSM - CO2C From 7019df8eae00b142ed917396c24832ac159d0fef Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 24 Oct 2023 11:43:54 +0100 Subject: [PATCH 6/8] new abstract type --- ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 8 ++++++++ ontology/yaml/resources/HVAC/entity_types/DOAS.yaml | 4 ++-- ontology/yaml/resources/fields/telemetry_fields.yaml | 7 +++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index ee33f69373..d698ca25a1 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -6847,4 +6847,12 @@ EDM2X: - exhaust_air_damper_status_1 - exhaust_air_damper_status_2 +ACO2C: + description: "Average Co2." + is_abstract: true + opt_uses: + - high_average_zone_air_co2_concentration_alarm + uses: + - average_zone_air_co2_concentration_sensor + - average_zone_air_co2_concentration_setpoint diff --git a/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml b/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml index f4d4c26de2..b964574b7c 100644 --- a/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/DOAS.yaml @@ -151,7 +151,7 @@ DOAS_CHWDC_EFSS_EFVSC_EFDPM_PHRUD_HWDC_DFSS_DFVSC_DSPM_DFDPM: - DSPM - DFDPM -DOAS_SFVSC_EFVSC_HTWHLSTC_CHWVM_HWVM_SFM_FDPSM_CO2C_SDM2X_EDM2X: +DOAS_SFVSC_EFVSC_HTWHLSTC_CHWVM_HWVM_SFM_FDPSM_ACO2C_SDM2X_EDM2X: description: "Multi-zone chilled water and heating water DOAS with heat wheel, supply, exhaust fan speed control" is_canonical: true implements: @@ -163,7 +163,7 @@ DOAS_SFVSC_EFVSC_HTWHLSTC_CHWVM_HWVM_SFM_FDPSM_CO2C_SDM2X_EDM2X: - HWVM - SFM - FDPSM - - CO2C + - ACO2C - SDM2X - EDM2X diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml index 82e190ed26..1834c4a0a1 100644 --- a/ontology/yaml/resources/fields/telemetry_fields.yaml +++ b/ontology/yaml/resources/fields/telemetry_fields.yaml @@ -3193,3 +3193,10 @@ literals: - ACTIVE - INACTIVE +- average_zone_air_co2_concentration_setpoint: + flexible_min: 0.00005 + flexible_max: 0.005 + +- high_average_zone_air_co2_concentration_alarm: + - ACTIVE + - INACTIVE \ No newline at end of file From ad68c5275dc9563a9b896ca8d5bc1327add610ed Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 24 Oct 2023 11:46:31 +0100 Subject: [PATCH 7/8] description --- ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index b58f64dd05..2fa5b19346 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -6885,7 +6885,7 @@ EDM2X: - exhaust_air_damper_status_2 ACO2C: - description: "Average Co2." + description: "Average Co2 control." is_abstract: true opt_uses: - high_average_zone_air_co2_concentration_alarm From b65da5a42048a73641beb5d54075db6537f67e29 Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 24 Oct 2023 11:47:34 +0100 Subject: [PATCH 8/8] fix ontology --- ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 2 -- ontology/yaml/resources/fields/telemetry_fields.yaml | 4 ---- 2 files changed, 6 deletions(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index 2fa5b19346..1f067535e9 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -6887,8 +6887,6 @@ EDM2X: ACO2C: description: "Average Co2 control." is_abstract: true - opt_uses: - - high_average_zone_air_co2_concentration_alarm uses: - average_zone_air_co2_concentration_sensor - average_zone_air_co2_concentration_setpoint diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml index 57d1124eca..b1907d86aa 100644 --- a/ontology/yaml/resources/fields/telemetry_fields.yaml +++ b/ontology/yaml/resources/fields/telemetry_fields.yaml @@ -3217,10 +3217,6 @@ literals: flexible_min: 0.00005 flexible_max: 0.005 -- high_average_zone_air_co2_concentration_alarm: - - ACTIVE - - INACTIVE - - soundpressurelevel_sensor: fixed_min: -60 flexible_max: 200