From 4d2a325fe33a1e18bc626a7cd8e7da2be8bb90d8 Mon Sep 17 00:00:00 2001 From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com> Date: Tue, 18 Jun 2024 14:18:07 -0700 Subject: [PATCH 1/4] Linter --- ontology/yaml/resources/fields/telemetry_fields.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml index 3fa4d01a8..e770b7bd1 100644 --- 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 From b9f27d199a270fcff246fd2b12e8336e1d34c468 Mon Sep 17 00:00:00 2001 From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com> Date: Tue, 18 Jun 2024 14:19:27 -0700 Subject: [PATCH 2/4] Update FCU.yaml --- .../yaml/resources/HVAC/entity_types/FCU.yaml | 80 ++++++++++--------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml index 890e30cf5..48f568976 100644 --- a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml @@ -1503,6 +1503,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 ### ################################### @@ -1943,41 +1985,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 \ No newline at end of file From 851e4f98220754be07dacc7b8da192dd06c50513 Mon Sep 17 00:00:00 2001 From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com> Date: Tue, 18 Jun 2024 14:19:54 -0700 Subject: [PATCH 3/4] Update subfields.yaml --- ontology/yaml/resources/subfields/subfields.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ontology/yaml/resources/subfields/subfields.yaml b/ontology/yaml/resources/subfields/subfields.yaml index 06aefbd7d..eabb1f019 100644 --- 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." From 7e4d89c58164839fcd32717608aaf157696eda3d Mon Sep 17 00:00:00 2001 From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com> Date: Tue, 18 Jun 2024 15:16:34 -0700 Subject: [PATCH 4/4] Update FCU.yaml --- ontology/yaml/resources/HVAC/entity_types/FCU.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml index 48f568976..390760deb 100644 --- a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml @@ -1504,7 +1504,7 @@ FCU_DFSS_RHDHC_HT2RC_DX2RC_ZTM: - ZTM FCU_DSP_DFVSC_DTM_RTM: -is_canonical: true + 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: @@ -1515,7 +1515,7 @@ is_canonical: true - RTM FCU_DFSS_DFSMC_HWRC: -is_canonical: true + is_canonical: true guid: "1388eea8-a039-4b33-8613-24ae9de719dd" description: "Warm air curtain with return air temperature control." implements: @@ -1525,7 +1525,7 @@ is_canonical: true - HWRC FCU_DFVSC_RTM_CO2M_HWZTC_CHWZTC: -is_canonical: true + 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: @@ -1537,7 +1537,7 @@ is_canonical: true - CHWZTC FCU_DFMSC_CHWZTC: -is_canonical: true + 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: