Skip to content

Tpkd day2 new telemetry name #436

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

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

Tpkd day2 new telemetry name #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c38dd3d
added new points for tpkd day2 work
conroychee Nov 29, 2021
f922599
Merge branch 'master' into tpkd-day2-naming
terryterpt Nov 29, 2021
5e1ad20
revert back to original master changes
conroychee Nov 29, 2021
de00fed
Merge branch 'google:master' into tpkd-day2-naming
terryterpt Dec 6, 2021
4013a5d
changed the description for motor and oil
conroychee Dec 6, 2021
3a66457
Merge branch 'tpkd-day2-naming' of https://github.com/conroy-chee/dig…
conroychee Dec 6, 2021
bfac976
added new telemetry field point name
conroychee Dec 8, 2021
292388a
changes according to the comment
conroychee Dec 21, 2021
bc6f5be
changed the definition of load, added compressor_temperature_sensor a…
conroychee Jan 5, 2022
79c02be
Merge branch 'google:master' into tpkd-day2-new-telemetry-name
terryterpt Jan 5, 2022
e291099
added everything for day2 tpkd
Jan 13, 2022
8398380
Merge branch 'master' into tpkd-day2-new-telemetry-name
terryterpt Jan 13, 2022
907e9a7
update pull request
terryterpt Mar 2, 2022
0e393a6
update tpkd day 2 types
terryterpt Mar 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 75 additions & 1 deletion 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 @@ -4375,4 +4375,78 @@ EC2SC:
- supply_air_temperature_sensor
- supply_air_temperature_setpoint
implements:
- CONTROL
- CONTROL

CWRISOVM2X:
description: "Condensing return water isolation valve control."
is_abstract: true
implements:
- OPERATIONAL
opt_uses:
- condensing_return_water_isolation_control_status
uses:
- condensing_return_water_isolation_valve_command_1
- condensing_return_water_isolation_valve_command_2
- condensing_return_water_isolation_valve_status_1
- condensing_return_water_isolation_valve_status_2
- condensing_return_water_isolation_valve_mode


CWSISOVPM2X:
description: "Condensing return water isolation valve control."
is_abstract: true
implements:
- OPERATIONAL
opt_uses:
- condensing_supply_water_isolation_control_status
uses:
- condensing_supply_water_isolation_valve_command_1
- condensing_supply_water_isolation_valve_command_2
- condensing_supply_water_isolation_valve_status_1
- condensing_supply_water_isolation_valve_status_2
- condensing_supply_water_isolation_valve_mode


WLAM:
description: "Water level alarm monitoring, generally for a water tank."
is_abstract: true
uses:
- water_high_level_alarm
- water_low_level_alarm
- water_overflow_level_alarm

WLAM3X:
description: "Water level alarm monitoring, generally for a water tank with three independent sets of alarms."
is_abstract: true
uses:
- water_high_level_alarm_1
- water_high_level_alarm_2
- water_high_level_alarm_3
- water_low_level_alarm_1
- water_low_level_alarm_2
- water_low_level_alarm_3
- water_overflow_level_alarm_1
- water_overflow_level_alarm_2
- water_overflow_level_alarm_3

ECHWTM:
description: "Entering chilled water temperature monitoring."
is_abstract: true
implements:
- MONITORING
opt_uses:
- chilled_water_flowrate_status
- leaving_chilled_water_temperature_sensor
uses:
- entering_chilled_water_temperature_sensor

ECWTM:
description: "Entering condensing water temperature monitoring."
is_abstract: true
implements:
- MONITORING
opt_uses:
- condensing_water_flowrate_status
- leaving_condensing_water_temperature_sensor
uses:
- entering_condensing_water_temperature_sensor
14 changes: 13 additions & 1 deletion ontology/yaml/resources/HVAC/entity_types/CDWS.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,18 @@ CDWS_SWTC_WDPM_SWPSS:
- WDPM
- SWPSS

CDWS_BYPVPM_WDPM_CWDT:
description: "Condensing water header pipe bypass valve, control via differential pressure sensor"
is_canonical: true
implements:
- CDWS
- BYPVPM
- WDPM
- CWDT
opt_uses:
- bypass_valve_percentage_setpoint
Copy link
Collaborator

@tasodorff tasodorff Mar 18, 2022

Choose a reason for hiding this comment

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

What is the difference between a percentage_setpoint and a percentage_command? Why isnt this a command for the valve?

Copy link
Contributor Author

@terryterpt terryterpt May 18, 2022

Choose a reason for hiding this comment

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

The percentage_setpoint is one where user input while the percentage_command is the feedback on the user input, based on graphic.

- run_mode

###################################
### Existing Non-standard Types ###
###################################
Expand All @@ -119,4 +131,4 @@ CDWS_US_MTV_2081_1:
- supply_water_isolation_valve_status_3
- return_water_isolation_valve_status_3
- supply_water_isolation_valve_status_4
- return_water_isolation_valve_status_4
- return_water_isolation_valve_status_4
59 changes: 58 additions & 1 deletion ontology/yaml/resources/HVAC/entity_types/CH.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,39 @@ CH_SS_SCHWTC_CHDX2SC_REFSM2X_REFPM2X_CWDT:
- REFPM2X
- CWDT

CH_SS_CHPM_REFSM_CHDXSC_ECHWTM_ECWTM:
description: "water cooled chiller single stage"
is_canonical: true
implements:
- CH
- SS
- CHPM
- REFSM
- CHDXSC
- ECHWTM
- ECWTM
opt_uses:
- lost_power_alarm
- control_mode
- reset_command
- control_status

CH_SS_CHDX2SC_CWDT:
description: "water cooled chiller single stage with compressor & condenser control"
is_canonical: true
implements:
- CH
- SS
- CHDX2SC
- CWDT
opt_uses:
- lost_power_alarm
- control_mode
- reset_command
- control_status
- chilled_water_flowrate_status
- condensing_water_flowrate_status

###################################
### Existing Non-standard Types ###
###################################
Expand Down Expand Up @@ -583,4 +616,28 @@ CH_SS_CHWSWISOVM_CWSISOVM_CWRISOVM_CHWRWISOVM_CHWDT:
- condensing_supply_water_temperature_sensor
opt_uses:
- lost_power_alarm
- run_mode
- run_mode

CH_SS_VSFC_CWDT_CWSISOVPM2X_CWRISOVM2X_CHWSWISOVPM_CHWRWISOVPM_REFSM_CHDXSC_CHPM_ECHWTM_ECWTM:
description: "Non standard water cooled chiller single stage with chilled/condensing supply/return water isolation valve control. Chilled water flowrate status"
implements:
- SS
- VSFC
- CWDT
- CWSISOVPM2X
- CWRISOVM2X
- CHWSWISOVPM
- CHWRWISOVPM
- REFSM
- CHDXSC
- CHPM
- ECHWTM
- ECWTM
opt_uses:
Copy link
Collaborator

@tasodorff tasodorff Mar 18, 2022

Choose a reason for hiding this comment

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

Same as above. Move optional fields to abstract types or remove the fields.

Copy link
Contributor Author

@terryterpt terryterpt Mar 10, 2023

Choose a reason for hiding this comment

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

Same as above

- lost_power_alarm
- control_status
- run_mode
- reset_command
- control_mode
- chilled_supply_water_isolation_valve_mode
- chilled_return_water_isolation_valve_mode
24 changes: 24 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,17 @@ CHWS_SWTC_WDPC2X_BYPVPM_WFRM_CLPM:
- WFRM
- CLPM

CHWS_CHWBYPVPM_CHWDPM:
description: "Chilled water header pipe bypass valve, control via differential pressure sensor"
is_canonical: true
implements:
- CHWS
- CHWBYPVPM
- CHWDPM
opt_uses:
- run_mode
- chilled_water_bypass_valve_percentage_setpoint
Copy link
Collaborator

@tasodorff tasodorff Apr 1, 2022

Choose a reason for hiding this comment

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

Is this a command?

Copy link
Contributor Author

@terryterpt terryterpt May 30, 2022

Choose a reason for hiding this comment

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

Based on my understanding, a command is a binary input like "on/off". Hence, this point is not a command as it is an analog input to set the percentage.


###################################
### Existing Non-standard Types ###
###################################
Expand Down Expand Up @@ -263,3 +274,16 @@ CHWS_US_SVL_TC6_1:
uses:
- production_differential_pressure_sensor
- supply_water_flowrate_sensor # Need to rename to flowrate_sensor

CHWS_CHWDT2X:
description: "Chilled water header pipe sensors"
implements:
- CHWS
- CHWDT2X
opt_uses:
- chilled_supply_water_flowrate_sensor
- chilled_supply_water_temperature_sensor_3
- chilled_supply_water_temperature_sensor_4
- chilled_supply_water_temperature_sensor_5
- chilled_return_water_temperature_sensor_3
- chilled_return_water_temperature_sensor_4
35 changes: 35 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/CT.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,41 @@ CT_SS_VSFC:
- run_mode
- lost_power_alarm

CT_SS_VSFC_CDWISOVPM:
description: "Cooling tower with condensing water isolation valve control"
is_canonical: true
implements:
- CT
- SS
- VSFC
- CDWISOVPM
opt_uses:
- lost_power_alarm
- control_status
- run_mode
- schedule_run_command
- reset_command
- condensing_water_isolation_valve_mode
- condensing_water_flowrate_status
- control_mode

CT_SS_VSFC_CWSISOVPM2X_CWRISOVM2X:
description: "Non standard cooling tower with condensing return/supply isolation valve control"
is_canonical: true
implements:
- CT
- SS
- VSFC
- CWSISOVPM2X
- CWRISOVM2X
opt_uses:
- lost_power_alarm
- control_status
- run_mode
- reset_command
- heat_percentage_sensor
- control_mode

###################################
### Existing Non-standard Types ###
###################################
Expand Down
7 changes: 7 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml
View file
Open in desktop
Copy link
Member

@shambersafai shambersafai Oct 28, 2024

Choose a reason for hiding this comment

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

TK already exists in the global namespace, please remove

Original file line number Diff line number Diff line change
Expand Up @@ -348,3 +348,10 @@ DOAS:
is_abstract: true
implements:
- EQUIPMENT

TK:
description: "Water tank."
is_abstract: true
implements:
- EQUIPMENT

65 changes: 64 additions & 1 deletion ontology/yaml/resources/HVAC/entity_types/PMP.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,24 @@ PMP_SS_CWCS_VSFC:
- run_mode
- lost_power_alarm

PMP_SS_CDWISOVPM_VSFC:
description: "Primary condenser water pump with condensing water isolation valve control"
is_canonical: true
implements:
- PMP
- SS
- CDWISOVPM
- VSFC
opt_uses:
- lost_power_alarm
- control_status
- low_differential_pressure_alarm
Copy link
Collaborator

@tasodorff tasodorff Apr 1, 2022

Choose a reason for hiding this comment

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

differential pressure across the pump?

Copy link
Contributor Author

@terryterpt terryterpt May 18, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Yes it is the differential pressure across pump to verify the pump working status

- run_mode
- reset_command
- condensing_water_isolation_valve_mode
- condensing_water_flowrate_status
- control_mode

###################################
### Existing Non-standard Types ###
###################################
Expand All @@ -140,4 +158,49 @@ PMP_S_VSCF_ISV:
uses:
- mixing_valve_percentage_command
- chilled_supply_water_temperature_setpoint
- chilled_supply_water_temperature_sensor
- chilled_supply_water_temperature_sensor

PMP_SS_CHWP_PCWP:
description: "Non standard chilled & Primary water pump"
implements:
- PMP
- SS
opt_uses:
- control_status
- run_mode
- lost_power_alarm
- low_differential_pressure_alarm
- reset_command

PMP_SS_VSFC_SHWP:
description: "Non standard secondary chilled water pump"
implements:
- PMP
- SS
- VSFC
opt_uses:
- lost_power_alarm
- control_status
- chilled_water_flowrate_status
- run_mode
- reset_command
- heat_percentage_sensor
- control_mode


PMP_SS_CHWISOVPM_VSFC_CHWP_PCWP:
description: "Non standard chilled & secondary chilled water pump with chilled water isolation valve control"
implements:
- PMP
- SS
- CHWISOVPM
- VSFC
opt_uses:
- lost_power_alarm
- control_status
- low_differential_pressure_alarm
- run_mode
- reset_command
- chilled_water_flowrate_status
- chilled_water_isolation_valve_mode
- control_mode
23 changes: 23 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/TK.yaml
View file
Open in desktop
Copy link
Member

@shambersafai shambersafai Oct 28, 2024

Choose a reason for hiding this comment

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

TANK.yaml has since been added, please move this type there if needed and remove this file

Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Copyright 2020 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the License);
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an AS IS BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

########################
### Canonical Types ###
########################

TK_WLAM3X:
description: "A water tank with three sets of alarms for high, low, and overflow alerting."
implements:
- TK
- WLAM3X
13 changes: 13 additions & 0 deletions ontology/yaml/resources/METERS/entity_types/HM.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,16 @@ HM_HW:
- heating_return_water_temperature_sensor
- heating_thermal_power_sensor
- heating_thermal_energy_accumulator


HM_CW:
description: "Cooling load heat meter for condensing water header pipe."
implements:
- HM
is_canonical: true
uses:
- condensing_water_flowrate_sensor
- condensing_supply_water_temperature_sensor
- condensing_return_water_temperature_sensor
- cooling_thermal_power_sensor
- cooling_thermal_energy_accumulator
Loading