adding setpoints and sensors from #677

BrickSchema · Jan 30, 2025 · e83197f · e83197f
1 parent 7c9144f
commit e83197f
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 19 deletions.
diff --git a/bricksrc/sensor.py b/bricksrc/sensor.py
@@ -115,19 +115,6 @@
                                             TAG.Zone,
                                         ],
                                     },
-                                    "Domestic_Hot_Water_Return_Temperature_Sensor": {
-                                        "tags": [
-                                            TAG.Point,
-                                            TAG.Domestic,
-                                            TAG.Hot,
-                                            TAG.Water,
-                                            TAG.Return,
-                                            TAG.Temperature,
-                                            TAG.Sensor,
-                                        ],
-                                        BRICK.hasQuantity: BRICK.Temperature,
-                                        BRICK.hasSubstance: BRICK.Domestic_Hot_Water,
-                                    },
                                 },
                             },
                             "Outside_Air_CO2_Sensor": {
@@ -1985,6 +1972,34 @@
                                     TAG.Temperature,
                                     TAG.Sensor,
                                 ],
+                                "subclasses": {
+                                    "Domestic_Hot_Water_Return_Temperature_Sensor": {
+                                        "tags": [
+                                            TAG.Point,
+                                            TAG.Domestic,
+                                            TAG.Hot,
+                                            TAG.Water,
+                                            TAG.Return,
+                                            TAG.Temperature,
+                                            TAG.Sensor,
+                                        ],
+                                        BRICK.hasQuantity: BRICK.Temperature,
+                                        BRICK.hasSubstance: BRICK.Domestic_Hot_Water,
+                                    },
+                                    "Domestic_Hot_Water_Supply_Temperature_Sensor": {
+                                        "tags": [
+                                            TAG.Point,
+                                            TAG.Domestic,
+                                            TAG.Hot,
+                                            TAG.Water,
+                                            TAG.Supply,
+                                            TAG.Temperature,
+                                            TAG.Sensor,
+                                        ],
+                                        BRICK.hasQuantity: BRICK.Temperature,
+                                        BRICK.hasSubstance: BRICK.Domestic_Hot_Water,
+                                    },
+                                },
                             },
                             "Entering_Hot_Water_Temperature_Sensor": {
                                 "tags": [

diff --git a/bricksrc/setpoint.py b/bricksrc/setpoint.py
@@ -374,6 +374,17 @@
                                     TAG.Setpoint,
                                 ],
                             },
+                            "Return_Air_Flow_Setpoint": {
+                                BRICK.hasQuantity: QUDTQK.VolumeFlowRate,
+                                BRICK.hasSubstance: BRICK.Return_Air,
+                                "tags": [
+                                    TAG.Point,
+                                    TAG.Return,
+                                    TAG.Air,
+                                    TAG.Flow,
+                                    TAG.Setpoint,
+                                ],
+                            },
                             "Supply_Air_Flow_Setpoint": {
                                 BRICK.hasQuantity: QUDTQK.VolumeFlowRate,
                                 BRICK.hasSubstance: [
@@ -915,10 +926,6 @@
                                 ],
                             },
                             "Supply_Air_Static_Pressure_Setpoint": {
-                                BRICK.hasSubstance: [
-                                    BRICK.Supply_Air,
-                                    BRICK.Discharge_Air,
-                                ],
                                 BRICK.hasSubstance: [
                                     BRICK.Supply_Air,
                                     BRICK.Discharge_Air,
@@ -937,6 +944,18 @@
                                     TAG.Setpoint,
                                 ],
                             },
+                            "Return_Air_Static_Pressure_Setpoint": {
+                                BRICK.hasSubstance: BRICK.Return_Air,
+                                BRICK.hasQuantity: BRICK.Static_Pressure,
+                                "tags": [
+                                    TAG.Point,
+                                    TAG.Return,
+                                    TAG.Air,
+                                    TAG.Static,
+                                    TAG.Pressure,
+                                    TAG.Setpoint,
+                                ],
+                            },
                             "Underfloor_Air_Plenum_Static_Pressure_Setpoint": {
                                 "tags": [
                                     TAG.Point,
@@ -1902,6 +1921,20 @@
                                 ],
                                 "parents": [BRICK.Hot_Water_Temperature_Setpoint],
                                 "subclasses": {
+                                    "Return_Domestic_Hot_Water_Temperature_Setpoint": {
+                                        "tags": [
+                                            TAG.Point,
+                                            TAG.Domestic,
+                                            TAG.Hot,
+                                            TAG.Return,
+                                            TAG.Water,
+                                            TAG.Temperature,
+                                            TAG.Setpoint,
+                                        ],
+                                        "parents": [
+                                            BRICK.Return_Water_Temperature_Setpoint,
+                                        ],
+                                    },
                                     "Entering_Domestic_Hot_Water_Temperature_Setpoint": {
                                         "tags": [
                                             TAG.Point,
@@ -2091,10 +2124,28 @@
                     "Return_Air_CO2_Setpoint": {
                         BRICK.hasQuantity: BRICK.CO2_Concentration,
                         "tags": [TAG.Point, TAG.Return, TAG.Air, TAG.CO2, TAG.Setpoint],
-                    }
+                    },
+                    "Zone_CO2_Level_Setpoint": {
+                        BRICK.hasQuantity: BRICK.CO2_Concentration,
+                        "tags": [TAG.Point, TAG.Zone, TAG.CO2, TAG.Setpoint],
+                    },
                 },
                 "tags": [TAG.Point, TAG.CO2, TAG.Setpoint],
             },
+            "CO_Setpoint": {
+                BRICK.hasQuantity: BRICK.CO_Concentration,
+                "tags": [TAG.Point, TAG.CO, TAG.Setpoint],
+                "subclasses": {
+                    "Zone_CO_Level_Setpoint": {
+                        BRICK.hasQuantity: BRICK.CO_Concentration,
+                        "tags": [TAG.Point, TAG.Zone, TAG.CO, TAG.Setpoint],
+                    },
+                    "Return_Air_CO_Setpoint": {
+                        BRICK.hasQuantity: BRICK.CO_Concentration,
+                        "tags": [TAG.Point, TAG.Return, TAG.Air, TAG.CO, TAG.Setpoint],
+                    },
+                },
+            },
             "Time_Setpoint": {
                 BRICK.hasQuantity: BRICK.Time,
                 "tags": [TAG.Point, TAG.Time, TAG.Setpoint],

diff --git a/pyproject.toml b/pyproject.toml
@@ -21,7 +21,7 @@ dev-dependencies = [
     "pytest-xdist[psutil]>=3.6.1",
     "semver>=3.0.2",
     "html5lib>=1.1",
-    "pyontoenv>=0.1.9",
+    "pyontoenv>=0.1.10a8",
     "brickschema[topquadrant]>=0.7.6a2",
     "scipy>=1.13.1",
     "sentence-transformers>=3.0.1",