Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dual Tank Section #1327

Merged
merged 3 commits into from
May 28, 2024
Merged

Dual Tank Section #1327

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7711fc
Dual Tank Section
Ciaran-Oflannagain May 2, 2024
4ea59d0
Merge branch 'master' into dual-tank-section-entity-Ciaran-2.5.24
Ciaran-Oflannagain May 7, 2024
4ad20dd
Merge branch 'master' into dual-tank-section-entity-Ciaran-2.5.24
cstirdivant May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 33 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5554,6 +5554,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"
Expand Down Expand Up @@ -7129,6 +7149,7 @@ LM:
- level_status
- percentage_sensor


LHLM:
guid: "647a4576-b503-43cd-b3b7-e1a9c6856695"
description: "High and Low Level Monitoring for tanks."
Expand All @@ -7137,6 +7158,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"
Expand Down
9 changes: 9 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/TANK.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
cstirdivant marked this conversation as resolved.
Show resolved Hide resolved
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."
Expand Down