From 49df2c9025242c30a44084bcf07bc8f4a90ad812 Mon Sep 17 00:00:00 2001
From: shambergoldstein <sgoldstein@dbengineering.net>
Date: Fri, 3 May 2024 08:37:29 -0700
Subject: [PATCH 01/32] hvac and steam updates so far

---
 .../resources/HVAC/entity_types/ABSTRACT.yaml | 110 +++++++++++++++++-
 .../yaml/resources/HVAC/entity_types/AHU.yaml |  27 +++++
 .../yaml/resources/HVAC/entity_types/CU.yaml  |  42 ++++++-
 .../yaml/resources/HVAC/entity_types/FCU.yaml |  35 ++++++
 .../HVAC/entity_types/GENERALTYPES.yaml       |   1 +
 .../yaml/resources/HVAC/entity_types/MAU.yaml |  20 ++++
 .../yaml/resources/HVAC/entity_types/PMP.yaml |   9 ++
 .../resources/METERS/entity_types/HM.yaml     |   2 +
 .../resources/fields/telemetry_fields.yaml    |  30 +++++
 9 files changed, 272 insertions(+), 4 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 07223e15a..187dbca26 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -233,6 +233,8 @@ DFMSS:
   - discharge_fan_power_capacity
   - discharge_fan_power_sensor
   - discharge_fan_lost_power_alarm
+  - failed_discharge_fan_alarm_1
+  - failed_discharge_fan_alarm_2
   uses:
   - discharge_fan_run_command
   - discharge_fan_run_status_1
@@ -252,6 +254,7 @@ DX2RC:
   - leaving_cooling_coil_temperature_sensor
   - failed_discharge_air_temperature_alarm
   - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - low_return_air_temperature_alarm
   uses:
   - compressor_run_command_1
@@ -282,6 +285,7 @@ DSP:
   opt_uses:
   - discharge_air_temperature_sensor
   - zone_air_relative_humidity_sensor
+  - failed_zone_air_relative_humidity_alarm
   - high_zone_air_relative_humidity_alarm
   - low_zone_air_relative_humidity_alarm
   - failed_discharge_air_temperature_alarm
@@ -528,6 +532,7 @@ VSC:
   - local_override_alarm
   - lost_power_alarm
   - master_alarm
+  - failed_inverter_alarm
   uses:
   - run_command
   - run_status
@@ -709,6 +714,8 @@ DTM:
   - discharge_air_relative_humidity_sensor
   - discharge_air_specificenthalpy_sensor
   - failed_discharge_air_temperature_alarm
+  - high_discharge_air_temperature_alarm
+  - low_discharge_air_temperature_alarm
   uses:
   - discharge_air_temperature_sensor
   implements:
@@ -836,6 +843,7 @@ HT2RC:
   - heating_stage_run_count
   - failed_discharge_air_temperature_alarm
   - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - low_return_air_temperature_alarm
   uses:
   - heater_run_command_1
@@ -1004,6 +1012,7 @@ RTM:
   - return_air_specificenthalpy_sensor
   - high_return_air_relative_humidity_alarm
   - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - low_return_air_relative_humidity_alarm
   - low_return_air_temperature_alarm
   uses:
@@ -1050,6 +1059,7 @@ RTC:
   - return_air_temperature_setpoint
   opt_uses:
   - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - low_return_air_temperature_alarm
 
 #TODO: Rename to OTM
@@ -1483,6 +1493,7 @@ DSPRTC:
   - failed_discharge_air_temperature_alarm
   - high_return_air_relative_humidity_alarm
   - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - low_return_air_relative_humidity_alarm
   - low_return_air_temperature_alarm
   uses:
@@ -1503,6 +1514,7 @@ ZHC:
   opt_uses:
   - failed_zone_air_relative_humidity_alarm
   - high_zone_air_relative_humidity_alarm
+  - low_zone_air_relative_humidity_alarm
   implements:
   - OPERATIONAL
 
@@ -1980,6 +1992,7 @@ CHWDC:
   - failed_chilled_water_valve_alarm
   - high_discharge_air_temperature_alarm
   - low_discharge_air_temperature_alarm
+  - water_leak_alarm
   uses:
   - chilled_water_valve_percentage_command
   - discharge_air_temperature_sensor
@@ -1994,11 +2007,16 @@ CHWSC:
   is_abstract: true
   opt_uses:
   - chilled_supply_water_temperature_sensor
+  - failed_chilled_supply_water_temperature_alarm
+  - high_chilled_supply_water_temperature_alarm
+  - low_chilled_supply_water_temperature_alarm
   - chilled_water_valve_percentage_sensor
   - cooling_request_count
   - cooling_thermal_power_capacity
   - leaving_cooling_coil_temperature_sensor
   - failed_leaving_cooling_coil_temperature_alarm
+  - high_leaving_cooling_coil_temperature_alarm
+  - low_leaving_cooling_coil_temperature_alarm
   - supply_air_relative_humidity_sensor
   - failed_supply_air_temperature_alarm
   - high_supply_air_temperature_alarm
@@ -2043,6 +2061,8 @@ CHW2XSC:
   - chilled_water_valve_percentage_sensor_1
   - chilled_water_valve_percentage_sensor_2
   - leaving_cooling_coil_temperature_sensor
+  - high_leaving_cooling_coil_temperature_alarm
+  - low_leaving_cooling_coil_temperature_alarm
   - leaving_cooling_coil_temperature_sensor_1
   - leaving_cooling_coil_temperature_sensor_2
   - failed_leaving_cooling_coil_temperature_alarm_1
@@ -2050,6 +2070,8 @@ CHW2XSC:
   - high_supply_air_temperature_alarm
   - low_supply_air_temperature_alarm
   - failed_supply_air_temperature_alarm
+  - frost_alarm
+  - water_leak_alarm
   uses:
   - chilled_water_valve_percentage_command_1
   - chilled_water_valve_percentage_command_2
@@ -2058,6 +2080,35 @@ CHW2XSC:
   implements:
   - CONTROL
 
+CHW2XDC:
+  description: "Two chilled water valves."
+  is_abstract: true
+  opt_uses:
+  - discharge_air_relative_humidity_sensor
+  - cooling_thermal_power_capacity
+  - chilled_supply_water_temperature_sensor
+  - chilled_water_valve_percentage_sensor
+  - chilled_water_valve_percentage_sensor_1
+  - chilled_water_valve_percentage_sensor_2
+  - leaving_cooling_coil_temperature_sensor
+  - high_leaving_cooling_coil_temperature_alarm
+  - low_leaving_cooling_coil_temperature_alarm
+  - leaving_cooling_coil_temperature_sensor_1
+  - leaving_cooling_coil_temperature_sensor_2
+  - failed_leaving_cooling_coil_temperature_alarm_1
+  - failed_leaving_cooling_coil_temperature_alarm_2
+  - high_discharge_air_temperature_alarm
+  - low_discharge_air_temperature_alarm
+  - failed_discharge_air_temperature_alarm
+  - frost_alarm
+  - water_leak_alarm
+  uses:
+  - chilled_water_valve_percentage_command_1
+  - chilled_water_valve_percentage_command_2
+  - discharge_air_temperature_sensor
+  - discharge_air_temperature_setpoint
+  implements:
+  - CONTROL
 
 CHWRC:
   guid: "f9bc8b36-ea88-4318-ab5c-703945fcb465"
@@ -2073,9 +2124,11 @@ CHWRC:
   - failed_discharge_air_temperature_alarm
   - high_return_air_relative_humidity_alarm
   - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - low_return_air_relative_humidity_alarm
   - low_return_air_temperature_alarm
-  - water_leak_alarm
+  - water_leak_alarm 
+  - frost_alarm
   uses:
   - chilled_water_valve_percentage_command
   - return_air_temperature_sensor
@@ -2101,6 +2154,8 @@ CHWZC:
   - failed_chilled_water_valve_alarm
   - high_zone_air_temperature_alarm
   - low_zone_air_temperature_alarm
+  - water_leak_alarm  
+  - frost_alarm
   uses:
   - chilled_water_valve_percentage_command
   - zone_air_cooling_temperature_setpoint
@@ -2125,6 +2180,7 @@ CHWZTC:
   - low_zone_air_temperature_alarm
   - zone_air_deadband_temperature_setpoint
   - water_leak_alarm
+  - frost_alarm
   uses:
   - chilled_water_valve_percentage_command
   - zone_air_temperature_sensor
@@ -2263,6 +2319,7 @@ DXDSPRTC:
   - failed_compressor_alarm
   - failed_discharge_air_temperature_alarm
   - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - low_return_air_temperature_alarm
   - overload_compressor_alarm
   uses:
@@ -2617,6 +2674,7 @@ DXRC:
   - failed_compressor_alarm
   - failed_discharge_air_temperature_alarm
   - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - low_return_air_temperature_alarm
   - overload_compressor_alarm
   uses:
@@ -2927,6 +2985,7 @@ HWRC:
   - heating_water_flowrate_sensor
   - heating_water_valve_percentage_sensor
   - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - low_return_air_temperature_alarm
   uses:
   - heating_water_valve_percentage_command
@@ -3057,6 +3116,19 @@ PHWSC:
   implements:
   - CONTROL
 
+PHSC:
+  description: "Preheating steam control."
+  is_abstract: true
+  opt_uses:
+  - failed_leaving_air_preheating_coil_temperature_alarm
+  - high_leaving_air_preheating_coil_temperature_alarm
+  - low_leaving_air_preheating_coil_temperature_alarm
+  uses:
+  - preheating_steam_valve_percentage_command
+  - leaving_air_preheating_coil_temperature_sensor
+  - leaving_air_preheating_coil_temperature_setpoint
+  implements:
+  - CONTROL
 
 HWPVM:
   guid: "0a51d47f-2d53-4a3b-aa9a-f218394b55a7"
@@ -3126,7 +3198,6 @@ HTSC:
   implements:
   - CONTROL
 
-
 HTSDC:
   guid: "d394c55c-af3d-4956-a3b4-9324e4f32ae9"
   description: "Gas or electric heater control on supply side."
@@ -3158,6 +3229,7 @@ HTRC:
   - heating_thermal_power_capacity
   - failed_discharge_air_temperature_alarm
   - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - low_return_air_temperature_alarm
   uses:
   - heater_run_command
@@ -3446,6 +3518,7 @@ ECON:
   - high_mixed_air_temperature_alarm
   - low_mixed_air_temperature_alarm
   - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - high_supply_air_temperature_alarm
   - low_return_air_temperature_alarm
   - low_supply_air_temperature_alarm
@@ -3478,6 +3551,7 @@ ECOND:
   - high_mixed_air_temperature_alarm
   - low_mixed_air_temperature_alarm
   - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - low_return_air_temperature_alarm
   - failed_outside_air_temperature_alarm
   uses:
@@ -3505,6 +3579,7 @@ ECONM:
   - high_mixed_air_temperature_alarm
   - low_mixed_air_temperature_alarm
   - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - high_supply_air_temperature_alarm
   - low_return_air_temperature_alarm
   - low_supply_air_temperature_alarm
@@ -3531,6 +3606,7 @@ ECONM2X:
   - return_air_damper_percentage_command
   - supply_air_temperature_sensor
   - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - high_supply_air_temperature_alarm
   - low_return_air_temperature_alarm
   - low_supply_air_temperature_alarm
@@ -3571,6 +3647,7 @@ ECONMD:
   - high_mixed_air_temperature_alarm
   - low_mixed_air_temperature_alarm
   - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - low_return_air_temperature_alarm
   - failed_outside_air_temperature_alarm
   uses:
@@ -3603,6 +3680,7 @@ ECONZ:
   - low_mixed_air_temperature_alarm
   - failed_zone_air_temperature_alarm
   - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - high_zone_air_temperature_alarm
   - low_return_air_temperature_alarm
   - low_zone_air_temperature_alarm
@@ -4332,7 +4410,6 @@ SFSS2X:
   implements:
   - OPERATIONAL
 
-
 SFSS3X:
   guid: "e1fba819-60f4-459e-ad37-5da8828618dd"
   description: "Supply fan start-stop and feedback for three fans."
@@ -5094,6 +5171,7 @@ CHWVM:
   - chilled_water_flowrate_sensor
   - cooling_thermal_power_capacity
   - failed_chilled_water_valve_alarm
+  - frost_alarm
   uses:
   - chilled_water_valve_percentage_command
   - chilled_water_valve_percentage_sensor
@@ -5354,6 +5432,7 @@ DX2DSPRTC:
   - cooling_thermal_power_capacity
   - leaving_cooling_coil_temperature_sensor
   - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - low_return_air_temperature_alarm
   uses:
   - compressor_run_command_1
@@ -5381,6 +5460,7 @@ HPDSPRTC:
   - failed_compressor_alarm
   - failed_discharge_air_temperature_alarm
   - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - low_return_air_temperature_alarm
   - overload_compressor_alarm
   uses:
@@ -5643,6 +5723,7 @@ CHWBRC:
   opt_uses:
   - failed_chilled_water_valve_alarm
   - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - low_return_air_temperature_alarm
 
 
@@ -5893,6 +5974,7 @@ HTWHLSTC:
   - return_air_temperature_sensor
   - failed_exhaust_air_temperature_alarm
   - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - high_supply_air_temperature_alarm
   - low_return_air_temperature_alarm
   - low_supply_air_temperature_alarm
@@ -5976,6 +6058,7 @@ HHRU:
   - outside_air_temperature_sensor
   - failed_exhaust_air_temperature_alarm
   - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - high_supply_air_temperature_alarm
   - high_supply_water_temperature_alarm
   - low_return_air_temperature_alarm
@@ -6002,6 +6085,7 @@ PHRU:
   - outside_air_temperature_sensor
   - failed_exhaust_air_temperature_alarm
   - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - high_supply_air_temperature_alarm
   - low_return_air_temperature_alarm
   - low_supply_air_temperature_alarm
@@ -6025,6 +6109,7 @@ PHRUD:
   - outside_air_temperature_sensor
   - failed_exhaust_air_temperature_alarm
   - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - high_discharge_air_temperature_alarm
   - low_return_air_temperature_alarm
   - low_discharge_air_temperature_alarm
@@ -6832,6 +6917,10 @@ SSPC2X:
   - supply_fan_speed_frequency_sensor
   - supply_fan_speed_percentage_command
   - failed_supply_fan_alarm
+  - failed_supply_air_static_pressure_alarm_1
+  - failed_supply_air_static_pressure_alarm_2
+  - high_supply_air_static_pressure_alarm_1
+  - high_supply_air_static_pressure_alarm_2
   uses:
   - supply_air_static_pressure_sensor_1
   - supply_air_static_pressure_sensor_2
@@ -7614,6 +7703,7 @@ HTWHLZTC:
   - supply_air_temperature_sensor
   - failed_exhaust_air_temperature_alarm
   - high_return_air_temperature_alarm
+  - failed_return_air_temperature_alarm
   - high_supply_air_temperature_alarm
   - low_return_air_temperature_alarm
   - low_supply_air_temperature_alarm
@@ -7935,6 +8025,18 @@ SSTC:
   - heating_supply_water_temperature_sensor
   - heating_supply_water_temperature_setpoint
 
+SSSC:
+  description: "Steam valve control to supply air temperature."
+  is_abstract: true
+  opt_uses:
+  - heating_request_count
+  uses:
+  - steam_valve_percentage_command
+  - supply_air_temperature_sensor
+  - supply_air_temperature_setpoint
+  implements:
+  - CONTROL
+
 COC2XDSP:
   guid: "fa7cba8d-be4d-4968-a5bf-f55429006b77"
   description: "Dual setpoint CO concentration control with 2 sensors."
@@ -7986,6 +8088,8 @@ CHCPC:
   guid: "ffd344fd-12ad-4633-ace7-79ae3987e9af"
   description: "Circulation control for onboard chilled water pump."
   is_abstract: true
+  opt_uses:
+  - failed_chilled_water_circulation_pump_alarm
   uses:
   - chilled_water_circulation_pump_run_status
   - chilled_water_circulation_pump_run_command
diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
index cd9a453b9..ebc97fb3d 100644
--- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
@@ -4508,6 +4508,33 @@ AHU_SFSS2X_SFVSC2X_RFSS2X_RFVSC2X_HWSC_CHWSC_SSPC_MOAFC_ECON_EDPM_RD_UV:
   - RD
   - UV
 
+AHU_SFSS_SFVSC_EFSS_EFVSC_CHW2XSC_SSSC_CO2CMAX_ECON_SSPC:
+  description: "Multi-zone AHU with supply and exhaust fans, co2 control, two chilled water and one steam valve control to supply air, and economizing."
+  is_canonical: true
+  implements:
+  - AHU
+  - SFSS
+  - SFVSC
+  - EFSS
+  - EFVSC
+  - CHW2XSC
+  - SSSC
+  - CO2CMAX
+  - ECON
+  - SSPC
+
+AHU_SFSS_SFVSC_CHW2XSC_SSSC_ECON_SSPC:
+  description: "Multi-zone AHU with supply fan control, two chilled water and one steam valve control to supply air, and economizing."
+  is_canonical: true
+  implements:
+  - AHU
+  - SFSS
+  - SFVSC
+  - CHW2XSC
+  - SSSC
+  - ECON
+  - SSPC
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################
diff --git a/ontology/yaml/resources/HVAC/entity_types/CU.yaml b/ontology/yaml/resources/HVAC/entity_types/CU.yaml
index 13c58846b..484e3a493 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CU.yaml
@@ -90,7 +90,47 @@ CU_SFSS_SFVSC_CHWSC_CHWDT_HTSC_SSPC_SARC_MTM_RTM:
   - MTM
   - RTM
   - CHWDT
-  
+
+CU_SFSS_SFVSC_CHWSC_HTSC_SSPC_MTM_RTM:
+  description: "Chilled water compartment unit on supply side with start/stop, status, cooling and heating (supply temp control)."
+  is_canonical: true
+  implements:
+  - CU
+  - SFSS
+  - SFVSC
+  - CHWSC
+  - HTSC
+  - SSPC
+  - MTM
+  - RTM
+
+CU_SFSS_SFVSC_CHWSC_CHWDT_HTSC_SSPC_SARC_MTM:
+  description: "Chilled water compartment unit on supply side with start/stop, status, cooling and heating (supply temp control), and differential temperature monitoring."
+  is_canonical: true
+  implements:
+  - CU
+  - SFSS
+  - SFVSC
+  - CHWSC
+  - CHWDT
+  - HTSC
+  - SSPC
+  - SARC
+  - MTM
+
+CU_SFSS2X_SFVSC2X_CHWSC_CHWDT_HTSC_SSPC2X_MTM:
+  description: "Chilled water compartment unit on supply side with two fan start/stop, status, cooling and heating (supply temp control), and differential temperature monitoring."
+  is_canonical: true
+  implements:
+  - CU
+  - SFSS2X
+  - SFVSC2X
+  - CHWSC
+  - CHWDT
+  - HTSC
+  - SSPC2X
+  - MTM
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################
diff --git a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
index b2ac695c3..d021613a3 100644
--- a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
@@ -505,6 +505,17 @@ FCU_DFSS_ZTC_ZHDHC_DXZTC:
   - ZHDHC
   - DXZTC
 
+FCU_DFSS_CHWZTC_CHWDT_HTZTC_ZHDHC:
+  description: "Chilled water fan coil with zone humidity and temp control."
+  is_canonical: true
+  implements:
+  - FCU
+  - DFSS
+  - CHWZTC
+  - CHWDT
+  - HTZTC
+  - ZHDHC
+
 FCU_DFSS_CSP_ZHC_DXZC:
   guid: "a705848f-4a8e-4ed5-9197-f8f10e039f53"
   description: "DX fan coil with zone temp and humidity control."
@@ -1176,6 +1187,30 @@ FCU_DFSS_CHWZTC_CHWDT_CAM_ZHC:
   - CAM
   - ZHC
 
+FCU_DFSS_CHWZTC_CHWDT_ZHC_DTM_RTM:
+  description: "Chilled water FCU with zone temperature control and chilled water valve control"
+  is_canonical: true
+  implements:
+  - FCU
+  - DFSS
+  - CHWZTC
+  - CHWDT
+  - ZHC
+  - DTM
+  - RTM
+
+FCU_DFSS2X_CHWZC_CHWDT_ZHM_DTM_RTM:
+  description: "Chilled water FCU with zone temperature control and chilled water valve control"
+  is_canonical: true
+  implements:
+  - FCU
+  - DFSS2X
+  - CHWZC
+  - CHWDT
+  - ZHM
+  - DTM
+  - RTM
+
 FCU_DFSS_ZTC:
   guid: "62c81f76-c539-461d-837d-d01b89a4e9da"
   description: "Chilled water FCU with binary mode (open/closed) and zone temperature control"
diff --git a/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml b/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml
index 2be4153d8..25de2e86a 100644
--- a/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml
@@ -102,6 +102,7 @@ MAU:
   opt_uses:
   - failed_communication_alarm
   - failed_alarm
+  - emergency_alarm
   implements:
   - EQUIPMENT
 
diff --git a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
index 57579772b..94b89a26b 100644
--- a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
@@ -779,6 +779,26 @@ MAU_SFSS2X_SFVSC2X_PHWSC_LCC_HWSC_SSPC_UV_SHM:
   - UV
   - SHM
 
+MAU_SFSS_SFVSC_CHWSC_CHCPC_CHWISOVM_PHSC_SSSC_SSPC_OADM_OA_ZTM_ZHM_CO2M_CAM:
+  description: "Multi-zone MAU with preheating steam control, chilled water control, heating steam control, and supply air static pressure control"
+  is_canonical: true
+  implements:
+  - MAU
+  - SFSS
+  - SFVSC
+  - CHWSC
+  - CHCPC
+  - CHWISOVM
+  - PHSC
+  - SSSC
+  - SSPC
+  - OADM
+  - OA
+  - ZTM
+  - ZHM
+  - CO2M
+  - CAM
+
 ############################
 ###   Remap These Types  ###
 ############################
diff --git a/ontology/yaml/resources/HVAC/entity_types/PMP.yaml b/ontology/yaml/resources/HVAC/entity_types/PMP.yaml
index efebe51cd..ee1cd5982 100644
--- a/ontology/yaml/resources/HVAC/entity_types/PMP.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/PMP.yaml
@@ -92,6 +92,15 @@ PMP_SS_CHWISOVPM_VSFC:
   - low_differential_pressure_alarm
   - chilled_water_differential_pressure_setpoint
 
+PMP_SS_CHWISOVPM_VSC:
+  description: "PMP device with chilled water valve and pump speed percentage control"
+  is_canonical: true
+  implements:
+  - PMP
+  - SS
+  - CHWISOVPM
+  - VSC
+
 PMP_SS_VSC_WDPC_WFRC:
   guid: "626cf14c-537c-4dbf-85e1-1ed6d68d5aa3"
   description: "Pump with variable speed control, differential pressure control and flow control."
diff --git a/ontology/yaml/resources/METERS/entity_types/HM.yaml b/ontology/yaml/resources/METERS/entity_types/HM.yaml
index 4373aa466..a5b6380ef 100644
--- a/ontology/yaml/resources/METERS/entity_types/HM.yaml
+++ b/ontology/yaml/resources/METERS/entity_types/HM.yaml
@@ -42,6 +42,8 @@ HM_CHW:
   opt_uses:
   - differential_temperature_sensor
   - failed_alarm
+  - failed_chilled_return_water_temperature_alarm
+  - failed_chilled_supply_water_temperature_alarm
 
 HM_CHW_WAC:
   guid: "441029f3-1324-42c5-aca2-74138500917a"
diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
index 615060acf..eb2c617f1 100644
--- a/ontology/yaml/resources/fields/telemetry_fields.yaml
+++ b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -883,6 +883,9 @@ literals:
   - UNKNOWN
   - UNOCCUPIED
   - INACTIVE
+- emergency_power_status:
+  - PRESENT
+  - ABSENT
 
 # INACTIVE indicates the device is being overridden to not run, irrespective of occupancy status.
 
@@ -980,6 +983,9 @@ literals:
 - preheating_water_valve_percentage_command:
     fixed_min: 0.0
     fixed_max: 100.0
+- preheating_steam_valve_percentage_command:
+    fixed_min: 0.0
+    fixed_max: 100.0
 - return_air_damper_command:
   - OPEN
   - CLOSED
@@ -1079,6 +1085,18 @@ literals:
 - leaving_air_preheating_coil_temperature_sensor:
     flexible_min: 255.9259259
     flexible_max: 310.9259259
+- leaving_air_preheating_coil_temperature_setpoint:
+    flexible_min: 255.9259259
+    flexible_max: 310.9259259
+- failed_leaving_air_preheating_coil_temperature_alarm:
+    - ACTIVE
+    - INACTIVE
+- high_leaving_air_preheating_coil_temperature_alarm:
+    - ACTIVE
+    - INACTIVE
+- low_leaving_air_preheating_coil_temperature_alarm:
+    - ACTIVE
+    - INACTIVE
 - cooling_stage_run_count:
     fixed_min: 0.0
     flexible_max: 500.0
@@ -1567,6 +1585,9 @@ literals:
 
 # New alarms using alarm as a point type, and existing alarms moved here
 # TODO (tsodorff): change these to ALARM/NORMAL after determining how this can be done safely to existing translations.
+- failed_chilled_water_circulation_pump_alarm:
+  - ACTIVE
+  - INACTIVE
 - fabric_protection_alarm:
   - ACTIVE
   - INACTIVE
@@ -1868,6 +1889,9 @@ literals:
 - high_refrigerant_pressure_alarm:
   - ACTIVE
   - INACTIVE
+- failed_return_air_temperature_alarm:
+  - ACTIVE
+  - INACTIVE
 - high_return_air_temperature_alarm:
   - ACTIVE
   - INACTIVE
@@ -3135,6 +3159,12 @@ literals:
 - failed_leaving_cooling_coil_temperature_alarm:
   - ACTIVE
   - INACTIVE
+- high_leaving_cooling_coil_temperature_alarm:
+  - ACTIVE
+  - INACTIVE
+- low_leaving_cooling_coil_temperature_alarm:
+  - ACTIVE
+  - INACTIVE
 - failed_bypass_valve_alarm:
   - ACTIVE
   - INACTIVE

From ba39aa70321725bd910b87a4a24fe30ded3d1b64 Mon Sep 17 00:00:00 2001
From: shambergoldstein <sgoldstein@dbengineering.net>
Date: Thu, 16 May 2024 08:05:52 -0700
Subject: [PATCH 02/32] more additions

---
 .../resources/HVAC/entity_types/ABSTRACT.yaml | 19 ++++++++++++++++++
 .../yaml/resources/HVAC/entity_types/AHU.yaml | 15 ++++++++++++++
 .../yaml/resources/HVAC/entity_types/CU.yaml  | 20 +++++++++++++++++--
 .../HVAC/entity_types/GENERALTYPES.yaml       |  1 +
 .../yaml/resources/HVAC/entity_types/MAU.yaml | 19 ++++++++++++++++++
 .../yaml/resources/HVAC/entity_types/PCU.yaml |  8 ++++++++
 .../resources/fields/telemetry_fields.yaml    |  3 +++
 7 files changed, 83 insertions(+), 2 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 187dbca26..043c8e47b 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -764,6 +764,25 @@ SSPC:
   implements:
   - OPERATIONAL
 
+DSPC:
+  description: "Discharge static pressure control via discharge fan speed"
+  is_abstract: true
+  opt_uses:
+  - discharge_air_damper_percentage_command
+  - discharge_air_flowrate_sensor
+  - discharge_fan_run_command
+  - discharge_fan_run_status
+  - discharge_fan_speed_frequency_sensor
+  - discharge_fan_speed_percentage_command
+  - failed_discharge_fan_alarm
+  - failed_discharge_air_static_pressure_alarm
+  - high_discharge_air_static_pressure_alarm
+  - low_discharge_air_static_pressure_alarm
+  uses:
+  - discharge_air_static_pressure_sensor
+  - discharge_air_static_pressure_setpoint
+  implements:
+  - OPERATIONAL
 
 SPSS:
   guid: "0b1c2a43-53d8-4349-883c-8bde722fccb5"
diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
index ebc97fb3d..47c11f991 100644
--- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
@@ -4535,6 +4535,21 @@ AHU_SFSS_SFVSC_CHW2XSC_SSSC_ECON_SSPC:
   - ECON
   - SSPC
 
+AHU_SFSS_SFVSC_CHWSC_HTSC_SARC_SSPC_FDPM_MTM_ZTM:
+  description: "Multi-zone AHU with supply fan control, chilled water and electric heater control to supply air, and mixed air and zone air temperature monitoring."
+  is_canonical: true
+  implements:
+  - AHU
+  - SFSS
+  - SFVSC
+  - CHWSC
+  - HTSC
+  - SARC
+  - SSPC
+  - FDPM
+  - MTM
+  - ZTM
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################
diff --git a/ontology/yaml/resources/HVAC/entity_types/CU.yaml b/ontology/yaml/resources/HVAC/entity_types/CU.yaml
index 484e3a493..e7e6ebbb8 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CU.yaml
@@ -92,7 +92,7 @@ CU_SFSS_SFVSC_CHWSC_CHWDT_HTSC_SSPC_SARC_MTM_RTM:
   - CHWDT
 
 CU_SFSS_SFVSC_CHWSC_HTSC_SSPC_MTM_RTM:
-  description: "Chilled water compartment unit on supply side with start/stop, status, cooling and heating (supply temp control)."
+  description: "Chilled water compartment unit with start/stop, status, cooling and heating (supply temp control)."
   is_canonical: true
   implements:
   - CU
@@ -119,7 +119,7 @@ CU_SFSS_SFVSC_CHWSC_CHWDT_HTSC_SSPC_SARC_MTM:
   - MTM
 
 CU_SFSS2X_SFVSC2X_CHWSC_CHWDT_HTSC_SSPC2X_MTM:
-  description: "Chilled water compartment unit on supply side with two fan start/stop, status, cooling and heating (supply temp control), and differential temperature monitoring."
+  description: "Chilled water compartment unit with two fan start/stop, status, cooling and heating (supply temp control), and differential temperature monitoring."
   is_canonical: true
   implements:
   - CU
@@ -131,6 +131,22 @@ CU_SFSS2X_SFVSC2X_CHWSC_CHWDT_HTSC_SSPC2X_MTM:
   - SSPC2X
   - MTM
 
+CU_DSP_DFSS_DFVSC_CHW2XDC_HTDC_DSPC_FDPM_MTM_CAM_CO2M:
+  description: "Single zone chilled water compartment unit with start/stop, status, cooling and heating (discharge temp control)."
+  is_canonical: true
+  implements:
+  - CU
+  - DSP
+  - DFSS
+  - DFVSC
+  - CHW2XDC
+  - HTDC
+  - DSPC
+  - FDPM
+  - MTM
+  - CAM
+  - CO2M
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################
diff --git a/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml b/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml
index 25de2e86a..a1df87bf4 100644
--- a/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml
@@ -67,6 +67,7 @@ AHU:
   - outside_air_flowrate_requirement # Included at AHU because, regardless of avaiable data for OAD, it will have ventilation requirements.
   - failed_communication_alarm
   - smoke_alarm
+  - emergency_alarm
 
 HX:
   guid: "9aa0dd1a-851c-4d4e-90da-6804c4f8b9f9"
diff --git a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
index 94b89a26b..6108cda26 100644
--- a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
@@ -799,6 +799,25 @@ MAU_SFSS_SFVSC_CHWSC_CHCPC_CHWISOVM_PHSC_SSSC_SSPC_OADM_OA_ZTM_ZHM_CO2M_CAM:
   - CO2M
   - CAM
 
+MAU_DSP_DFSS_DFVSC_CHW2XDC_CHCPC_CHWISOVM_HTDC_FDPM_OADM_OA_DSPM_ZHC_CAM:
+  description: "Multi-zone MAU with preheating steam control, chilled water control, heating steam control, and supply air static pressure control"
+  is_canonical: true
+  implements:
+  - MAU
+  - DSP
+  - DFSS
+  - DFVSC
+  - CHW2XDC
+  - CHCPC
+  - CHWISOVM
+  - HTDC
+  - FDPM
+  - OADM
+  - OA
+  - DSPM
+  - ZHC
+  - CAM
+
 ############################
 ###   Remap These Types  ###
 ############################
diff --git a/ontology/yaml/resources/HVAC/entity_types/PCU.yaml b/ontology/yaml/resources/HVAC/entity_types/PCU.yaml
index 5826234e9..28c1be508 100644
--- a/ontology/yaml/resources/HVAC/entity_types/PCU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/PCU.yaml
@@ -25,4 +25,12 @@ PCU_EFSS_EFVSC_ESM2X_DTPM:
   - EFSS
   - EFVSC
   - ESM2X
+  - DTPM
+
+PCU_EFSS_DTPM:
+  description: "Pollution control unit with single speed exhaust fan and one detergent pump."
+  is_canonical: true
+  implements:
+  - PCU
+  - EFSS
   - DTPM
\ No newline at end of file
diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
index eb2c617f1..d682f7975 100644
--- a/ontology/yaml/resources/fields/telemetry_fields.yaml
+++ b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -1380,6 +1380,9 @@ literals:
 - discharge_air_static_pressure_sensor:
     flexible_min: -124.540012
     flexible_max: 996.320096
+- discharge_air_static_pressure_setpoint:
+    flexible_min: -124.540012
+    flexible_max: 996.320096
 - heat_exchange_supply_water_isolation_valve_command:
   - OPEN
   - CLOSED

From 8b4dfea6843a899de2369f8951d5e2b2ffff2dc2 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Thu, 16 May 2024 08:28:29 -0700
Subject: [PATCH 03/32] Update ABSTRACT.yaml descriptions and guids

---
 ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index b7e5a9c67..330dd6656 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -765,6 +765,7 @@ SSPC:
   - OPERATIONAL
 
 DSPC:
+  guid: "e95c6b69-3bec-4021-8db8-07b530aaa54d"
   description: "Discharge static pressure control via discharge fan speed"
   is_abstract: true
   opt_uses:
@@ -2100,7 +2101,8 @@ CHW2XSC:
   - CONTROL
 
 CHW2XDC:
-  description: "Two chilled water valves."
+  guid: "bf683a14-2a3b-4d4a-bcf5-ef3dab34dd15"
+  description: "Dual chilled water valve control to discharge air temperatures."
   is_abstract: true
   opt_uses:
   - discharge_air_relative_humidity_sensor
@@ -3136,7 +3138,8 @@ PHWSC:
   - CONTROL
 
 PHSC:
-  description: "Preheating steam control."
+  guid: "9fd93443-7815-4f71-a8b7-cbb864b2b14b"
+  description: "Preheating steam control to leaving coil air temperature."
   is_abstract: true
   opt_uses:
   - failed_leaving_air_preheating_coil_temperature_alarm
@@ -8048,6 +8051,7 @@ SSTC:
   - heating_supply_water_temperature_setpoint
 
 SSSC:
+  guid: "cb7bb427-b108-478f-97b5-3a8b925acec0"
   description: "Steam valve control to supply air temperature."
   is_abstract: true
   opt_uses:

From 21e83d250737f2ea916873577c68ce9cc5517e73 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Thu, 16 May 2024 08:29:15 -0700
Subject: [PATCH 04/32] Update telemetry_fields.yaml

---
 ontology/yaml/resources/fields/telemetry_fields.yaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
index c16f961f2..26f0abe43 100644
--- a/ontology/yaml/resources/fields/telemetry_fields.yaml
+++ b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -883,9 +883,6 @@ literals:
   - UNKNOWN
   - UNOCCUPIED
   - INACTIVE
-- emergency_power_status:
-  - PRESENT
-  - ABSENT
 
 # INACTIVE indicates the device is being overridden to not run, irrespective of occupancy status.
 
@@ -3618,4 +3615,4 @@ literals:
     flexible_max: 44.704
 - south_wind_linearvelocity_sensor:
     flexible_min: 0.0
-    flexible_max: 44.704
\ No newline at end of file
+    flexible_max: 44.704

From 304cf93c1f6f1fa47cf5c9d1bf0daa5a06f92df0 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Thu, 16 May 2024 08:30:59 -0700
Subject: [PATCH 05/32] Update AHU.yaml add guids

---
 ontology/yaml/resources/HVAC/entity_types/AHU.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
index c85aae2ae..c5578b221 100644
--- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
@@ -4525,6 +4525,7 @@ AHU_SFSS2X_SFVSC2X_RFSS2X_RFVSC2X_HWSC_CHWSC_SSPC_MOAFC_ECON_EDPM_RD_UV:
   - UV
 
 AHU_SFSS_SFVSC_EFSS_EFVSC_CHW2XSC_SSSC_CO2CMAX_ECON_SSPC:
+  guid: "7bde22a0-19c3-4755-b9d4-a41fd4b54a8e"
   description: "Multi-zone AHU with supply and exhaust fans, co2 control, two chilled water and one steam valve control to supply air, and economizing."
   is_canonical: true
   implements:
@@ -4540,6 +4541,7 @@ AHU_SFSS_SFVSC_EFSS_EFVSC_CHW2XSC_SSSC_CO2CMAX_ECON_SSPC:
   - SSPC
 
 AHU_SFSS_SFVSC_CHW2XSC_SSSC_ECON_SSPC:
+  guid: "4520481a-167e-4767-9e3e-cd5a21624776"
   description: "Multi-zone AHU with supply fan control, two chilled water and one steam valve control to supply air, and economizing."
   is_canonical: true
   implements:
@@ -4552,6 +4554,7 @@ AHU_SFSS_SFVSC_CHW2XSC_SSSC_ECON_SSPC:
   - SSPC
 
 AHU_SFSS_SFVSC_CHWSC_HTSC_SARC_SSPC_FDPM_MTM_ZTM:
+  guid: "b270b104-aed8-40c3-80b5-bd991e3ed102"
   description: "Multi-zone AHU with supply fan control, chilled water and electric heater control to supply air, and mixed air and zone air temperature monitoring."
   is_canonical: true
   implements:

From 7980b73aa91d0215c686b1ccc47fbaa7220dd4d5 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Thu, 16 May 2024 08:32:30 -0700
Subject: [PATCH 06/32] Update CU.yaml add guids

---
 ontology/yaml/resources/HVAC/entity_types/CU.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ontology/yaml/resources/HVAC/entity_types/CU.yaml b/ontology/yaml/resources/HVAC/entity_types/CU.yaml
index e7e6ebbb8..95cd4c951 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CU.yaml
@@ -92,6 +92,7 @@ CU_SFSS_SFVSC_CHWSC_CHWDT_HTSC_SSPC_SARC_MTM_RTM:
   - CHWDT
 
 CU_SFSS_SFVSC_CHWSC_HTSC_SSPC_MTM_RTM:
+  guid: "6b48ff18-d05c-427e-8315-a792c01be753"
   description: "Chilled water compartment unit with start/stop, status, cooling and heating (supply temp control)."
   is_canonical: true
   implements:
@@ -105,6 +106,7 @@ CU_SFSS_SFVSC_CHWSC_HTSC_SSPC_MTM_RTM:
   - RTM
 
 CU_SFSS_SFVSC_CHWSC_CHWDT_HTSC_SSPC_SARC_MTM:
+  guid: "bb90002e-fe38-41b8-b9ba-5094928f676b"
   description: "Chilled water compartment unit on supply side with start/stop, status, cooling and heating (supply temp control), and differential temperature monitoring."
   is_canonical: true
   implements:
@@ -119,6 +121,7 @@ CU_SFSS_SFVSC_CHWSC_CHWDT_HTSC_SSPC_SARC_MTM:
   - MTM
 
 CU_SFSS2X_SFVSC2X_CHWSC_CHWDT_HTSC_SSPC2X_MTM:
+  guid: "bccd555b-864f-4b66-a084-fa29ce28e770"
   description: "Chilled water compartment unit with two fan start/stop, status, cooling and heating (supply temp control), and differential temperature monitoring."
   is_canonical: true
   implements:
@@ -132,6 +135,7 @@ CU_SFSS2X_SFVSC2X_CHWSC_CHWDT_HTSC_SSPC2X_MTM:
   - MTM
 
 CU_DSP_DFSS_DFVSC_CHW2XDC_HTDC_DSPC_FDPM_MTM_CAM_CO2M:
+  guid: "8af7abce-3d69-4380-bb90-d8690050b238"
   description: "Single zone chilled water compartment unit with start/stop, status, cooling and heating (discharge temp control)."
   is_canonical: true
   implements:

From 1f90bf3e397f4402952d951b2f84ebee9ededb01 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Thu, 16 May 2024 08:34:14 -0700
Subject: [PATCH 07/32] Update FCU.yaml add guids

---
 ontology/yaml/resources/HVAC/entity_types/FCU.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
index d021613a3..cd68029c0 100644
--- a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
@@ -506,6 +506,7 @@ FCU_DFSS_ZTC_ZHDHC_DXZTC:
   - DXZTC
 
 FCU_DFSS_CHWZTC_CHWDT_HTZTC_ZHDHC:
+  guid: "98df75a0-f985-4b76-a78d-3a2e9d3b791c"
   description: "Chilled water fan coil with zone humidity and temp control."
   is_canonical: true
   implements:
@@ -1188,6 +1189,7 @@ FCU_DFSS_CHWZTC_CHWDT_CAM_ZHC:
   - ZHC
 
 FCU_DFSS_CHWZTC_CHWDT_ZHC_DTM_RTM:
+  guid: "e1d8907d-d1f6-4492-bf6f-bc5e38601b36"
   description: "Chilled water FCU with zone temperature control and chilled water valve control"
   is_canonical: true
   implements:
@@ -1200,6 +1202,7 @@ FCU_DFSS_CHWZTC_CHWDT_ZHC_DTM_RTM:
   - RTM
 
 FCU_DFSS2X_CHWZC_CHWDT_ZHM_DTM_RTM:
+  guid: "ea6137f5-0218-479e-83fb-3ab2efca7d29"
   description: "Chilled water FCU with zone temperature control and chilled water valve control"
   is_canonical: true
   implements:

From 2c68b940701f3bacfcdc173dd199cdbf8e978935 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Thu, 16 May 2024 08:35:43 -0700
Subject: [PATCH 08/32] Update MAU.yaml add guids

---
 ontology/yaml/resources/HVAC/entity_types/MAU.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
index afdf9992d..589d81516 100644
--- a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
@@ -793,6 +793,7 @@ MAU_SFSS2X_SFVSC2X_PHWSC_LCC_HWSC_SSPC_UV_SHM:
   - SHM
 
 MAU_SFSS_SFVSC_CHWSC_CHCPC_CHWISOVM_PHSC_SSSC_SSPC_OADM_OA_ZTM_ZHM_CO2M_CAM:
+  guid: "d50d41d6-f7bf-4ec2-937f-b7e72ce56b4c"
   description: "Multi-zone MAU with preheating steam control, chilled water control, heating steam control, and supply air static pressure control"
   is_canonical: true
   implements:
@@ -813,6 +814,7 @@ MAU_SFSS_SFVSC_CHWSC_CHCPC_CHWISOVM_PHSC_SSSC_SSPC_OADM_OA_ZTM_ZHM_CO2M_CAM:
   - CAM
 
 MAU_DSP_DFSS_DFVSC_CHW2XDC_CHCPC_CHWISOVM_HTDC_FDPM_OADM_OA_DSPM_ZHC_CAM:
+  guid: "32dd1642-fcd5-4e1f-a422-42a5dacb6e0e"
   description: "Multi-zone MAU with preheating steam control, chilled water control, heating steam control, and supply air static pressure control"
   is_canonical: true
   implements:

From 90357d9cd4d1fbd380994dd2baa9bb8e0841457d Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Thu, 16 May 2024 08:38:35 -0700
Subject: [PATCH 09/32] Update PCU.yaml add guid

---
 ontology/yaml/resources/HVAC/entity_types/PCU.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/PCU.yaml b/ontology/yaml/resources/HVAC/entity_types/PCU.yaml
index 28c1be508..2d73ac51c 100644
--- a/ontology/yaml/resources/HVAC/entity_types/PCU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/PCU.yaml
@@ -28,9 +28,10 @@ PCU_EFSS_EFVSC_ESM2X_DTPM:
   - DTPM
 
 PCU_EFSS_DTPM:
+  guid: "766bc88a-f43c-453b-9dea-d0db652cd3d4"
   description: "Pollution control unit with single speed exhaust fan and one detergent pump."
   is_canonical: true
   implements:
   - PCU
   - EFSS
-  - DTPM
\ No newline at end of file
+  - DTPM

From 910cd2a4b4708af4c9d4fd83e139d9152b0be059 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Thu, 16 May 2024 08:39:00 -0700
Subject: [PATCH 10/32] Update PMP.yaml

---
 ontology/yaml/resources/HVAC/entity_types/PMP.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ontology/yaml/resources/HVAC/entity_types/PMP.yaml b/ontology/yaml/resources/HVAC/entity_types/PMP.yaml
index 8b14b2ab5..b0597048e 100644
--- a/ontology/yaml/resources/HVAC/entity_types/PMP.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/PMP.yaml
@@ -102,6 +102,7 @@ PMP_SS_CHWISOVPM_VSFC:
   - chilled_water_differential_pressure_setpoint
 
 PMP_SS_CHWISOVPM_VSC:
+  guid: "6ee2c381-b2f1-455a-9d0c-59b48cab5b4c"
   description: "PMP device with chilled water valve and pump speed percentage control"
   is_canonical: true
   implements:

From bff903c9c14332be006743ab7bb60f8e04deb581 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Thu, 16 May 2024 08:49:37 -0700
Subject: [PATCH 11/32] Update telemetry_fields.yaml

---
 ontology/yaml/resources/fields/telemetry_fields.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
index 26f0abe43..7cfe32737 100644
--- a/ontology/yaml/resources/fields/telemetry_fields.yaml
+++ b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -1910,6 +1910,9 @@ literals:
 - failed_supply_air_relative_humidity_alarm:
   - ACTIVE
   - INACTIVE
+- failed_discharge_air_static_pressure_alarm:
+  - ACTIVE
+  - INACTIVE
 - high_return_air_relative_humidity_alarm:
   - ACTIVE
   - INACTIVE

From 90d1a8015a50df01748575e813c1d4673df9fa44 Mon Sep 17 00:00:00 2001
From: shambergoldstein <sgoldstein@dbengineering.net>
Date: Fri, 24 May 2024 14:17:17 -0700
Subject: [PATCH 12/32] more hvac additions

---
 .../resources/HVAC/entity_types/ABSTRACT.yaml |  4 +++
 .../yaml/resources/HVAC/entity_types/CU.yaml  | 26 +++++++++++++++++++
 .../yaml/resources/HVAC/entity_types/FCU.yaml | 14 ++++++++++
 .../HVAC/entity_types/GENERALTYPES.yaml       |  2 ++
 .../yaml/resources/HVAC/entity_types/MAU.yaml | 19 +++++++++++++-
 5 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 330dd6656..f1587dff3 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -2057,9 +2057,12 @@ CHWSDC:
   opt_uses:
   - chilled_water_valve_percentage_sensor
   - cooling_thermal_power_capacity
+  - cooling_request_count
   - leaving_cooling_coil_temperature_sensor
   - high_supply_air_temperature_alarm
   - low_supply_air_temperature_alarm
+  - water_leak_alarm
+  - frost_alarm
   uses:
   - chilled_water_valve_percentage_command
   - supply_air_cooling_temperature_setpoint
@@ -3227,6 +3230,7 @@ HTSDC:
   opt_uses:
   - heater_run_status
   - heating_percentage_command
+  - heating_request_count
   - heating_thermal_power_capacity
   - high_supply_air_temperature_alarm
   - low_supply_air_temperature_alarm
diff --git a/ontology/yaml/resources/HVAC/entity_types/CU.yaml b/ontology/yaml/resources/HVAC/entity_types/CU.yaml
index 95cd4c951..c8477cd96 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CU.yaml
@@ -75,6 +75,18 @@ CU_SFSS_SFVSC_CHWSC_HTSC_SSPC_SARC_MTM_FDPM_CAM:
   - FDPM
   - CAM
 
+CU_SFSS_SFVSC_CHWSDC_HTSDC_SSPC_RTM:
+  description: "Chilled water compartment unit on supply side with start/stop, status, cooling and heating (dual setpoint supply temp control)."
+  is_canonical: true
+  implements:
+  - CU
+  - SFSS
+  - SFVSC
+  - CHWSDC
+  - HTSDC
+  - SSPC
+  - RTM
+
 CU_SFSS_SFVSC_CHWSC_CHWDT_HTSC_SSPC_SARC_MTM_RTM:
   guid: "15e39197-05fa-4b52-9473-5e0bccb883e5"
   description: "Chilled water compartment unit on supply side with start/stop, status, cooling and heating (supply temp control), and differential temperature monitoring."
@@ -151,6 +163,20 @@ CU_DSP_DFSS_DFVSC_CHW2XDC_HTDC_DSPC_FDPM_MTM_CAM_CO2M:
   - CAM
   - CO2M
 
+CU_DSP_DFSS_DFVSC_CHWDC_HTDC_DSPC_RTM_CO2M:
+  description: "Single zone chilled water compartment unit with start/stop, status, cooling and heating (discharge temp control)."
+  is_canonical: true
+  implements:
+  - CU
+  - DSP
+  - DFSS
+  - DFVSC
+  - CHWDC
+  - HTDC
+  - DSPC
+  - RTM
+  - CO2M
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################
diff --git a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
index cd68029c0..f784a1648 100644
--- a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
@@ -950,6 +950,20 @@ FCU_SFSS_SFVSC_CHWSC_SSPC_RTM:
   - SSPC
   - RTM
 
+FCU_SFSS_SFVSC_CHWSC_HTSC_SSPC_FDPM_RTM_CAM:
+  description: "Multi-zone FCU with chilled water"
+  is_canonical: true
+  implements:
+  - FCU
+  - SFSS
+  - SFVSC
+  - CHWSC
+  - HTSC
+  - SSPC
+  - FDPM
+  - RTM
+  - CAM
+
 FCU_DFSS_DFVSC_SSPC_DTC_CHWDC:
   guid: "3609bf02-9dc4-44cb-b8a4-3a14607d74bf"
   description: "Discharge temperature control FCU with chilled water."
diff --git a/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml b/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml
index a1df87bf4..4693e817c 100644
--- a/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml
@@ -54,6 +54,8 @@ FCU:
   - lost_power_alarm
   - smoke_alarm
   - failed_alarm
+  - emergency_alarm
+  - fire_alarm
   implements:
   - EQUIPMENT
 
diff --git a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
index 589d81516..9b03c8bc6 100644
--- a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
@@ -502,7 +502,7 @@ MAU_DFSS_DSP_FDPM_HT2ZC_OAFC:
 
 MAU_DFSS_DFVSC_HTDC_ZTM:
   guid: "80381ee4-6ab6-4a26-bf96-6cb809f3a600"
-  description: "Single zone heating make-up air unit."
+  description: "Single zone heating make-up air unit with zone temperature monitoring."
   is_canonical: true
   implements:
   - MAU
@@ -511,6 +511,23 @@ MAU_DFSS_DFVSC_HTDC_ZTM:
   - HTDC
   - ZTM
 
+MAU_DFSS_DFVSC_HTDC:
+  description: "Single zone heating make-up air unit."
+  is_canonical: true
+  implements:
+  - MAU
+  - DFSS
+  - DFVSC
+  - HTDC
+
+MAU_DFSS_HTDC:
+  description: "Single zone heating make-up air unit with start/stop control."
+  is_canonical: true
+  implements:
+  - MAU
+  - DFSS
+  - HTDC
+
 MAU_DFSS_DFVSC_HTDC_CO2CMAX:
   guid: "9eff969b-9cff-46c0-be0a-1ee317d6987b"
   description: "Mechanical room heating make-up air unit with multi-zone co2 control."

From fd2c2340e444ff6a5f1737be18f4156e337fcb1b Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Fri, 24 May 2024 14:20:38 -0700
Subject: [PATCH 13/32] Update CU.yaml; add guid

---
 ontology/yaml/resources/HVAC/entity_types/CU.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ontology/yaml/resources/HVAC/entity_types/CU.yaml b/ontology/yaml/resources/HVAC/entity_types/CU.yaml
index c8477cd96..194e78ec9 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CU.yaml
@@ -76,6 +76,7 @@ CU_SFSS_SFVSC_CHWSC_HTSC_SSPC_SARC_MTM_FDPM_CAM:
   - CAM
 
 CU_SFSS_SFVSC_CHWSDC_HTSDC_SSPC_RTM:
+  guid: "cc27b007-3427-4d17-b07b-31f4cdcbf700"
   description: "Chilled water compartment unit on supply side with start/stop, status, cooling and heating (dual setpoint supply temp control)."
   is_canonical: true
   implements:

From eed05785e206e04d1214c968677d42420b90fb2f Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Fri, 24 May 2024 14:22:03 -0700
Subject: [PATCH 14/32] Update FCU.yaml; add guid

---
 ontology/yaml/resources/HVAC/entity_types/FCU.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
index f784a1648..0a5f4aa81 100644
--- a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
@@ -951,6 +951,7 @@ FCU_SFSS_SFVSC_CHWSC_SSPC_RTM:
   - RTM
 
 FCU_SFSS_SFVSC_CHWSC_HTSC_SSPC_FDPM_RTM_CAM:
+  guid: "b22e70a5-b94a-460b-bcae-5569ff78ee3b"
   description: "Multi-zone FCU with chilled water"
   is_canonical: true
   implements:

From 63c543515e3230fbf62679a468ac54498961673a Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Fri, 24 May 2024 14:23:15 -0700
Subject: [PATCH 15/32] Update MAU.yaml; add guids

---
 ontology/yaml/resources/HVAC/entity_types/MAU.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
index 9b03c8bc6..9080ae6cb 100644
--- a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
@@ -512,6 +512,7 @@ MAU_DFSS_DFVSC_HTDC_ZTM:
   - ZTM
 
 MAU_DFSS_DFVSC_HTDC:
+  guid: "6d2519ce-ede3-4bbd-ba18-0084bfd7cbf7"
   description: "Single zone heating make-up air unit."
   is_canonical: true
   implements:
@@ -521,6 +522,7 @@ MAU_DFSS_DFVSC_HTDC:
   - HTDC
 
 MAU_DFSS_HTDC:
+  guid: "f23aed1d-0043-49c3-b793-9b08f8273bbd"
   description: "Single zone heating make-up air unit with start/stop control."
   is_canonical: true
   implements:

From 226519c95b9b441074dcba61a0acc9fd41070b73 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Tue, 4 Jun 2024 12:51:59 -0700
Subject: [PATCH 16/32] Update CU.yaml

---
 ontology/yaml/resources/HVAC/entity_types/CU.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/CU.yaml b/ontology/yaml/resources/HVAC/entity_types/CU.yaml
index 194e78ec9..9bb164940 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CU.yaml
@@ -147,7 +147,7 @@ CU_SFSS2X_SFVSC2X_CHWSC_CHWDT_HTSC_SSPC2X_MTM:
   - SSPC2X
   - MTM
 
-CU_DSP_DFSS_DFVSC_CHW2XDC_HTDC_DSPC_FDPM_MTM_CAM_CO2M:
+CU_DSP_DFSS_DFVSC_CHW2XDC_HTDC_FDPM_MTM_CAM_CO2M:
   guid: "8af7abce-3d69-4380-bb90-d8690050b238"
   description: "Single zone chilled water compartment unit with start/stop, status, cooling and heating (discharge temp control)."
   is_canonical: true
@@ -158,13 +158,12 @@ CU_DSP_DFSS_DFVSC_CHW2XDC_HTDC_DSPC_FDPM_MTM_CAM_CO2M:
   - DFVSC
   - CHW2XDC
   - HTDC
-  - DSPC
   - FDPM
   - MTM
   - CAM
   - CO2M
 
-CU_DSP_DFSS_DFVSC_CHWDC_HTDC_DSPC_RTM_CO2M:
+CU_DSP_DFSS_DFVSC_CHWDC_HTDC_RTM_CO2M:
   description: "Single zone chilled water compartment unit with start/stop, status, cooling and heating (discharge temp control)."
   is_canonical: true
   implements:
@@ -174,7 +173,6 @@ CU_DSP_DFSS_DFVSC_CHWDC_HTDC_DSPC_RTM_CO2M:
   - DFVSC
   - CHWDC
   - HTDC
-  - DSPC
   - RTM
   - CO2M
 

From 64f63d039a06ca605737106ea137a5975c71dea3 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Tue, 4 Jun 2024 12:54:26 -0700
Subject: [PATCH 17/32] Update ABSTRACT.yaml

---
 .../resources/HVAC/entity_types/ABSTRACT.yaml | 24 +------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 64a11b302..733cd626c 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -764,27 +764,6 @@ SSPC:
   implements:
   - OPERATIONAL
 
-DSPC:
-  guid: "e95c6b69-3bec-4021-8db8-07b530aaa54d"
-  description: "Discharge static pressure control via discharge fan speed"
-  is_abstract: true
-  opt_uses:
-  - discharge_air_damper_percentage_command
-  - discharge_air_flowrate_sensor
-  - discharge_fan_run_command
-  - discharge_fan_run_status
-  - discharge_fan_speed_frequency_sensor
-  - discharge_fan_speed_percentage_command
-  - failed_discharge_fan_alarm
-  - failed_discharge_air_static_pressure_alarm
-  - high_discharge_air_static_pressure_alarm
-  - low_discharge_air_static_pressure_alarm
-  uses:
-  - discharge_air_static_pressure_sensor
-  - discharge_air_static_pressure_setpoint
-  implements:
-  - OPERATIONAL
-
 SPSS:
   guid: "0b1c2a43-53d8-4349-883c-8bde722fccb5"
   description: "Spray pump start stop monitoring."
@@ -795,7 +774,6 @@ SPSS:
   implements:
   - OPERATIONAL
 
-
 EFSS:
   guid: "1df2cdc8-ef3c-472a-ace0-c85d501e121e"
   description: "Basic combination of exhaust fan run command and status (start/stop)."
@@ -8087,7 +8065,7 @@ SSTC:
   - heating_supply_water_temperature_sensor
   - heating_supply_water_temperature_setpoint
 
-SSSC:
+SSC:
   guid: "cb7bb427-b108-478f-97b5-3a8b925acec0"
   description: "Steam valve control to supply air temperature."
   is_abstract: true

From 9a1eb30bedbd146cd405514f4a2cf91325c15f9f Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Tue, 4 Jun 2024 12:55:36 -0700
Subject: [PATCH 18/32] Update telemetry_fields.yaml

---
 ontology/yaml/resources/fields/telemetry_fields.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
index e8d58fb56..e797adfb9 100644
--- a/ontology/yaml/resources/fields/telemetry_fields.yaml
+++ b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -1383,9 +1383,6 @@ literals:
 - discharge_air_static_pressure_sensor:
     flexible_min: -124.540012
     flexible_max: 996.320096
-- discharge_air_static_pressure_setpoint:
-    flexible_min: -124.540012
-    flexible_max: 996.320096
 - heat_exchange_supply_water_isolation_valve_command:
   - OPEN
   - CLOSED

From 322d54a0abddfc10d503caaf124b4b638f61c274 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:07:56 -0700
Subject: [PATCH 19/32] Update MAU.yaml

---
 ontology/yaml/resources/HVAC/entity_types/MAU.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
index 9080ae6cb..39155045d 100644
--- a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
@@ -834,7 +834,7 @@ MAU_SFSS_SFVSC_CHWSC_CHCPC_CHWISOVM_PHSC_SSSC_SSPC_OADM_OA_ZTM_ZHM_CO2M_CAM:
 
 MAU_DSP_DFSS_DFVSC_CHW2XDC_CHCPC_CHWISOVM_HTDC_FDPM_OADM_OA_DSPM_ZHC_CAM:
   guid: "32dd1642-fcd5-4e1f-a422-42a5dacb6e0e"
-  description: "Multi-zone MAU with preheating steam control, chilled water control, heating steam control, and supply air static pressure control"
+  description: "Single zone MAU with dual zone temperture setpoint control, heating valve and dual chilled water valve control on the discharge side, and variable speed discharge fan control."
   is_canonical: true
   implements:
   - MAU

From 4845ef217a899153800000d7501c48a866a5ba55 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:21:12 -0700
Subject: [PATCH 20/32] Update CU.yaml

---
 ontology/yaml/resources/HVAC/entity_types/CU.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/CU.yaml b/ontology/yaml/resources/HVAC/entity_types/CU.yaml
index 9bb164940..ad2aba8bd 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CU.yaml
@@ -133,7 +133,7 @@ CU_SFSS_SFVSC_CHWSC_CHWDT_HTSC_SSPC_SARC_MTM:
   - SARC
   - MTM
 
-CU_SFSS2X_SFVSC2X_CHWSC_CHWDT_HTSC_SSPC2X_MTM:
+CU_SFSS2X_SFVSC2X_CHWSC_CHWDT_HTSC_SSPC_MTM:
   guid: "bccd555b-864f-4b66-a084-fa29ce28e770"
   description: "Chilled water compartment unit with two fan start/stop, status, cooling and heating (supply temp control), and differential temperature monitoring."
   is_canonical: true
@@ -144,7 +144,7 @@ CU_SFSS2X_SFVSC2X_CHWSC_CHWDT_HTSC_SSPC2X_MTM:
   - CHWSC
   - CHWDT
   - HTSC
-  - SSPC2X
+  - SSPC
   - MTM
 
 CU_DSP_DFSS_DFVSC_CHW2XDC_HTDC_FDPM_MTM_CAM_CO2M:

From b8e2491cd022036ce85fe805bfc3706d9b3ea753 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:44:38 -0700
Subject: [PATCH 21/32] Update telemetry_fields.yaml

---
 ontology/yaml/resources/fields/telemetry_fields.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
index 57ec08daf..941b81426 100644
--- a/ontology/yaml/resources/fields/telemetry_fields.yaml
+++ b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -3622,8 +3622,6 @@ literals:
 - south_wind_linearvelocity_sensor:
     flexible_min: 0.0
     flexible_max: 44.704
-<<<<<<< steam_and_hvac_additions
-=======
 - switch_position_status:
   - NORMAL
   - EMERGENCY
@@ -3633,4 +3631,3 @@ literals:
 - emergency_power_status:
   - PRESENT
   - ABSENT
->>>>>>> master

From dd7d558abd99d8291b7c9bb25ea743498cc52bd4 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:47:14 -0700
Subject: [PATCH 22/32] Update AHU.yaml

---
 ontology/yaml/resources/HVAC/entity_types/AHU.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
index c5578b221..bf8b5a615 100644
--- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
@@ -4524,7 +4524,7 @@ AHU_SFSS2X_SFVSC2X_RFSS2X_RFVSC2X_HWSC_CHWSC_SSPC_MOAFC_ECON_EDPM_RD_UV:
   - RD
   - UV
 
-AHU_SFSS_SFVSC_EFSS_EFVSC_CHW2XSC_SSSC_CO2CMAX_ECON_SSPC:
+AHU_SFSS_SFVSC_EFSS_EFVSC_CHW2XSC_SSC_CO2CMAX_ECON_SSPC:
   guid: "7bde22a0-19c3-4755-b9d4-a41fd4b54a8e"
   description: "Multi-zone AHU with supply and exhaust fans, co2 control, two chilled water and one steam valve control to supply air, and economizing."
   is_canonical: true
@@ -4535,12 +4535,12 @@ AHU_SFSS_SFVSC_EFSS_EFVSC_CHW2XSC_SSSC_CO2CMAX_ECON_SSPC:
   - EFSS
   - EFVSC
   - CHW2XSC
-  - SSSC
+  - SSC
   - CO2CMAX
   - ECON
   - SSPC
 
-AHU_SFSS_SFVSC_CHW2XSC_SSSC_ECON_SSPC:
+AHU_SFSS_SFVSC_CHW2XSC_SSC_ECON_SSPC:
   guid: "4520481a-167e-4767-9e3e-cd5a21624776"
   description: "Multi-zone AHU with supply fan control, two chilled water and one steam valve control to supply air, and economizing."
   is_canonical: true
@@ -4549,7 +4549,7 @@ AHU_SFSS_SFVSC_CHW2XSC_SSSC_ECON_SSPC:
   - SFSS
   - SFVSC
   - CHW2XSC
-  - SSSC
+  - SSC
   - ECON
   - SSPC
 

From a29bc4080a12122fabfd7ebdaff64b5b18a3d9e0 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:50:32 -0700
Subject: [PATCH 23/32] Update MAU.yaml

---
 ontology/yaml/resources/HVAC/entity_types/MAU.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
index 39155045d..85c2d9bb0 100644
--- a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
@@ -811,7 +811,7 @@ MAU_SFSS2X_SFVSC2X_PHWSC_LCC_HWSC_SSPC_UV_SHM:
   - UV
   - SHM
 
-MAU_SFSS_SFVSC_CHWSC_CHCPC_CHWISOVM_PHSC_SSSC_SSPC_OADM_OA_ZTM_ZHM_CO2M_CAM:
+MAU_SFSS_SFVSC_CHWSC_CHCPC_CHWISOVM_PHSC_SSC_SSPC_OADM_OA_ZTM_ZHM_CO2M_CAM:
   guid: "d50d41d6-f7bf-4ec2-937f-b7e72ce56b4c"
   description: "Multi-zone MAU with preheating steam control, chilled water control, heating steam control, and supply air static pressure control"
   is_canonical: true
@@ -823,7 +823,7 @@ MAU_SFSS_SFVSC_CHWSC_CHCPC_CHWISOVM_PHSC_SSSC_SSPC_OADM_OA_ZTM_ZHM_CO2M_CAM:
   - CHCPC
   - CHWISOVM
   - PHSC
-  - SSSC
+  - SSC
   - SSPC
   - OADM
   - OA

From 9f1490f8e20e32c3d82163eab653214c796e884e Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Wed, 5 Jun 2024 07:55:50 -0700
Subject: [PATCH 24/32] Update FCU.yaml

---
 .../yaml/resources/HVAC/entity_types/FCU.yaml     | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
index 0a5f4aa81..cd68029c0 100644
--- a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
@@ -950,21 +950,6 @@ FCU_SFSS_SFVSC_CHWSC_SSPC_RTM:
   - SSPC
   - RTM
 
-FCU_SFSS_SFVSC_CHWSC_HTSC_SSPC_FDPM_RTM_CAM:
-  guid: "b22e70a5-b94a-460b-bcae-5569ff78ee3b"
-  description: "Multi-zone FCU with chilled water"
-  is_canonical: true
-  implements:
-  - FCU
-  - SFSS
-  - SFVSC
-  - CHWSC
-  - HTSC
-  - SSPC
-  - FDPM
-  - RTM
-  - CAM
-
 FCU_DFSS_DFVSC_SSPC_DTC_CHWDC:
   guid: "3609bf02-9dc4-44cb-b8a4-3a14607d74bf"
   description: "Discharge temperature control FCU with chilled water."

From d0debc5072d4c74cb9179f24b1be53f27541dca3 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Wed, 5 Jun 2024 08:13:55 -0700
Subject: [PATCH 25/32] Update AHU.yaml

---
 ontology/yaml/resources/HVAC/entity_types/AHU.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
index bf8b5a615..00600ddce 100644
--- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
@@ -4553,7 +4553,7 @@ AHU_SFSS_SFVSC_CHW2XSC_SSC_ECON_SSPC:
   - ECON
   - SSPC
 
-AHU_SFSS_SFVSC_CHWSC_HTSC_SARC_SSPC_FDPM_MTM_ZTM:
+AHU_SFSS_SFVSC_CHWSC_HTSC_SARC_SSPC_FDPM_MTM:
   guid: "b270b104-aed8-40c3-80b5-bd991e3ed102"
   description: "Multi-zone AHU with supply fan control, chilled water and electric heater control to supply air, and mixed air and zone air temperature monitoring."
   is_canonical: true
@@ -4567,7 +4567,6 @@ AHU_SFSS_SFVSC_CHWSC_HTSC_SARC_SSPC_FDPM_MTM_ZTM:
   - SSPC
   - FDPM
   - MTM
-  - ZTM
 
 AHU_BSPC_DX5SC_ECONM_EDM_EFSS_EFVSC_SFSS4X_SFVSC4X_SSPC_SARC:
   guid: "befd596e-5a4b-4c64-b045-7f546ada3e96"

From 4d233ae3dbfec21658ffb583479b7747a8ed0989 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Thu, 13 Jun 2024 11:19:08 -0700
Subject: [PATCH 26/32] Update AHU.yaml

---
 ontology/yaml/resources/HVAC/entity_types/AHU.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
index 00600ddce..5aab935c9 100644
--- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
@@ -4553,9 +4553,9 @@ AHU_SFSS_SFVSC_CHW2XSC_SSC_ECON_SSPC:
   - ECON
   - SSPC
 
-AHU_SFSS_SFVSC_CHWSC_HTSC_SARC_SSPC_FDPM_MTM:
+AHU_SFSS_SFVSC_CHWSC_HTSC_ECON_SARC_SSPC_FDPM:
   guid: "b270b104-aed8-40c3-80b5-bd991e3ed102"
-  description: "Multi-zone AHU with supply fan control, chilled water and electric heater control to supply air, and mixed air and zone air temperature monitoring."
+  description: "Multi-zone AHU with supply fan control, chilled water and electric heater control to supply air, economizing, and filter differential pressure monitoring."
   is_canonical: true
   implements:
   - AHU
@@ -4563,10 +4563,10 @@ AHU_SFSS_SFVSC_CHWSC_HTSC_SARC_SSPC_FDPM_MTM:
   - SFVSC
   - CHWSC
   - HTSC
+  - ECON
   - SARC
   - SSPC
   - FDPM
-  - MTM
 
 AHU_BSPC_DX5SC_ECONM_EDM_EFSS_EFVSC_SFSS4X_SFVSC4X_SSPC_SARC:
   guid: "befd596e-5a4b-4c64-b045-7f546ada3e96"

From b035c7459fc4b5b4491bfdd844178f70e55284be Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Thu, 13 Jun 2024 11:20:13 -0700
Subject: [PATCH 27/32] Update AHU.yaml

---
 ontology/yaml/resources/HVAC/entity_types/AHU.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
index 5aab935c9..73e65700c 100644
--- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
@@ -4553,9 +4553,9 @@ AHU_SFSS_SFVSC_CHW2XSC_SSC_ECON_SSPC:
   - ECON
   - SSPC
 
-AHU_SFSS_SFVSC_CHWSC_HTSC_ECON_SARC_SSPC_FDPM:
+AHU_SFSS_SFVSC_CHWSC_HTSC_ECON_SARC_SSPC_FDPM_ZTM:
   guid: "b270b104-aed8-40c3-80b5-bd991e3ed102"
-  description: "Multi-zone AHU with supply fan control, chilled water and electric heater control to supply air, economizing, and filter differential pressure monitoring."
+  description: "Multi-zone AHU with supply fan control, chilled water and electric heater control to supply air, economizing, filter differential pressure and zone temperature monitoring."
   is_canonical: true
   implements:
   - AHU
@@ -4567,6 +4567,7 @@ AHU_SFSS_SFVSC_CHWSC_HTSC_ECON_SARC_SSPC_FDPM:
   - SARC
   - SSPC
   - FDPM
+  - ZTM
 
 AHU_BSPC_DX5SC_ECONM_EDM_EFSS_EFVSC_SFSS4X_SFVSC4X_SSPC_SARC:
   guid: "befd596e-5a4b-4c64-b045-7f546ada3e96"

From 1f5fd6f03e0fc97e4642d8c1c7fbb607d4e5baa1 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Tue, 18 Jun 2024 11:33:09 -0700
Subject: [PATCH 28/32] Update ABSTRACT.yaml

---
 .../yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 733cd626c..0b88882e4 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -1986,11 +1986,15 @@ CHWDC:
   - chilled_water_valve_percentage_sensor
   - cooling_thermal_power_capacity
   - leaving_cooling_coil_temperature_sensor
+  - failed_leaving_cooling_coil_temperature_alarm
+  - high_leaving_cooling_coil_temperature_alarm
+  - low_leaving_cooling_coil_temperature_alarm
   - failed_discharge_air_temperature_alarm
   - failed_chilled_water_valve_alarm
   - high_discharge_air_temperature_alarm
   - low_discharge_air_temperature_alarm
   - water_leak_alarm
+  - frost_alarm
   uses:
   - chilled_water_valve_percentage_command
   - discharge_air_temperature_sensor
@@ -8065,16 +8069,14 @@ SSTC:
   - heating_supply_water_temperature_sensor
   - heating_supply_water_temperature_setpoint
 
-SSC:
+SVDC:
   guid: "cb7bb427-b108-478f-97b5-3a8b925acec0"
-  description: "Steam valve control to supply air temperature."
+  description: "Steam valve control to discharge air temperature."
   is_abstract: true
-  opt_uses:
-  - heating_request_count
   uses:
   - steam_valve_percentage_command
-  - supply_air_temperature_sensor
-  - supply_air_temperature_setpoint
+  - discharge_air_temperature_sensor
+  - discharge_air_temperature_setpoint
   implements:
   - CONTROL
 

From 22719568a3ac01babaa3d2402160ab42410cab62 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Tue, 18 Jun 2024 11:34:45 -0700
Subject: [PATCH 29/32] Update MAU.yaml

---
 ontology/yaml/resources/HVAC/entity_types/MAU.yaml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
index 85c2d9bb0..c46500371 100644
--- a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
@@ -811,20 +811,19 @@ MAU_SFSS2X_SFVSC2X_PHWSC_LCC_HWSC_SSPC_UV_SHM:
   - UV
   - SHM
 
-MAU_SFSS_SFVSC_CHWSC_CHCPC_CHWISOVM_PHSC_SSC_SSPC_OADM_OA_ZTM_ZHM_CO2M_CAM:
+MAU_DFSS_DFVSC_CHWDC_CHCPC_CHWISOVM_PHSC_SVDC_OADM_OA_ZTM_ZHM_CO2M_CAM:
   guid: "d50d41d6-f7bf-4ec2-937f-b7e72ce56b4c"
-  description: "Multi-zone MAU with preheating steam control, chilled water control, heating steam control, and supply air static pressure control"
+  description: "Single-zone MAU with preheating steam control, chilled water control, and heating steam control"
   is_canonical: true
   implements:
   - MAU
-  - SFSS
-  - SFVSC
-  - CHWSC
+  - DFSS
+  - DFVSC
+  - CHWDC
   - CHCPC
   - CHWISOVM
   - PHSC
-  - SSC
-  - SSPC
+  - SVDC
   - OADM
   - OA
   - ZTM

From 93ce13113d7693ee982df4d48b4f37d93f2779db Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Tue, 18 Jun 2024 11:41:30 -0700
Subject: [PATCH 30/32] Update ABSTRACT.yaml

---
 .../resources/HVAC/entity_types/ABSTRACT.yaml   | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 0b88882e4..1fb5c6a29 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -8068,9 +8068,22 @@ SSTC:
   - supply_steam_valve_percentage_command
   - heating_supply_water_temperature_sensor
   - heating_supply_water_temperature_setpoint
-
-SVDC:
+  
+SSVC:
   guid: "cb7bb427-b108-478f-97b5-3a8b925acec0"
+  description: "Steam valve control to supply air temperature."
+  is_abstract: true
+  opt_uses:
+  - heating_request_count
+  uses:
+  - steam_valve_percentage_command
+  - supply_air_temperature_sensor
+  - supply_air_temperature_setpoint
+  implements:
+  - CONTROL
+  
+DSVC:
+  guid: "45b08e9e-d8a1-49a1-b182-c245edc543cc"
   description: "Steam valve control to discharge air temperature."
   is_abstract: true
   uses:

From e31fcd327d487d8c2470b0501de1f79c15d1eec9 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Tue, 18 Jun 2024 11:42:05 -0700
Subject: [PATCH 31/32] Update MAU.yaml

---
 ontology/yaml/resources/HVAC/entity_types/MAU.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
index c46500371..628dd7b93 100644
--- a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml
@@ -811,7 +811,7 @@ MAU_SFSS2X_SFVSC2X_PHWSC_LCC_HWSC_SSPC_UV_SHM:
   - UV
   - SHM
 
-MAU_DFSS_DFVSC_CHWDC_CHCPC_CHWISOVM_PHSC_SVDC_OADM_OA_ZTM_ZHM_CO2M_CAM:
+MAU_DFSS_DFVSC_CHWDC_CHCPC_CHWISOVM_PHSC_DSVC_OADM_OA_ZTM_ZHM_CO2M_CAM:
   guid: "d50d41d6-f7bf-4ec2-937f-b7e72ce56b4c"
   description: "Single-zone MAU with preheating steam control, chilled water control, and heating steam control"
   is_canonical: true
@@ -823,7 +823,7 @@ MAU_DFSS_DFVSC_CHWDC_CHCPC_CHWISOVM_PHSC_SVDC_OADM_OA_ZTM_ZHM_CO2M_CAM:
   - CHCPC
   - CHWISOVM
   - PHSC
-  - SVDC
+  - DSVC
   - OADM
   - OA
   - ZTM

From 498eb305effad62e950bd2d287550c5bda05b2d0 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Tue, 18 Jun 2024 11:42:35 -0700
Subject: [PATCH 32/32] Update AHU.yaml

---
 ontology/yaml/resources/HVAC/entity_types/AHU.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
index 73e65700c..656ce31e6 100644
--- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
@@ -4524,7 +4524,7 @@ AHU_SFSS2X_SFVSC2X_RFSS2X_RFVSC2X_HWSC_CHWSC_SSPC_MOAFC_ECON_EDPM_RD_UV:
   - RD
   - UV
 
-AHU_SFSS_SFVSC_EFSS_EFVSC_CHW2XSC_SSC_CO2CMAX_ECON_SSPC:
+AHU_SFSS_SFVSC_EFSS_EFVSC_CHW2XSC_SSVC_CO2CMAX_ECON_SSPC:
   guid: "7bde22a0-19c3-4755-b9d4-a41fd4b54a8e"
   description: "Multi-zone AHU with supply and exhaust fans, co2 control, two chilled water and one steam valve control to supply air, and economizing."
   is_canonical: true
@@ -4535,12 +4535,12 @@ AHU_SFSS_SFVSC_EFSS_EFVSC_CHW2XSC_SSC_CO2CMAX_ECON_SSPC:
   - EFSS
   - EFVSC
   - CHW2XSC
-  - SSC
+  - SSVC
   - CO2CMAX
   - ECON
   - SSPC
 
-AHU_SFSS_SFVSC_CHW2XSC_SSC_ECON_SSPC:
+AHU_SFSS_SFVSC_CHW2XSC_SSVC_ECON_SSPC:
   guid: "4520481a-167e-4767-9e3e-cd5a21624776"
   description: "Multi-zone AHU with supply fan control, two chilled water and one steam valve control to supply air, and economizing."
   is_canonical: true
@@ -4549,7 +4549,7 @@ AHU_SFSS_SFVSC_CHW2XSC_SSC_ECON_SSPC:
   - SFSS
   - SFVSC
   - CHW2XSC
-  - SSC
+  - SSVC
   - ECON
   - SSPC