From 004d59fadb37205949da3534fe27585b9406b617 Mon Sep 17 00:00:00 2001 From: anil72007 <34532425+anil72007@users.noreply.github.com> Date: Wed, 16 Mar 2022 09:42:16 +0530 Subject: [PATCH 1/5] Add files via upload --- bricksrc/sensor.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/bricksrc/sensor.py b/bricksrc/sensor.py index d5fb804f..c9b49888 100644 --- a/bricksrc/sensor.py +++ b/bricksrc/sensor.py @@ -325,6 +325,19 @@ }, }, }, + "NH3_Sensor": { + "substances": [[BRICK.measures, BRICK.Air]], + "subclasses": { + "Ammonia_Sensor": { + "tags": [ + TAG.Outside, + TAG.Air, + TAG.Sensor, + ], + }, + }, + "tags": [TAG.Outside, TAG.Air, TAG.Sensor], + }, "Angle_Sensor": { "substances": [[BRICK.measures, BRICK.Angle]], "subclasses": { From a60da738c0d0a539502a6b808903f5b876230fef Mon Sep 17 00:00:00 2001 From: anil72007 Date: Wed, 16 Mar 2022 10:03:01 +0530 Subject: [PATCH 2/5] Updated Sensor.py --- bricksrc/sensor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bricksrc/sensor.py b/bricksrc/sensor.py index c9b49888..9211cbee 100644 --- a/bricksrc/sensor.py +++ b/bricksrc/sensor.py @@ -330,13 +330,13 @@ "subclasses": { "Ammonia_Sensor": { "tags": [ - TAG.Outside, + TAG.Air, TAG.Sensor, ], }, }, - "tags": [TAG.Outside, TAG.Air, TAG.Sensor], + "tags": [ TAG.Air, TAG.Sensor], }, "Angle_Sensor": { "substances": [[BRICK.measures, BRICK.Angle]], From 9a47cca19b0d8070c4e2ca1cf8dddc06846a7fc7 Mon Sep 17 00:00:00 2001 From: anil72007 Date: Thu, 17 Mar 2022 10:28:41 +0530 Subject: [PATCH 3/5] Add Ammonia Concentration Ammonia Concentration --- bricksrc/quantities.py | 11 +++++++++++ bricksrc/sensor.py | 21 ++++++++------------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/bricksrc/quantities.py b/bricksrc/quantities.py index 662408d0..d664a5c4 100644 --- a/bricksrc/quantities.py +++ b/bricksrc/quantities.py @@ -36,6 +36,17 @@ def get_units(qudt_quantity): quantity_definitions = { "Air_Quality": { SKOS.narrower: { + "Ammonia_Concentration": { + QUDT.applicableUnit: [UNIT.PPM, UNIT.PPB], + QUDT.hasDimensionVector: QUDTDV["A0E0L0I0M0H0T0D1"], + SKOS.definition: Literal( + "The concentration of Ammonia in a medium" + ), + RDFS.isDefinedBy: URIRef(str(BRICK).strip("#")), + RDFS.label: Literal("AmmoniaConcentration"), + SKOS.broader: QUDTQK.DimensionlessRatio, + + }, "CO_Concentration": { QUDT.applicableUnit: [UNIT.PPM, UNIT.PPB], QUDT.hasDimensionVector: QUDTDV["A0E0L0I0M0H0T0D1"], diff --git a/bricksrc/sensor.py b/bricksrc/sensor.py index 9211cbee..8c94db7b 100644 --- a/bricksrc/sensor.py +++ b/bricksrc/sensor.py @@ -19,6 +19,13 @@ "Air_Quality_Sensor": { "tags": [TAG.Point, TAG.Sensor, TAG.Air, TAG.Quality], "subclasses": { + "Ammonia_Sensor": { + "tags": [TAG.Point, TAG.Ammonia, TAG.Sensor], + "substances": [ + [BRICK.measures, BRICK.Air], + [BRICK.measures, BRICK.Ammonia_Concentration], + ], + }, "CO_Sensor": { "tags": [TAG.Point, TAG.Sensor, TAG.CO], "substances": [ @@ -325,19 +332,7 @@ }, }, }, - "NH3_Sensor": { - "substances": [[BRICK.measures, BRICK.Air]], - "subclasses": { - "Ammonia_Sensor": { - "tags": [ - - TAG.Air, - TAG.Sensor, - ], - }, - }, - "tags": [ TAG.Air, TAG.Sensor], - }, + "Angle_Sensor": { "substances": [[BRICK.measures, BRICK.Angle]], "subclasses": { From 7a2c7b2607135a40e57cf4771b6a48829257df90 Mon Sep 17 00:00:00 2001 From: anil72007 Date: Sun, 12 Jun 2022 11:33:26 +0530 Subject: [PATCH 4/5] Update quantities.py --- bricksrc/quantities.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bricksrc/quantities.py b/bricksrc/quantities.py index d664a5c4..aedbb737 100644 --- a/bricksrc/quantities.py +++ b/bricksrc/quantities.py @@ -38,7 +38,7 @@ def get_units(qudt_quantity): SKOS.narrower: { "Ammonia_Concentration": { QUDT.applicableUnit: [UNIT.PPM, UNIT.PPB], - QUDT.hasDimensionVector: QUDTDV["A0E0L0I0M0H0T0D1"], + QUDT.hasDimensionVector: QUDTDV["A0E0L0I0M0H0T0D1"], SKOS.definition: Literal( "The concentration of Ammonia in a medium" ), From 2a0c87c5300c2b27d1cb4b9b24819b3666a9e031 Mon Sep 17 00:00:00 2001 From: anil72007 Date: Tue, 14 Jun 2022 14:31:19 +0530 Subject: [PATCH 5/5] Tablet Added to Equipment Tablet Added to Equipment --- bricksrc/definitions.csv | 1 + bricksrc/equipment.py | 1 + bricksrc/sensor.py | 1 + 3 files changed, 3 insertions(+) diff --git a/bricksrc/definitions.csv b/bricksrc/definitions.csv index b02c6324..57b71194 100644 --- a/bricksrc/definitions.csv +++ b/bricksrc/definitions.csv @@ -1121,3 +1121,4 @@ https://brickschema.org/schema/Brick#measures,The subject measures a quantity or https://brickschema.org/schema/Brick#regulates,The subject contributes to or performs the regulation of the substance given by the object, https://brickschema.org/schema/Brick#storedAt,A reference to where the data for this TimeseriesReference is stored, https://brickschema.org/schema/Brick#timeseries,Relates a Brick point to the TimeseriesReference that indicates where and how the data for this point is stored, +https://brickschema.org/schema/Brick#Tablet, Tablet diff --git a/bricksrc/equipment.py b/bricksrc/equipment.py index a6495c01..0c3ac1b3 100644 --- a/bricksrc/equipment.py +++ b/bricksrc/equipment.py @@ -4,6 +4,7 @@ Set up subclasses of the equipment superclass """ equipment_subclasses = { + "Tablet": {"tags": [TAG.Tablet, TAG.Equipment, TAG.Electronics]}, "HVAC_Equipment": {"tags": [TAG.HVAC, TAG.Equipment]}, "Weather_Station": {"tags": [TAG.Weather, TAG.Station, TAG.Equipment]}, "Electrical_Equipment": { diff --git a/bricksrc/sensor.py b/bricksrc/sensor.py index 8c94db7b..6bad293d 100644 --- a/bricksrc/sensor.py +++ b/bricksrc/sensor.py @@ -26,6 +26,7 @@ [BRICK.measures, BRICK.Ammonia_Concentration], ], }, + "CO_Sensor": { "tags": [TAG.Point, TAG.Sensor, TAG.CO], "substances": [