Merge pull request #1480 from ccquigley/master

vav and rp updates

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

@@ -26,6 +26,8 @@ SD:
   opt_uses:
   - cooling_thermal_power_capacity
   - run_command
+  - warmup_run_command
+  - schedule_run_command
   - supply_air_cooling_flowrate_capacity
   - supply_air_damper_percentage_sensor
   - supply_air_heating_flowrate_capacity
@@ -39,6 +41,8 @@ SD:
   - failed_supply_air_damper_alarm
   - pressurization_request_count
   - zone_air_differential_pressure_sensor
+  - flowrate_requirement
+  - unoccupied_flowrate_requirement
   uses:
   - supply_air_damper_percentage_command
   - supply_air_flowrate_sensor
@@ -183,6 +187,8 @@ CSP:
   - high_zone_air_temperature_alarm
   - low_zone_air_temperature_alarm
   - cooling_request_count
+  - heating_request_count
+  - warmup_request_count
   uses:
   - zone_air_cooling_temperature_setpoint
   - zone_air_temperature_sensor
@@ -300,6 +306,7 @@ DSP:
   - zone_occupancy_status
   - cooling_request_count
   - heating_request_count
+  - warmup_request_count
   uses:
   - zone_air_cooling_temperature_setpoint
   - zone_air_heating_temperature_setpoint
@@ -756,6 +763,9 @@ ZHM:
   opt_uses:
   - failed_zone_air_relative_humidity_alarm
   - high_zone_air_relative_humidity_alarm
+  - zone_air_dewpoint_temperature_sensor
+  - zone_air_dewpoint_temperature_setpoint
+
 
 ZHM2X:
   guid: "1e5c95b5-bbf8-42ab-b68f-08bd3fc7638e"
@@ -1656,6 +1666,8 @@ ED:
   opt_uses:
   - exhaust_air_damper_percentage_sensor
   - exhaust_air_static_pressure_sensor
+  - run_command
+  - schedule_run_command
   uses:
   - exhaust_air_damper_percentage_command
   - exhaust_air_flowrate_sensor
@@ -1771,6 +1783,8 @@ ZHC:
   - failed_zone_air_relative_humidity_alarm
   - high_zone_air_relative_humidity_alarm
   - low_zone_air_relative_humidity_alarm
+  - zone_air_dewpoint_temperature_sensor
+  - zone_air_dewpoint_temperature_setpoint
   implements:
   - OPERATIONAL
 
@@ -5544,6 +5558,10 @@ PDSCV:
   guid: "b1eac019-247c-4669-bd66-f70f262f9af7"
   description: "Pressure-dependent supply damper control for ventilation purposes (CO2 or VOC)."
   is_abstract: true
+  opt_uses:
+  - run_command
+  - schedule_run_command
+  - warmup_run_command
   uses:
   - supply_air_damper_percentage_command
   - supply_air_damper_percentage_sensor

ontology/yaml/resources/HVAC/entity_types/RP.yaml

@@ -68,6 +68,16 @@ RP_DSP_CHWVM:
   - DSP
   - CHWVM
 
+RP_DSP_CHWVM_ZHM:
+  guid: "6ed94869-111a-4a7c-8190-ba71d0b2d74e"
+  description: "Cooling-only radiant panel, one pipe installation and with zone humidity monitoring."
+  is_canonical: true
+  implements:
+  - RP
+  - DSP
+  - CHWVM
+  - ZHM
+
 RP_DSP_HWVM:
   guid: "c049cd6d-cf92-44d1-983b-7c04c2a000c3"
   description: "Heating-only radiant panel, one pipe installation."
@@ -77,6 +87,16 @@ RP_DSP_HWVM:
   - DSP
   - HWVM
 
+RP_DSP_HWVM_ZHM:
+  guid: "1a40086b-7323-4729-9461-51a0dfc02cc5"
+  description: "Heating-only radiant panel, one pipe installation and zone humidity monitoring."
+  is_canonical: true
+  implements:
+  - RP
+  - DSP
+  - HWVM
+  - ZHM
+
 RP_DSP_CHWVM_CAM:
   guid: "1087d6a8-fa58-4083-89de-12cc6275de35"
   description: "Cooling-only one-pipe radiant panel with condensate monitoring."
@@ -87,6 +107,17 @@ RP_DSP_CHWVM_CAM:
   - CHWVM
   - CAM
 
+RP_DSP_CHWVM_CAM_ZHM:
+  guid: "9fae6fde-fe98-4629-a30f-3f726af70c32"
+  description: "Cooling-only one-pipe radiant panel with condensate monitoring and zone humidity monitoring."
+  is_canonical: true
+  implements:
+  - RP
+  - DSP
+  - CHWVM
+  - CAM
+  - ZHM
+
 RP_DSP_FPHC:
   guid: "04bbeedd-75ba-4454-a49c-26bc0b802b86"
   description: "Four-pipe radiant panel for room heating and cooling."
@@ -96,6 +127,16 @@ RP_DSP_FPHC:
   - DSP
   - FPHC
 
+RP_DSP_FPHC_ZHM:
+  guid: "87cb7e92-e697-4108-9bdc-48f1b2614534"
+  description: "Four-pipe radiant panel for room heating and cooling and with zone humidity monitoring."
+  is_canonical: true
+  implements:
+  - RP
+  - DSP
+  - FPHC
+  - ZHM
+
 RP_DSP_FPHC_CAM:
   guid: "587a5a45-c7bb-415d-b75d-1b1aae4e09e2"
   description: "Four-pipe radiant panel for room heating and cooling with condensate monitoring."
@@ -104,4 +145,15 @@ RP_DSP_FPHC_CAM:
   - RP
   - DSP
   - FPHC
-  - CAM
+  - CAM
+
+RP_DSP_FPHC_CAM_ZHM:
+  guid: "36560088-c885-4029-ad49-c9b2d469a9f6"
+  description: "Four-pipe radiant panel for room heating and cooling with condensate monitoring and zone humidity monitoring."
+  is_canonical: true
+  implements:
+  - RP
+  - DSP
+  - FPHC
+  - CAM
+  - ZHM

ontology/yaml/resources/HVAC/entity_types/VAV.yaml

@@ -116,6 +116,17 @@ VAV_SD_DSP_HWDC:
   - DSP
   - HWDC
 
+VAV_SD_DSP_HWDC_ZHM:
+  guid: "f344f1c3-b117-42e4-9b1e-41073687bd8f"
+  description: "Single duct reheat VAV with dual setpoint control and zone humidity monitoring."
+  is_canonical: true
+  implements:
+  - VAV
+  - SD
+  - DSP
+  - HWDC
+  - ZHM
+
 VAV_SD_DSP_CO2M:
   guid: "0de6754a-9094-4f93-a32a-af2ccee4f495"
   description: "VAV with zone CO2 monitoring."
@@ -188,6 +199,18 @@ VAV_SD_DSP_HWDC_CO2C:
   - HWDC
   - CO2C
 
+VAV_SD_DSP_HWDC_CO2C_ZHM:
+  guid: "33767e72-193c-48fe-8da8-2db988d261fa"
+  description: "Single duct reheat VAV with CO2, temp control, and humidity monitoring."
+  is_canonical: true
+  implements:
+  - VAV
+  - SD
+  - DSP
+  - HWDC
+  - CO2C
+  - ZHM
+
 VAV_SD_DSP_HWDC_VOCC:
   guid: "f79768d5-31aa-4f42-a814-c0f901e36999"
   description: "Single duct reheat VAV with VOC and temp control."
@@ -613,6 +636,17 @@ VAV_DSP_PDSCV_CO2C:
   - PDSCV
   - CO2C
 
+VAV_DSP_PDSCV_CO2C_ZHM:
+  guid: "2f7f35cf-2984-4b3c-87fb-816a78f47553"
+  description: "VAV with pressure dependent supply valve control, CO2 control and zone humidity monitoring."
+  is_canonical: true
+  implements:
+  - VAV
+  - DSP
+  - PDSCV
+  - CO2C
+  - ZHM
+
 VAV_DSP_PDSCV_HTZC:
   guid: "3d727b03-e945-4af3-822e-b8da662a26f6"
   description: "Reheat VAV with pressure dependent supply damper control."
@@ -634,6 +668,18 @@ VAV_DSP_PDSCV_HTZC_CO2C:
   - HTZC
   - CO2C
 
+VAV_DSP_PDSCV_HTZC_CO2C_ZHM:
+  guid: "fb03179b-f73b-4f3b-b77c-57ca3ca6148c"
+  description: "Reheat VAV with pressure dependent supply valve control, CO2 control and zone humidity monitoring."
+  is_canonical: true
+  implements:
+  - VAV
+  - DSP
+  - PDSCV
+  - HTZC
+  - CO2C
+  - ZHM
+
 VAV_PDSCV_WDPC2X:
   guid: "cd3a50ce-83bf-4521-b67f-376eb8a2f336"
   description: "VAV with pressure-dependent supply damper control and dual sensor differential pressure control."
@@ -672,6 +718,16 @@ VAV_DSP_PDSCV:
   - DSP
   - PDSCV
 
+VAV_DSP_PDSCV_ZHM:
+  guid: "32639e96-d247-49c4-9ab5-229eb4573db5"
+  description: "VAV with pressure dependent supply valve control and zone humidity monitoring."
+  is_canonical: true
+  implements:
+  - VAV
+  - DSP
+  - PDSCV
+  - ZHM
+
 VAV_CSP_DFVSC_DAIDC:
   guid: "b7389975-b755-4a4f-aa7a-b80031990ee2"
   description: "VAV with cooling, discharge fan control, and supply damper monitoring."

ontology/yaml/resources/fields/metadata_fields.yaml

@@ -82,6 +82,9 @@ literals:
 - flowrate_requirement: # Minimum flowrate
     fixed_min: 0.0
     flexible_max: 18.92706
+- unoccupied_flowrate_requirement:
+    fixed_min: 0.0
+    flexible_max: 18.92706
 - outside_air_flowrate_requirement:
     fixed_min: 0.0
     flexible_max: 141.584233

ontology/yaml/resources/fields/telemetry_fields.yaml

@@ -4034,3 +4034,6 @@ literals:
 - exhaust_air_linearvelocity_sensor:
     fixed_min: 0.0
     flexible_max: 25.4000508
+- zone_air_dewpoint_temperature_setpoint:
+    flexible_min: 255.9259259
+    flexible_max: 310.9259259