Merge branch 'add-energy-star-metrics' of github.com:mapped/Brick int…

…o mapped-add-energy-star-metrics
BrickSchema · Jan 16, 2024 · de821c1 · de821c1
2 parents 044b683 + b7bea27
commit de821c1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/bricksrc/definitions.csv b/bricksrc/definitions.csv
@@ -1157,6 +1157,8 @@ https://brickschema.org/schema/Brick#Wall_Fan_Coil_Unit,"A wall-mounted fan coil
 https://brickschema.org/schema/Brick#Wardrobe,"Storage for clothing, costumes, or uniforms",
 https://brickschema.org/schema/Brick#Warm_Cool_Adjust_Sensor,"User provided adjustment of zone temperature, typically in the range of +/- 5 degrees",
 https://brickschema.org/schema/Brick#Warmest_Zone_Air_Temperature_Sensor,The zone temperature that is warmest; drives the supply temperature of cold air. A computed value rather than a physical sensor. Also referred to as a 'Highest Zone Air Temperature Sensor',
+https://brickschema.org/schema/Brick#Waste_Amount_Sensor,A metric used for measuring the quantity of waste generated in a building.,
+https://brickschema.org/schema/Brick#Waste_Meter,"A Waste Meter is used for tracking and categorizing various waste types in a building, aiding in waste management facilitating waste reduction, recycling, and disposal strategies."
 https://brickschema.org/schema/Brick#Waste_Storage,A room used for storing waste such as trash or recycling,
 https://brickschema.org/schema/Brick#Water,"transparent, odorless, tasteless liquid; a compound of hydrogen and oxygen (H2O), containing 11.188% hydrogen and 88.812% oxygen by mass; freezing at 32°F (0°C); boiling near 212°F (100°C).",
 https://brickschema.org/schema/Brick#Water_Alarm,"Alarm that indicates an undesirable event with a pipe, container, or equipment carrying water e.g. water leak",

diff --git a/bricksrc/meters.py b/bricksrc/meters.py
@@ -15,6 +15,7 @@
             }
         },
     },
+    "Waste_Meter": {"tags": [TAG.Waste, TAG.Meter]},
     "Gas_Meter": {
         "tags": [TAG.Meter, TAG.Equipment, TAG.Gas],
         "subclasses": {

diff --git a/bricksrc/sensor.py b/bricksrc/sensor.py
@@ -856,6 +856,7 @@
                     },
                 },
             },
+            "Waste_Amount_Sensor": {"tags": [TAG.Waste, TAG.Amount, TAG.Sensor]},
             "Frequency_Sensor": {
                 BRICK.hasQuantity: BRICK.Frequency,
                 "tags": [TAG.Point, TAG.Sensor, TAG.Frequency],