From e7711fc62339978d220476c1e2ff8700d4163505 Mon Sep 17 00:00:00 2001 From: "Ciaran O'Flannagain (Hereworks)" Date: Thu, 2 May 2024 11:49:44 +0100 Subject: [PATCH 01/20] Dual Tank Section --- .../resources/HVAC/entity_types/ABSTRACT.yaml | 33 +++++++++++++++++++ .../resources/HVAC/entity_types/TANK.yaml | 9 +++++ 2 files changed, 42 insertions(+) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index 79ab4eef1f..84b985e883 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -5519,6 +5519,26 @@ SWTM: uses: - supply_water_temperature_sensor +SWTM2X: + guid: "5fe10f00-bfb6-4493-b8bd-0d58f47a88b4" + description: "Dual supply water temperature monitoring." + is_abstract: true + implements: + - MONITORING + opt_uses: + - cooling_request_count_1 + - heating_request_count_1 + - return_water_temperature_sensor_1 + - high_supply_water_temperature_alarm_1 + - low_supply_water_temperature_alarm_1 + - cooling_request_count_2 + - heating_request_count_2 + - return_water_temperature_sensor_2 + - high_supply_water_temperature_alarm_2 + - low_supply_water_temperature_alarm_2 + uses: + - supply_water_temperature_sensor_1 + - supply_water_temperature_sensor_2 RWTM: guid: "c317c88d-f090-4cd9-9289-6e03e24e496f" @@ -7094,6 +7114,7 @@ LM: - level_status - percentage_sensor + LHLM: guid: "647a4576-b503-43cd-b3b7-e1a9c6856695" description: "High and Low Level Monitoring for tanks." @@ -7102,6 +7123,18 @@ LHLM: - water_high_level_status - water_low_level_status + +LHLM2X: + guid: "dbd0f972-f56f-4455-a8e5-4a4cb99c9a0a" + description: "Dual High and Low Level Monitoring for tanks." + is_abstract: true + uses: + - water_high_level_status_1 + - water_low_level_status_1 + - water_high_level_status_2 + - water_low_level_status_2 + + PLPM: guid: "87da5960-a441-49a1-8f80-05acdbf32426" description: "Pipeline Fluid pressure monitoring" diff --git a/ontology/yaml/resources/HVAC/entity_types/TANK.yaml b/ontology/yaml/resources/HVAC/entity_types/TANK.yaml index e8b1c5eb34..01719b45fb 100644 --- a/ontology/yaml/resources/HVAC/entity_types/TANK.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/TANK.yaml @@ -42,6 +42,15 @@ TK_LHLM_SWTM: - LHLM - SWTM +TK_LHLM2X_SWTM2X: + guid: "e50038e9-60fc-4604-a632-5300043f93cc" + description: "Dual section Tank with supply water temperature monitoring with high and low water level monitoring." + is_canonical: true + implements: + - /TK # Inherits from global namespace + - LHLM2X + - SWTM2X + TK_SWTC_PHWTC: guid: "afec4cde-0aa9-4f75-9cf8-1fa1512fd49a" description: "Tank with supply water temperature control and potable water temperature monitoring." From b30fee46b842dfbe2b600eae23127921282635ea Mon Sep 17 00:00:00 2001 From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com> Date: Thu, 16 May 2024 09:13:14 -0700 Subject: [PATCH 02/20] Update states.yaml --- ontology/yaml/resources/states/states.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ontology/yaml/resources/states/states.yaml b/ontology/yaml/resources/states/states.yaml index dda47f5073..a5f6409968 100644 --- a/ontology/yaml/resources/states/states.yaml +++ b/ontology/yaml/resources/states/states.yaml @@ -94,6 +94,7 @@ BATTERY: "Operation mode or input power is via Battery" SYNCHRONOUS: "Mode of operation of inverter where inverter operation is in line with the bypass voltage and frequency" ASYNCHRONOUS: "Mode of operation of inverter where either the bypass supply fails or the inverter is not in line bypass voltage and frequency" SOFTSTART: "Mode of operation of rectifier where the input power supply is gradually turned on to avoid overloading" +EMERGENCY: "Power source or mode of operation in critical situations when the primary power source or typical mode of operation fails." ## LIGHTING FADING: "An operation mode of a lighting dimmer: dimming speed based on a duration to dim from minimum to maximum." From 8f33c354624f001f56bb473791416d2764dc91d5 Mon Sep 17 00:00:00 2001 From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com> Date: Thu, 16 May 2024 09:15:39 -0700 Subject: [PATCH 03/20] Update telemetry_fields.yaml --- ontology/yaml/resources/fields/telemetry_fields.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml index 56ae443242..babb8daf7c 100644 --- a/ontology/yaml/resources/fields/telemetry_fields.yaml +++ b/ontology/yaml/resources/fields/telemetry_fields.yaml @@ -3585,4 +3585,13 @@ literals: flexible_max: 44.704 - south_wind_linearvelocity_sensor: flexible_min: 0.0 - flexible_max: 44.704 \ No newline at end of file + flexible_max: 44.704 +- switch_position_status: + - NORMAL + - EMERGENCY +- line_power_status: + - PRESENT + - ABSENT +- emergency_power_status: + - PRESENT + - ABSENT From 660ae24f4803972912e425175ddc89878b9a76c7 Mon Sep 17 00:00:00 2001 From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com> Date: Thu, 16 May 2024 09:17:06 -0700 Subject: [PATCH 04/20] Update ABSTRACT.yaml --- .../yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml index 6fd54098ac..9699f28fc7 100644 --- a/ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml @@ -182,3 +182,12 @@ SRC2: - source2_phase3_phase1_over_voltage_status - source2_over_voltage_status - source2_lost_power_alarm + +SPM: + guid: "ff13347e-e823-4adc-a2e4-c02cbae45a84" + description: "ATS switch position monitoring." + is_abstract: true + uses: + - switch_position_status + - line_power_status +  - emergency_power_status From a25ced3db17b715929f85b6f9f0f34e849f4b0f3 Mon Sep 17 00:00:00 2001 From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com> Date: Thu, 16 May 2024 09:19:42 -0700 Subject: [PATCH 05/20] Update ATS.yaml --- .../yaml/resources/ELECTRICAL/entity_types/ATS.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ontology/yaml/resources/ELECTRICAL/entity_types/ATS.yaml b/ontology/yaml/resources/ELECTRICAL/entity_types/ATS.yaml index af74822f51..537ab75391 100644 --- a/ontology/yaml/resources/ELECTRICAL/entity_types/ATS.yaml +++ b/ontology/yaml/resources/ELECTRICAL/entity_types/ATS.yaml @@ -29,3 +29,14 @@ ATS_SRC1_SRC2: opt_uses: - generator_status - fire_alarm + +ATS_SPM: + guid: "7d1b371e-cdbe-439d-9a35-f5ace7f6dcbb" + description: "Automatic transfer switch with switch position monitoring." + is_canonical: true + implements: + - ATS + - SPM + opt_uses: + - generator_status + - fire_alarm From a3fa05c628e852c1b630ab724615b46fa468f2b1 Mon Sep 17 00:00:00 2001 From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com> Date: Thu, 16 May 2024 09:21:10 -0700 Subject: [PATCH 06/20] Update ABSTRACT.yaml --- .../resources/ELECTRICAL/entity_types/ABSTRACT.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml index 9699f28fc7..729ffd37d4 100644 --- a/ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml @@ -184,10 +184,10 @@ SRC2: - source2_lost_power_alarm SPM: - guid: "ff13347e-e823-4adc-a2e4-c02cbae45a84" + guid: "ff13347e-e823-4adc-a2e4-c02cbae45a84" description: "ATS switch position monitoring." - is_abstract: true - uses: - - switch_position_status - - line_power_status + is_abstract: true + uses: + - switch_position_status + - line_power_status   - emergency_power_status From 49accde5a2285dfa74a9f7f8e5504af536bd1cce Mon Sep 17 00:00:00 2001 From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com> Date: Thu, 16 May 2024 09:22:16 -0700 Subject: [PATCH 07/20] Update telemetry_fields.yaml --- ontology/yaml/resources/fields/telemetry_fields.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml index babb8daf7c..17880df54c 100644 --- a/ontology/yaml/resources/fields/telemetry_fields.yaml +++ b/ontology/yaml/resources/fields/telemetry_fields.yaml @@ -3588,10 +3588,10 @@ literals: flexible_max: 44.704 - switch_position_status: - NORMAL - - EMERGENCY + - EMERGENCY - line_power_status: - PRESENT - - ABSENT + - ABSENT - emergency_power_status: - PRESENT - ABSENT From 6fadcaa6d44245640b6a8c1579513a3388343b10 Mon Sep 17 00:00:00 2001 From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com> Date: Thu, 16 May 2024 09:22:52 -0700 Subject: [PATCH 08/20] Update telemetry_fields.yaml --- ontology/yaml/resources/fields/telemetry_fields.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml index 17880df54c..e729b80ecb 100644 --- a/ontology/yaml/resources/fields/telemetry_fields.yaml +++ b/ontology/yaml/resources/fields/telemetry_fields.yaml @@ -3587,11 +3587,11 @@ literals: flexible_min: 0.0 flexible_max: 44.704 - switch_position_status: - - NORMAL - - EMERGENCY + - NORMAL + - EMERGENCY - line_power_status: - - PRESENT - - ABSENT + - PRESENT + - ABSENT - emergency_power_status: - - PRESENT - - ABSENT + - PRESENT + - ABSENT From 8cf065fa7cf4c6366669ca45fc4aafd264c59cd0 Mon Sep 17 00:00:00 2001 From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com> Date: Thu, 16 May 2024 09:23:55 -0700 Subject: [PATCH 09/20] Update ATS.yaml --- ontology/yaml/resources/ELECTRICAL/entity_types/ATS.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ontology/yaml/resources/ELECTRICAL/entity_types/ATS.yaml b/ontology/yaml/resources/ELECTRICAL/entity_types/ATS.yaml index 537ab75391..1934eb2a59 100644 --- a/ontology/yaml/resources/ELECTRICAL/entity_types/ATS.yaml +++ b/ontology/yaml/resources/ELECTRICAL/entity_types/ATS.yaml @@ -38,5 +38,4 @@ ATS_SPM: - ATS - SPM opt_uses: - - generator_status - fire_alarm From 8730c6bec4e77c40fe8dc689c22eb124b33f5dcb Mon Sep 17 00:00:00 2001 From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com> Date: Thu, 16 May 2024 09:33:51 -0700 Subject: [PATCH 10/20] Update telemetry_fields.yaml From 2510579185a1344841bcf3bc00b2032de117f3be Mon Sep 17 00:00:00 2001 From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com> Date: Thu, 16 May 2024 09:36:10 -0700 Subject: [PATCH 11/20] Update telemetry_fields.yaml --- .../yaml/resources/fields/telemetry_fields.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml index e729b80ecb..019e913fde 100644 --- a/ontology/yaml/resources/fields/telemetry_fields.yaml +++ b/ontology/yaml/resources/fields/telemetry_fields.yaml @@ -3586,12 +3586,12 @@ literals: - south_wind_linearvelocity_sensor: flexible_min: 0.0 flexible_max: 44.704 -- switch_position_status: - - NORMAL - - EMERGENCY -- line_power_status: - - PRESENT - - ABSENT +- switch_position_status: + - NORMAL + - EMERGENCY +- line_power_status: + - PRESENT + - ABSENT - emergency_power_status: - - PRESENT - - ABSENT + - PRESENT + - ABSENT From 8b02a3192c36b9e12a2269edd2172923131f7fd4 Mon Sep 17 00:00:00 2001 From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com> Date: Thu, 16 May 2024 09:39:46 -0700 Subject: [PATCH 12/20] Update ABSTRACT.yaml --- ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml index 729ffd37d4..4bd7bbca7c 100644 --- a/ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml @@ -183,11 +183,11 @@ SRC2: - source2_over_voltage_status - source2_lost_power_alarm -SPM: +SPM: guid: "ff13347e-e823-4adc-a2e4-c02cbae45a84" description: "ATS switch position monitoring." is_abstract: true uses: - switch_position_status - line_power_status -  - emergency_power_status + - emergency_power_status From b1b4209dc43fbca5dc4a52c281628ec6ee669f2b Mon Sep 17 00:00:00 2001 From: "Ciaran O'Flannagain (Hereworks)" Date: Mon, 20 May 2024 16:15:35 +0100 Subject: [PATCH 13/20] New Sump PUMP entity type --- ontology/yaml/resources/HVAC/entity_types/PMP.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ontology/yaml/resources/HVAC/entity_types/PMP.yaml b/ontology/yaml/resources/HVAC/entity_types/PMP.yaml index efebe51cde..9dfc97e34e 100644 --- a/ontology/yaml/resources/HVAC/entity_types/PMP.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/PMP.yaml @@ -61,6 +61,15 @@ PMP_SS_VSC_WDPC: - VSC - WDPC +PMP_SS_LHLM: + guid: "0c3cc1e4-6710-4dab-a0bc-35708f9c2b91" + description: "Sump Pump with water level monitoring." + is_canonical: true + implements: + - PMP + - SS + - LVLHL + PMP_SS_VSFC: guid: "08683c47-596a-4e52-8545-5079201b55df" description: "PMP device with pump frequency control" From 5b0a732a616517917dc27127f9b3a600002533df Mon Sep 17 00:00:00 2001 From: "Ciaran O'Flannagain (Hereworks)" Date: Mon, 20 May 2024 16:19:47 +0100 Subject: [PATCH 14/20] New Sump PUMP entity type --- 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 9dfc97e34e..e062d321ad 100644 --- a/ontology/yaml/resources/HVAC/entity_types/PMP.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/PMP.yaml @@ -68,7 +68,7 @@ PMP_SS_LHLM: implements: - PMP - SS - - LVLHL + - LHLM PMP_SS_VSFC: guid: "08683c47-596a-4e52-8545-5079201b55df" From 64b33fc72749cc1a0eef14536122fcaff980738f Mon Sep 17 00:00:00 2001 From: John Vines Date: Wed, 29 May 2024 11:45:22 -0400 Subject: [PATCH 15/20] Adding in disambiguated tonnage We will later need to remove tons/tons_per_hour, but that is a more disruptive change so will be presented in a later PR --- ontology/yaml/resources/units/units.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/ontology/yaml/resources/units/units.yaml b/ontology/yaml/resources/units/units.yaml index 1e6f23ffdd..95a029874e 100644 --- a/ontology/yaml/resources/units/units.yaml +++ b/ontology/yaml/resources/units/units.yaml @@ -300,6 +300,15 @@ mass: tons: multiplier: 907184 offset: 0 + metric_tons: + multiplier: 1000000 + offset: 0 + uk_tons: + multiplier: 1016046.9088 + offset: 0 + us_tons: + multiplier: 907184.74 + offset: 0 massconcentration: concentration massflow: grams_per_second: STANDARD @@ -318,6 +327,15 @@ massflow: tons_per_hour: multiplier: 251.996 offset: 0 + metric_tons_per_hour: + multiplier: 277.777777778 + offset: 0 + uk_tons_per_hour: + multiplier: 282.235252444 + offset: 0 + us_tons_per_hour: + multiplier: 251.995761111 + offset: 0 pounds_mass_per_hour: multiplier: 0.125998 offset: 0 From 9e338f8d530571455c30e2417b1a8a7284a538d1 Mon Sep 17 00:00:00 2001 From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:37:29 -0700 Subject: [PATCH 16/20] Update meter_loads.md --- ontology/docs/meter_loads.md | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/ontology/docs/meter_loads.md b/ontology/docs/meter_loads.md index 0e5a0533d9..629c9a1185 100644 --- a/ontology/docs/meter_loads.md +++ b/ontology/docs/meter_loads.md @@ -1,33 +1,20 @@ # Meter Load Designation -Digital Buildings provides abstract models that can be used to represent various -types of loads within a building and can be connected to meter entities to indicate the types -of loads measured by each metering device. This document describes how these loadtypes -should be created and connected within a building configuration file. +Digital Buildings provides abstract models that can be used to represent various types of loads within a building and can be connected to meter entities to indicate the types of loads measured by each metering device. This document describes how these loadtypes should be created and connected within a building configuration file. + +* For an explanation of building configuration files see [building_config](building_config.md) -* For an explanation of building configuration files see - [building_config](building_config.md) - ### Create the Building Entity and Meter Device Entity -Use the syntax described in [building_config](building_config.md) to create a -facility entity for the building and a reporting entity for the meter device. -A `CONTAINS` connection should be used to indicate that the meter exists within -the building. +Use the syntax described in [building_config](building_config.md) to create a facility entity for the building and a reporting entity for the meter device. A `CONTAINS` connection should be used to indicate that the meter exists within the building. ### Create an Abstract Loadtype Entity -Create a loadtype entity to represent each of the types of loads the meters in -the building measure. The entity will consist of a single abstract loadtype -found in the file called `LOADTYPES.yaml` in the `METER` namespace. The abstract -loadtype does not implement any fields. A `CONTAINS` connection should be used -to indicate that the load exists within the building. +Create a loadtype entity to represent each of the types of loads the meters in the building measure. The entity will consist of a single abstract loadtype found in the file called `LOADTYPES.yaml` in the `METER` namespace. The abstract loadtype does not implement any fields. A `CONTAINS` connection should be used to indicate that the load exists within the building. ### Connect the Loadtype Entity to the Meter Entity via a `MEASURES` Connection -Add a `MEASURES` connection to the loadtype entity to indicate which meter(s) -provide data for it. A building may have multiple meters that -measure the same loadtype. +Add a `MEASURES` connection to the loadtype entity to indicate which meter(s) provide data for it. A building may have multiple meters that measure the same loadtype. ## Example Building Layout and Config @@ -36,7 +23,7 @@ Example full building-loadtype-meter layout: ![image](https://github.com/shambergoldstein/digitalbuildings/assets/124837286/427e4c03-c132-468c-94e7-20486117643a) Example building-loadtype-meter connection in building configuration file: -``` yaml +``` yaml # The building ccb-342: code: BLDG-123 @@ -62,6 +49,6 @@ dde-453: present_value: points.kW.present_value units: key: pointset.points.kW.units - values: + values: kilowatts: "kW" ``` From d92015af766ea0cd47814ff515ef5813121bd5db Mon Sep 17 00:00:00 2001 From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:38:05 -0700 Subject: [PATCH 17/20] Update ABSTRACT.yaml --- ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml index 4bd7bbca7c..1f42f88d5d 100644 --- a/ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml @@ -175,7 +175,7 @@ SRC2: - source2_phase1_phase2_voltage_sensor - source2_phase2_phase3_voltage_sensor - source2_phase3_phase1_voltage_sensor - - source2_frequency_sensor + - source2_frequency_sensor opt_uses: - source2_phase1_phase2_over_voltage_status - source2_phase2_phase3_over_voltage_status From ebceee7a37bfa8a0c6e1b68b2a347faf5c5e556a Mon Sep 17 00:00:00 2001 From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:39:19 -0700 Subject: [PATCH 18/20] Update SDC.yaml --- ontology/yaml/resources/HVAC/entity_types/SDC.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/SDC.yaml b/ontology/yaml/resources/HVAC/entity_types/SDC.yaml index c5f9c5bf2e..618252f717 100644 --- a/ontology/yaml/resources/HVAC/entity_types/SDC.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/SDC.yaml @@ -103,7 +103,7 @@ SDC_EXT_TLT_NORTH_WIND2X: uses: - north_wind_linearvelocity_sensor_1 - north_wind_linearvelocity_sensor_2 - + SDC_EXT_TLT_SOUTH_WIND2X: guid: "426eace1-f4c8-49d0-acef-0fad52d9cc44" description: "Directional shade (South) with two wind sensors." From 0cc5c8bad6811c2ef7f9561b578a2afb8d978b10 Mon Sep 17 00:00:00 2001 From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:39:46 -0700 Subject: [PATCH 19/20] Update TANK.yaml --- ontology/yaml/resources/HVAC/entity_types/TANK.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/TANK.yaml b/ontology/yaml/resources/HVAC/entity_types/TANK.yaml index 01719b45fb..c42074011c 100644 --- a/ontology/yaml/resources/HVAC/entity_types/TANK.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/TANK.yaml @@ -49,7 +49,7 @@ TK_LHLM2X_SWTM2X: implements: - /TK # Inherits from global namespace - LHLM2X - - SWTM2X + - SWTM2X TK_SWTC_PHWTC: guid: "afec4cde-0aa9-4f75-9cf8-1fa1512fd49a" From 50d9548b7911c248eda23d62cbcd1e02b4505920 Mon Sep 17 00:00:00 2001 From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:40:15 -0700 Subject: [PATCH 20/20] 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 62c4986ecb..16d3927c3e 100644 --- a/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml +++ b/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml @@ -314,7 +314,7 @@ LGRP_OS_AWIC: is_canonical: true implements: - LGRP - - OS + - OS - AWIC uses: - group_mode