Skip to content

Commit 1eef0e7

Browse files
authored
Merge pull request #1314 from shambergoldstein/alarm_additions
Alarm Additions
2 parents ca4d9c0 + cca832a commit 1eef0e7

File tree

2 files changed

+65
-1
lines changed

2 files changed

+65
-1
lines changed

ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ OAFC:
125125
- economizer_mode
126126
- mixed_air_temperature_sensor
127127
- failed_mixed_air_temperature_alarm
128+
- high_mixed_air_temperature_alarm
129+
- low_mixed_air_temperature_alarm
128130
uses:
129131
- outside_air_damper_percentage_command
130132
- outside_air_flowrate_sensor
@@ -321,6 +323,7 @@ CO2C:
321323
- zone_air_co2_concentration_setpoint
322324
opt_uses:
323325
- high_zone_air_co2_concentration_alarm
326+
- failed_zone_air_co2_concentration_alarm
324327

325328

326329
CO2CDSP:
@@ -335,6 +338,7 @@ CO2CDSP:
335338
- zone_air_co2_concentration_sensor
336339
opt_uses:
337340
- high_zone_air_co2_concentration_alarm
341+
- failed_zone_air_co2_concentration_alarm
338342

339343

340344
COC:
@@ -723,6 +727,7 @@ SSPC:
723727
- supply_fan_speed_frequency_sensor
724728
- supply_fan_speed_percentage_command
725729
- failed_supply_fan_alarm
730+
- failed_supply_air_static_pressure_alarm
726731
- high_supply_air_static_pressure_alarm
727732
- low_supply_air_static_pressure_alarm
728733
uses:
@@ -1217,6 +1222,7 @@ SCHWTC:
12171222
- cooling_request_count
12181223
- cooling_run_command
12191224
- failed_cooling_alarm
1225+
- failed_chilled_supply_water_temperature_alarm
12201226
- high_chilled_supply_water_temperature_alarm
12211227
- low_chilled_supply_water_temperature_alarm
12221228
uses:
@@ -1251,6 +1257,9 @@ RCHWTC:
12511257
- chilled_supply_water_temperature_sensor
12521258
- cooling_percentage_command
12531259
- cooling_request_count
1260+
- failed_chilled_return_water_temperature_alarm
1261+
- high_chilled_return_water_temperature_alarm
1262+
- low_chilled_return_water_temperature_alarm
12541263
uses:
12551264
- chilled_return_water_temperature_sensor
12561265
- chilled_return_water_temperature_setpoint
@@ -1384,6 +1393,8 @@ MTM:
13841393
- mixed_air_dewpoint_temperature_sensor
13851394
- mixed_air_relative_humidity_sensor
13861395
- failed_mixed_air_temperature_alarm
1396+
- high_mixed_air_temperature_alarm
1397+
- low_mixed_air_temperature_alarm
13871398
uses:
13881399
- mixed_air_temperature_sensor
13891400
implements:
@@ -1401,6 +1412,8 @@ MTC:
14011412
- OPERATIONAL
14021413
opt_uses:
14031414
- failed_mixed_air_temperature_alarm
1415+
- high_mixed_air_temperature_alarm
1416+
- low_mixed_air_temperature_alarm
14041417

14051418

14061419
STM:
@@ -1636,6 +1649,7 @@ CO2M:
16361649
- MONITORING
16371650
opt_uses:
16381651
- high_zone_air_co2_concentration_alarm
1652+
- failed_zone_air_co2_concentration_alarm
16391653

16401654

16411655
VOCM:
@@ -1754,6 +1768,7 @@ SSPM:
17541768
implements:
17551769
- MONITORING
17561770
opt_uses:
1771+
- failed_supply_air_static_pressure_alarm
17571772
- high_supply_air_static_pressure_alarm
17581773
- low_supply_air_static_pressure_alarm
17591774

@@ -3394,6 +3409,8 @@ ECON:
33943409
- return_air_damper_percentage_command
33953410
- supply_air_temperature_sensor
33963411
- failed_mixed_air_temperature_alarm
3412+
- high_mixed_air_temperature_alarm
3413+
- low_mixed_air_temperature_alarm
33973414
- high_return_air_temperature_alarm
33983415
- high_supply_air_temperature_alarm
33993416
- low_return_air_temperature_alarm
@@ -3423,6 +3440,8 @@ ECOND:
34233440
- return_air_temperature_sensor
34243441
- failed_discharge_air_temperature_alarm
34253442
- failed_mixed_air_temperature_alarm
3443+
- high_mixed_air_temperature_alarm
3444+
- low_mixed_air_temperature_alarm
34263445
- high_return_air_temperature_alarm
34273446
- low_return_air_temperature_alarm
34283447
uses:
@@ -3447,6 +3466,8 @@ ECONM:
34473466
- return_air_damper_percentage_command
34483467
- supply_air_temperature_sensor
34493468
- failed_mixed_air_temperature_alarm
3469+
- high_mixed_air_temperature_alarm
3470+
- low_mixed_air_temperature_alarm
34503471
- high_return_air_temperature_alarm
34513472
- high_supply_air_temperature_alarm
34523473
- low_return_air_temperature_alarm
@@ -3479,6 +3500,10 @@ ECONM2X:
34793500
- average_mixed_air_temperature_sensor
34803501
- failed_mixed_air_temperature_alarm_1
34813502
- failed_mixed_air_temperature_alarm_2
3503+
- high_mixed_air_temperature_alarm_1
3504+
- low_mixed_air_temperature_alarm_1
3505+
- high_mixed_air_temperature_alarm_2
3506+
- low_mixed_air_temperature_alarm_2
34823507
uses:
34833508
- economizer_mode
34843509
- mixed_air_temperature_sensor_1
@@ -3505,6 +3530,8 @@ ECONMD:
35053530
- return_air_temperature_sensor
35063531
- failed_discharge_air_temperature_alarm
35073532
- failed_mixed_air_temperature_alarm
3533+
- high_mixed_air_temperature_alarm
3534+
- low_mixed_air_temperature_alarm
35083535
- high_return_air_temperature_alarm
35093536
- low_return_air_temperature_alarm
35103537
uses:
@@ -3533,6 +3560,8 @@ ECONZ:
35333560
- return_air_temperature_sensor
35343561
- failed_discharge_air_temperature_alarm
35353562
- failed_mixed_air_temperature_alarm
3563+
- high_mixed_air_temperature_alarm
3564+
- low_mixed_air_temperature_alarm
35363565
- failed_zone_air_temperature_alarm
35373566
- high_return_air_temperature_alarm
35383567
- high_zone_air_temperature_alarm
@@ -3558,6 +3587,8 @@ VOADM:
35583587
- mixed_air_temperature_sensor
35593588
- outside_air_damper_percentage_sensor
35603589
- failed_mixed_air_temperature_alarm
3590+
- high_mixed_air_temperature_alarm
3591+
- low_mixed_air_temperature_alarm
35613592
- failed_outside_air_damper_alarm
35623593
uses:
35633594
- outside_air_damper_percentage_command
@@ -3598,6 +3629,8 @@ OAFMC:
35983629
- economizer_mode
35993630
- mixed_air_temperature_sensor
36003631
- failed_mixed_air_temperature_alarm
3632+
- high_mixed_air_temperature_alarm
3633+
- low_mixed_air_temperature_alarm
36013634
- ventilation_request_count
36023635
uses:
36033636
- outside_air_damper_percentage_command
@@ -4522,6 +4555,7 @@ BYPSSPC:
45224555
opt_uses:
45234556
- supply_air_flowrate_sensor
45244557
- failed_supply_fan_alarm
4558+
- failed_supply_air_static_pressure_alarm
45254559
- high_supply_air_static_pressure_alarm
45264560
- low_supply_air_static_pressure_alarm
45274561
uses:
@@ -4541,6 +4575,7 @@ BYPSSPC2X: # Consider virtual point for instances where dampers control to same
45414575
opt_uses:
45424576
- supply_air_flowrate_sensor
45434577
- failed_supply_fan_alarm
4578+
- failed_supply_air_static_pressure_alarm
45444579
- high_supply_air_static_pressure_alarm
45454580
- low_supply_air_static_pressure_alarm
45464581
uses:
@@ -4982,6 +5017,7 @@ SDBPC:
49825017
is_abstract: true
49835018
opt_uses:
49845019
- supply_air_flowrate_sensor
5020+
- failed_supply_air_static_pressure_alarm
49855021
- high_supply_air_static_pressure_alarm
49865022
- low_supply_air_static_pressure_alarm
49875023
uses:
@@ -6003,6 +6039,7 @@ CO2DFVSC:
60036039
- CONTROL
60046040
opt_uses:
60056041
- high_zone_air_co2_concentration_alarm
6042+
- failed_zone_air_co2_concentration_alarm
60066043

60076044

60086045
CO2EFVSC:
@@ -6012,6 +6049,7 @@ CO2EFVSC:
60126049
opt_uses:
60136050
- exhaust_fan_speed_percentage_sensor
60146051
- high_zone_air_co2_concentration_alarm
6052+
- failed_zone_air_co2_concentration_alarm
60156053
uses:
60166054
- exhaust_fan_speed_percentage_command
60176055
- zone_air_co2_concentration_sensor
@@ -6165,6 +6203,8 @@ VOADM2X:
61656203
- outside_air_flowrate_sensor_1
61666204
- outside_air_flowrate_sensor_2
61676205
- failed_mixed_air_temperature_alarm
6206+
- high_mixed_air_temperature_alarm
6207+
- low_mixed_air_temperature_alarm
61686208
uses:
61696209
- outside_air_damper_percentage_command_1
61706210
- outside_air_damper_percentage_command_2

ontology/yaml/resources/fields/telemetry_fields.yaml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,18 @@ literals:
3333
- bypass_valve_percentage_command:
3434
fixed_min: 0.0
3535
fixed_max: 100.0
36+
- failed_chilled_supply_water_temperature_alarm:
37+
- ACTIVE
38+
- INACTIVE
39+
- failed_chilled_return_water_temperature_alarm:
40+
- ACTIVE
41+
- INACTIVE
42+
- high_chilled_return_water_temperature_alarm:
43+
- ACTIVE
44+
- INACTIVE
45+
- low_chilled_return_water_temperature_alarm:
46+
- ACTIVE
47+
- INACTIVE
3648
- chilled_return_water_temperature_sensor:
3749
flexible_min: 255.9259259
3850
flexible_max: 308.1481481
@@ -3162,6 +3174,12 @@ literals:
31623174
- failed_mixed_air_temperature_alarm:
31633175
- ACTIVE
31643176
- INACTIVE
3177+
- high_mixed_air_temperature_alarm:
3178+
- ACTIVE
3179+
- INACTIVE
3180+
- low_mixed_air_temperature_alarm:
3181+
- ACTIVE
3182+
- INACTIVE
31653183
- failed_outside_air_damper_alarm:
31663184
- ACTIVE
31673185
- INACTIVE
@@ -3204,6 +3222,9 @@ literals:
32043222
- high_differential_pressure_alarm:
32053223
- ACTIVE
32063224
- INACTIVE
3225+
- failed_supply_air_static_pressure_alarm:
3226+
- ACTIVE
3227+
- INACTIVE
32073228
- high_supply_air_static_pressure_alarm:
32083229
- ACTIVE
32093230
- INACTIVE
@@ -3252,6 +3273,9 @@ literals:
32523273
- high_process_water_differential_pressure_alarm:
32533274
- ACTIVE
32543275
- INACTIVE
3276+
- failed_zone_air_co2_concentration_alarm:
3277+
- ACTIVE
3278+
- INACTIVE
32553279
- high_zone_air_co2_concentration_alarm:
32563280
- ACTIVE
32573281
- INACTIVE
@@ -3546,4 +3570,4 @@ literals:
35463570
- INACTIVE
35473571
- circulation_pump_speed_frequency_sensor:
35483572
flexible_min: -0.5
3549-
flexible_max: 65.0
3573+
flexible_max: 65.0

0 commit comments

Comments
 (0)