Skip to content

Commit 10f0bd2

Browse files
gtfierrogtfierro
committed
Merge branch 'master' of github.com:anil72007/Brick into anil72007-master
2 parents 0d63902 + 2a0c87c commit 10f0bd2

File tree

3 files changed

+162
-41
lines changed

3 files changed

+162
-41
lines changed

‎bricksrc/definitions.csv‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1029,6 +1029,7 @@ https://brickschema.org/schema/Brick#System_Status,Indicates properties of the a
10291029
https://brickschema.org/schema/Brick#TABS_Panel,See Thermally_Activated_Building_System_Panel,
10301030
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",
10311031
https://brickschema.org/schema/Brick#TVOC_Level_Sensor,A sensor measuring the level of all VOCs in air,
1032+
https://brickschema.org/schema/Brick#Tablet,"A flat, handheld mobile computer, usually with a touchscreen"
10321033
https://brickschema.org/schema/Brick#Tank,A container designed to hold or store fluids for various applications within a system.,
10331034
https://brickschema.org/schema/Brick#Team_Room,An office used by multiple team members for specific work tasks. Distinct from Conference Room,
10341035
https://brickschema.org/schema/Brick#Telecom_Room,A class of spaces used to support telecommuncations and IT equipment,

‎bricksrc/equipment.py‎

Lines changed: 108 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@
99
"ICT_Equipment": {
1010
"tags": [TAG.ICT, TAG.Equipment],
1111
"subclasses": {
12+
"ICT_Hardware": {
13+
"tags": [TAG.Equipment, TAG.ICT, TAG.Hardware],
14+
"subclasses": {
15+
"Tablet": {
16+
"tags": [TAG.Equipment, TAG.ICT, TAG.Hardware, TAG.Tablet]
17+
},
18+
},
19+
},
1220
"Sensor_Equipment": {
1321
"tags": [TAG.Sensor, TAG.Equipment, TAG.ICT],
1422
},
@@ -51,7 +59,7 @@
5159
"Photovoltaic_Inverter": {
5260
"tags": [TAG.Photovoltaic, TAG.Inverter, TAG.Equipment]
5361
}
54-
}
62+
},
5563
},
5664
"PlugStrip": {"tags": [TAG.PlugStrip, TAG.Equipment]},
5765
"Disconnect_Switch": {"tags": [TAG.Disconnect, TAG.Switch, TAG.Equipment]},
@@ -74,7 +82,13 @@
7482
"tags": [TAG.Equipment, TAG.Motor],
7583
"subclasses": {
7684
"Variable_Frequency_Drive": {
77-
"tags": [TAG.Equipment, TAG.Variable, TAG.Frequency, TAG.Drive, TAG.VFD],
85+
"tags": [
86+
TAG.Equipment,
87+
TAG.Variable,
88+
TAG.Frequency,
89+
TAG.Drive,
90+
TAG.VFD,
91+
],
7892
"aliases": [BRICK["VFD"]],
7993
"subclasses": {
8094
"Heat_Wheel_VFD": {
@@ -243,59 +257,119 @@
243257
"tags": [TAG.Water, TAG.Storage, TAG.Equipment],
244258
"subclasses": {
245259
"Chilled_Water_Storage_Tank": {
246-
"tags": [TAG.Chilled, TAG.Water, TAG.Storage, TAG.Equipment]
260+
"tags": [
261+
TAG.Chilled,
262+
TAG.Water,
263+
TAG.Storage,
264+
TAG.Equipment,
265+
]
247266
},
248267
"Cold_Water_Storage_Tank": {
249-
"tags": [TAG.Cold, TAG.Water, TAG.Storage, TAG.Equipment]
268+
"tags": [
269+
TAG.Cold,
270+
TAG.Water,
271+
TAG.Storage,
272+
TAG.Equipment,
273+
]
250274
},
251275
"Hot_Water_Storage_Tank": {
252276
"tags": [TAG.Hot, TAG.Water, TAG.Storage, TAG.Equipment]
253277
},
254278
"Fire_Sprinkler_Water_Storage_Tank": {
255-
"tags": [TAG.Fire, TAG.Water, TAG.Storage, TAG.Equipment]
279+
"tags": [
280+
TAG.Fire,
281+
TAG.Water,
282+
TAG.Storage,
283+
TAG.Equipment,
284+
]
256285
},
257286
"Rain_Water_Storage_Tank": {
258-
"tags": [TAG.Rain, TAG.Water, TAG.Storage, TAG.Equipment]
287+
"tags": [
288+
TAG.Rain,
289+
TAG.Water,
290+
TAG.Storage,
291+
TAG.Equipment,
292+
]
259293
},
260-
}
294+
},
261295
},
262296
"Thermal_Energy_Storage_Tank": {
263-
"tags": [TAG.Thermal, TAG.Energy, TAG.Storage, TAG.Tank, TAG.Equipment],
297+
"tags": [
298+
TAG.Thermal,
299+
TAG.Energy,
300+
TAG.Storage,
301+
TAG.Tank,
302+
TAG.Equipment,
303+
],
264304
"subclasses": {
265305
"Chilled_Water_Thermal_Energy_Storage_Tank": {
266-
"tags": [TAG.Chilled, TAG.Water, TAG.Thermal, TAG.Energy, TAG.Storage, TAG.Tank, TAG.Equipment],
306+
"tags": [
307+
TAG.Chilled,
308+
TAG.Water,
309+
TAG.Thermal,
310+
TAG.Energy,
311+
TAG.Storage,
312+
TAG.Tank,
313+
TAG.Equipment,
314+
],
267315
},
268316
"Hot_Water_Thermal_Energy_Storage_Tank": {
269-
"tags": [TAG.Hot, TAG.Water, TAG.Thermal, TAG.Energy, TAG.Storage, TAG.Tank, TAG.Equipment],
270-
}
271-
}
272-
}
273-
}
317+
"tags": [
318+
TAG.Hot,
319+
TAG.Water,
320+
TAG.Thermal,
321+
TAG.Energy,
322+
TAG.Storage,
323+
TAG.Tank,
324+
TAG.Equipment,
325+
],
326+
},
327+
},
328+
},
329+
},
274330
},
275331
"Thermal_Expansion_Tank": {
276332
"tags": [TAG.Tank, TAG.Equipment],
277333
"subclasses": {
278334
"Chilled_Water_Thermal_Expansion_Tank": {
279-
"tags": [TAG.Chilled, TAG.Thermal, TAG.Expansion, TAG.Tank, TAG.Equipment],
335+
"tags": [
336+
TAG.Chilled,
337+
TAG.Thermal,
338+
TAG.Expansion,
339+
TAG.Tank,
340+
TAG.Equipment,
341+
],
280342
},
281343
"Hot_Water_Thermal_Expansion_Tank": {
282-
"tags": [TAG.Hot, TAG.Thermal, TAG.Expansion, TAG.Tank, TAG.Equipment],
344+
"tags": [
345+
TAG.Hot,
346+
TAG.Thermal,
347+
TAG.Expansion,
348+
TAG.Tank,
349+
TAG.Equipment,
350+
],
283351
},
284352
"Fire_Sprinkler_Thermal_Expansion_Tank": {
285-
"tags": [TAG.Fire, TAG.Thermal, TAG.Expansion, TAG.Tank, TAG.Equipment],
286-
}
287-
}
353+
"tags": [
354+
TAG.Fire,
355+
TAG.Thermal,
356+
TAG.Expansion,
357+
TAG.Tank,
358+
TAG.Equipment,
359+
],
360+
},
361+
},
288362
},
289363
"Separation_Tank": {
290364
"tags": [TAG.Tank, TAG.Equipment],
291365
"subclasses": {
292366
"Grease_Interceptor": {
293367
"tags": [TAG.Waste, TAG.Tank, TAG.Equipment],
294368
}
295-
}
296-
}
297-
}
298-
}
369+
},
370+
},
371+
},
372+
},
299373
}
300374

301375
"""
@@ -611,7 +685,14 @@
611685
},
612686
"Condenser": {"tags": [TAG.Equipment, TAG.Condenser]},
613687
"Computer_Room_Air_Conditioning": {
614-
"tags": [TAG.Equipment, TAG.Computer, TAG.Room, TAG.Air, TAG.Conditioning, TAG.CRAC],
688+
"tags": [
689+
TAG.Equipment,
690+
TAG.Computer,
691+
TAG.Room,
692+
TAG.Air,
693+
TAG.Conditioning,
694+
TAG.CRAC,
695+
],
615696
"aliases": [BRICK["CRAC"]],
616697
"subclasses": {
617698
"Standby_CRAC": {"tags": [TAG.Equipment, TAG.CRAC, TAG.Standby]},
@@ -679,8 +760,8 @@
679760
"Air_Handling_Unit": {
680761
"tags": [TAG.Equipment, TAG.Air, TAG.Handling, TAG.Handler, TAG.Unit, TAG.AHU],
681762
"aliases": [
682-
BRICK["AHU"],
683-
BRICK["Air_Handler_Unit"], # here for historical purposes
763+
BRICK["AHU"],
764+
BRICK["Air_Handler_Unit"], # here for historical purposes
684765
],
685766
"subclasses": {
686767
"Dedicated_Outdoor_Air_System_Unit": {
@@ -708,7 +789,7 @@
708789
},
709790
"Pre-Cooling_Air_Unit": {
710791
"tags": [TAG.Equipment, TAG.PAU],
711-
"aliases": [BRICK["PAU"]]
792+
"aliases": [BRICK["PAU"]],
712793
},
713794
},
714795
},

‎bricksrc/sensor.py‎

Lines changed: 53 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -674,11 +674,16 @@
674674
TAG.Discharge,
675675
],
676676
BRICK.hasQuantity: BRICK.Flow,
677-
BRICK.hasSubstance: [BRICK.Supply_Air, BRICK.Discharge_Air],
677+
BRICK.hasSubstance: [
678+
BRICK.Supply_Air,
679+
BRICK.Discharge_Air,
680+
],
678681
"aliases": [BRICK["Discharge_Air_Flow_Sensor"]],
679682
"subclasses": {
680683
"Average_Supply_Air_Flow_Sensor": {
681-
"aliases": [BRICK["Average_Discharge_Air_Flow_Sensor"]],
684+
"aliases": [
685+
BRICK["Average_Discharge_Air_Flow_Sensor"]
686+
],
682687
"tags": [
683688
TAG.Point,
684689
TAG.Average,
@@ -952,7 +957,10 @@
952957
],
953958
"aliases": [BRICK["Discharge_Air_Humidity_Sensor"]],
954959
BRICK.hasQuantity: BRICK.Relative_Humidity,
955-
BRICK.hasSubstance: [BRICK.Supply_Air, BRICK.Discharge_Air],
960+
BRICK.hasSubstance: [
961+
BRICK.Supply_Air,
962+
BRICK.Discharge_Air,
963+
],
956964
},
957965
"Zone_Air_Humidity_Sensor": {
958966
"tags": [
@@ -1072,10 +1080,17 @@
10721080
BRICK.hasQuantity: BRICK.Differential_Pressure,
10731081
BRICK.hasSubstance: BRICK.Supply_Air,
10741082
"substances": [
1075-
[BRICK.measures, BRICK.Differential_Pressure],
1083+
[
1084+
BRICK.measures,
1085+
BRICK.Differential_Pressure,
1086+
],
10761087
[BRICK.measures, BRICK.Discharge_Air],
10771088
],
1078-
"aliases": [BRICK["Discharge_Air_Differential_Pressure_Sensor"]],
1089+
"aliases": [
1090+
BRICK[
1091+
"Discharge_Air_Differential_Pressure_Sensor"
1092+
]
1093+
],
10791094
"tags": [
10801095
TAG.Point,
10811096
TAG.Supply,
@@ -1162,9 +1177,14 @@
11621177
TAG.Supply,
11631178
TAG.Discharge,
11641179
],
1165-
"aliases": [BRICK["Discharge_Air_Static_Pressure_Sensor"]],
1180+
"aliases": [
1181+
BRICK["Discharge_Air_Static_Pressure_Sensor"]
1182+
],
11661183
BRICK.hasQuantity: BRICK.Static_Pressure,
1167-
BRICK.hasSubstance: [BRICK.Supply_Air, BRICK.Discharge_Air],
1184+
BRICK.hasSubstance: [
1185+
BRICK.Supply_Air,
1186+
BRICK.Discharge_Air,
1187+
],
11681188
},
11691189
"Exhaust_Air_Static_Pressure_Sensor": {
11701190
"tags": [
@@ -1241,9 +1261,14 @@
12411261
TAG.Discharge,
12421262
TAG.Air,
12431263
],
1244-
"aliases": [BRICK["Discharge_Air_Velocity_Pressure_Sensor"]],
1264+
"aliases": [
1265+
BRICK["Discharge_Air_Velocity_Pressure_Sensor"]
1266+
],
12451267
BRICK.hasQuantity: BRICK.Velocity_Pressure,
1246-
BRICK.hasSubstance: [BRICK.Supply_Air, BRICK.Discharge_Air],
1268+
BRICK.hasSubstance: [
1269+
BRICK.Supply_Air,
1270+
BRICK.Discharge_Air,
1271+
],
12471272
},
12481273
},
12491274
},
@@ -1312,7 +1337,14 @@
13121337
"tags": [TAG.Point, TAG.Rain, TAG.Duration, TAG.Sensor],
13131338
},
13141339
"On_Timer_Sensor": {
1315-
"tags": [TAG.Point, TAG.On, TAG.Timer, TAG.Run, TAG.Time, TAG.Sensor],
1340+
"tags": [
1341+
TAG.Point,
1342+
TAG.On,
1343+
TAG.Timer,
1344+
TAG.Run,
1345+
TAG.Time,
1346+
TAG.Sensor,
1347+
],
13161348
"aliases": [BRICK.Run_Time_Sensor],
13171349
},
13181350
},
@@ -1440,8 +1472,8 @@
14401472
TAG.Usage,
14411473
TAG.Sensor,
14421474
]
1443-
}
1444-
}
1475+
},
1476+
},
14451477
},
14461478
"Water_Usage_Sensor": {
14471479
"tags": [TAG.Point, TAG.Sensor, TAG.Usage, TAG.Water],
@@ -1500,11 +1532,18 @@
15001532
TAG.Discharge,
15011533
],
15021534
BRICK.hasQuantity: BRICK.Temperature,
1503-
BRICK.hasSubstance: [BRICK.Supply_Air, BRICK.Discharge_Air],
1535+
BRICK.hasSubstance: [
1536+
BRICK.Supply_Air,
1537+
BRICK.Discharge_Air,
1538+
],
15041539
"aliases": [BRICK["Discharge_Air_Temperature_Sensor"]],
15051540
"subclasses": {
15061541
"Preheat_Supply_Air_Temperature_Sensor": {
1507-
"aliases": [BRICK["Preheat_Discharge_Air_Temperature_Sensor"]],
1542+
"aliases": [
1543+
BRICK[
1544+
"Preheat_Discharge_Air_Temperature_Sensor"
1545+
]
1546+
],
15081547
"tags": [
15091548
TAG.Point,
15101549
TAG.Preheat,

0 commit comments

Comments
 (0)