Merge remote-tracking branch 'origin/master' into v1.4.0-rc1

BrickSchema · Jan 24, 2024 · a95c838 · a95c838
2 parents b2a75a2 + 6322eb6
commit a95c838
Showing 1 changed file with 12 additions and 26 deletions.
diff --git a/bricksrc/sensor.py b/bricksrc/sensor.py
@@ -1900,6 +1900,18 @@
                                 ],
                                 BRICK.hasQuantity: BRICK.Differential_Temperature,
                                 BRICK.hasSubstance: BRICK.Water,
+                                "subclasses": {
+                                    "Hot_Water_Differential_Temperature_Sensor": {
+                                        "tags": [
+                                            TAG.Point,
+                                            TAG.Hot,
+                                            TAG.Water,
+                                            TAG.Differential,
+                                            TAG.Temperature,
+                                            TAG.Sensor,
+                                        ],
+                                    },
+                                }
                             },
                             "Domestic_Hot_Water_Temperature_Sensor": {
                                 "tags": [
@@ -1923,19 +1935,6 @@
                                 BRICK.hasQuantity: BRICK.Temperature,
                                 BRICK.hasSubstance: BRICK.Entering_Hot_Water,
                                 "subclasses": {
-                                    "Hot_Water_Differential_Temperature_Sensor": {
-                                        "tags": [
-                                            TAG.Point,
-                                            TAG.Hot,
-                                            TAG.Water,
-                                            TAG.Differential,
-                                            TAG.Temperature,
-                                            TAG.Sensor,
-                                        ],
-                                        "parents": [
-                                            BRICK.Water_Differential_Temperature_Sensor,
-                                        ],
-                                    },
                                     "Entering_Domestic_Hot_Water_Temperature_Sensor": {
                                         "tags": [
                                             TAG.Point,
@@ -1988,19 +1987,6 @@
                                 BRICK.hasQuantity: BRICK.Temperature,
                                 BRICK.hasSubstance: BRICK.Leaving_Hot_Water,
                                 "subclasses": {
-                                    "Hot_Water_Differential_Temperature_Sensor": {
-                                        "tags": [
-                                            TAG.Point,
-                                            TAG.Hot,
-                                            TAG.Water,
-                                            TAG.Differential,
-                                            TAG.Temperature,
-                                            TAG.Sensor,
-                                        ],
-                                        "parents": [
-                                            BRICK.Water_Differential_Temperature_Sensor,
-                                        ],
-                                    },
                                     "Leaving_Domestic_Hot_Water_Temperature_Sensor": {
                                         "tags": [
                                             TAG.Point,