From 6049a7c215ccd82315e52262f68c5e537e60546b Mon Sep 17 00:00:00 2001 From: bsaxpi Date: Tue, 26 Mar 2024 19:37:57 +0100 Subject: [PATCH 01/10] Changes on Lighting Group --- .../resources/LIGHTING/entity_types/ABSTRACT.yaml | 12 ++++++++++++ .../yaml/resources/LIGHTING/entity_types/LGRP.yaml | 10 ++++++++++ ontology/yaml/resources/fields/telemetry_fields.yaml | 6 ++++++ 3 files changed, 28 insertions(+) diff --git a/ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml index c21b1d275c..cccba7ce0f 100644 --- a/ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml @@ -30,6 +30,18 @@ DC: uses: - brightness_percentage_command +LC_DUAL: + guid: "58b91ab7-a475-4800-bf15-f918fa95f829" + description: "Luminance control with separate aisle and window brightness command." + is_abstract: true + opt_uses: + - brightness_percentage_sensor + uses: + - illuminance_sensor + - illuminance_setpoint + - aisle_brightness_percentage_command + - window_brightness_percentage_command + MS: guid: "d5244d01-e5e9-4592-8c76-bf3a7e196a28" description: "Motion sensing monitoring." diff --git a/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml b/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml index bbd422d23f..f3444d3c73 100644 --- a/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml +++ b/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml @@ -308,3 +308,13 @@ LGRP_SS_OS_IM: uses: - group_mode +LGRP_OS_DC_DUAL_LC: + guid: "ac5f1146-2734-44f8-b3d1-99e4226fc72a" + description: "Standard lighting fixture group control with zone occupancy montoring and luminance control" + is_canonical: true + implements: + - LGRP + - OS + - LC_DUAL + uses: + - group_mode \ 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 25455fb080..51b1eba215 100644 --- a/ontology/yaml/resources/fields/telemetry_fields.yaml +++ b/ontology/yaml/resources/fields/telemetry_fields.yaml @@ -1202,6 +1202,12 @@ literals: - dimmer_percentage_command: # Should be adjusted to brightness_percentage_command fixed_min: 0.0 fixed_max: 100.0 +- aisle_brightness_percentage_command: + fixed_min: 0.0 + fixed_max: 100.0 +- window_brightness_percentage_command: + fixed_min: 0.0 + fixed_max: 100.0 - calendar_sync_status: - ACCESS_FAILED - CALENDAR_STARTUP From 27ff550f893640f92fd62ef25b0e10f473e69ee8 Mon Sep 17 00:00:00 2001 From: bsaxpi Date: Tue, 26 Mar 2024 20:00:14 +0100 Subject: [PATCH 02/10] additional subfield --- ontology/yaml/resources/subfields/subfields.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ontology/yaml/resources/subfields/subfields.yaml b/ontology/yaml/resources/subfields/subfields.yaml index 3c39c431a5..43368360be 100644 --- a/ontology/yaml/resources/subfields/subfields.yaml +++ b/ontology/yaml/resources/subfields/subfields.yaml @@ -66,6 +66,7 @@ component: descriptor: air: "Atmospheric air, either conditioned or unconditioned." aisle: "Passage between two rows of server racks." + window: "Transparent part of the facade" ac: "Electric charge which periodically reverses direction and changes its magnitude continuously with time." ammonia: "Ammonia gas." blowdown: "Process of expelling water filled with mineral deposits for the purposes of water treatment." From 5dc0ad679aa7f2162a7fba8c9b811b6241035ff2 Mon Sep 17 00:00:00 2001 From: bsaxpi Date: Tue, 26 Mar 2024 20:03:26 +0100 Subject: [PATCH 03/10] Correct entity type name --- ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml b/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml index f3444d3c73..72d7bf787c 100644 --- a/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml +++ b/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml @@ -308,7 +308,7 @@ LGRP_SS_OS_IM: uses: - group_mode -LGRP_OS_DC_DUAL_LC: +LGRP_OS_LC_DUAL: guid: "ac5f1146-2734-44f8-b3d1-99e4226fc72a" description: "Standard lighting fixture group control with zone occupancy montoring and luminance control" is_canonical: true From 49119f1a5d27be83f868a42a7e8b8126b6837a32 Mon Sep 17 00:00:00 2001 From: bsaxpi Date: Wed, 27 Mar 2024 07:21:06 +0100 Subject: [PATCH 04/10] Clarifications / Changes --- ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml | 2 +- ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml | 4 ++-- ontology/yaml/resources/subfields/subfields.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml index cccba7ce0f..f8aec9415f 100644 --- a/ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml @@ -30,7 +30,7 @@ DC: uses: - brightness_percentage_command -LC_DUAL: +LC_AWIC: guid: "58b91ab7-a475-4800-bf15-f918fa95f829" description: "Luminance control with separate aisle and window brightness command." is_abstract: true diff --git a/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml b/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml index 72d7bf787c..b4e074f620 100644 --- a/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml +++ b/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml @@ -308,13 +308,13 @@ LGRP_SS_OS_IM: uses: - group_mode -LGRP_OS_LC_DUAL: +LGRP_OS_LC_AWIC: guid: "ac5f1146-2734-44f8-b3d1-99e4226fc72a" description: "Standard lighting fixture group control with zone occupancy montoring and luminance control" is_canonical: true implements: - LGRP - OS - - LC_DUAL + - LC_AWIC uses: - group_mode \ No newline at end of file diff --git a/ontology/yaml/resources/subfields/subfields.yaml b/ontology/yaml/resources/subfields/subfields.yaml index 43368360be..1d2c235fd2 100644 --- a/ontology/yaml/resources/subfields/subfields.yaml +++ b/ontology/yaml/resources/subfields/subfields.yaml @@ -66,7 +66,6 @@ component: descriptor: air: "Atmospheric air, either conditioned or unconditioned." aisle: "Passage between two rows of server racks." - window: "Transparent part of the facade" ac: "Electric charge which periodically reverses direction and changes its magnitude continuously with time." ammonia: "Ammonia gas." blowdown: "Process of expelling water filled with mineral deposits for the purposes of water treatment." @@ -257,6 +256,7 @@ descriptor: water: "Water in liquid form, conditioned or unconditioned" west: "Cardinal direction; opposite of east" wind: "Movement of ambient air." + window: "Transparent part of the facade" winter: "Method or process used during colder weather (i.e. winter season)." wireless: "Devices capable of communication wirelessly through electromagnetic fields.(e.g. wireless_sensors) " xaxis: "Horizontal axis of a three-dimensional Cartesian coordinate system (abscissa)." From dd06352e894dab9e03fa55571bf90539ee205b39 Mon Sep 17 00:00:00 2001 From: bsaxpi Date: Fri, 26 Apr 2024 08:33:35 +0200 Subject: [PATCH 05/10] Removed "LC_" on "LC_AVIC" --- ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml b/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml index b4e074f620..a7b81b24a0 100644 --- a/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml +++ b/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml @@ -308,7 +308,7 @@ LGRP_SS_OS_IM: uses: - group_mode -LGRP_OS_LC_AWIC: +LGRP_OS_AWIC: guid: "ac5f1146-2734-44f8-b3d1-99e4226fc72a" description: "Standard lighting fixture group control with zone occupancy montoring and luminance control" is_canonical: true @@ -317,4 +317,4 @@ LGRP_OS_LC_AWIC: - OS - LC_AWIC uses: - - group_mode \ No newline at end of file + - group_mode From d69bec562b625c4bcb2b90e714b6bae6fe2e8300 Mon Sep 17 00:00:00 2001 From: bsaxpi Date: Fri, 26 Apr 2024 08:34:37 +0200 Subject: [PATCH 06/10] Removed "LC_" on "LC_AVIC" --- ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml index f8aec9415f..b62828613b 100644 --- a/ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml @@ -30,7 +30,7 @@ DC: uses: - brightness_percentage_command -LC_AWIC: +AWIC: guid: "58b91ab7-a475-4800-bf15-f918fa95f829" description: "Luminance control with separate aisle and window brightness command." is_abstract: true From 09282b6654ef391c73da7680209b851603869303 Mon Sep 17 00:00:00 2001 From: bsaxpi Date: Fri, 26 Apr 2024 16:03:46 +0200 Subject: [PATCH 07/10] Update LGRP.yaml --- ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml b/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml index a7b81b24a0..62c4986ecb 100644 --- a/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml +++ b/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml @@ -315,6 +315,6 @@ LGRP_OS_AWIC: implements: - LGRP - OS - - LC_AWIC + - AWIC uses: - group_mode From 258d0af45687bd93771608905f17ccaa090fbb13 Mon Sep 17 00:00:00 2001 From: ccquigley Date: Mon, 20 May 2024 10:00:52 -0700 Subject: [PATCH 08/10] adding new fan type --- ontology/yaml/resources/HVAC/entity_types/FAN.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ontology/yaml/resources/HVAC/entity_types/FAN.yaml b/ontology/yaml/resources/HVAC/entity_types/FAN.yaml index 6870f30f0e..c12c05d92d 100644 --- a/ontology/yaml/resources/HVAC/entity_types/FAN.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/FAN.yaml @@ -673,6 +673,17 @@ FAN_SS_VSC_REFC: - VSC - REFC +FAN_SS_VSC_ZSPM_DWI: + description: "Dishwasher-interlocked fan with start/stop status, open-loop speed control, and zone static pressure monitoring." + is_canonical: true + implements: + - FAN + - SS + - VSC + - ZSPM + uses: + - dishwasher_run_status + ################################### ### Existing Non-standard Types ### ################################### From da4196693a4fc0f2f0e1ef06b71c5bd9b3bfd090 Mon Sep 17 00:00:00 2001 From: db-robot Date: Mon, 20 May 2024 17:01:17 +0000 Subject: [PATCH 09/10] Add GUIDs to new entity types --- ontology/yaml/resources/HVAC/entity_types/FAN.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ontology/yaml/resources/HVAC/entity_types/FAN.yaml b/ontology/yaml/resources/HVAC/entity_types/FAN.yaml index c12c05d92d..2f07a7467e 100644 --- a/ontology/yaml/resources/HVAC/entity_types/FAN.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/FAN.yaml @@ -674,6 +674,7 @@ FAN_SS_VSC_REFC: - REFC FAN_SS_VSC_ZSPM_DWI: + guid: "a1148f7d-4aa0-4560-b2cb-53b8eb949278" description: "Dishwasher-interlocked fan with start/stop status, open-loop speed control, and zone static pressure monitoring." is_canonical: true implements: From 643c2d3d053c7de4fc357c6fc7ee6fcfbe7e38ae Mon Sep 17 00:00:00 2001 From: ccquigley Date: Mon, 20 May 2024 10:54:14 -0700 Subject: [PATCH 10/10] updated new fan type --- ontology/yaml/resources/HVAC/entity_types/FAN.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/FAN.yaml b/ontology/yaml/resources/HVAC/entity_types/FAN.yaml index 2f07a7467e..d8a8c4ba9d 100644 --- a/ontology/yaml/resources/HVAC/entity_types/FAN.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/FAN.yaml @@ -676,7 +676,7 @@ FAN_SS_VSC_REFC: FAN_SS_VSC_ZSPM_DWI: guid: "a1148f7d-4aa0-4560-b2cb-53b8eb949278" description: "Dishwasher-interlocked fan with start/stop status, open-loop speed control, and zone static pressure monitoring." - is_canonical: true + is_canonical: false implements: - FAN - SS