From 80210f6088808c6c65089511d994cb7b4b099480 Mon Sep 17 00:00:00 2001 From: Ciaran Oflannagain Date: Tue, 21 Nov 2023 17:00:31 +0000 Subject: [PATCH 1/6] Adding a new AHU --- .../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..e0869e6609 100644 --- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml @@ -18,6 +18,21 @@ ### Single Zone Units ### +AHU_HTWHLSTC_SFM_SFVSC_FDPM_CREFM_SDM_SFMSC_SSPC_SWCM: + description: "Supply Only AHU." + is_canonical: true + implements: + - AHU + - HTWHLSTC + - SFM + - SFVSC + - FDPM + - CREFM + - SDM + - SFMSC + - SSPC + - SWCM + AHU_CSP_DFSS_DX2ZC_ECONZ: guid: "f0e116a8-ab2c-4303-a782-2a9a47005372" description: "Single zone AHU." From 9d4359546d5fb8c7c8b6151bc2e1449bea200200 Mon Sep 17 00:00:00 2001 From: Ciaran Oflannagain Date: Tue, 28 Nov 2023 08:51:58 +0000 Subject: [PATCH 2/6] New AHU Description --- ontology/yaml/resources/HVAC/entity_types/AHU.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml index e0869e6609..aa2d049856 100644 --- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml @@ -19,7 +19,7 @@ ### Single Zone Units ### AHU_HTWHLSTC_SFM_SFVSC_FDPM_CREFM_SDM_SFMSC_SSPC_SWCM: - description: "Supply Only AHU." + description: "Supply only AHU with pressure control and heating only." is_canonical: true implements: - AHU From 32846fe3d9118915f2a05973b4930d378251a50e Mon Sep 17 00:00:00 2001 From: Ciaran Oflannagain Date: Wed, 29 Nov 2023 10:08:57 +0000 Subject: [PATCH 3/6] Adding a new Supply Only AHU --- ontology/yaml/resources/HVAC/entity_types/AHU.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml index aa2d049856..0f7d2c6433 100644 --- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml @@ -18,20 +18,20 @@ ### Single Zone Units ### -AHU_HTWHLSTC_SFM_SFVSC_FDPM_CREFM_SDM_SFMSC_SSPC_SWCM: - description: "Supply only AHU with pressure control and heating only." +AHU_STC_SFM_SFVSC_FDPM_FDPSM_CREFM_SDM_SSPC_HWVM: + description: "Supply only AHU with heating control using wet coil to maintain air flowrate." is_canonical: true implements: - AHU - - HTWHLSTC + - STC - SFM - SFVSC - FDPM + - FDPSM - CREFM - SDM - - SFMSC - SSPC - - SWCM + - HWVM AHU_CSP_DFSS_DX2ZC_ECONZ: guid: "f0e116a8-ab2c-4303-a782-2a9a47005372" From f4b4e1cd223c2d97166c3354a2cb410c02271f74 Mon Sep 17 00:00:00 2001 From: Ciaran Oflannagain Date: Wed, 29 Nov 2023 15:59:54 +0000 Subject: [PATCH 4/6] Adding a new MAU --- .../yaml/resources/HVAC/entity_types/AHU.yaml | 15 --------------- .../yaml/resources/HVAC/entity_types/MAU.yaml | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml index 0f7d2c6433..110a6e31ad 100644 --- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml @@ -18,21 +18,6 @@ ### Single Zone Units ### -AHU_STC_SFM_SFVSC_FDPM_FDPSM_CREFM_SDM_SSPC_HWVM: - description: "Supply only AHU with heating control using wet coil to maintain air flowrate." - is_canonical: true - implements: - - AHU - - STC - - SFM - - SFVSC - - FDPM - - FDPSM - - CREFM - - SDM - - SSPC - - HWVM - AHU_CSP_DFSS_DX2ZC_ECONZ: guid: "f0e116a8-ab2c-4303-a782-2a9a47005372" description: "Single zone AHU." diff --git a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml index 5b569ebcd6..0fa6129973 100644 --- a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml @@ -16,6 +16,21 @@ ### Canonical Types ### ######################## +MAU_STC_SFM_SFVSC_FDPM_FDPSM_CREFM_SDM_SSPC_HWVM: + description: "Make-up air unit with heating control using wet coil to maintain air flowrate." + is_canonical: true + implements: + - MAU + - STC + - SFM + - SFVSC + - FDPM + - FDPSM + - CREFM + - SDM + - SSPC + - HWVM + MAU_SFSS_STM: guid: "9532ed28-f40c-472b-90aa-4a679911ef17" description: "Simple make-up air unit." From 21d2be1a9f18c93cff886f1d4dfd2d795b9250fa Mon Sep 17 00:00:00 2001 From: Ciaran Oflannagain Date: Mon, 4 Dec 2023 12:21:59 +0000 Subject: [PATCH 5/6] MAU that uses heating coil to maintain air temperature setpoint --- ontology/yaml/resources/HVAC/entity_types/MAU.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml index 0fa6129973..c8956be204 100644 --- a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml @@ -16,8 +16,8 @@ ### Canonical Types ### ######################## -MAU_STC_SFM_SFVSC_FDPM_FDPSM_CREFM_SDM_SSPC_HWVM: - description: "Make-up air unit with heating control using wet coil to maintain air flowrate." +MAU_STC_SFM_SFVSC_FDPM_FDPSM_SDM_SSPC_HWVM: + description: "Make-up air unit with heating control" is_canonical: true implements: - MAU @@ -26,7 +26,6 @@ MAU_STC_SFM_SFVSC_FDPM_FDPSM_CREFM_SDM_SSPC_HWVM: - SFVSC - FDPM - FDPSM - - CREFM - SDM - SSPC - HWVM From d951a5c5c17b32a96d88168542f1902a15d834c1 Mon Sep 17 00:00:00 2001 From: Ciaran Oflannagain Date: Tue, 5 Dec 2023 08:59:06 +0000 Subject: [PATCH 6/6] Combine STC and HWVM into HWSC --- ontology/yaml/resources/HVAC/entity_types/MAU.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml index c8956be204..1511cece3a 100644 --- a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml @@ -16,19 +16,18 @@ ### Canonical Types ### ######################## -MAU_STC_SFM_SFVSC_FDPM_FDPSM_SDM_SSPC_HWVM: +MAU_HWSC_SFM_SFVSC_FDPM_FDPSM_SDM_SSPC: description: "Make-up air unit with heating control" is_canonical: true implements: - MAU - - STC + - HWSC - SFM - SFVSC - FDPM - FDPSM - SDM - SSPC - - HWVM MAU_SFSS_STM: guid: "9532ed28-f40c-472b-90aa-4a679911ef17"