From 01b163e35048ecf6abd63068bf36e6bf1075cece Mon Sep 17 00:00:00 2001 From: Kevin Date: Wed, 10 May 2023 12:36:36 +0100 Subject: [PATCH 1/3] added tank with level, temp monitoring --- .../yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 12 ++++++++++++ ontology/yaml/resources/HVAC/entity_types/TANK.yaml | 7 +++++++ 2 files changed, 19 insertions(+) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index 8b1e878b8..80a3adddb 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -6618,3 +6618,15 @@ VMADC: - mixed_air_damper_percentage_sensor implements: - CONTROL + +TLM: + description: "Level and temperature monitoring" + is_abstract: true + uses: + - supply_water_temperature_sensor + - water_high_level_status + - water_low_level_status + - high_water_temperature_alarm + - high_water_temperature_setpoint + implements: + - MONITORING \ No newline at end of file diff --git a/ontology/yaml/resources/HVAC/entity_types/TANK.yaml b/ontology/yaml/resources/HVAC/entity_types/TANK.yaml index be15ea179..e2d91b459 100644 --- a/ontology/yaml/resources/HVAC/entity_types/TANK.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/TANK.yaml @@ -43,3 +43,10 @@ TK_LM: implements: - /TK # Inherits from global namespace - LM + +TK_TLM: + description: "Tank with level monitoring " + is_canonical: true + implements: + - /TK # Inherits from global namespace + - TLM From d8965c5136584ea4b755246a3a19ec740aab5068 Mon Sep 17 00:00:00 2001 From: Kevin Date: Wed, 10 May 2023 12:41:21 +0100 Subject: [PATCH 2/3] tank type x2 --- .../resources/HVAC/entity_types/ABSTRACT.yaml | 17 +++++++++++++++++ .../yaml/resources/HVAC/entity_types/TANK.yaml | 8 ++++++++ 2 files changed, 25 insertions(+) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index 80a3adddb..214bd3a45 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -6629,4 +6629,21 @@ TLM: - high_water_temperature_alarm - high_water_temperature_setpoint implements: + - MONITORING + +TLM2X: + description: "Level and temperature monitoring 2x" + is_abstract: true + uses: + - supply_water_temperature_sensor_1 + - water_high_level_status_1 + - water_low_level_status_1 + - high_water_temperature_setpoint_1 + - high_water_temperature_alarm_1 + - supply_water_temperature_sensor_2 + - water_high_level_status_2 + - water_low_level_status_2 + - high_water_temperature_setpoint_2 + - high_water_temperature_alarm_2 + implements: - MONITORING \ No newline at end of file diff --git a/ontology/yaml/resources/HVAC/entity_types/TANK.yaml b/ontology/yaml/resources/HVAC/entity_types/TANK.yaml index e2d91b459..49c32749d 100644 --- a/ontology/yaml/resources/HVAC/entity_types/TANK.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/TANK.yaml @@ -50,3 +50,11 @@ TK_TLM: implements: - /TK # Inherits from global namespace - TLM + + +TK_TLM2X: + description: "Tank with level monitoring " + is_canonical: true + implements: + - /TK # Inherits from global namespace + - TLM2X \ No newline at end of file From 1cc3a96cef0c20791c7f10f539105590b0cf943b Mon Sep 17 00:00:00 2001 From: Kevin Date: Wed, 10 May 2023 12:45:09 +0100 Subject: [PATCH 3/3] added field --- ontology/yaml/resources/fields/telemetry_fields.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml index 1fbe39850..67d2c069e 100644 --- a/ontology/yaml/resources/fields/telemetry_fields.yaml +++ b/ontology/yaml/resources/fields/telemetry_fields.yaml @@ -3110,3 +3110,7 @@ literals: - ultraviolet_irradiance_sensor: fixed_min: 0.0 flexible_max: 2000.0 + +- high_water_temperature_setpoint: + flexible_min: 255.9259259 + flexible_max: 380.3703704