diff --git a/events/2024.11.Munich/TDs/Flask-manual/Uarm-TUM.td.jsonld b/events/2024.11.Munich/TDs/Flask-manual/Uarm-TUM.td.jsonld index 9333b759..7c3a730f 100644 --- a/events/2024.11.Munich/TDs/Flask-manual/Uarm-TUM.td.jsonld +++ b/events/2024.11.Munich/TDs/Flask-manual/Uarm-TUM.td.jsonld @@ -1,396 +1,401 @@ { - "@context": "https://www.w3.org/2019/wot/td/v1", - "actions": { - "beep": { - "description": "Beep for 1 sec", - "forms": [ - { - "contentType": "application/json", - "href": "http://172.16.1.150:8080/uarm/actions/beep", - "htv:methodName": "POST", - "op": "invokeaction" + "@context": "https://www.w3.org/2019/wot/td/v1", + "actions": { + "beep": { + "description": "Beep for 1 sec", + "forms": [ + { + "contentType": "application/json", + "href": "http://192.168.120.23:8080/uarm/actions/beep", + "htv:methodName": "POST", + "op": "invokeaction" + }, + { + "contentType": "application/json", + "href": "mqtt://172.16.1.230:1883/uarm/actions/beep", + "mqv:controlPacketValue": "PUBLISH", + "op": "invokeaction" + } + ], + "idempotent": true, + "safe": false, + "title": "Beep" }, - { - "contentType": "application/json", - "href": "mqtt://dbbroker.local:1883/uarm/actions/beep", - "mqv:controlPacketValue": "PUBLISH", - "op": "invokeaction" - } - ], - "idempotent": true, - "safe": false, - "title": "Beep" - }, - "beepWithTime": { - "description": "Beep for a time set between 1-3 sec", - "forms": [ - { - "contentType": "application/json", - "href": "http://172.16.1.150:8080/uarm/actions/beepwithtime", - "htv:methodName": "POST", - "op": "invokeaction" + "beepWithTime": { + "description": "Beep for a time set between 1-3 sec", + "forms": [ + { + "contentType": "application/json", + "href": "http://192.168.120.23:8080/uarm/actions/beepwithtime", + "htv:methodName": "POST", + "op": "invokeaction" + }, + { + "contentType": "application/json", + "href": "mqtt://172.16.1.230:1883/uarm/actions/beepwithtime", + "mqv:commandCode": 3, + "op": "invokeaction" + } + ], + "idempotent": true, + "input": { + "maximum": 3, + "minimum": 1, + "type": "integer" + }, + "safe": false, + "title": "Beep with Time set" }, - { - "contentType": "application/json", - "href": "mqtt://dbbroker.local:1883/uarm/actions/beepwithtime", - "mqv:commandCode": 3, - "op": "invokeaction" - } - ], - "idempotent": true, - "input": { - "maximum": 3, - "minimum": 1, - "type": "integer" - }, - "safe": false, - "title": "Beep with Time set" - }, - "go": { - "description": "Move to described Position with set speed", - "forms": [ - { - "contentType": "application/json", - "href": "http://172.16.1.150:8080/uarm/actions/gowithspeed", - "htv:methodName": "POST", - "op": "invokeaction" + "goHome": { + "description": "Go to the set home point", + "forms": [ + { + "contentType": "application/json", + "href": "http://192.168.120.23:8080/uarm/actions/gohome", + "htv:methodName": "POST", + "op": "invokeaction" + }, + { + "contentType": "application/json", + "href": "mqtt://172.16.1.230:1883/uarm/actions/gohome", + "mqv:controlPacketValue": "PUBLISH", + "op": "invokeaction" + } + ], + "idempotent": false, + "safe": false, + "title": "Go Home" }, - { - "contentType": "application/json", - "href": "mqtt://dbbroker.local:1883/uarm/actions/gowithspeed", - "mqv:controlPacketValue": "PUBLISH", - "op": "invokeaction" - } - ], - "idempotent": true, - "input": { - "properties": { - "speed": { - "maximum": 10000, - "minimum": 100, - "type": "integer" - }, - "x": { - "maximum": 200, - "minimum": 120, - "type": "integer" - }, - "y": { - "maximum": 200, - "minimum": -200, - "type": "integer" - }, - "z": { - "maximum": 100, - "minimum": 52, - "type": "integer" - } + "goTo": { + "description": "Move to Position x,y,z given by the user with fixed speed=3000", + "forms": [ + { + "contentType": "application/json", + "href": "http://192.168.120.23:8080/uarm/actions/goto", + "htv:methodName": "POST", + "op": "invokeaction" + }, + { + "contentType": "application/json", + "href": "mqtt://172.16.1.230:1883/uarm/actions/goto", + "mqv:controlPacketValue": "PUBLISH", + "op": "invokeaction" + } + ], + "idempotent": true, + "input": { + "properties": { + "x": { + "maximum": 375, + "minimum": -35, + "type": "integer" + }, + "y": { + "maximum": 363, + "minimum": -363, + "type": "number" + }, + "z": { + "maximum": 175, + "minimum": -29, + "type": "integer" + } + }, + "required": [ + "x", + "y", + "z" + ], + "type": "object" + }, + "safe": false, + "title": "Go to position" }, - "required": [ - "x", - "y", - "z", - "speed" - ], - "type": "object" - }, - "safe": false, - "title": "Go to with speed" - }, - "goHome": { - "description": "Go to the set home point", - "forms": [ - { - "contentType": "application/json", - "href": "http://172.16.1.150:8080/uarm/actions/gohome", - "htv:methodName": "POST", - "op": "invokeaction" + "goWithSpeed": { + "description": "Move to described Position with set speed", + "forms": [ + { + "contentType": "application/json", + "href": "http://192.168.120.23:8080/uarm/actions/gowithspeed", + "htv:methodName": "POST", + "op": "invokeaction" + }, + { + "contentType": "application/json", + "href": "mqtt://172.16.1.230:1883/uarm/actions/gowithspeed", + "mqv:controlPacketValue": "PUBLISH", + "op": "invokeaction" + } + ], + "idempotent": true, + "input": { + "properties": { + "speed": { + "maximum": 10000, + "minimum": 100, + "type": "integer" + }, + "x": { + "maximum": 200, + "minimum": 120, + "type": "integer" + }, + "y": { + "maximum": 363, + "minimum": -363, + "type": "integer" + }, + "z": { + "maximum": 175, + "minimum": -29, + "type": "integer" + } + }, + "required": [ + "x", + "y", + "z", + "speed" + ], + "type": "object" + }, + "safe": false, + "title": "Go to with speed" }, - { - "contentType": "application/json", - "href": "mqtt://dbbroker.local:1883/uarm/actions/gohome", - "mqv:controlPacketValue": "PUBLISH", - "op": "invokeaction" - } - ], - "idempotent": false, - "safe": false, - "title": "Go Home" - }, - "goTo": { - "description": "Move to Position x,y,z given by the user with fixed speed=3000", - "forms": [ - { - "contentType": "application/json", - "href": "http://172.16.1.150:8080/uarm/actions/goto", - "htv:methodName": "POST", - "op": "invokeaction" + "gripClose": { + "description": "Closes the grip", + "forms": [ + { + "contentType": "application/json", + "href": "http://192.168.120.23:8080/uarm/actions/gripclose", + "htv:methodName": "POST", + "op": "invokeaction" + }, + { + "contentType": "application/json", + "href": "mqtt://172.16.1.230:1883/uarm/actions/gripclose", + "mqv:controlPacketValue": "PUBLISH", + "op": "invokeaction" + } + ], + "idempotent": true, + "safe": false, + "title": "Close Grip" }, - { - "contentType": "application/json", - "href": "mqtt://dbbroker.local:1883/uarm/actions/goto", - "mqv:controlPacketValue": "PUBLISH", - "op": "invokeaction" - } - ], - "idempotent": true, - "input": { - "properties": { - "x": { - "maximum": 200, - "minimum": 120, - "type": "integer" - }, - "y": { - "maximum": 200, - "minimum": -200, - "type": "integer" - }, - "z": { - "maximum": 100, - "minimum": 52, - "type": "integer" - } + "gripOpen": { + "description": "Opens the grip", + "forms": [ + { + "contentType": "application/json", + "href": "http://192.168.120.23:8080/uarm/actions/gripopen", + "htv:methodName": "POST", + "op": "invokeaction" + }, + { + "contentType": "application/json", + "href": "mqtt://172.16.1.230:1883/uarm/actions/gripopen", + "mqv:controlPacketValue": "PUBLISH", + "op": "invokeaction" + } + ], + "idempotent": true, + "safe": false, + "title": "Open Grip" }, - "required": [ - "x", - "y", - "z" - ], - "type": "object" - }, - "safe": false, - "title": "Go to position" - }, - "gripClose": { - "description": "Closes the grip", - "forms": [ - { - "contentType": "application/json", - "href": "http://172.16.1.150:8080/uarm/actions/gripclose", - "htv:methodName": "POST", - "op": "invokeaction" + "sequence1": { + "description": "Routine to move to a position and close the grip", + "forms": [ + { + "contentType": "application/json", + "href": "http://192.168.120.23:8080/uarm/actions/sequence1", + "htv:methodName": "POST", + "op": "invokeaction" + }, + { + "contentType": "application/json", + "href": "mqtt://172.16.1.230:1883/uarm/actions/sequence1", + "mqv:controlPacketValue": "PUBLISH", + "op": "invokeaction" + } + ], + "idempotent": true, + "safe": false, + "title": "Grip Routine" }, - { - "contentType": "application/json", - "href": "mqtt://dbbroker.local:1883/uarm/actions/gripclose", - "mqv:controlPacketValue": "PUBLISH", - "op": "invokeaction" - } - ], - "idempotent": true, - "safe": false, - "title": "Close Grip" - }, - "gripOpen": { - "description": "Opens the grip", - "forms": [ - { - "contentType": "application/json", - "href": "http://172.16.1.150:8080/uarm/actions/gripopen", - "htv:methodName": "POST", - "op": "invokeaction" + "turnLeft": { + "description": "Turn robot arm to left for 1 step", + "forms": [ + { + "contentType": "application/json", + "href": "http://192.168.120.23:8080/uarm/actions/turnleft", + "htv:methodName": "POST", + "op": "invokeaction" + }, + { + "contentType": "application/json", + "href": "mqtt://172.16.1.230:1883/uarm/actions/turnleft", + "mqv:controlPacketValue": "PUBLISH", + "op": "invokeaction" + } + ], + "idempotent": false, + "input": { + "properties": { + "y": { + "maximum": 350, + "minimum": -350, + "type": "number" + } + }, + "required": [ + "y" + ], + "type": "object" + }, + "safe": false, + "title": "Turn Left" }, - { - "contentType": "application/json", - "href": "mqtt://dbbroker.local:1883/uarm/actions/gripopen", - "mqv:controlPacketValue": "PUBLISH", - "op": "invokeaction" - } - ], - "idempotent": true, - "safe": false, - "title": "Open Grip" - }, - "reset": { - "description": "Reestablish connection to Uarm to correct for loss of location", - "forms": [ - { - "contentType": "application/json", - "href": "http://172.16.1.150:8080/uarm/actions/reset", - "htv:methodName": "POST", - "op": "invokeaction" + "turnRight": { + "description": "Turn robot arm to right for a certain distance (has yet to be implemented in loT.py)", + "forms": [ + { + "contentType": "application/json", + "href": "http://192.168.120.23:8080/uarm/actions/turnright", + "htv:methodName": "POST", + "op": "invokeaction" + }, + { + "contentType": "application/json", + "href": "mqtt://172.16.1.230:1883/uarm/actions/turnright", + "mqv:controlPacketValue": "PUBLISH", + "op": "invokeaction" + } + ], + "idempotent": false, + "input": { + "properties": { + "y": { + "maximum": 350, + "minimum": -350, + "type": "number" + } + }, + "required": [ + "y" + ], + "type": "object" + }, + "safe": false, + "title": "Turn Right" } - ], - "idempotent": true, - "safe": false, - "title": "Reset" }, - "turnLeft": { - "description": "Turn robot arm to left for 1 step", - "forms": [ - { - "contentType": "application/json", - "href": "http://172.16.1.150:8080/uarm/actions/turnleft", - "htv:methodName": "POST", - "op": "invokeaction" + "id": "de.tum:ei:esi:uArm:192.168.0.112:8080", + "properties": { + "homeLoc": { + "description": "Home location, can be set to a new value. goHome action goes there", + "forms": [ + { + "contentType": "application/json", + "href": "http://192.168.120.23:8080/uarm/properties/homeloc", + "op": [ + "readproperty", + "writeproperty" + ] + }, + { + "contentType": "application/json", + "href": "mqtt://172.16.1.230:1883/uarm/properties/homeloc", + "mqv:controlPacketValue": "SUBSCRIBE", + "op": [ + "readproperty", + "observeproperty" + ] + }, + { + "contentType": "application/json", + "href": "mqtt://172.16.1.230:1883/uarm/properties/homeloc/writeproperty", + "mqv:controlPacketValue": "PUBLISH", + "op": "writeproperty" + } + ], + "properties": { + "x": { + "maximum": 200, + "minimum": 0, + "type": "integer" + }, + "y": { + "maximum": 350, + "minimum": -350, + "type": "integer" + }, + "z": { + "maximum": 250, + "minimum": 10, + "type": "integer" + } + }, + "required": [ + "x", + "y", + "z" + ], + "title": "Home location", + "type": "object" }, - { - "contentType": "application/json", - "href": "mqtt://dbbroker.local:1883/uarm/actions/turnleft", - "mqv:controlPacketValue": "PUBLISH", - "op": "invokeaction" + "location": { + "description": "Gives back the current location", + "forms": [ + { + "contentType": "application/json", + "href": "http://192.168.120.23:8080/uarm/properties/location", + "op": [ + "readproperty" + ] + }, + { + "contentType": "application/json", + "href": "mqtt://172.16.1.230:1883/uarm/properties/location", + "mqv:controlPacketValue": "SUBSCRIBE", + "op": [ + "readproperty", + "observeproperty" + ] + } + ], + "properties": { + "x": { + "maximum": 200, + "minimum": 120, + "type": "integer" + }, + "y": { + "maximum": 350, + "minimum": -350, + "type": "integer" + }, + "z": { + "maximum": 250, + "minimum": 10, + "type": "integer" + } + }, + "required": [ + "x", + "y", + "z" + ], + "title": "Return location", + "type": "object" } - ], - "idempotent": false, - "output": { - "properties": { - "y": { - "maximum": 200, - "minimum": -200, - "type": "number" - } - }, - "required": [ - "y" - ], - "type": "object" - }, - "safe": false, - "title": "Turn Left" }, - "turnRight": { - "description": "Turn robot arm to right for 1 step", - "forms": [ - { - "contentType": "application/json", - "href": "http://172.16.1.150:8080/uarm/actions/turnright", - "htv:methodName": "POST", - "op": "invokeaction" - }, - { - "contentType": "application/json", - "href": "mqtt://dbbroker.local:1883/uarm/actions/turnright", - "mqv:controlPacketValue": "PUBLISH", - "op": "invokeaction" - } - ], - "idempotent": false, - "input": { - "properties": { - "y": { - "maximum": 330, - "minimum": -330, - "type": "number" - } - }, - "required": [ - "y" - ], - "type": "object" - }, - "safe": false, - "title": "Turn Right" - } - }, - "description": "Uarm resets every full hour automatically to negate accumulation of location errors", - "id": "urn:dev:ops:32473-UArm-001", - "properties": { - "homeLoc": { - "description": "Home location, can be set to a new value. goHome action goes there", - "forms": [ - { - "contentType": "application/json", - "href": "http://172.16.1.150:8080/uarm/properties/homeloc", - "op": [ - "readproperty", - "writeproperty" - ] - }, - { - "contentType": "application/json", - "href": "mqtt://dbbroker.local:1883/uarm/properties/homeloc", - "mqv:controlPacketValue": "SUBSCRIBE", - "op": [ - "readproperty", - "observeproperty" - ] - }, - { - "contentType": "application/json", - "href": "mqtt://dbbroker.local:1883/uarm/properties/homeloc/writeproperty", - "mqv:controlPacketValue": "PUBLISH", - "op": "writeproperty" - } - ], - "properties": { - "x": { - "maximum": 250, - "minimum": 50, - "type": "integer" - }, - "y": { - "maximum": 330, - "minimum": -330, - "type": "integer" - }, - "z": { - "maximum": 100, - "minimum": 52, - "type": "integer" + "security": [ + "nosec_sc" + ], + "securityDefinitions": { + "nosec_sc": { + "scheme": "nosec" } - }, - "required": [ - "x", - "y", - "z" - ], - "title": "Home location", - "type": "object" }, - "location": { - "description": "Gives back the current location", - "forms": [ - { - "contentType": "application/json", - "href": "http://172.16.1.150:8080/uarm/properties/location", - "op": [ - "readproperty" - ] - }, - { - "contentType": "application/json", - "href": "mqtt://dbbroker.local:1883/uarm/properties/location", - "mqv:controlPacketValue": "SUBSCRIBE", - "op": [ - "readproperty", - "observeproperty" - ] - } - ], - "properties": { - "x": { - "maximum": 200, - "minimum": 120, - "type": "integer" - }, - "y": { - "maximum": 200, - "minimum": -200, - "type": "integer" - }, - "z": { - "maximum": 100, - "minimum": 52, - "type": "integer" - } - }, - "required": [ - "x", - "y", - "z" - ], - "title": "Return location", - "type": "object" - } - }, - "security": [ - "nosec_sc" - ], - "securityDefinitions": { - "nosec_sc": { - "scheme": "nosec" - } - }, - "title": "Uarm" -} \ No newline at end of file + "title": "Uarm" +} diff --git a/events/2024.11.Munich/TDs/Philips-Hue/Color-Lamp-onsite-TUM.td.jsonld b/events/2024.11.Munich/TDs/Philips-Hue/Color-Lamp-onsite-TUM.td.jsonld index c9539370..8dac3a06 100644 --- a/events/2024.11.Munich/TDs/Philips-Hue/Color-Lamp-onsite-TUM.td.jsonld +++ b/events/2024.11.Munich/TDs/Philips-Hue/Color-Lamp-onsite-TUM.td.jsonld @@ -12,12 +12,13 @@ } }, "security": "basic_sc", - "base": "https://192.168.1.101/clip/v2/resource/light/5dc4b482-e6e4-4f0b-9783-f85a1432c845", + "base": "https://192.168.120.22/", "properties": { "lightInformation": { "title": "State and Attributes of the Light", "description": "The current state and attributes of the light. There are more attributes that are not listed here and are not of importance.", "type": "object", + "readOnly": true, "properties": { "data": { "title": "An Array that holds the object of the information", @@ -27,15 +28,21 @@ "properties": { "id": { "description": "The ID of the light", - "type": "string" + "type": "string", + "readOnly": false, + "writeOnly": false }, "id_v1": { "description": "The ID of the light in version 1", - "type": "string" + "type": "string", + "readOnly": false, + "writeOnly": false }, "on": { "description": "On/Off state of the light. On=true, Off=false", - "type": "boolean" + "type": "boolean", + "readOnly": false, + "writeOnly": false }, "dimming": { "description": "The brightness of the light", @@ -45,13 +52,19 @@ "description": "The brightness of the light. 0 is the minimum brightness and 100 is the maximum brightness", "type": "number", "minimum": 0, - "maximum": 100 + "maximum": 100, + "readOnly": false, + "writeOnly": false }, "min_dim_level": { "description": "The unit of the brightness", - "type": "number" + "type": "number", + "readOnly": false, + "writeOnly": false } - } + }, + "readOnly": false, + "writeOnly": false }, "color": { "description": "The color of the light", @@ -63,13 +76,19 @@ "properties": { "x": { "description": "The x coordinate of the color in the CIE color space", - "type": "number" + "type": "number", + "readOnly": false, + "writeOnly": false }, "y": { "description": "The y coordinate of the color in the CIE color space", - "type": "number" + "type": "number", + "readOnly": false, + "writeOnly": false } - } + }, + "readOnly": false, + "writeOnly": false }, "gamut": { "description": "The color gamut of the light", @@ -81,13 +100,19 @@ "properties": { "x": { "description": "The x coordinate of the red color gamut in the CIE color space", - "type": "number" + "type": "number", + "readOnly": false, + "writeOnly": false }, "y": { "description": "The y coordinate of the red color gamut in the CIE color space", - "type": "number" + "type": "number", + "readOnly": false, + "writeOnly": false } - } + }, + "readOnly": false, + "writeOnly": false }, "green": { "description": "The green color gamut of the light", @@ -95,13 +120,19 @@ "properties": { "x": { "description": "The x coordinate of the green color gamut in the CIE color space", - "type": "number" + "type": "number", + "readOnly": false, + "writeOnly": false }, "y": { "description": "The y coordinate of the green color gamut in the CIE color space", - "type": "number" + "type": "number", + "readOnly": false, + "writeOnly": false } - } + }, + "readOnly": false, + "writeOnly": false }, "blue": { "description": "The blue color gamut of the light", @@ -109,21 +140,33 @@ "properties": { "x": { "description": "The x coordinate of the blue color gamut in the CIE color space", - "type": "number" + "type": "number", + "readOnly": false, + "writeOnly": false }, "y": { "description": "The y coordinate of the blue color gamut in the CIE color space", - "type": "number" + "type": "number", + "readOnly": false, + "writeOnly": false } - } + }, + "readOnly": false, + "writeOnly": false } - } + }, + "readOnly": false, + "writeOnly": false }, "gamut_type": { "description": "The type of the color gamut", - "type": "string" + "type": "string", + "readOnly": false, + "writeOnly": false } - } + }, + "readOnly": false, + "writeOnly": false }, "dynamics": { "description": "The dynamics of the light", @@ -135,37 +178,55 @@ "enum": [ "none", "dynamic_palette" - ] + ], + "readOnly": false, + "writeOnly": false }, "speed": { "description": "The speed of the dynamics", - "type": "number" + "type": "number", + "readOnly": false, + "writeOnly": false }, "speed_valid": { "description": "The validity of the speed", - "type": "boolean" + "type": "boolean", + "readOnly": false, + "writeOnly": false } - - } + }, + "readOnly": false, + "writeOnly": false }, "type": { "description": "The type of the device", - "type": "string" + "type": "string", + "readOnly": false, + "writeOnly": false } - } - } + }, + "readOnly": false, + "writeOnly": false + }, + "readOnly": false, + "writeOnly": false + }, + "errors": { + "type": "array" } }, "forms": [ { - "href": "", - "contentType": "application/json", + "href": "/clip/v2/resource/light/5dc4b482-e6e4-4f0b-9783-f85a1432c845", "htv:methodName": "GET", "op": [ "readproperty" - ] + ], + "contentType": "application/json" } - ] + ], + "observable": false, + "writeOnly": false } }, "actions": { @@ -180,10 +241,14 @@ "type": "object", "properties": { "on": { - "description": "On/Off state of the light. On=true, Off=false", - "type": "boolean" + "description": "On/Off state of the light. On=true, Off=false", + "type": "boolean", + "readOnly": false, + "writeOnly": false } - } + }, + "readOnly": false, + "writeOnly": false }, "dimming": { "description": "The brightness of the light", @@ -193,9 +258,13 @@ "description": "The brightness of the light. 0 is the minimum brightness and 100 is the maximum brightness", "type": "number", "minimum": 0, - "maximum": 100 + "maximum": 100, + "readOnly": false, + "writeOnly": false } - } + }, + "readOnly": false, + "writeOnly": false }, "color": { "description": "The color of the light", @@ -209,19 +278,29 @@ "description": "The x coordinate of the color in the CIE color space", "type": "number", "minimum": 0, - "maximum": 1 + "maximum": 1, + "readOnly": false, + "writeOnly": false }, "y": { "description": "The y coordinate of the color in the CIE color space", "type": "number", "minimum": 0, - "maximum": 1 + "maximum": 1, + "readOnly": false, + "writeOnly": false } - } + }, + "readOnly": false, + "writeOnly": false } - } + }, + "readOnly": false, + "writeOnly": false } - } + }, + "readOnly": false, + "writeOnly": false }, "output": { "type": "object", @@ -233,31 +312,45 @@ "properties": { "rid": { "description": "The ID of the resource", - "type": "string" + "type": "string", + "readOnly": false, + "writeOnly": false }, "rtype": { "description": "The type of the resource", - "type": "string" + "type": "string", + "readOnly": false, + "writeOnly": false } - } - } + }, + "readOnly": false, + "writeOnly": false + }, + "readOnly": false, + "writeOnly": false }, "errors": { - "type": "array" + "type": "array", + "readOnly": false, + "writeOnly": false } - } + }, + "readOnly": false, + "writeOnly": false }, "forms": [ { - "href": "", - "contentType": "application/json", + "href": "/", "htv:methodName": "PUT", "op": [ "invokeaction" - ] + ], + "contentType": "application/json" } - ] + ], + "safe": false, + "idempotent": false } }, "events": {} -} \ No newline at end of file +} diff --git a/events/2024.11.Munich/TDs/Philips-Hue/Dimmer-Switch-TUM.td.jsonld b/events/2024.11.Munich/TDs/Philips-Hue/Dimmer-Switch-TUM.td.jsonld index 1988f59e..1b46c71e 100644 --- a/events/2024.11.Munich/TDs/Philips-Hue/Dimmer-Switch-TUM.td.jsonld +++ b/events/2024.11.Munich/TDs/Philips-Hue/Dimmer-Switch-TUM.td.jsonld @@ -1,98 +1,388 @@ { - "title": "Hue Dimmer Switch", - "description": "A controller to switch off and on the lights or to dim them", - "id": "urn:dev:ops:32473-HueSwitch-1234", - "@context": [ - "https://www.w3.org/2019/wot/td/v1", + "@context": "https://www.w3.org/2022/wot/td/v1.1", + "id": "urn:dev:ops:32473-HueButton-2", + "@type": "Thing", + "title": "Philips Hue Button", + "description": "A Philips Button with four labeled buttons.", + "securityDefinitions": { + "basic_sc": { + "scheme": "apikey", + "in": "header", + "name": "hue-application-key" + } + }, + "security": "basic_sc", + "links": [ { - "@language": "en" + "rel": "self", + "href": "http://192.168.120.25:8080/tds/button.td.json" } ], - "security": [ - "basic_sc" - ], - "securityDefinitions": { - "basic_sc": { - "scheme": "basic", - "in": "header" - } - }, - "base": "https://remotelab.esi.cit.tum.de:8081/LabLocal/api/17AvYQeLM2T8Z3r0e3BiEvb9Qdwt36yU2BudTxrn/", + "base": "https://192.168.120.22/", "properties": { - "switchInformation": { - "description": "Switch information", - "type": "object", - "properties": { - "state": { + "on": { + "type": "object", + "description": "The state of the on button (I)", + "properties": { + "errors": { + "type": "array", + "readOnly": true, + "description": "A list of errors that have occurred" + }, + "data": { + "type": "array", + "readOnly": true, + "items": { + "type": "object", + "properties": { + "type": { + "type": "string", + "readOnly": true, + "description": "Type of the supported resources" + }, + "id": { + "type": "string", + "readOnly": true, + "description": "Unique identifier of the resource" + }, + "id_v1": { + "type": "string", + "readOnly": true, + "description": "Clip v1 resource identifier" + }, + "button": { + "type": "object", + "properties": { + "last_event": { + "type": "string", + "enum": [ + "initial_press", + "repeat", + "short_release", + "long_release", + "double_short_release", + "long_press" + ] + }, + "button_report": { + "type": "object", + "properties": { + "updated": { + "type": "string", + "format": "date-time", + "readOnly": true, + "description": "The time the button was last updated" + }, + "event": { + "type": "string", + "enum": [ + "initial_press", + "repeat", + "short_release", + "long_release", + "double_short_release", + "long_press" + ] + } + } + }, + "repeat_inteval": { + "type": "integer", + "readOnly": true, + "description": "Duration of a light transition or timed effects in ms." + }, + "event_values": { + "type": "array", + "description": "list of all button events that this device supports" + } + } + } + } + } + } + }, + "forms": [ + { + "href": "/clip/v2/resource/button/0ca4f93b-f3fc-4086-b0a7-031d0d4dc359", + "contentType": "application/json", + "op": [ + "readproperty" + ] + } + ] + }, + "brighter": { "type": "object", - "description": "When the switch last pressed and what button was pressed and how it was pressed", + "description": "The state of the brighter button ", "properties": { - "buttonevent": { - "description": "*2 means short release, *3 means long release. 1* is the turn on button, 2* is the brighten button, 3* is the dim button, 4* is the turn off button", - "type": "integer", - "enum": [ - 1002, - 1003, - 2002, - 2003, - 3002, - 3003, - 4002, - 4003 - ] - }, - "lastupdated": { - "type": "string", - "format": "date-time" - } - } - }, - "config": { + "errors": { + "type": "array", + "readOnly": true, + "description": "A list of errors that have occurred" + }, + "data": { + "type": "array", + "readOnly": true, + "items": { + "type": "object", + "properties": { + "type": { + "type": "string", + "readOnly": true, + "description": "Type of the supported resources" + }, + "id": { + "type": "string", + "readOnly": true, + "description": "Unique identifier of the resource" + }, + "id_v1": { + "type": "string", + "readOnly": true, + "description": "Clip v1 resource identifier" + }, + "button": { + "type": "object", + "properties": { + "last_event": { + "type": "string", + "enum": [ + "initial_press", + "repeat", + "short_release", + "long_release", + "double_short_release", + "long_press" + ] + }, + "button_report": { + "type": "object", + "properties": { + "updated": { + "type": "string", + "format": "date-time", + "readOnly": true, + "description": "The time the button was last updated" + }, + "event": { + "type": "string", + "enum": [ + "initial_press", + "repeat", + "short_release", + "long_release", + "double_short_release", + "long_press" + ] + } + } + }, + "repeat_inteval": { + "type": "integer", + "readOnly": true, + "description": "Duration of a light transition or timed effects in ms." + }, + "event_values": { + "type": "array", + "description": "list of all button events that this device supports" + } + } + } + } + } + } + }, + "forms": [ + { + "href": "/clip/v2/resource/button/014ece4d-9b00-43fc-ba0a-8c263c9ab91d", + "contentType": "application/json", + "op": [ + "readproperty" + ] + } + ] + }, + "darker": { "type": "object", + "description": "The state of the darler button.", "properties": { - "on": { - "type": "boolean" - }, - "battery": { - "type": "integer", - "maximum": 100 - }, - "reachable": { - "type": "boolean" - } - } - }, - "name": { - "type": "string" - }, - "type": { - "type": "string", - "const": "ZLLSwitch" - }, - "modelid": { - "type": "string", - "const": "RWL021" - }, - "manufacturername": { - "type": "string" - }, - "swversion": { - "type": "string" - }, - "uniqueid": { - "type": "string" - } + "errors": { + "type": "array", + "readOnly": true, + "description": "A list of errors that have occurred" + }, + "data": { + "type": "array", + "readOnly": true, + "items": { + "type": "object", + "properties": { + "type": { + "type": "string", + "readOnly": true, + "description": "Type of the supported resources" + }, + "id": { + "type": "string", + "readOnly": true, + "description": "Unique identifier of the resource" + }, + "id_v1": { + "type": "string", + "readOnly": true, + "description": "Clip v1 resource identifier" + }, + "button": { + "type": "object", + "properties": { + "last_event": { + "type": "string", + "enum": [ + "initial_press", + "repeat", + "short_release", + "long_release", + "double_short_release", + "long_press" + ] + }, + "button_report": { + "type": "object", + "properties": { + "updated": { + "type": "string", + "format": "date-time", + "readOnly": true, + "description": "The time the button was last updated" + }, + "event": { + "type": "string", + "enum": [ + "initial_press", + "repeat", + "short_release", + "long_release", + "double_short_release", + "long_press" + ] + } + } + }, + "repeat_inteval": { + "type": "integer", + "readOnly": true, + "description": "Duration of a light transition or timed effects in ms." + }, + "event_values": { + "type": "array", + "description": "list of all button events that this device supports" + } + } + } + } + } + } + }, + "forms": [ + { + "href": "/clip/v2/resource/button/7e203fcb-23d6-4b29-b547-142d0484659e", + "contentType": "application/json", + "op": [ + "readproperty" + ] + } + ] }, - "forms": [ - { - "href": "sensors/7", - "contentType": "application/json", - "htv:methodName": "GET", - "op": [ - "readproperty" + "off": { + "type": "object", + "description": "The state of the on button (I)", + "properties": { + "errors": { + "type": "array", + "readOnly": true, + "description": "A list of errors that have occurred" + }, + "data": { + "type": "array", + "readOnly": true, + "items": { + "type": "object", + "properties": { + "type": { + "type": "string", + "readOnly": true, + "description": "Type of the supported resources" + }, + "id": { + "type": "string", + "readOnly": true, + "description": "Unique identifier of the resource" + }, + "id_v1": { + "type": "string", + "readOnly": true, + "description": "Clip v1 resource identifier" + }, + "button": { + "type": "object", + "properties": { + "last_event": { + "type": "string", + "enum": [ + "initial_press", + "repeat", + "short_release", + "long_release", + "double_short_release", + "long_press" + ] + }, + "button_report": { + "type": "object", + "properties": { + "updated": { + "type": "string", + "format": "date-time", + "readOnly": true, + "description": "The time the button was last updated" + }, + "event": { + "type": "string", + "enum": [ + "initial_press", + "repeat", + "short_release", + "long_release", + "double_short_release", + "long_press" + ] + } + } + }, + "repeat_inteval": { + "type": "integer", + "readOnly": true, + "description": "Duration of a light transition or timed effects in ms." + }, + "event_values": { + "type": "array", + "description": "list of all button events that this device supports" + } + } + } + } + } + } + }, + "forms": [ + { + "href": "/clip/v2/resource/button/57c690ce-320a-481e-92ad-fb12f1fdc9aa", + "contentType": "application/json", + "op": [ + "readproperty" + ] + } ] - } - ] - } + } } -} \ No newline at end of file +} diff --git a/events/2024.11.Munich/TDs/Philips-Hue/Motion-Sensor-TUM.td.jsonld b/events/2024.11.Munich/TDs/Philips-Hue/Motion-Sensor-TUM.td.jsonld new file mode 100644 index 00000000..377bde35 --- /dev/null +++ b/events/2024.11.Munich/TDs/Philips-Hue/Motion-Sensor-TUM.td.jsonld @@ -0,0 +1,107 @@ +{ + "@context": "https://www.w3.org/2022/wot/td/v1.1", + "id": "urn:dev:ops:32473-HueMotion-2", + "@type": "Thing", + "title": "Philips Hue Motion Sensor", + "description": "A Philips Hue motion sensor", + "securityDefinitions": { + "basic_sc": { + "scheme": "apikey", + "in": "header", + "name": "hue-application-key" + } + }, + "security": "basic_sc", + "base": "https://192.168.120.22/", + "properties": { + "state": { + "type": "object", + "description": "The state of the on button (I)", + "properties": { + "errors": { + "type": "array", + "readOnly": true, + "description": "A list of errors that have occurred" + }, + "data": { + "type": "array", + "readOnly": true, + "items": { + "type": "object", + "properties": { + "id": { + "description": "The ID of the motion sensor", + "type": "string", + "readOnly": true, + "writeOnly": false + }, + "id_v1": { + "description": "The ID of the motion sensor in version 1", + "type": "string", + "readOnly": true, + "writeOnly": false + }, + "enabled": { + "type": "boolean", + "description": "If the motion sensor is enabled or not" + }, + "motion": { + "type": "object", + "properties": { + "motion": { + "type": "boolean" + }, + "motion_valid": { + "type": "boolean" + }, + "motion_report": { + "type": "object", + "properties": { + "changed": { + "type": "string" + }, + "motion": { + "type": "boolean" + } + } + } + } + }, + "sensitivity": { + "type": "object", + "properties": { + "status": { + "type": "string", + "enum": [ + "set", + "changing" + ] + }, + "sensitivity": { + "type": "number", + "description": "Sensitivity of the sensor. Value in the range 0 to sensitivity_max." + }, + "sensitivity_max": { + "type": "number" + } + } + }, + "type": { + "type": "string" + } + } + } + } + }, + "forms": [ + { + "href": "/clip/v2/resource/motion/c104416d-965a-4d60-92fa-06bd7396d764", + "contentType": "application/json", + "op": [ + "readproperty" + ] + } + ] + } + } +} diff --git a/events/2024.11.Munich/TDs/Philips-Hue/Readme.md b/events/2024.11.Munich/TDs/Philips-Hue/Readme.md new file mode 100644 index 00000000..81442d7f --- /dev/null +++ b/events/2024.11.Munich/TDs/Philips-Hue/Readme.md @@ -0,0 +1,4 @@ +API Key for onsite hue devices from TU Munich + +"name": "hue-application-key", +"value": "KXAMA9HEQKMVsl5Z0MRQCEmNvcqBnzcDVjhWnmob" diff --git a/events/2024.11.Munich/TDs/thingweb-nodewot/ConveyorBelt1-TUM.td.jsonld b/events/2024.11.Munich/TDs/thingweb-nodewot/ConveyorBelt1-TUM.td.jsonld index 8df61422..d6c97361 100644 --- a/events/2024.11.Munich/TDs/thingweb-nodewot/ConveyorBelt1-TUM.td.jsonld +++ b/events/2024.11.Munich/TDs/thingweb-nodewot/ConveyorBelt1-TUM.td.jsonld @@ -1,114 +1,146 @@ { - "@context": [ - "https://www.w3.org/2019/wot/td/v1", - { - "@language": "en" - } - ], - "@type": "", - "actions": { - "startBeltBackward": { - "description": "This action starts moving the conveyor belt backward", - "forms": [ + "@context": [ + "https://www.w3.org/2019/wot/td/v1", { - "contentType": "application/json", - "href": "https://remotelab.esi.cit.tum.de:8081/ConveyorBelt1/actions/startBeltBackward", - "htv:methodName": "POST", - "op": [ - "invokeaction" - ] + "@language": "en" + } + ], + "@type": "", + "id": "urn:dev:ops:32473-ConveyorBelt-001", + "title": "ConveyorBelt1", + "description": "Conveyor Belt with a Stepper Motor on a RPi", + "properties": { + "speed": { + "title": "Speed", + "description": "Speed of the conveyor belt", + "type": "integer", + "unit": "%", + "minimum": 1, + "maximum": 100, + "readOnly": false, + "writeOnly": false, + "observable": false, + "forms": [ + { + "href": "http://192.168.120.21:8080/ConveyorBelt1/properties/speed", + "contentType": "application/json", + "op": [ + "readproperty", + "writeproperty" + ] + }, + { + "href": "http://[fde4:4f8a:8808:0:86fc:1c58:fdb2:c4b]:8080/ConveyorBelt1/properties/speed", + "contentType": "application/json", + "op": [ + "readproperty", + "writeproperty" + ] + } + ] } - ], - "idempotent": false, - "output": { - "const": "Conveyor belt started backwards" - }, - "safe": false, - "synchronous": true, - "title": "Start conveyor belt" }, - "startBeltForward": { - "description": "This action starts moving the conveyor belt forward", - "forms": [ - { - "contentType": "application/json", - "href": "https://remotelab.esi.cit.tum.de:8081/ConveyorBelt1/actions/startBeltForward", - "htv:methodName": "POST", - "op": [ - "invokeaction" - ] + "actions": { + "startBeltForward": { + "title": "Start conveyor belt", + "description": "This action starts moving the conveyor belt forward", + "synchronous": true, + "idempotent": false, + "safe": false, + "forms": [ + { + "href": "http://192.168.120.21:8080/ConveyorBelt1/actions/startBeltForward", + "contentType": "application/json", + "op": [ + "invokeaction" + ], + "htv:methodName": "POST" + }, + { + "href": "http://[fde4:4f8a:8808:0:86fc:1c58:fdb2:c4b]:8080/ConveyorBelt1/actions/startBeltForward", + "contentType": "application/json", + "op": [ + "invokeaction" + ], + "htv:methodName": "POST" + } + ] + }, + "startBeltBackward": { + "title": "Start conveyor belt", + "description": "This action starts moving the conveyor belt backward", + "synchronous": true, + "idempotent": false, + "safe": false, + "forms": [ + { + "href": "http://192.168.120.21:8080/ConveyorBelt1/actions/startBeltBackward", + "contentType": "application/json", + "op": [ + "invokeaction" + ], + "htv:methodName": "POST" + }, + { + "href": "http://[fde4:4f8a:8808:0:86fc:1c58:fdb2:c4b]:8080/ConveyorBelt1/actions/startBeltBackward", + "contentType": "application/json", + "op": [ + "invokeaction" + ], + "htv:methodName": "POST" + } + ] + }, + "stopBelt": { + "title": "Stop conveyor belt", + "description": "This action stops moving the conveyor belt", + "synchronous": false, + "idempotent": false, + "safe": false, + "forms": [ + { + "href": "http://192.168.120.21:8080/ConveyorBelt1/actions/stopBelt", + "contentType": "application/json", + "op": [ + "invokeaction" + ], + "htv:methodName": "POST" + }, + { + "href": "http://[fde4:4f8a:8808:0:86fc:1c58:fdb2:c4b]:8080/ConveyorBelt1/actions/stopBelt", + "contentType": "application/json", + "op": [ + "invokeaction" + ], + "htv:methodName": "POST" + } + ] } - ], - "idempotent": false, - "output": { - "const": "Conveyor belt started forwards" - }, - "safe": false, - "synchronous": true, - "title": "Start conveyor belt" }, - "stopBelt": { - "description": "This action stops moving the conveyor belt", - "forms": [ + "security": [ + "nosec_sc" + ], + "forms": [ { - "contentType": "application/json", - "href": "https://remotelab.esi.cit.tum.de:8081/ConveyorBelt1/actions/stopBelt", - "htv:methodName": "POST", - "op": [ - "invokeaction" - ] - } - ], - "idempotent": false, - "output": { - "const": "Conveyor belt stopped" - }, - "safe": false, - "synchronous": false, - "title": "Stop conveyor belt" - } - }, - "description": "Conveyor Belt with a Stepper Motor on a RPi", - "forms": [ - { - "contentType": "application/json", - "href": "https://remotelab.esi.cit.tum.de:8081/ConveyorBelt1/all/properties", - "op": [ - "writeallproperties", - "writemultipleproperties" - ] - } - ], - "id": "urn:dev:ops:32473-ConveyorBelt-001", - "properties": { - "speed": { - "description": "Speed of the conveyor belt", - "forms": [ + "href": "http://192.168.120.21:8080/ConveyorBelt1/all/properties", + "contentType": "application/json", + "op": [ + "writeallproperties", + "writemultipleproperties" + ] + }, { - "contentType": "application/json", - "href": "https://remotelab.esi.cit.tum.de:8081/ConveyorBelt1/properties/speed", - "op": [ - "readproperty", - "writeproperty" - ] + "href": "http://[fde4:4f8a:8808:0:86fc:1c58:fdb2:c4b]:8080/ConveyorBelt1/all/properties", + "contentType": "application/json", + "op": [ + "writeallproperties", + "writemultipleproperties" + ] + } + ], + "securityDefinitions": { + "nosec_sc": { + "scheme": "nosec" } - ], - "maximum": 100, - "minimum": 1, - "observable": false, - "readOnly": false, - "title": "Speed", - "type": "integer", - "unit": "%", - "writeOnly": false - } - }, - "security": "basic_sc", - "securityDefinitions": { - "basic_sc": { - "in": "header", - "scheme": "basic" } - }, - "title": "ConveyorBelt1" -} \ No newline at end of file +}