Skip to content

Commit

Permalink
Merge branch 'master' into cstirdivant-tool-doc-updates
Browse files Browse the repository at this point in the history
  • Loading branch information
trav3711 authored Dec 8, 2023
2 parents 8c65483 + 4a5cf65 commit 48824c5
Show file tree
Hide file tree
Showing 9 changed files with 193 additions and 1 deletion.
77 changes: 77 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3645,6 +3645,8 @@ MXVPM:
guid: "4bb25777-d661-4fd3-9f8f-a84b349ada87"
description: "Mixing valve percent monitoring."
is_abstract: true
opt_uses:
- mixing_valve_percentage_sensor
uses:
- mixing_valve_percentage_command
implements:
Expand Down Expand Up @@ -6891,6 +6893,43 @@ VSMC:
- high_speed_status
- schedule_run_command

CO2DSPMADC:
guid: "316d6473-f187-45ce-9b0e-35b8149e83ce"
description: "Dual setpoint CO2 control with mixed air damper (for recirculated air in AHU)."
is_abstract: true
uses:
- mixed_air_damper_open_command
- mixed_air_damper_closed_command
- low_limit_return_air_co2_concentration_setpoint
- high_limit_return_air_co2_concentration_setpoint
- return_air_co2_concentration_sensor
implements:
- CONTROL

HTWHLZTC:
guid: "0d063fbc-57cc-4678-9516-d9372e9ccf15"
description: "Heat wheel which controls zone temperature using speed control."
is_abstract: true
implements:
- CONTROL
opt_uses:
- exhaust_air_temperature_sensor
- heat_wheel_speed_percentage_sensor
- return_air_temperature_sensor
- supply_air_temperature_sensor
- failed_exhaust_air_temperature_alarm
- high_return_air_temperature_alarm
- high_supply_air_temperature_alarm
- low_return_air_temperature_alarm
- low_supply_air_temperature_alarm
uses:
- heat_wheel_run_command
- heat_wheel_run_status
- heat_wheel_speed_percentage_command
- outside_air_temperature_sensor
- zone_air_temperature_sensor
- zone_air_temperature_setpoint

SDM2X:
guid: "b56e4a52-c988-448a-847d-25710ae4aaef"
description: "Supply air damper monitoring, dual status fields."
Expand Down Expand Up @@ -7142,6 +7181,9 @@ CPC2X:
- circulation_pump_run_status_1
- circulation_pump_run_command_2
- circulation_pump_run_status_2
opt_uses:
- failed_circulation_pump_alarm_1
- failed_circulation_pump_alarm_2

SDHC:
guid: "de065843-b1a9-4d2e-b751-31d7af8e8991"
Expand Down Expand Up @@ -7171,3 +7213,38 @@ FPHC:
uses:
- heating_water_valve_percentage_command
- chilled_water_valve_percentage_command

SSTC:
guid: "3aefe568-b8eb-485e-a3d9-38ac3bb9906d"
description: "Supply steam valve monitoring to control water temperature on supply side for steam exchanger."
is_abstract: true
opt_uses:
- supply_steam_valve_percentage_sensor
uses:
- supply_steam_valve_percentage_command
- heating_supply_water_temperature_sensor
- heating_supply_water_temperature_setpoint

COC2XDSP:
guid: "fa7cba8d-be4d-4968-a5bf-f55429006b77"
description: "Dual setpoint CO concentration control with 2 sensors."
is_abstract: true
uses:
- high_limit_zone_air_co_concentration_setpoint
- low_limit_zone_air_co_concentration_setpoint
- zone_air_co_concentration_sensor_1
- zone_air_co_concentration_sensor_2
implements:
- CONTROL

NO2C2XDSP:
guid: "7a76fa65-88d2-4cea-8297-3bdb4ca507e4"
description: "Dual setpoint NO2 concentration control with 2 sensors."
is_abstract: true
uses:
- high_limit_zone_air_no2_concentration_setpoint
- low_limit_zone_air_no2_concentration_setpoint
- zone_air_no2_concentration_sensor_1
- zone_air_no2_concentration_sensor_2
implements:
- CONTROL
20 changes: 20 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/AHU.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -918,6 +918,26 @@ AHU_DFSS_CHWDT_DTM_RTC_RWISOVPC_OAFC_FDPSM2X:
- OAFC
- FDPSM2X

AHU_SFSS_SFVSC_EFSS_EFVSC_HTWHLZTC_HWZTC_CHWZTC_SSPC_RSPC_CO2DSPMADC_MTM_ECONZ_FDPM3X:
guid: "d1f96a1d-3c49-49c9-8ff7-aa60f1f7e10b"
description: "AHU that serves multiple dampers all feeding a single zone."
is_canonical: true
implements:
- AHU
- SFSS
- SFVSC
- EFSS
- EFVSC
- HTWHLZTC
- HWZTC
- CHWZTC
- SSPC
- RSPC
- CO2DSPMADC
- MTM
- ECONZ
- FDPM3X

### Multi-zone Units ###

AHU_DXSC_ECON_EFSS_SFSS:
Expand Down
10 changes: 10 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/FAN.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,16 @@ FAN_SS_FDPM_VSC_SRC:
- VSC
- SRC

FAN_HLC_COC2XDSP_NO2C2XDSP:
guid: "69a67398-f2d7-4fc7-b60a-945be99012b2"
description: "Two-speed fan (low/high) with CO concentration dual setpoint control and NO2 concentration dual setpoint control with 2 sensors."
is_canonical: true
implements:
- FAN
- HLC
- COC2XDSP
- NO2C2XDSP

###################################
### Existing Non-standard Types ###
###################################
Expand Down
29 changes: 29 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/FCU.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1255,6 +1255,15 @@ FCU_DFSS_DFVSC_FDPM_CHWDC_SRC_DFRMM:
- SRC
- DFRMM

FCU_DFSS_CHWRC:
guid: "854f3eff-07db-4324-a4b3-84e19f6a8639"
description: "CRAC unit with discharge fan and return temperature control."
is_canonical: true
implements:
- FCU
- DFSS
- CHWRC

FCU_DXZTC_DFSS:
guid: "5688519e-f88e-4620-8bd5-89d91467028d"
description: "FCU with SS, discharge temp sensors, zone control and sensor, filter change"
Expand Down Expand Up @@ -1338,6 +1347,17 @@ FCU_DFSS_CHWDC_CSP_RTM_DXZC:
- filter_alarm
- run_mode

FCU_SS_HTRC_DTM_ZTM:
guid: "3d9b6b87-0770-4ae6-9bfc-8f729341ccac"
description: "FCU with return temperature control, discharge temperature monitoring, zone temperature monitorning and start/stop control."
is_canonical: true
implements:
- FCU
- SS
- HTRC
- DTM
- ZTM

###################################
### Existing Non-standard Types ###
###################################
Expand Down Expand Up @@ -1790,6 +1810,15 @@ FCU_DSP_DFVSC_DTM_RTM:
- DTM
- RTM

FCU_DFSS_DFSMC_HWRC:
guid: "1388eea8-a039-4b33-8613-24ae9de719dd"
description: "Warm air curtain with return air temperature control."
implements:
- FCU
- DFSS
- DFSMC
- HWRC

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."
Expand Down
1 change: 1 addition & 0 deletions ontology/yaml/resources/HVAC/entity_types/HWS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@ HWS_SWTC_WDPC_WFRM_HWTTC:
- WFRM
- HWTTC


###################################
### Existing Non-standard Types ###
###################################
Expand Down
9 changes: 9 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/HX.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -187,3 +187,12 @@ HX_CWDT_HSWTC_HWDPC_HWBYPVPM:
- HSWTC
- HWDPC
- HWBYPVPM

HX_SSTC_SSSPC:
guid: "02c3c81d-241c-4868-b260-9c580c29379b"
description: "Steam exchanger with heating water temperature control and steam static pressure control on supply side."
is_canonical: true
implements:
- HX
- SSTC
- SSSPC
14 changes: 14 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/MAU.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,20 @@
### Canonical Types ###
########################

MAU_HWSC_SFM_SFVSC_FDPM_FDPSM_SDM_SSPC:
guid: "5d055bc2-ea29-4d1e-beb9-e082f7bea4c7"
description: "Make-up air unit with heating control"
is_canonical: true
implements:
- MAU
- HWSC
- SFM
- SFVSC
- FDPM
- FDPSM
- SDM
- SSPC

MAU_SFSS_STM:
guid: "9532ed28-f40c-472b-90aa-4a679911ef17"
description: "Simple make-up air unit."
Expand Down
30 changes: 29 additions & 1 deletion ontology/yaml/resources/fields/telemetry_fields.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,10 @@ literals:
- HIGH
- OFF
- VFD
- TWENTY_PERCENT
- FORTY_PERCENT
- SIXTY_PERCENT
- EIGHTY_PERCENT
- discharge_fan_speed_percentage_command:
fixed_min: 0.0
fixed_max: 100.0
Expand Down Expand Up @@ -3182,6 +3186,18 @@ literals:
- low_discharge_air_static_pressure_alarm:
- ACTIVE
- INACTIVE
- mixed_air_damper_open_command:
- ON
- OFF
- mixed_air_damper_closed_command:
- ON
- OFF
- low_limit_return_air_co2_concentration_setpoint:
flexible_min: 0.00005
flexible_max: 0.005
- high_limit_return_air_co2_concentration_setpoint:
flexible_min: 0.00005
flexible_max: 0.005
- average_zone_air_co2_concentration_setpoint:
flexible_min: 0.00005
flexible_max: 0.005
Expand All @@ -3199,4 +3215,16 @@ literals:
flexible_max: 80
- tamper_alarm:
- ACTIVE
- INACTIVE
- INACTIVE
- supply_steam_valve_percentage_command:
fixed_min: 0.0
fixed_max: 100.0
- supply_steam_valve_percentage_sensor:
fixed_min: 0.0
fixed_max: 100.0
- high_limit_zone_air_no2_concentration_setpoint:
fixed_min: 0.0
flexible_max: 0.0005
- low_limit_zone_air_no2_concentration_setpoint:
fixed_min: 0.0
flexible_max: 0.0005
4 changes: 4 additions & 0 deletions ontology/yaml/resources/states/states.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ VFD: Discrete speed (frequency) control
BYPASS: Bypassing an element or entity.
DEHUMIDIFY: Modes of operation in DX unit where the unit acts as a dehumidifier by removing moisture from air
FAN_ONLY: Modes of operation in DX unit where only fan runs and heating/cooling is disabled
TWENTY_PERCENT: Speed of 20 percent of the maximum
FORTY_PERCENT: Speed of 40 percent of the maximum
SIXTY_PERCENT: Speed of 60 percent of the maximum
EIGHTY_PERCENT: Speed of 80 percent of the maximum

# Moved from HVAC namespace because all fields are currently global in DL.
COMMISSIONING: The fan speed and valve positions are set to preconfigured parameters.
Expand Down

0 comments on commit 48824c5

Please sign in to comment.