diff --git a/bricksrc/collections.py b/bricksrc/collections.py index 3023b093..9b82467e 100644 --- a/bricksrc/collections.py +++ b/bricksrc/collections.py @@ -114,6 +114,9 @@ "Condenser_Water_System": { "tags": [TAG.Condenser, TAG.Water, TAG.System] }, + "Fire_Sprinkler_System": { + "tags": [TAG.Fire, TAG.Sprinkler, TAG.Water, TAG.System] + }, }, }, }, diff --git a/bricksrc/definitions.csv b/bricksrc/definitions.csv index 05bed105..0a9b59ce 100644 --- a/bricksrc/definitions.csv +++ b/bricksrc/definitions.csv @@ -107,6 +107,7 @@ https://brickschema.org/schema/Brick#CRAH,"a computer room air handler (CRAH) us https://brickschema.org/schema/Brick#Cafeteria,A space to serve food and beverages, https://brickschema.org/schema/Brick#Capacity,, https://brickschema.org/schema/Brick#Capacity_Sensor,, +https://brickschema.org/schema/Brick#Ceiling_Damper,"Function only as a heat barrier to limit heat transfer, into the concealed space of a fire-resistance-rated floor-ceiling or roof-ceiling assembly where ducts or air transfer openings are made only through the ceiling membrane that is part of the fire-resistance rated assembly.", https://brickschema.org/schema/Brick#Ceiling_Fan,A fan installed on the ceiling of a room for the purpose of air circulation, https://brickschema.org/schema/Brick#Centrifugal_Chiller,A chiller that uses the vapor compression cycle to chill water. It throws off the heat collected from the chilled water plus the heat from the compressor to a water loop,https://bellomyims.com/your-definitive-guide-to-centrifugal-chillers/ https://brickschema.org/schema/Brick#Change_Filter_Alarm,An alarm that indicates that a filter must be changed, @@ -201,6 +202,7 @@ https://brickschema.org/schema/Brick#Cooling_Zone_Air_Temperature_Setpoint,The c https://brickschema.org/schema/Brick#Copy_Room,"A room set aside for common office equipment, including printers and copiers", https://brickschema.org/schema/Brick#Core_Temperature_Sensor,Measures the internal temperature of the radiant layer at the heat source or sink level of the radiant heating and cooling HVAC system., https://brickschema.org/schema/Brick#Core_Temperature_Setpoint,"Sets temperature for the core, i.e. the temperature at the heat source or sink level, of the radiant panel.", +https://brickschema.org/schema/Brick#Corridor_Fire_Smoke_Damper,Corridor dampers are combination fire-smoke dampers that have been specifically evaluated for mounting only in ceilings of fire-resistance-rated corridors., https://brickschema.org/schema/Brick#Cubicle,"A smaller space set aside for an individual, but not with a door and without full-height walls", https://brickschema.org/schema/Brick#Current,, https://brickschema.org/schema/Brick#Current_Angle,Angle of current phasor, @@ -308,6 +310,7 @@ https://brickschema.org/schema/Brick#Drive_Ready_Status,"Indicates if a hard dri https://brickschema.org/schema/Brick#Dry_Bulb_Temperature,"The temperature of air measured by a thermometer freely exposed to the air, but shielded from radiation and moisture. (https://en.wikipedia.org/wiki/Dry-bulb_temperature)", https://brickschema.org/schema/Brick#Dry_Cooler,"A dry cooler is a fluid cooler that uses air, a relatively dry, non-liquid fluid to accomplish process cooling. (https://submer.com/submer-academy/library/dry-cooler/)", https://brickschema.org/schema/Brick#Dual_Duct_Air_Handling_Unit,An air handling unit that contains hot and cold decks to supply heating and cooling to a building, +https://brickschema.org/schema/Brick#Duct_Smoke_Detector,"Duct smoke detectors sample currents in the air handling equipment to determine if smoke or fumes are present. If smoke is detected, the device will close dampers and stop fans.", https://brickschema.org/schema/Brick#Duration_Sensor,Measures the duration of a phenomenon or event, https://brickschema.org/schema/Brick#ESS_Panel,See Embedded_Surface_System_Panel, https://brickschema.org/schema/Brick#Economizer,"Device that, on proper variable sensing, initiates control signals or actions to conserve energy. A control system that reduces the mechanical heating and cooling requirement.", @@ -417,6 +420,7 @@ https://brickschema.org/schema/Brick#Exhaust_Air_Temperature_Sensor,Measures the https://brickschema.org/schema/Brick#Exhaust_Air_Velocity_Pressure_Sensor,, https://brickschema.org/schema/Brick#Exhaust_Damper,A damper that modulates the flow of exhaust air, https://brickschema.org/schema/Brick#Exhaust_Fan,Fan moving exhaust air -- air that must be removed from a space due to contaminants, +https://brickschema.org/schema/Brick#Exit_Sign,"Exit signs are used to indicate the location of the nearest emergency exit in a building, particularly in situations where quick evacuation is necessary.", https://brickschema.org/schema/Brick#FCU,See Fan_Coil_Unit, https://brickschema.org/schema/Brick#Failure_Alarm,"Alarms that indicate the failure of devices, equipment, systems and control loops", https://brickschema.org/schema/Brick#Fan,"Any device with two or more blades or vanes attached to a rotating shaft used to produce an airflow for the purpose of comfort, ventilation, exhaust, heating, cooling, or any other gaseous transport.", @@ -437,8 +441,14 @@ https://brickschema.org/schema/Brick#Fire_Alarm_Control_Panel,Fire alarm panel i https://brickschema.org/schema/Brick#Fire_Alarm_Manual_Call_Point,Manual alarm call points are designed for the purpose of raising an alarm manually once verification of a fire or emergency condition exists. by operating the push button or break glass the alarm signal can be raised.,http://www.coopermedc.com/products/manual-alarm-call-points https://brickschema.org/schema/Brick#Fire_Alarm_Pull_Station,An active fire protection device (usually wall-mounted) that when activated initiates an alarm on a fire alarm system. In its simplest form the user activates the alarm by pulling the handle down.,https://en.wikipedia.org/wiki/Manual_fire_alarm_activation#Fire_alarm_pull_station https://brickschema.org/schema/Brick#Fire_Control_Panel,A panel-mounted device that provides status and control of a fire safety system, +https://brickschema.org/schema/Brick#Fire_Damper,"Fire dampers are designed to close automatically when heat is detected, and are used to restrict the spread of fire where ducts and air transfer openings penetrate fire walls, fire barriers, fire partitions, horizontal assemblies and shaft enclosures.", +https://brickschema.org/schema/Brick#Fire_Extinguisher,"A handheld device for active fire protection, usually filled with a dry or wet chemical used to extinguish or control small fires, often in emergencies." +https://brickschema.org/schema/Brick#Fire_Hydrant,"A Fire Hydrant is an above-ground access point connected to a water supply, primarily used by firefighters to obtain water for extinguishing fires.", https://brickschema.org/schema/Brick#Fire_Safety_System,"A system containing devices and equipment that monitor, detect and suppress fire hazards",https://assetinsights.net/Glossary/G_Fire_Safety_System.html https://brickschema.org/schema/Brick#Fire_Sensor,Measures the presence of fire, +https://brickschema.org/schema/Brick#Fire_Smoke_Damper,Combination fire-smoke dampers are used to restrict both the spread of fire and movement of smoke where ducts and air transfer openings penetrate assemblies that are designed to restrict the passage of both fire and smoke., +https://brickschema.org/schema/Brick#Fire_Sprinkler,"A fire sprinkler or sprinkler head is the component of a fire sprinkler system that discharges water when the effects of a fire have been detected, such as when a predetermined temperature has been exceeded.", +https://brickschema.org/schema/Brick#Fire_Sprinkler_System,"A fire sprinkler system is an active fire protection measure that includes a water supply system, which provides sufficient pressure and flowrate, and a water distribution piping system to which fire sprinklers are attached", https://brickschema.org/schema/Brick#Fire_Sprinkler_Thermal_Expansion_Tank,A specialized thermal expansion tank that is part of a building's fire suppression system., https://brickschema.org/schema/Brick#Fire_Sprinkler_Water_Storage_Tank,A specialized tank intended to store water that can be quickly accessed for fire suppression., https://brickschema.org/schema/Brick#Fire_Zone,combustion chamber in a furnace or boiler., @@ -945,6 +955,8 @@ https://brickschema.org/schema/Brick#Short_Cycle_Alarm,An alarm that indicates a https://brickschema.org/schema/Brick#Shower,"A space containing showers, usually adjacent to an athletic or execise area", https://brickschema.org/schema/Brick#Site,A geographic region containing 0 or more buildings. Typically used as the encapsulating location for a collection of Brick entities through the hasPart/isPartOf relationships, https://brickschema.org/schema/Brick#Smoke_Alarm,An alarm that indicates the off-normal conditions associated with smoke., +https://brickschema.org/schema/Brick#Smoke_Damper,Smoke dampers are used to restrict the movement of smoke where ducts and air transfer openings penetrate assemblies that are designed to restrict the movement of smoke. +https://brickschema.org/schema/Brick#Smoke_Zone,"A smoke zone an area designed to contain smoke, delineated by smoke barrier walls, to facilitate safe and efficient evacuation,", https://brickschema.org/schema/Brick#Soil_Temperature_Sensor,Measures the temperature of soil, https://brickschema.org/schema/Brick#Solar_Azimuth_Angle_Sensor,Measures the azimuth angle of the sun, https://brickschema.org/schema/Brick#Solar_Irradiance,The power per unit area of solar electromagnetic radiation incident on a surface, diff --git a/bricksrc/equipment.py b/bricksrc/equipment.py index 32bd2c65..bbf5fdc8 100644 --- a/bricksrc/equipment.py +++ b/bricksrc/equipment.py @@ -205,6 +205,15 @@ "Fire_Alarm": { "tags": [TAG.Equipment, TAG.Fire, TAG.Safety, TAG.Alarm], }, + "Fire_Extinguisher": { + "tags": [TAG.Equipment, TAG.Fire, TAG.Safety, TAG.Extinguisher], + }, + "Fire_Hydrant": { + "tags": [TAG.Equipment, TAG.Fire, TAG.Safety, TAG.Hydrant], + }, + "Fire_Sprinkler": { + "tags": [TAG.Equipment, TAG.Fire, TAG.Safety, TAG.Sprinkler] + }, "Manual_Fire_Alarm_Activation_Equipment": { "tags": [ TAG.Equipment, @@ -244,12 +253,28 @@ }, "Smoke_Detector": { "tags": [TAG.Equipment, TAG.Fire, TAG.Safety, TAG.Smoke, TAG.Detector], + "subclasses": { + "Duct_Smoke_Detector": { + "tags": [ + TAG.Equipment, + TAG.Fire, + TAG.Safety, + TAG.Smoke, + TAG.Detector, + ] + } + }, }, }, }, "Elevator": {"tags": [TAG.Elevator, TAG.Equipment]}, "Security_Equipment": {"tags": [TAG.Security, TAG.Equipment]}, - "Safety_Equipment": {"tags": [TAG.Safety, TAG.Equipment]}, + "Safety_Equipment": { + "tags": [TAG.Safety, TAG.Equipment], + "subclasses": { + "Exit_Sign": {"tags": [TAG.Safety, TAG.Equipment, TAG.Exit, TAG.Sign]} + }, + }, "Camera": {"tags": [TAG.Camera, TAG.Equipment]}, "Relay": {"tags": [TAG.Relay, TAG.Equipment]}, "Water_Heater": { @@ -789,6 +814,50 @@ "Return_Damper": {"tags": [TAG.Equipment, TAG.Damper, TAG.Return]}, "Mixed_Damper": {"tags": [TAG.Equipment, TAG.Damper, TAG.Mixed]}, "Relief_Damper": {"tags": [TAG.Equipment, TAG.Damper, TAG.Relief]}, + "Smoke_Damper": { + "tags": [TAG.Equipment, TAG.Damper, TAG.Smoke], + "parents": [BRICK.Fire_Safety_Equipment], + }, + "Fire_Damper": { + "tags": [TAG.Equipment, TAG.Damper, TAG.Fire], + "parents": [BRICK.Fire_Safety_Equipment], + }, + "Fire_Smoke_Damper": { + "tags": [ + TAG.Equipment, + TAG.Damper, + TAG.Combination, + TAG.Fire, + TAG.Smoke, + ], + "parents": [ + BRICK.Fire_Damper, + BRICK.Smoke_Damper, + BRICK.Fire_Safety_Equipment, + ], + "subclasses": { + "Corridor_Fire_Smoke_Damper": { + "tags": [ + TAG.Equipment, + TAG.Damper, + TAG.Combination, + TAG.Fire, + TAG.Smoke, + TAG.Corridor, + ] + }, + }, + }, + "Ceiling_Damper": { + "tags": [ + TAG.Equipment, + TAG.Damper, + TAG.Heat, + TAG.Barrier, + TAG.Ceiling, + ], + "parents": [BRICK.Fire_Safety_Equipment], + }, "Zone_Damper": {"tags": [TAG.Equipment, TAG.Damper, TAG.Zone]}, }, }, diff --git a/bricksrc/location.py b/bricksrc/location.py index 7863a735..6c135be1 100644 --- a/bricksrc/location.py +++ b/bricksrc/location.py @@ -625,6 +625,7 @@ "HVAC_Zone": {"tags": [TAG.HVAC, TAG.Zone, TAG.Location]}, "Lighting_Zone": {"tags": [TAG.Lighting, TAG.Zone, TAG.Location]}, "Fire_Zone": {"tags": [TAG.Fire, TAG.Zone, TAG.Location]}, + "Smoke_Zone": {"tags": [TAG.Smoke, TAG.Zone, TAG.Location]}, }, "constraints": { BRICK.hasPart: [