From df9b966fc1e5acea38a657a0fc3eaac85d11a81b Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Mon, 18 Dec 2023 09:26:04 -0800 Subject: [PATCH 01/17] Add fire and smoke dampers --- bricksrc/definitions.csv | 4 ++++ bricksrc/equipment.py | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/bricksrc/definitions.csv b/bricksrc/definitions.csv index 47ddd1d2..3fa5af69 100644 --- a/bricksrc/definitions.csv +++ b/bricksrc/definitions.csv @@ -198,6 +198,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, @@ -432,8 +433,10 @@ 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_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_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., @@ -942,6 +945,7 @@ 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#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 dc0e8276..85e045da 100644 --- a/bricksrc/equipment.py +++ b/bricksrc/equipment.py @@ -681,6 +681,30 @@ "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]}, + "Fire_Damper": {"tags": [TAG.Equipment, TAG.Damper, TAG.Fire]}, + "Fire_Smoke_Damper": { + "tags": [ + TAG.Equipment, + TAG.Damper, + TAG.Combination, + TAG.Fire, + TAG.Smoke, + ], + "parents": [BRICK.Fire_Damper, BRICK.Smoke_Damper], + }, + "subclasses": { + "Corridor_Fire_Smoke_Damper": { + "tags": [ + TAG.Equipment, + TAG.Damper, + TAG.Combination, + TAG.Fire, + TAG.Smoke, + TAG.Corridor, + ] + }, + }, }, }, "Condenser": {"tags": [TAG.Equipment, TAG.Condenser]}, From 758f7e89d052c8e07d1a47255299c8b438ed1052 Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Mon, 18 Dec 2023 09:27:01 -0800 Subject: [PATCH 02/17] Add duct smoke detector --- bricksrc/definitions.csv | 1 + bricksrc/equipment.py | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/bricksrc/definitions.csv b/bricksrc/definitions.csv index 3fa5af69..1f00f60c 100644 --- a/bricksrc/definitions.csv +++ b/bricksrc/definitions.csv @@ -305,6 +305,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.", diff --git a/bricksrc/equipment.py b/bricksrc/equipment.py index 85e045da..7c3c35b5 100644 --- a/bricksrc/equipment.py +++ b/bricksrc/equipment.py @@ -225,6 +225,17 @@ }, "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, + ] + } + }, }, }, }, From e8dcf7ba09e7b0dc3b86860a6a2e495fe7b9000c Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Mon, 18 Dec 2023 09:32:08 -0800 Subject: [PATCH 03/17] Add smoke zone --- bricksrc/definitions.csv | 1 + bricksrc/location.py | 1 + 2 files changed, 2 insertions(+) diff --git a/bricksrc/definitions.csv b/bricksrc/definitions.csv index 1f00f60c..de5d7183 100644 --- a/bricksrc/definitions.csv +++ b/bricksrc/definitions.csv @@ -947,6 +947,7 @@ https://brickschema.org/schema/Brick#Shower,"A space containing showers, usually 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/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: [ From 256adda5ba2570fe11db65a57780fdead2d51671 Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Mon, 18 Dec 2023 09:40:20 -0800 Subject: [PATCH 04/17] Add fire sprinkler system and equipment --- bricksrc/collections.py | 12 +++++++++++- bricksrc/definitions.csv | 2 ++ bricksrc/equipment.py | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/bricksrc/collections.py b/bricksrc/collections.py index da4a66bb..6fa5f2d7 100644 --- a/bricksrc/collections.py +++ b/bricksrc/collections.py @@ -40,7 +40,14 @@ }, "Gas_System": {"tags": [TAG.Gas, TAG.System]}, "Heating_Ventilation_Air_Conditioning_System": { - "tags": [TAG.Heat, TAG.Ventilation, TAG.Air, TAG.Conditioning, TAG.HVAC, TAG.System], + "tags": [ + TAG.Heat, + TAG.Ventilation, + TAG.Air, + TAG.Conditioning, + TAG.HVAC, + TAG.System, + ], "aliases": [BRICK["HVAC_System"]], "subclasses": { "Air_System": { @@ -107,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 de5d7183..b00a5de7 100644 --- a/bricksrc/definitions.csv +++ b/bricksrc/definitions.csv @@ -438,6 +438,8 @@ https://brickschema.org/schema/Brick#Fire_Damper,"Fire dampers are designed to c 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., diff --git a/bricksrc/equipment.py b/bricksrc/equipment.py index 7c3c35b5..6b83bce1 100644 --- a/bricksrc/equipment.py +++ b/bricksrc/equipment.py @@ -186,6 +186,9 @@ "Fire_Alarm": { "tags": [TAG.Equipment, TAG.Fire, TAG.Safety, TAG.Alarm], }, + "Fire_Sprinkler": { + "tags": [TAG.Equipment, TAG.Fire, TAG.Safety, TAG.Sprinkler] + }, "Manual_Fire_Alarm_Activation_Equipment": { "tags": [ TAG.Equipment, From 9d88749b590b90a9bc767f25aad4590353ef7afc Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Mon, 18 Dec 2023 09:43:03 -0800 Subject: [PATCH 05/17] Add fire safety equip as parent to fire and smoke dampers --- bricksrc/equipment.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/bricksrc/equipment.py b/bricksrc/equipment.py index 6b83bce1..4180eebf 100644 --- a/bricksrc/equipment.py +++ b/bricksrc/equipment.py @@ -695,8 +695,14 @@ "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]}, - "Fire_Damper": {"tags": [TAG.Equipment, TAG.Damper, TAG.Fire]}, + "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, @@ -705,7 +711,11 @@ TAG.Fire, TAG.Smoke, ], - "parents": [BRICK.Fire_Damper, BRICK.Smoke_Damper], + "parents": [ + BRICK.Fire_Damper, + BRICK.Smoke_Damper, + BRICK.Fire_Safety_Equipment, + ], }, "subclasses": { "Corridor_Fire_Smoke_Damper": { From aea1898902c824639d8649d1dd0ed4a5bb7ce2d3 Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Mon, 18 Dec 2023 09:47:07 -0800 Subject: [PATCH 06/17] Add fire hydrant and fire extinguisher --- bricksrc/definitions.csv | 2 ++ bricksrc/equipment.py | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/bricksrc/definitions.csv b/bricksrc/definitions.csv index b00a5de7..65fe3bd7 100644 --- a/bricksrc/definitions.csv +++ b/bricksrc/definitions.csv @@ -435,6 +435,8 @@ https://brickschema.org/schema/Brick#Fire_Alarm_Manual_Call_Point,Manual alarm c 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., diff --git a/bricksrc/equipment.py b/bricksrc/equipment.py index 4180eebf..b1c311c6 100644 --- a/bricksrc/equipment.py +++ b/bricksrc/equipment.py @@ -186,6 +186,12 @@ "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] }, From 02a8848868010bb2c596b8878b93665e7b2da9a8 Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Mon, 18 Dec 2023 09:56:00 -0800 Subject: [PATCH 07/17] Add exit sign --- bricksrc/definitions.csv | 1 + bricksrc/equipment.py | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bricksrc/definitions.csv b/bricksrc/definitions.csv index 65fe3bd7..785588a7 100644 --- a/bricksrc/definitions.csv +++ b/bricksrc/definitions.csv @@ -414,6 +414,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.", diff --git a/bricksrc/equipment.py b/bricksrc/equipment.py index b1c311c6..f5f6e6c0 100644 --- a/bricksrc/equipment.py +++ b/bricksrc/equipment.py @@ -250,7 +250,12 @@ }, "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": { From 7210cd561e5add1ead587b9d66c87cf0c299a1c0 Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Mon, 18 Dec 2023 11:23:57 -0800 Subject: [PATCH 08/17] Add ceiling damper --- bricksrc/definitions.csv | 1 + bricksrc/equipment.py | 32 +++++++++++++++++++++----------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/bricksrc/definitions.csv b/bricksrc/definitions.csv index 785588a7..0cfbf249 100644 --- a/bricksrc/definitions.csv +++ b/bricksrc/definitions.csv @@ -108,6 +108,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, diff --git a/bricksrc/equipment.py b/bricksrc/equipment.py index f5f6e6c0..ba59876d 100644 --- a/bricksrc/equipment.py +++ b/bricksrc/equipment.py @@ -727,19 +727,29 @@ 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, - ] + "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], + }, }, }, "Condenser": {"tags": [TAG.Equipment, TAG.Condenser]}, From aa09cc66750e2309d12fbe07594ea42ed1c8d732 Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Mon, 18 Dec 2023 09:26:04 -0800 Subject: [PATCH 09/17] Add fire and smoke dampers --- bricksrc/definitions.csv | 4 ++++ bricksrc/equipment.py | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/bricksrc/definitions.csv b/bricksrc/definitions.csv index 05bed105..93ff88ce 100644 --- a/bricksrc/definitions.csv +++ b/bricksrc/definitions.csv @@ -201,6 +201,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, @@ -437,8 +438,10 @@ 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_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_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 +948,7 @@ 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#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..8114bdbd 100644 --- a/bricksrc/equipment.py +++ b/bricksrc/equipment.py @@ -790,6 +790,30 @@ "Mixed_Damper": {"tags": [TAG.Equipment, TAG.Damper, TAG.Mixed]}, "Relief_Damper": {"tags": [TAG.Equipment, TAG.Damper, TAG.Relief]}, "Zone_Damper": {"tags": [TAG.Equipment, TAG.Damper, TAG.Zone]}, + "Smoke_Damper": {"tags": [TAG.Equipment, TAG.Damper, TAG.Smoke]}, + "Fire_Damper": {"tags": [TAG.Equipment, TAG.Damper, TAG.Fire]}, + "Fire_Smoke_Damper": { + "tags": [ + TAG.Equipment, + TAG.Damper, + TAG.Combination, + TAG.Fire, + TAG.Smoke, + ], + "parents": [BRICK.Fire_Damper, BRICK.Smoke_Damper], + }, + "subclasses": { + "Corridor_Fire_Smoke_Damper": { + "tags": [ + TAG.Equipment, + TAG.Damper, + TAG.Combination, + TAG.Fire, + TAG.Smoke, + TAG.Corridor, + ] + }, + }, }, }, "Condenser": {"tags": [TAG.Equipment, TAG.Condenser]}, From 09faaf1afd9ac84a230c3fb5ca26502363ab913c Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Mon, 18 Dec 2023 09:27:01 -0800 Subject: [PATCH 10/17] Add duct smoke detector --- bricksrc/definitions.csv | 1 + bricksrc/equipment.py | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/bricksrc/definitions.csv b/bricksrc/definitions.csv index 93ff88ce..c475e8af 100644 --- a/bricksrc/definitions.csv +++ b/bricksrc/definitions.csv @@ -309,6 +309,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.", diff --git a/bricksrc/equipment.py b/bricksrc/equipment.py index 8114bdbd..30d689b8 100644 --- a/bricksrc/equipment.py +++ b/bricksrc/equipment.py @@ -244,6 +244,17 @@ }, "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, + ] + } + }, }, }, }, From add075e45b4a1012b88bf68567ea93926d4ee39c Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Mon, 18 Dec 2023 09:32:08 -0800 Subject: [PATCH 11/17] Add smoke zone --- bricksrc/definitions.csv | 1 + bricksrc/location.py | 1 + 2 files changed, 2 insertions(+) diff --git a/bricksrc/definitions.csv b/bricksrc/definitions.csv index c475e8af..8e4fcafc 100644 --- a/bricksrc/definitions.csv +++ b/bricksrc/definitions.csv @@ -950,6 +950,7 @@ https://brickschema.org/schema/Brick#Shower,"A space containing showers, usually 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/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: [ From aac68f7a98552521ec4aac4ad337aa2a2031571d Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Mon, 18 Dec 2023 09:40:20 -0800 Subject: [PATCH 12/17] Add fire sprinkler system and equipment --- bricksrc/collections.py | 3 +++ bricksrc/definitions.csv | 2 ++ bricksrc/equipment.py | 3 +++ 3 files changed, 8 insertions(+) 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 8e4fcafc..3e37fa43 100644 --- a/bricksrc/definitions.csv +++ b/bricksrc/definitions.csv @@ -443,6 +443,8 @@ https://brickschema.org/schema/Brick#Fire_Damper,"Fire dampers are designed to c 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., diff --git a/bricksrc/equipment.py b/bricksrc/equipment.py index 30d689b8..cfd7b3a7 100644 --- a/bricksrc/equipment.py +++ b/bricksrc/equipment.py @@ -205,6 +205,9 @@ "Fire_Alarm": { "tags": [TAG.Equipment, TAG.Fire, TAG.Safety, TAG.Alarm], }, + "Fire_Sprinkler": { + "tags": [TAG.Equipment, TAG.Fire, TAG.Safety, TAG.Sprinkler] + }, "Manual_Fire_Alarm_Activation_Equipment": { "tags": [ TAG.Equipment, From 2bb2908d9ec1fc6816ddad94c05e3a048b86f4f2 Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Mon, 18 Dec 2023 09:43:03 -0800 Subject: [PATCH 13/17] Add fire safety equip as parent to fire and smoke dampers --- bricksrc/equipment.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/bricksrc/equipment.py b/bricksrc/equipment.py index cfd7b3a7..d7eb430f 100644 --- a/bricksrc/equipment.py +++ b/bricksrc/equipment.py @@ -804,8 +804,14 @@ "Mixed_Damper": {"tags": [TAG.Equipment, TAG.Damper, TAG.Mixed]}, "Relief_Damper": {"tags": [TAG.Equipment, TAG.Damper, TAG.Relief]}, "Zone_Damper": {"tags": [TAG.Equipment, TAG.Damper, TAG.Zone]}, - "Smoke_Damper": {"tags": [TAG.Equipment, TAG.Damper, TAG.Smoke]}, - "Fire_Damper": {"tags": [TAG.Equipment, TAG.Damper, TAG.Fire]}, + "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, @@ -814,7 +820,11 @@ TAG.Fire, TAG.Smoke, ], - "parents": [BRICK.Fire_Damper, BRICK.Smoke_Damper], + "parents": [ + BRICK.Fire_Damper, + BRICK.Smoke_Damper, + BRICK.Fire_Safety_Equipment, + ], }, "subclasses": { "Corridor_Fire_Smoke_Damper": { From ed6bf430bb0ba351c4b0ec932c6ae3ac1edee8c5 Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Mon, 18 Dec 2023 09:47:07 -0800 Subject: [PATCH 14/17] Add fire hydrant and fire extinguisher --- bricksrc/definitions.csv | 2 ++ bricksrc/equipment.py | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/bricksrc/definitions.csv b/bricksrc/definitions.csv index 3e37fa43..cc697d52 100644 --- a/bricksrc/definitions.csv +++ b/bricksrc/definitions.csv @@ -440,6 +440,8 @@ https://brickschema.org/schema/Brick#Fire_Alarm_Manual_Call_Point,Manual alarm c 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., diff --git a/bricksrc/equipment.py b/bricksrc/equipment.py index d7eb430f..3b2b61bc 100644 --- a/bricksrc/equipment.py +++ b/bricksrc/equipment.py @@ -205,6 +205,12 @@ "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] }, From 62af5e3fab994c84dd2639d62eee010ded8d60b7 Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Mon, 18 Dec 2023 09:56:00 -0800 Subject: [PATCH 15/17] Add exit sign --- bricksrc/definitions.csv | 1 + bricksrc/equipment.py | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bricksrc/definitions.csv b/bricksrc/definitions.csv index cc697d52..6c6cadc0 100644 --- a/bricksrc/definitions.csv +++ b/bricksrc/definitions.csv @@ -419,6 +419,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.", diff --git a/bricksrc/equipment.py b/bricksrc/equipment.py index 3b2b61bc..9ffda114 100644 --- a/bricksrc/equipment.py +++ b/bricksrc/equipment.py @@ -269,7 +269,12 @@ }, "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": { From 800df936147b908cad4d4c6e8336149d1157ec52 Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Mon, 18 Dec 2023 11:23:57 -0800 Subject: [PATCH 16/17] Add ceiling damper --- bricksrc/definitions.csv | 1 + bricksrc/equipment.py | 32 +++++++++++++++++++++----------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/bricksrc/definitions.csv b/bricksrc/definitions.csv index 6c6cadc0..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, diff --git a/bricksrc/equipment.py b/bricksrc/equipment.py index 9ffda114..c8aeaf04 100644 --- a/bricksrc/equipment.py +++ b/bricksrc/equipment.py @@ -836,19 +836,29 @@ 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, - ] + "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], + }, }, }, "Condenser": {"tags": [TAG.Equipment, TAG.Condenser]}, From b709b3dd76e12038de0558161f51c3a88d985e25 Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Tue, 16 Jan 2024 09:03:49 -0800 Subject: [PATCH 17/17] Remove duplicate equipment --- bricksrc/equipment.py | 44 ------------------------------------------- 1 file changed, 44 deletions(-) diff --git a/bricksrc/equipment.py b/bricksrc/equipment.py index d032342f..bbf5fdc8 100644 --- a/bricksrc/equipment.py +++ b/bricksrc/equipment.py @@ -859,50 +859,6 @@ "parents": [BRICK.Fire_Safety_Equipment], }, "Zone_Damper": {"tags": [TAG.Equipment, TAG.Damper, TAG.Zone]}, - "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], - }, }, }, "Condenser": {"tags": [TAG.Equipment, TAG.Condenser]},