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.

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

create new types for taiwan project #1384

Merged
merged 26 commits into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
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
3 changes: 3 additions & 0 deletions .gitignore
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@
package-lock.json
yarn.lock
venv/
.idea/
scratch/
tools/*
12 changes: 12 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8264,3 +8264,15 @@ DTPM:
- detergent_pump_run_command
implements:
- MONITORING

#TW-NTC-TPKE
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
DICM2X:
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
description: "Damper isolation control and monitoring. "
is_abstract: true
uses:
- supply_air_isolation_damper_closed_status_1
- supply_air_isolation_damper_open_status_1
- supply_air_isolation_damper_closed_status_2
- supply_air_isolation_damper_open_status_2
- supply_air_isolation_damper_command_1
- supply_air_isolation_damper_command_2
103 changes: 103 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/AHU.yaml
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -5439,3 +5439,106 @@ AHU_BSPC_DX4SC_ECON_EFSS_EFVSC_SFSS_SFVSC_SSPC_RHHC_NONCANONICAL_1:
- heating_water_valve_percentage_command
- min_zone_air_relative_humidity_sensor
- min_zone_air_relative_humidity_setpoint

# TW-NTC-TPKE
AHU_DSPM_DFVSC_DTM_RDC_OAMC_OA_CHWRC_RCO2M:
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
description: "AHU with discharge air/fan, chilled water valve operation, humidity monitoring with dual dampers monitoring and control ."
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
is_canonical: true
implements:
- AHU
- DSPM
- DFVSC
- DTM
- RDC
- OAMC
- OA
- CHWRC
- RCO2M
opt_uses:
- filter_alarm
- low_differential_pressure_alarm
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved

AHU_DFVSC_HWDC_UV_OAFM_MTM_CHWPVM_RDC_RCO2M_RTM:
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
description: "AHU with discharge air/fan, UV, chilled water valve and return air temperature monitoring with dual dampers monitoring."
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
is_canonical: true
implements:
- AHU
- DFVSC
- HWDC
- OAFM
- MTM
- CHWPVM
- RCO2M
- RTM
opt_uses:
- filter_alarm
- return_air_damper_percentage_sensor
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
- ultraviolet_lamp_run_status
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved


AHU_DFVSC_CHWPVM_RTM:
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
description: "AHU with discharge air/fan, chilled water valve and return air temperature monitoring."
is_canonical: true
implements:
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
- AHU
- DFVSC
- CHWPVM
- RTM
opt_uses:
- filter_alarm
- ultraviolet_lamp_run_status
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved


AHU_DFSS_CHWPVM_ZTC:
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
description: "AHU with discharge air/fan, chilled water valve and zone air temperature control."
is_canonical: true
implements:
- AHU
- DFSS
- CHWPVM
- ZTC
opt_uses:
- filter_alarm
- control_mode
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved


AHU_DFSS_DFVSC_CHWDC_ZTC_CO2M:
description: "AHU with discharge air/fan, chilled water valve and zone air temperature monitoring."
is_canonical: true
implements:
- AHU
- DFSS
- DFVSC
- CHWDC
- ZTC
- CO2M
opt_uses:
- filter_alarm
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
- ultraviolet_lamp_run_status


AHU_DFSS_DFVSC_HWDC_ZTC_OAFM_CHWPVM:
description: "AHU with discharge air/fan, UV, chilled water valve and 5x co2 concentration monitoring with 5x dampers monitoring."
is_canonical: true
implements:
- AHU
- DFSS
- DFVSC
- HWDC
- ZTC
- OAFM
- CHWPVM
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
opt_uses:
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
- filter_alarm
- ultraviolet_lamp_run_status
- zone_air_co2_concentration_sensor_1
- zone_air_co2_concentration_sensor_2
- zone_air_co2_concentration_sensor_3
- zone_air_co2_concentration_sensor_4
- zone_air_co2_concentration_sensor_5
- zone_air_co2_concentration_sensor_6
- supply_air_damper_percentage_sensor_1
- supply_air_damper_percentage_sensor_2
- supply_air_damper_percentage_sensor_3
- supply_air_damper_percentage_sensor_4
- supply_air_damper_percentage_sensor_5
30 changes: 30 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/CH.yaml
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -771,3 +771,33 @@ CH_SS_CHWSWISOVM_CWSISOVM_CWRISOVM_CHWRWISOVM_CHWDT:
opt_uses:
- lost_power_alarm
- run_mode

# TW-NTC-TPKE
CH_SS_SCHWTC_CWDT_REFSM_CHWFRSM_CDWFRSM_CHDXSC_IGM:
description: "Simple water-cooled chiller with supply temperature control with refrigerant monitoring, chilled and condenser water flowrate status monitoring."
is_canonical: true
implements:
- CH
- SS
- SCHWTC
- CWDT
- REFSM
- CHWFRSM
- CDWFRSM
- CHDXSC
- IGM
opt_uses:
- compressor_run_time_accumulator

CH_SS_CC2XM_REFSM2X_REFPM2X:
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
description: "Simple water-cooled chiller with 2 circuit refrigerant monitoring and compressor current monitoring."
is_canonical: true
implements:
- CH
- SS
- CC2XM
- REFSM2X
- REFPM2X
opt_uses:
- water_flowrate_status_1
- water_flowrate_status_2
8 changes: 8 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -436,3 +436,11 @@ CHWS_SWTC_WDPC_BYPVPM_WFRM_NONCANONICAL_1:
uses:
- production_differential_pressure_sensor
- supply_water_flowrate_sensor # Need to rename to flowrate_sensor

# TW-NTC-TPKE
CHWS_RWTM:
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
description: "Simple chilled water system with return temperature monitoring."
is_canonical: true
implements:
- CHWS
- RWTM
14 changes: 14 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/DOAS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -219,3 +219,17 @@ DOAS_SFVSC_EFVSC_HTWHLSTC_CHWVM_HWVM_SFM_FDPSM_ACO2C_SDM2X_EDM2X:
- SDM2X
- EDM2X

#TW-NTC-TPKE
DOAS_DFVSC_CHWDDC_OAMC_OA:
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
description: "Single zone DOAS with damper and discharge fan speed control."
is_canonical: true
implements:
- DOAS
- DFVSC
- CHWDDC
- OAMC
- OA
opt_uses:
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
- smoke_alarm
- filter_alarm
- low_differential_pressure_alarm
40 changes: 40 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/FAN.yaml
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -949,3 +949,43 @@ FAN_SS_MSM:
- FAN
- MSM

#TW-NTC-TPKE
FAN_SS_DICM2X:
description: "Basic fan with start/stop and status with dual dampers monitoring."
is_canonical: true
implements:
- FAN
- SS
- DICM2X

FAN_SS_DICM:
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
description: "Basic fan with start/stop and status with damper monitoring."
is_canonical: true
implements:
- FAN
- SS
- DICM


FAN_SS_VSC_INVOPWM:
description: "Basic fan with start/stop and status with inverter monitoring."
is_canonical: true
implements:
- FAN
- SS
- VSC
- INVOPWM
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
opt_uses:
- load_percentage_sensor

FAN_SS_VSC_NONCANONICAL_7:
description: "Basic fan with start/stop and status with carbon monoxide monitoring."
implements:
- FAN
- SS
- VSC
opt_uses:
- zone_air_co_concentration_sensor_1
- zone_air_co_concentration_sensor_2
- zone_air_co_concentration_sensor_3
- zone_air_co_concentration_sensor_4
23 changes: 23 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/FCU.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1993,6 +1993,7 @@ FCU_DFSS_DSPRTC_DXDSPRTC_NONCANONICAL_1:
FCU_RHC_DFVSC_RTC:
guid: "251b58f5-dfee-4123-a528-b03d97403e66"
description: "CRAC with return air temp/humidity control and discharge/cooling fan monitor."
is_canonical: true
implements:
- FCU
- RHC
Expand Down Expand Up @@ -2138,3 +2139,25 @@ FCU_DFSS_DFRMM_CSP_CHWDC:
- DFRMM
- CSP
- CHWDC

FCU_DFVSC_RTM_CO2M_HWZTC_CHWZTC:
guid: "6f6fd049-576c-4f0a-894d-a6433575b8dd"
description: "Fan coil unit with zone temperature control, heating water and chilled water valve monitoring."
implements:
- FCU
- DFVSC
- RTM
- CO2M
- HWZTC
- CHWZTC

# TW-NTC-TPKE
FCU_DFSS_ZTC_CHWISOVM:
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
description: "Chilled water FCU with zone temperature control and chilled water valve monitoring"
is_canonical: true
implements:
- FCU
- DFSS
- ZTC
- CHWISOVM

19 changes: 19 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/PMP.yaml
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -209,3 +209,22 @@ PMP_SS_VSC_NONCANONICAL_2:
- mixing_valve_percentage_command
- chilled_supply_water_temperature_setpoint
- chilled_supply_water_temperature_sensor


# TW-NTC-TPKE
PMP_SS_CHWFRSM:
description: "Typical pump with chilled water flowrate status monitoring."
is_canonical: true
implements:
- PMP
- SS
- CHWFRSM

PMP_SS_VSC_CHWFRSM:
description: "Typical variable speed pump with chilled water flowrate status monitoring."
is_canonical: true
implements:
- PMP
- SS
- VSC
- CHWFRSM
18 changes: 18 additions & 0 deletions ontology/yaml/resources/TRANSPORT/entity_types/ABSTRACT.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,21 @@ SS:
- failed_alarm
- lost_power_alarm

# TW-NTC-TPKE
EOM:
description: "Elevator operation monitoring."
is_abstract: true
opt_uses:
- maintenance_alarm
- control_status
- fire_alarm
uses:
- level_sensor
- position_status

EDM:
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
description: "Elevator direction monitoring."
is_abstract: true
uses:
- direction_up_mode
- direction_down_mode
9 changes: 9 additions & 0 deletions ontology/yaml/resources/TRANSPORT/entity_types/ELV.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,12 @@ ELV_SS:
- ELV
- SS

#TW-NTC-TPKE
ELV_SS_EOM_EDM:
description: "Elevator operation and direction mode monitoring."
is_canonical: true
implements:
- ELV
- SS
- EOM
- EDM
9 changes: 9 additions & 0 deletions ontology/yaml/resources/fields/telemetry_fields.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3661,6 +3661,15 @@ literals:
- emergency_power_status:
- PRESENT
- ABSENT
- level_sensor:
flexible_min: -3
flexible_max: 14
- direction_up_mode:
- UP
- DOWN
- direction_down_mode:
- UP
- DOWN
- expansion_valve_percentage_command:
fixed_min: 0.0
fixed_max: 100.0
Loading