Merge branch 'master' into add-metering-classes

BrickSchema · Jan 15, 2024 · 5878024 · 5878024
2 parents 1334e0f + db76a6e
commit 5878024
Show file tree

Hide file tree

Showing 47 changed files with 5,243 additions and 3,585 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2016, Brick Development Team
+Copyright (c) 2016-2023, Brick Consortium, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -28,12 +28,3 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-About the Copyright Holders
-===========================
-Brick Development Team was initiated to produce a unified metadata
-schema for resources in buildings in early 2016. The team consists
-of members from IBM; Carnegie Mellon University; University of
-California, Berkeley; University of California, Los Angeles;
-University of California, San Diego; University of Virginia and
-University of Southern Denmark.
diff --git a/README.md b/README.md
@@ -72,3 +72,8 @@ It will produce three files inside `history/{old_version}-{new_version}`.
 - `added_classes.txt`: A list of new classes introduced in the current version compared to the previous version.
 - `removed_classes.txt`: A list of old classes removed in the current version compared to the previous version.
 - `possible_mapping.json`: A map of candidate classes that can replace removed classes. Keys are removed classes and the values are candidate correspondants in the new vesion.
+
+
+---
+
+*The Brick Development Team was initiated to produce a unified metadata schema for resources in buildings in early 2016. The team consists of members from IBM; Carnegie Mellon University; University of California, Berkeley; University of California, Los Angeles; University of California, San Diego; University of Virginia and University of Southern Denmark.*
diff --git a/bricksrc/alarm.py b/bricksrc/alarm.py
@@ -41,7 +41,9 @@
                                 ],
                                 "subclasses": {
                                     "Low_Supply_Air_Flow_Alarm": {
-                                        "aliases": [BRICK["Low_Discharge_Air_Flow_Alarm"]],
+                                        "aliases": [
+                                            BRICK["Low_Discharge_Air_Flow_Alarm"]
+                                        ],
                                         "tags": [
                                             TAG.Point,
                                             TAG.Air,
@@ -217,7 +219,11 @@
                                 ],
                                 "subclasses": {
                                     "High_Supply_Air_Temperature_Alarm": {
-                                        "aliases": [BRICK["High_Discharge_Air_Temperature_Alarm"]],
+                                        "aliases": [
+                                            BRICK[
+                                                "High_Discharge_Air_Temperature_Alarm"
+                                            ]
+                                        ],
                                         "tags": [
                                             TAG.Point,
                                             TAG.High,
@@ -230,7 +236,9 @@
                                         "parents": [BRICK.High_Temperature_Alarm],
                                     },
                                     "Low_Supply_Air_Temperature_Alarm": {
-                                        "aliases": [BRICK["Low_Discharge_Air_Temperature_Alarm"]],
+                                        "aliases": [
+                                            BRICK["Low_Discharge_Air_Temperature_Alarm"]
+                                        ],
                                         "tags": [
                                             TAG.Point,
                                             TAG.Low,
@@ -288,7 +296,9 @@
                         "tags": [TAG.Point, TAG.Smoke, TAG.Detection, TAG.Alarm],
                         "subclasses": {
                             "Supply_Air_Smoke_Detection_Alarm": {
-                                "aliases": [BRICK["Discharge_Air_Smoke_Detection_Alarm"]],
+                                "aliases": [
+                                    BRICK["Discharge_Air_Smoke_Detection_Alarm"]
+                                ],
                                 "tags": [
                                     TAG.Point,
                                     TAG.Supply,

diff --git 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": {
@@ -55,6 +62,8 @@
                     },
                 },
             },
+            "VRF_System": {"tags": [TAG.Variable, TAG.Refrigerant, TAG.Flow, TAG.System]},
+            "Refrigeration_System": {"tags": [TAG.Refrigeration, TAG.System]},
             "Steam_System": {"tags": [TAG.Steam, TAG.System]},
             "Water_System": {
                 "tags": [TAG.Water, TAG.System],
@@ -173,4 +182,9 @@
         "aliases": [BRICK["PV_Array"]],
         "constraints": {BRICK.hasPart: [BRICK.PV_Panel]},
     },
+    "Electric_Vehicle_Charging_Hub": {
+        "tags": [TAG.Collection, TAG.Electric, TAG.Vehicle, TAG.Charging, TAG.Hub],
+        "aliases": [BRICK["EV_Charging_Hub"]],
+        "constraints": {BRICK.hasPart: [BRICK.Electric_Vehicle_Charging_Station]},
+    },
 }
diff --git a/bricksrc/command.py b/bricksrc/command.py
@@ -17,6 +17,9 @@
             },
             "Relay_Command": {"tags": [TAG.Point, TAG.Relay, TAG.Command]},
             "Light_Command": {"tags": [TAG.Point, TAG.Light, TAG.Command]},
+           "Level_Command": {
+                "tags": [TAG.Level, TAG.Command, TAG.Point],
+            },
             "Speed_Command": {"tags": [TAG.Point, TAG.Speed, TAG.Command]},
             "Cooling_Command": {"tags": [TAG.Point, TAG.Cool, TAG.Command]},
             "Heating_Command": {"tags": [TAG.Point, TAG.Heat, TAG.Command]},
@@ -36,7 +39,6 @@
             },
             "Humidify_Command": {
                 "tags": [TAG.Point, TAG.Humidify, TAG.Command],
-                BRICK.hasQuantity: BRICK.Humidity,
             },
             "Position_Command": {
                 "tags": [TAG.Point, TAG.Position, TAG.Command],