Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Specifying Sensor.lastKnownValue.value schemas #159

Merged
merged 16 commits into from
Oct 13, 2022
Merged

Specifying Sensor.lastKnownValue.value schemas #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
87b0ed9
Removed superfluous Architecture.hasPart
hammar Oct 3, 2022
eb95b11
Re-saved TTL using TBCFE serializer
hammar Oct 3, 2022
161eb4d
Updated Brick patches
hammar Oct 3, 2022
aab50a1
Imported DTDLv3 models for regression testing
hammar Oct 3, 2022
c2bb2aa
Fixed substance regression in brickpatches
hammar Oct 3, 2022
d1edf3a
POC typing on three common sensor types
hammar Oct 3, 2022
0484a8a
Added lastKnownValue on all Sensor subclasses
hammar Oct 4, 2022
ffd190a
Merge branch 'main' into feature-lastKnownValueTypes
hammar Oct 12, 2022
3b3c130
Update to latest Brick
hammar Oct 12, 2022
6970d29
Update REC.ttl to TBCFE serialization; adding feeds.substance
hammar Oct 12, 2022
fbece83
Regenerated DTDL
hammar Oct 12, 2022
cfa1e65
Attempting to filter out Energy_Usage_Sensor subclassing
hammar Oct 12, 2022
b7c29b9
Remove Energy_Sensor -> Energy_Usage_Sensor inheritance
hammar Oct 12, 2022
6819ffe
Updated DTDLv2 models with lastKnownValues
hammar Oct 12, 2022
2e0ac0a
Added lastKnownValue to new Brick sensors
hammar Oct 12, 2022
b39daa3
Removed DTDLv3 models
hammar Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Ontology/DTDLv2/Brick/Asset/Equipment/HVAC_Equipment/Chiller/Chiller.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
"schema": {
"@type": "Object",
"fields": [
{
"name": "value",
"schema": "string"
},
{
"name": "hasUnit",
"schema": {
Expand All @@ -35,10 +39,6 @@
],
"valueSchema": "string"
}
},
{
"name": "value",
"schema": "string"
}
]
},
Expand Down
23 changes: 23 additions & 0 deletions Ontology/DTDLv2/Brick/Point/Alarm/Alarm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,29 @@
{
"@id": "dtmi:org:brickschema:schema:Brick:Alarm;1",
"@type": "Interface",
"contents": [
{
"@type": "Property",
"displayName": {
"en": "last known value"
},
"name": "lastKnownValue",
"schema": {
"@type": "Object",
"fields": [
{
"name": "value",
"schema": "string"
},
{
"name": "timestamp",
"schema": "dateTime"
}
]
},
"writable": true
}
],
"displayName": {
"en": "Alarm"
},
Expand Down
23 changes: 23 additions & 0 deletions Ontology/DTDLv2/Brick/Point/Command/Command.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,29 @@
{
"@id": "dtmi:org:brickschema:schema:Brick:Command;1",
"@type": "Interface",
"contents": [
{
"@type": "Property",
"displayName": {
"en": "last known value"
},
"name": "lastKnownValue",
"schema": {
"@type": "Object",
"fields": [
{
"name": "value",
"schema": "string"
},
{
"name": "timestamp",
"schema": "dateTime"
}
]
},
"writable": true
}
],
"displayName": {
"en": "Command"
},
Expand Down
23 changes: 23 additions & 0 deletions Ontology/DTDLv2/Brick/Point/Parameter/Parameter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,29 @@
{
"@id": "dtmi:org:brickschema:schema:Brick:Parameter;1",
"@type": "Interface",
"contents": [
{
"@type": "Property",
"displayName": {
"en": "last known value"
},
"name": "lastKnownValue",
"schema": {
"@type": "Object",
"fields": [
{
"name": "value",
"schema": "string"
},
{
"name": "timestamp",
"schema": "dateTime"
}
]
},
"writable": true
}
],
"displayName": {
"en": "Parameter"
},
Expand Down
23 changes: 1 addition & 22 deletions Ontology/DTDLv2/Brick/Point/Point.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,27 +694,6 @@
},
"writable": true
},
{
"@type": "Property",
"displayName": {
"en": "Last known value"
},
"name": "lastKnownValue",
"schema": {
"@type": "Object",
"fields": [
{
"name": "timestamp",
"schema": "dateTime"
},
{
"name": "value",
"schema": "string"
}
]
},
"writable": true
},
{
"@type": "Property",
"displayName": {
Expand All @@ -727,7 +706,7 @@
{
"@type": "Relationship",
"displayName": {
"en": "Is point of"
"en": "is point of"
},
"name": "isPointOf",
"writable": true
Expand Down
23 changes: 23 additions & 0 deletions Ontology/DTDLv2/Brick/Point/Sensor/Adjust_Sensor/Adjust_Sensor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,29 @@
{
"@id": "dtmi:org:brickschema:schema:Brick:Adjust_Sensor;1",
"@type": "Interface",
"contents": [
{
"@type": "Property",
"displayName": {
"en": "last known value"
},
"name": "lastKnownValue",
"schema": {
"@type": "Object",
"fields": [
{
"name": "value",
"schema": "double"
},
{
"name": "timestamp",
"schema": "dateTime"
}
]
},
"writable": true
}
],
"displayName": {
"en": "Adjust Sensor"
},
Expand Down
23 changes: 23 additions & 0 deletions Ontology/DTDLv2/Brick/Point/Sensor/Air_Grains_Sensor/Air_Grains_Sensor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,29 @@
{
"@id": "dtmi:org:brickschema:schema:Brick:Air_Grains_Sensor;1",
"@type": "Interface",
"contents": [
{
"@type": "Property",
"displayName": {
"en": "last known value"
},
"name": "lastKnownValue",
"schema": {
"@type": "Object",
"fields": [
{
"name": "value",
"schema": "double"
},
{
"name": "timestamp",
"schema": "dateTime"
}
]
},
"writable": true
}
],
"displayName": {
"en": "Air Grains Sensor"
},
Expand Down
23 changes: 23 additions & 0 deletions Ontology/DTDLv2/Brick/Point/Sensor/Air_Quality_Sensor/Air_Quality_Sensor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,29 @@
{
"@id": "dtmi:org:brickschema:schema:Brick:Air_Quality_Sensor;1",
"@type": "Interface",
"contents": [
{
"@type": "Property",
"displayName": {
"en": "last known value"
},
"name": "lastKnownValue",
"schema": {
"@type": "Object",
"fields": [
{
"name": "value",
"schema": "double"
},
{
"name": "timestamp",
"schema": "dateTime"
}
]
},
"writable": true
}
],
"displayName": {
"en": "Air Quality Sensor"
},
Expand Down
23 changes: 23 additions & 0 deletions Ontology/DTDLv2/Brick/Point/Sensor/Angle_Sensor/Angle_Sensor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,29 @@
{
"@id": "dtmi:org:brickschema:schema:Brick:Angle_Sensor;1",
"@type": "Interface",
"contents": [
{
"@type": "Property",
"displayName": {
"en": "last known value"
},
"name": "lastKnownValue",
"schema": {
"@type": "Object",
"fields": [
{
"name": "value",
"schema": "double"
},
{
"name": "timestamp",
"schema": "dateTime"
}
]
},
"writable": true
}
],
"displayName": {
"en": "Angle Sensor"
},
Expand Down
21 changes: 21 additions & 0 deletions Ontology/DTDLv2/Brick/Point/Sensor/Capacity_Sensor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,27 @@
"@id": "dtmi:org:brickschema:schema:Brick:Capacity_Sensor;1",
"@type": "Interface",
"contents": [
{
"@type": "Property",
"displayName": {
"en": "last known value"
},
"name": "lastKnownValue",
"schema": {
"@type": "Object",
"fields": [
{
"name": "timestamp",
"schema": "dateTime"
},
{
"name": "value",
"schema": "double"
}
]
},
"writable": true
},
{
"@type": [
"Property"
Expand Down
23 changes: 23 additions & 0 deletions Ontology/DTDLv2/Brick/Point/Sensor/Conductivity_Sensor/Conductivity_Sensor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,29 @@
{
"@id": "dtmi:org:brickschema:schema:Brick:Conductivity_Sensor;1",
"@type": "Interface",
"contents": [
{
"@type": "Property",
"displayName": {
"en": "last known value"
},
"name": "lastKnownValue",
"schema": {
"@type": "Object",
"fields": [
{
"name": "value",
"schema": "double"
},
{
"name": "timestamp",
"schema": "dateTime"
}
]
},
"writable": true
}
],
"displayName": {
"en": "Conductivity Sensor"
},
Expand Down
21 changes: 21 additions & 0 deletions Ontology/DTDLv2/Brick/Point/Sensor/Contact_Sensor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,27 @@
"@id": "dtmi:org:brickschema:schema:Brick:Contact_Sensor;1",
"@type": "Interface",
"contents": [
{
"@type": "Property",
"displayName": {
"en": "last known value"
},
"name": "lastKnownValue",
"schema": {
"@type": "Object",
"fields": [
{
"name": "value",
"schema": "boolean"
},
{
"name": "timestamp",
"schema": "dateTime"
}
]
},
"writable": true
},
{
"@type": [
"Property"
Expand Down
23 changes: 23 additions & 0 deletions Ontology/DTDLv2/Brick/Point/Sensor/Current_Sensor/Current_Sensor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,29 @@
{
"@id": "dtmi:org:brickschema:schema:Brick:Current_Sensor;1",
"@type": "Interface",
"contents": [
{
"@type": "Property",
"displayName": {
"en": "last known value"
},
"name": "lastKnownValue",
"schema": {
"@type": "Object",
"fields": [
{
"name": "value",
"schema": "double"
},
{
"name": "timestamp",
"schema": "dateTime"
}
]
},
"writable": true
}
],
"displayName": {
"en": "Current Sensor"
},
Expand Down
Loading