From 0005c20872346ce67277a64f787738fc79c72abc Mon Sep 17 00:00:00 2001 From: terryterpt Date: Sun, 8 Dec 2024 01:43:55 +0800 Subject: [PATCH 1/2] move the smoke alarm and filter alarm from DOAS to MAU type --- ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml b/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml index ad2ba96df..aad8cb22b 100644 --- a/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml @@ -107,6 +107,8 @@ MAU: - failed_communication_alarm - failed_alarm - emergency_alarm + - smoke_alarm + - filter_alarm implements: - EQUIPMENT @@ -402,8 +404,6 @@ DOAS: is_abstract: true opt_uses: - failed_communication_alarm - - smoke_alarm - - filter_alarm implements: - EQUIPMENT From 26d117aeeb58d958a8cfce7a7320a8636e869f28 Mon Sep 17 00:00:00 2001 From: terryterpt Date: Tue, 17 Dec 2024 16:47:10 +0800 Subject: [PATCH 2/2] update DOAS general type and add new LS type --- .../yaml/resources/HVAC/entity_types/GENERALTYPES.yaml | 2 ++ .../yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml | 8 ++++++++ ontology/yaml/resources/LIGHTING/entity_types/LS.yaml | 8 ++++++++ 3 files changed, 18 insertions(+) diff --git a/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml b/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml index 2321fade4..3dd4044b8 100644 --- a/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml @@ -404,6 +404,8 @@ DOAS: is_abstract: true opt_uses: - failed_communication_alarm + - smoke_alarm + - filter_alarm implements: - EQUIPMENT diff --git a/ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml index b62828613..e90dad906 100644 --- a/ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml @@ -218,3 +218,11 @@ CTC: - lighting_color_temperature_sensor uses: - lighting_color_temperature_setpoint + + +LPS: + guid: "a6981abe-eb32-4431-88fa-9b2660b84762" + description: "Individual lighting percentage sensor monitoring, not used for control" + is_abstract: true + uses: + - lighting_percentage_sensor \ No newline at end of file diff --git a/ontology/yaml/resources/LIGHTING/entity_types/LS.yaml b/ontology/yaml/resources/LIGHTING/entity_types/LS.yaml index d812ec8b2..98d30e4e9 100644 --- a/ontology/yaml/resources/LIGHTING/entity_types/LS.yaml +++ b/ontology/yaml/resources/LIGHTING/entity_types/LS.yaml @@ -94,3 +94,11 @@ LS_OS_IS_MTS: - zone_air_temperature_sensor - zone_air_relative_humidity_sensor +LS_LPS_OS: + guid: "502f5b67-1373-47e7-b151-08f185b67ec7" + description: "Lighting percentage sensing and zone occupancy monitoring" + is_canonical: true + implements: + - LS + - LPS + - OS \ No newline at end of file