Merge branch 'master' into water-system-additions

google · Dec 13, 2024 · bbc3591 · bbc3591
2 parents e1c14c0 + 6d54892
commit bbc3591
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 0 deletions.
diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -1424,6 +1424,18 @@ PSWTC:
   implements:
   - OPERATIONAL
 
+PRSWTC:
+  guid: "26e7feb6-34d7-4eca-8118-ad200649161c"
+  description: "Primary loop water temperature control."
+  is_abstract: true
+  opt_uses:
+  - primary_return_water_temperature_sensor
+  uses:
+  - primary_supply_water_temperature_sensor
+  - primary_supply_water_temperature_setpoint
+  implements:
+  - OPERATIONAL
+
 SGTC:
   guid: "8ead3288-04f5-49d0-9d96-0a85688a923a"
   description: "Supply glycol temperature control."

diff --git a/ontology/yaml/resources/HVAC/entity_types/CH.yaml b/ontology/yaml/resources/HVAC/entity_types/CH.yaml
@@ -190,6 +190,18 @@ CH_SS_SWTC_DX2SWC_SWISOVM:
   - DX2SWC
   - SWISOVM
 
+CH_SS_SWTC_DX2SWC_SWISOVM_REFPM2X:
+  guid: "e64f0b0a-dfb1-43f9-908b-0a039ffa7bdf"
+  description: "Two-stage air-cooled chiller with supply temperature control, supply isolation valve and two circuit refrigerant pressure monitoring."
+  is_canonical: true
+  implements:
+  - CH
+  - SS
+  - SWTC
+  - DX2SWC
+  - SWISOVM
+  - REFPM2X
+
 CH_SS_CHWRWISOVPM_SCHWTC_CHWDPM:
   guid: "6bf879c5-ec1b-478f-9fac-8318b285bd9c"
   description: "Simple air-cooled chiller."
@@ -559,6 +571,20 @@ CH_SS_SWTC_DX4SWC_SWISOVPM_REFSM2X_REFPM2X:
   - REFSM2X
   - REFPM2X
 
+CH_SS_SWTC_WDPM_DX4SWC_SWISOVPM_REFSM2X_REFPM2X:
+  guid: "c2c25a1f-44cb-4c3e-9e49-18735d656431"
+  description: "Four-stage air-cooled chiller with differential pressure monitoring and two-circuit refrigerant temperature and pressure monitoring."
+  is_canonical: true
+  implements:
+  - CH
+  - SS
+  - SWTC
+  - WDPM
+  - DX4SWC
+  - SWISOVPM
+  - REFSM2X
+  - REFPM2X
+
 CH_SS_SCHWTC_HWDT:
   guid: "ef865ad6-bf61-41f5-b717-ebaa4240d853"
   description: "Simple air-cooled heat recovery chiller."

diff --git a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
@@ -447,6 +447,18 @@ CHWS_SEWDPC_SESWTC_SERWFRM_PRWFRM_PWDT:
   - PRWFRM
   - PWDT
 
+CHWS_PRSWTC_PRWFRM_SEWDPC_SEWTM_SEWFRM:
+  guid: "3d55637e-976c-4ff5-b86d-f99f7f910ab9"
+  description: "Chilled water system with primary loop supply water temperature control and flowrate monitoring, secondary loop water temperature and flow monitoring and differential pressure control."
+  is_canonical: true
+  implements:
+  - CHWS
+  - PRSWTC
+  - PRWFRM
+  - SEWDPC
+  - SEWTM
+  - SEWFRM
+
 CHWS_SEWDPC_SESWTC_SERWFRM_PRWFRM_PRWDPC_PWDT:
   guid: "fe148047-bc3a-48be-96e8-c1d589e2d4e6"
   description: "Chilled water system with secondary loop supply water temperature control, primary and secondary differential pressure control, primary and secondary flowrate monitoring."

diff --git a/ontology/yaml/resources/HVAC/entity_types/DC.yaml b/ontology/yaml/resources/HVAC/entity_types/DC.yaml
@@ -46,3 +46,14 @@ DC_SS_SWTC_RWISOVM:
   - SS
   - SWTC
   - RWISOVM
+
+DC_SS_VSC_SWTC_SWISOVM:
+  guid: "6f384455-0b46-4f86-a7b3-fc08dda6fe11"
+  description: "Dry air cooler with isolation valve on the supply side."
+  is_canonical: true
+  implements:
+  - DC
+  - SS
+  - VSC
+  - SWTC
+  - SWISOVM
diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -1143,6 +1143,9 @@ literals:
 - primary_supply_water_temperature_sensor:
     flexible_min: 255.9259259
     flexible_max: 380.3703704
+- primary_supply_water_temperature_setpoint:
+    flexible_min: 255.9259259
+    flexible_max: 380.3703704
 - primary_supply_water_flowrate_sensor:
     flexible_min: -0.000315451
     flexible_max: 0.315451