From d2ca48e46aed8560318d99941325fbe07a816474 Mon Sep 17 00:00:00 2001 From: Gabe Fierro Date: Wed, 27 Sep 2023 13:56:42 -0600 Subject: [PATCH] add gauge pressure sensors --- bricksrc/definitions.csv | 3 ++ bricksrc/sensor.py | 92 ++++++++++++++++++++++++++++++++++------ 2 files changed, 81 insertions(+), 14 deletions(-) diff --git a/bricksrc/definitions.csv b/bricksrc/definitions.csv index 7d849cc9..a5f327e2 100644 --- a/bricksrc/definitions.csv +++ b/bricksrc/definitions.csv @@ -126,6 +126,7 @@ https://brickschema.org/schema/Brick#Chilled_Water_Differential_Pressure_Step_Pa https://brickschema.org/schema/Brick#Chilled_Water_Differential_Temperature_Sensor,Measures the difference in temperature between the entering water to the chiller or other water cooling device and leaving water from the same chiller or other water cooling device, https://brickschema.org/schema/Brick#Chilled_Water_Flow_Sensor,Measures the rate of flow in a chilled water circuit, https://brickschema.org/schema/Brick#Chilled_Water_Flow_Setpoint,Sets the target flow rate of chilled water, +https://brickschema.org/schema/Brick#Chilled_Water_Gauge_Pressure_Sensor,Sensor measuring the gauge pressure (zero-referenced against ambient air pressure) of chilled water, https://brickschema.org/schema/Brick#Chilled_Water_Loop,A collection of equipment that transport and regulate chilled water among each other, https://brickschema.org/schema/Brick#Chilled_Water_Meter,A meter that measures the usage or consumption of chilled water, https://brickschema.org/schema/Brick#Chilled_Water_Pump,A pump that performs work on chilled water; typically part of a chilled water system, @@ -465,6 +466,7 @@ https://brickschema.org/schema/Brick#Gas_Meter,A meter that measures the usage o https://brickschema.org/schema/Brick#Gas_Sensor,Measures gas concentration (other than CO2), https://brickschema.org/schema/Brick#Gasoline,Petroleum derived liquid used as a fuel source, https://brickschema.org/schema/Brick#Gatehouse,The standalone building used to manage the entrance to a campus or building grounds, +https://brickschema.org/schema/Brick#Gauge_Pressure_Sensor,Pressure sensor which is zero-referenced against ambient air pressure, https://brickschema.org/schema/Brick#Generation_Sensor,A sensor measuring how much something has been generated., https://brickschema.org/schema/Brick#Generator_Room,"A room for electrical equipment, specifically electrical generators.", https://brickschema.org/schema/Brick#Grains,, @@ -530,6 +532,7 @@ https://brickschema.org/schema/Brick#Hot_Water_Differential_Temperature_Sensor,M https://brickschema.org/schema/Brick#Hot_Water_Discharge_Temperature_Load_Shed_Status,, https://brickschema.org/schema/Brick#Hot_Water_Flow_Sensor,Measures the rate of flow in a hot water circuit, https://brickschema.org/schema/Brick#Hot_Water_Flow_Setpoint,Sets the target flow rate of hot water, +https://brickschema.org/schema/Brick#Hot_Water_Gauge_Pressure_Sensor,Sensor measuring the gauge pressure (zero-referenced against ambient air pressure) of hot water, https://brickschema.org/schema/Brick#Hot_Water_Loop,A collection of equipment that transport and regulate hot water among each other, https://brickschema.org/schema/Brick#Hot_Water_Meter,A meter that measures the usage or consumption of hot water, https://brickschema.org/schema/Brick#Hot_Water_Pump,A pump that performs work on hot water; typically part of a hot water system, diff --git a/bricksrc/sensor.py b/bricksrc/sensor.py index f7bd23b3..6085e1f4 100644 --- a/bricksrc/sensor.py +++ b/bricksrc/sensor.py @@ -674,11 +674,16 @@ TAG.Discharge, ], BRICK.hasQuantity: BRICK.Flow, - BRICK.hasSubstance: [BRICK.Supply_Air, BRICK.Discharge_Air], + BRICK.hasSubstance: [ + BRICK.Supply_Air, + BRICK.Discharge_Air, + ], "aliases": [BRICK["Discharge_Air_Flow_Sensor"]], "subclasses": { "Average_Supply_Air_Flow_Sensor": { - "aliases": [BRICK["Average_Discharge_Air_Flow_Sensor"]], + "aliases": [ + BRICK["Average_Discharge_Air_Flow_Sensor"] + ], "tags": [ TAG.Point, TAG.Average, @@ -952,7 +957,10 @@ ], "aliases": [BRICK["Discharge_Air_Humidity_Sensor"]], BRICK.hasQuantity: BRICK.Relative_Humidity, - BRICK.hasSubstance: [BRICK.Supply_Air, BRICK.Discharge_Air], + BRICK.hasSubstance: [ + BRICK.Supply_Air, + BRICK.Discharge_Air, + ], }, "Zone_Air_Humidity_Sensor": { "tags": [ @@ -1029,6 +1037,31 @@ "tags": [TAG.Point, TAG.Sensor, TAG.Pressure], BRICK.hasQuantity: BRICK.Pressure, "subclasses": { + "Gauge_Pressure_Sensor": { + "tags": [TAG.Point, TAG.Sensor, TAG.Pressure, TAG.Gauge], + "subclasses": { + "Chilled_Water_Gauge_Pressure_Sensor": { + "tags": [ + TAG.Point, + TAG.Sensor, + TAG.Chilled, + TAG.Water, + TAG.Gauge, + TAG.Pressure, + ], + }, + "Hot_Water_Gauge_Pressure_Sensor": { + "tags": [ + TAG.Point, + TAG.Sensor, + TAG.Hot, + TAG.Water, + TAG.Gauge, + TAG.Pressure, + ], + }, + }, + }, "Differential_Pressure_Sensor": { "tags": [TAG.Point, TAG.Sensor, TAG.Pressure, TAG.Differential], BRICK.hasQuantity: BRICK.Differential_Pressure, @@ -1072,10 +1105,17 @@ BRICK.hasQuantity: BRICK.Differential_Pressure, BRICK.hasSubstance: BRICK.Supply_Air, "substances": [ - [BRICK.measures, BRICK.Differential_Pressure], + [ + BRICK.measures, + BRICK.Differential_Pressure, + ], [BRICK.measures, BRICK.Discharge_Air], ], - "aliases": [BRICK["Discharge_Air_Differential_Pressure_Sensor"]], + "aliases": [ + BRICK[ + "Discharge_Air_Differential_Pressure_Sensor" + ] + ], "tags": [ TAG.Point, TAG.Supply, @@ -1162,9 +1202,14 @@ TAG.Supply, TAG.Discharge, ], - "aliases": [BRICK["Discharge_Air_Static_Pressure_Sensor"]], + "aliases": [ + BRICK["Discharge_Air_Static_Pressure_Sensor"] + ], BRICK.hasQuantity: BRICK.Static_Pressure, - BRICK.hasSubstance: [BRICK.Supply_Air, BRICK.Discharge_Air], + BRICK.hasSubstance: [ + BRICK.Supply_Air, + BRICK.Discharge_Air, + ], }, "Exhaust_Air_Static_Pressure_Sensor": { "tags": [ @@ -1241,9 +1286,14 @@ TAG.Discharge, TAG.Air, ], - "aliases": [BRICK["Discharge_Air_Velocity_Pressure_Sensor"]], + "aliases": [ + BRICK["Discharge_Air_Velocity_Pressure_Sensor"] + ], BRICK.hasQuantity: BRICK.Velocity_Pressure, - BRICK.hasSubstance: [BRICK.Supply_Air, BRICK.Discharge_Air], + BRICK.hasSubstance: [ + BRICK.Supply_Air, + BRICK.Discharge_Air, + ], }, }, }, @@ -1312,7 +1362,14 @@ "tags": [TAG.Point, TAG.Rain, TAG.Duration, TAG.Sensor], }, "On_Timer_Sensor": { - "tags": [TAG.Point, TAG.On, TAG.Timer, TAG.Run, TAG.Time, TAG.Sensor], + "tags": [ + TAG.Point, + TAG.On, + TAG.Timer, + TAG.Run, + TAG.Time, + TAG.Sensor, + ], "aliases": [BRICK.Run_Time_Sensor], }, }, @@ -1440,8 +1497,8 @@ TAG.Usage, TAG.Sensor, ] - } - } + }, + }, }, "Water_Usage_Sensor": { "tags": [TAG.Point, TAG.Sensor, TAG.Usage, TAG.Water], @@ -1500,11 +1557,18 @@ TAG.Discharge, ], BRICK.hasQuantity: BRICK.Temperature, - BRICK.hasSubstance: [BRICK.Supply_Air, BRICK.Discharge_Air], + BRICK.hasSubstance: [ + BRICK.Supply_Air, + BRICK.Discharge_Air, + ], "aliases": [BRICK["Discharge_Air_Temperature_Sensor"]], "subclasses": { "Preheat_Supply_Air_Temperature_Sensor": { - "aliases": [BRICK["Preheat_Discharge_Air_Temperature_Sensor"]], + "aliases": [ + BRICK[ + "Preheat_Discharge_Air_Temperature_Sensor" + ] + ], "tags": [ TAG.Point, TAG.Preheat,