Merge pull request #1539 from ccquigley/master

new fan type for carbon monoxide control

Author: shambergoldstein

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

@@ -399,6 +399,19 @@ COC:
   - high_zone_air_co_concentration_alarm
   - failed_zone_air_co_concentration_alarm
 
+COCMAX:
+  guid: "5d8f0f34-247b-4a2d-bbcf-c0ae84019489"
+  description: "Multi-zone carbon monoxide control to the maximum zone concentration."
+  is_abstract: true
+  implements:
+  - OPERATIONAL
+  uses:
+  - max_zone_air_co_concentration_sensor
+  - zone_air_co_concentration_setpoint
+  opt_uses:
+  - high_zone_air_co_concentration_alarm
+  - failed_zone_air_co_concentration_alarm
+
 COM:
   guid: "bd9a1e2d-0710-4c58-8a56-3890af55f6b3"
   description: "Carbon monoxide monitoring."

ontology/yaml/resources/HVAC/entity_types/FAN.yaml

@@ -343,6 +343,16 @@ FAN_SS_VSC_COC:
   - VSC
   - COC
 
+FAN_SS_VSC_COCMAX:
+  guid: "d7c1b80c-e982-4ce5-9fc4-2bf59d0f9d4e"
+  description: "Variable speed ventilation fan (for controlling to maximum carbon monoxide concentration)."
+  is_canonical: true
+  implements:
+  - FAN
+  - SS
+  - VSC
+  - COCMAX
+
 FAN_SS_VSC_ETM:
   guid: "506ff5b9-c55a-4d4e-8c91-a040871a9b40"
   description: "Fan with exhaust air temp sensor."

ontology/yaml/resources/fields/telemetry_fields.yaml

@@ -569,6 +569,9 @@ literals:
 - max_zone_air_co2_concentration_sensor:
     flexible_min: 0.00005
     flexible_max: 0.005
+- max_zone_air_co_concentration_sensor:
+    flexible_min: 0.00035
+    flexible_max: 0.0015
 - average_zone_air_co2_concentration_sensor:
     flexible_min: 0.00005
     flexible_max: 0.005