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

New tank type #1025

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

New tank type #1025

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01b163e
added tank with level, temp monitoring
kevin-hereworks May 10, 2023
d8965c5
tank type x2
kevin-hereworks May 10, 2023
1cc3a96
added field
kevin-hereworks May 10, 2023
90bf8a8
Merge branch 'master' into new-tank-type
cstirdivant Jul 10, 2023
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
29 changes: 29 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 @@ -6618,3 +6618,32 @@ VMADC:
- mixed_air_damper_percentage_sensor
implements:
- CONTROL

TLM:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Supply temperature points should be covered with SWTC or SWTM. Water level statuses make more sense to put on the pump, using DRPM, if possible.

description: "Level and temperature monitoring"
is_abstract: true
uses:
- supply_water_temperature_sensor
- water_high_level_status
- water_low_level_status
- high_water_temperature_alarm
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please move alarms to opt_uses

- high_water_temperature_setpoint
implements:
- MONITORING

TLM2X:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See above comment.

description: "Level and temperature monitoring 2x"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this intended to model two distinct tanks or a single tank with two sensors? If you are trying to model two tanks, please just apply the other type to each individual tank.

is_abstract: true
uses:
- supply_water_temperature_sensor_1
- water_high_level_status_1
- water_low_level_status_1
- high_water_temperature_setpoint_1
- high_water_temperature_alarm_1
- supply_water_temperature_sensor_2
- water_high_level_status_2
- water_low_level_status_2
- high_water_temperature_setpoint_2
- high_water_temperature_alarm_2
implements:
- MONITORING
15 changes: 15 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 @@ -43,3 +43,18 @@ TK_LM:
implements:
- /TK # Inherits from global namespace
- LM

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comments on abstract types.

TK_TLM:
description: "Tank with level monitoring "
is_canonical: true
implements:
- /TK # Inherits from global namespace
- TLM


TK_TLM2X:
description: "Tank with level monitoring "
is_canonical: true
implements:
- /TK # Inherits from global namespace
- TLM2X
4 changes: 4 additions & 0 deletions ontology/yaml/resources/fields/telemetry_fields.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3110,3 +3110,7 @@ literals:
- ultraviolet_irradiance_sensor:
fixed_min: 0.0
flexible_max: 2000.0

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you clarify what this is?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is to set the temperature at which an alarm will be triggered, maybe not very useful in hindsight

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you are including the alarm point itself there is no need to include the threshold at which the alarm is triggered; so you can remove this point and the model will still be complete.

- high_water_temperature_setpoint:
flexible_min: 255.9259259
flexible_max: 380.3703704