Merge branch 'master' into steam_and_hvac_additions

google · Jun 19, 2024 · e05a8cf · e05a8cf
2 parents 498eb30 + 2c55036
commit e05a8cf
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 40 deletions.
diff --git a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
@@ -1541,6 +1541,48 @@ FCU_DFSS_RHDHC_HT2RC_DX2RC_ZTM:
   - DX2RC
   - ZTM
 
+FCU_DSP_DFVSC_DTM_RTM:
+  is_canonical: true
+  guid: "ff0b58c2-8446-47f9-913d-068fd3b43ae7"
+  description: "Hybrid variable refrigerant flow unit with discharge and return air temperature monitoring, zone cooling and heating setpoints, discharge fan speed command"
+  implements:
+  - FCU
+  - DSP
+  - DFVSC
+  - DTM
+  - RTM
+
+FCU_DFSS_DFSMC_HWRC:
+  is_canonical: true
+  guid: "1388eea8-a039-4b33-8613-24ae9de719dd"
+  description: "Warm air curtain with return air temperature control."
+  implements:
+  - FCU
+  - DFSS
+  - DFSMC
+  - HWRC
+
+FCU_DFVSC_RTM_CO2M_HWZTC_CHWZTC:
+  is_canonical: true
+  guid: "6f6fd049-576c-4f0a-894d-a6433575b8dd"
+  description: "Fan coil unit with zone temperature control, heating water and chilled water valve monitoring."
+  implements:
+  - FCU
+  - DFVSC
+  - RTM
+  - CO2M
+  - HWZTC
+  - CHWZTC
+
+FCU_DFMSC_CHWZTC:
+  is_canonical: true
+  guid: "2b7cde44-9553-405b-b186-0fdf126a9a8c"
+  description: "Fan coil unit with chilled water valve monitoring on zone side (ZTC) and discharge fan multi-speed control."
+  implements:
+  - FCU
+  - DFMSC
+  - CHWZTC
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################
@@ -1981,41 +2023,3 @@ FCU_RTC_RHDHS_DTM_DFSS:
   - water_leak_alarm
   - fire_alarm
   - schedule_run_command
-
-FCU_DSP_DFVSC_DTM_RTM:
-  guid: "ff0b58c2-8446-47f9-913d-068fd3b43ae7"
-  description: "Hybrid variable refrigerant flow unit with discharge and return air temperature monitoring, zone cooling and heating setpoints, discharge fan speed command"
-  implements:
-  - FCU
-  - DSP
-  - DFVSC
-  - DTM
-  - RTM
-
-FCU_DFSS_DFSMC_HWRC:
-  guid: "1388eea8-a039-4b33-8613-24ae9de719dd"
-  description: "Warm air curtain with return air temperature control."
-  implements:
-  - FCU
-  - DFSS
-  - DFSMC
-  - HWRC
-
-FCU_DFVSC_RTM_CO2M_HWZTC_CHWZTC:
-  guid: "6f6fd049-576c-4f0a-894d-a6433575b8dd"
-  description: "Fan coil unit with zone temperature control, heating water and chilled water valve monitoring."
-  implements:
-  - FCU
-  - DFVSC
-  - RTM
-  - CO2M
-  - HWZTC
-  - CHWZTC
-
-FCU_DFMSC_CHWZTC:
-  guid: "2b7cde44-9553-405b-b186-0fdf126a9a8c"
-  description: "Fan coil unit with Chilled water valve monitoring on zone side (ZTC) and discharge fan multi-speed control."
-  implements:
-  - FCU
-  - DFMSC
-  - CHWZTC
diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -118,7 +118,7 @@ literals:
     flexible_max: 308.1481481
 - condensing_water_sump_temperature_sensor:
     flexible_min: 255.9259259
-    flexible_max: 308.1481481    
+    flexible_max: 308.1481481
 - condensing_water_flowrate_sensor:
     flexible_min: -0.000315451
     flexible_max: 0.315451

diff --git a/ontology/yaml/resources/subfields/subfields.yaml b/ontology/yaml/resources/subfields/subfields.yaml
@@ -346,7 +346,7 @@ measurement_descriptor:
   dewpoint: "The thermodynamic point at which water condenses from standing air."
   differential: "Measured difference between two reference points (e.g. differential_water_pressure)"
   down: "The direction of a spatial movement, opposite of up."
-  dynamic: "Describing a system which is instable or constantly changing (e.g. supply_air_dynamic_pressure_sensor)."  
+  dynamic: "Describing a system which is instable or constantly changing (e.g. supply_air_dynamic_pressure_sensor)."
   efficiency: "The ratio of required input to actual output. "
   end: "Indicates a final part of something, especially a period of time."
   extent: "The range over which something has spread."