Skip to content

Commit

Permalink
Merge branch 'anil72007-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@gtfierro
gtfierro committed Dec 7, 2023
2 parents 0d63902 + 10f0bd2 commit fe931ec
Show file tree
Hide file tree
Showing 3 changed files with 162 additions and 41 deletions.
1 change: 1 addition & 0 deletions bricksrc/definitions.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1029,6 +1029,7 @@ https://brickschema.org/schema/Brick#System_Status,Indicates properties of the a
https://brickschema.org/schema/Brick#TABS_Panel,See Thermally_Activated_Building_System_Panel,
https://brickschema.org/schema/Brick#TETRA_Room,"A room used for local two-way radio networks, e.g. the portable radios carried by facilities staff",
https://brickschema.org/schema/Brick#TVOC_Level_Sensor,A sensor measuring the level of all VOCs in air,
https://brickschema.org/schema/Brick#Tablet,"A flat, handheld mobile computer, usually with a touchscreen"
https://brickschema.org/schema/Brick#Tank,A container designed to hold or store fluids for various applications within a system.,
https://brickschema.org/schema/Brick#Team_Room,An office used by multiple team members for specific work tasks. Distinct from Conference Room,
https://brickschema.org/schema/Brick#Telecom_Room,A class of spaces used to support telecommuncations and IT equipment,
Expand Down
135 changes: 108 additions & 27 deletions bricksrc/equipment.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@
"ICT_Equipment": {
"tags": [TAG.ICT, TAG.Equipment],
"subclasses": {
"ICT_Hardware": {
"tags": [TAG.Equipment, TAG.ICT, TAG.Hardware],
"subclasses": {
"Tablet": {
"tags": [TAG.Equipment, TAG.ICT, TAG.Hardware, TAG.Tablet]
},
},
},
"Sensor_Equipment": {
"tags": [TAG.Sensor, TAG.Equipment, TAG.ICT],
},
Expand Down Expand Up @@ -51,7 +59,7 @@
"Photovoltaic_Inverter": {
"tags": [TAG.Photovoltaic, TAG.Inverter, TAG.Equipment]
}
}
},
},
"PlugStrip": {"tags": [TAG.PlugStrip, TAG.Equipment]},
"Disconnect_Switch": {"tags": [TAG.Disconnect, TAG.Switch, TAG.Equipment]},
Expand All @@ -74,7 +82,13 @@
"tags": [TAG.Equipment, TAG.Motor],
"subclasses": {
"Variable_Frequency_Drive": {
"tags": [TAG.Equipment, TAG.Variable, TAG.Frequency, TAG.Drive, TAG.VFD],
"tags": [
TAG.Equipment,
TAG.Variable,
TAG.Frequency,
TAG.Drive,
TAG.VFD,
],
"aliases": [BRICK["VFD"]],
"subclasses": {
"Heat_Wheel_VFD": {
Expand Down Expand Up @@ -243,59 +257,119 @@
"tags": [TAG.Water, TAG.Storage, TAG.Equipment],
"subclasses": {
"Chilled_Water_Storage_Tank": {
"tags": [TAG.Chilled, TAG.Water, TAG.Storage, TAG.Equipment]
"tags": [
TAG.Chilled,
TAG.Water,
TAG.Storage,
TAG.Equipment,
]
},
"Cold_Water_Storage_Tank": {
"tags": [TAG.Cold, TAG.Water, TAG.Storage, TAG.Equipment]
"tags": [
TAG.Cold,
TAG.Water,
TAG.Storage,
TAG.Equipment,
]
},
"Hot_Water_Storage_Tank": {
"tags": [TAG.Hot, TAG.Water, TAG.Storage, TAG.Equipment]
},
"Fire_Sprinkler_Water_Storage_Tank": {
"tags": [TAG.Fire, TAG.Water, TAG.Storage, TAG.Equipment]
"tags": [
TAG.Fire,
TAG.Water,
TAG.Storage,
TAG.Equipment,
]
},
"Rain_Water_Storage_Tank": {
"tags": [TAG.Rain, TAG.Water, TAG.Storage, TAG.Equipment]
"tags": [
TAG.Rain,
TAG.Water,
TAG.Storage,
TAG.Equipment,
]
},
}
},
},
"Thermal_Energy_Storage_Tank": {
"tags": [TAG.Thermal, TAG.Energy, TAG.Storage, TAG.Tank, TAG.Equipment],
"tags": [
TAG.Thermal,
TAG.Energy,
TAG.Storage,
TAG.Tank,
TAG.Equipment,
],
"subclasses": {
"Chilled_Water_Thermal_Energy_Storage_Tank": {
"tags": [TAG.Chilled, TAG.Water, TAG.Thermal, TAG.Energy, TAG.Storage, TAG.Tank, TAG.Equipment],
"tags": [
TAG.Chilled,
TAG.Water,
TAG.Thermal,
TAG.Energy,
TAG.Storage,
TAG.Tank,
TAG.Equipment,
],
},
"Hot_Water_Thermal_Energy_Storage_Tank": {
"tags": [TAG.Hot, TAG.Water, TAG.Thermal, TAG.Energy, TAG.Storage, TAG.Tank, TAG.Equipment],
}
}
}
}
"tags": [
TAG.Hot,
TAG.Water,
TAG.Thermal,
TAG.Energy,
TAG.Storage,
TAG.Tank,
TAG.Equipment,
],
},
},
},
},
},
"Thermal_Expansion_Tank": {
"tags": [TAG.Tank, TAG.Equipment],
"subclasses": {
"Chilled_Water_Thermal_Expansion_Tank": {
"tags": [TAG.Chilled, TAG.Thermal, TAG.Expansion, TAG.Tank, TAG.Equipment],
"tags": [
TAG.Chilled,
TAG.Thermal,
TAG.Expansion,
TAG.Tank,
TAG.Equipment,
],
},
"Hot_Water_Thermal_Expansion_Tank": {
"tags": [TAG.Hot, TAG.Thermal, TAG.Expansion, TAG.Tank, TAG.Equipment],
"tags": [
TAG.Hot,
TAG.Thermal,
TAG.Expansion,
TAG.Tank,
TAG.Equipment,
],
},
"Fire_Sprinkler_Thermal_Expansion_Tank": {
"tags": [TAG.Fire, TAG.Thermal, TAG.Expansion, TAG.Tank, TAG.Equipment],
}
}
"tags": [
TAG.Fire,
TAG.Thermal,
TAG.Expansion,
TAG.Tank,
TAG.Equipment,
],
},
},
},
"Separation_Tank": {
"tags": [TAG.Tank, TAG.Equipment],
"subclasses": {
"Grease_Interceptor": {
"tags": [TAG.Waste, TAG.Tank, TAG.Equipment],
}
}
}
}
}
},
},
},
},
}

"""
Expand Down Expand Up @@ -611,7 +685,14 @@
},
"Condenser": {"tags": [TAG.Equipment, TAG.Condenser]},
"Computer_Room_Air_Conditioning": {
"tags": [TAG.Equipment, TAG.Computer, TAG.Room, TAG.Air, TAG.Conditioning, TAG.CRAC],
"tags": [
TAG.Equipment,
TAG.Computer,
TAG.Room,
TAG.Air,
TAG.Conditioning,
TAG.CRAC,
],
"aliases": [BRICK["CRAC"]],
"subclasses": {
"Standby_CRAC": {"tags": [TAG.Equipment, TAG.CRAC, TAG.Standby]},
Expand Down Expand Up @@ -679,8 +760,8 @@
"Air_Handling_Unit": {
"tags": [TAG.Equipment, TAG.Air, TAG.Handling, TAG.Handler, TAG.Unit, TAG.AHU],
"aliases": [
BRICK["AHU"],
BRICK["Air_Handler_Unit"], # here for historical purposes
BRICK["AHU"],
BRICK["Air_Handler_Unit"], # here for historical purposes
],
"subclasses": {
"Dedicated_Outdoor_Air_System_Unit": {
Expand Down Expand Up @@ -708,7 +789,7 @@
},
"Pre-Cooling_Air_Unit": {
"tags": [TAG.Equipment, TAG.PAU],
"aliases": [BRICK["PAU"]]
"aliases": [BRICK["PAU"]],
},
},
},
Expand Down
67 changes: 53 additions & 14 deletions bricksrc/sensor.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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": [
Expand Down Expand Up @@ -1072,10 +1080,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,
Expand Down Expand Up @@ -1162,9 +1177,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": [
Expand Down Expand Up @@ -1241,9 +1261,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,
],
},
},
},
Expand Down Expand Up @@ -1312,7 +1337,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],
},
},
Expand Down Expand Up @@ -1440,8 +1472,8 @@
TAG.Usage,
TAG.Sensor,
]
}
}
},
},
},
"Water_Usage_Sensor": {
"tags": [TAG.Point, TAG.Sensor, TAG.Usage, TAG.Water],
Expand Down Expand Up @@ -1500,11 +1532,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,
Expand Down

0 comments on commit fe931ec

Please sign in to comment.