Merge remote-tracking branch 'origin' into egekorkan-patch-12

w3c · Nov 11, 2024 · 46f879b · 46f879b
2 parents 9374057 + d8777fa
commit 46f879b
Show file tree

Hide file tree

Showing 16 changed files with 75 additions and 31 deletions.
diff --git a/.github/workflows/validation.yaml b/.github/workflows/validation.yaml
@@ -10,29 +10,22 @@ jobs:
 
     steps:
       - name: Checkout wot-testing
-        uses: actions/checkout@v2
-
-      - name: Checkout thingweb-playground
-        uses: actions/checkout@v2
-        with:
-          repository: thingweb/thingweb-playground
-          path: thingweb-playground
+        uses: actions/checkout@v4
 
       - name: Setup Node.js                         
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v4.1.0
         with:
-          node-version: '15'       
-
-      - name: Use lerna
-        run: npm install -g [email protected]
-
-      - name: Bootstrap
-        working-directory: thingweb-playground
-        run: lerna bootstrap --no-ci
+          node-version: '20'
 
+      - name: Create empty folder
+        run: npm init -y
+
+      - name: Install Playground CLI
+        run: npm i @thing-description-playground/cli
+
       - name: Run validation script on all new matching files
         env:
-          VALIDATION_SCRIPT: thingweb-playground/packages/cli/index.js
+          VALIDATION_SCRIPT: node_modules/@thing-description-playground/cli/index.js
           PATTERN: "*.td.jsonld" 
         run: |
           # Get the list of changed files

diff --git a/data/input_2022/Architecture/Impls/hitachi-espidf.html b/data/input_2022/Architecture/Impls/hitachi-espidf.html
@@ -1,8 +1,8 @@
 <div class="impl" id="impl-hitachi-esp-idf">
-  <h4>Air quality sensor and acclerometer: TD Exposer</h4>
+  <h4>hitachi-esp-idf: Air quality sensor and acclerometer: TD Exposer</h4>
   <p>
     This is an example of a Thing implemented on a microcontroller. 
     It can exporting the Thing's sensor reading via HTTP REST API,
     and advertise its own Thing Description using DNS-SD/mDNS.
   </p>
-</div>
+</div>
diff --git a/data/input_2022/Architecture/Impls/hitachi-nodegen.html b/data/input_2022/Architecture/Impls/hitachi-nodegen.html
@@ -1,5 +1,5 @@
 <div class="impl" id="impl-hitachi-nodegen">
-  <h4>Node generator for Node-RED: TD Consumer</h4>
+  <h4>hitachi-nodegen: Node generator for Node-RED: TD Consumer</h4>
   <p>
     <a href="https://github.com/node-red/node-red-nodegen">Node generator</a> is
     command line tool to generate

diff --git a/data/input_2022/Architecture/Impls/hitachi-nodered.html b/data/input_2022/Architecture/Impls/hitachi-nodered.html
@@ -1,5 +1,5 @@
 <div class="impl" id="impl-hitachi-nodered">
-  <h4>LED lamp: TD Exposer</h4>
+  <h4>hitachi-nodered: LED lamp: TD Exposer</h4>
   <p>
     This is an example of a Thing implemented in Node-RED.
     It can turn on and off a LED connected to Raspberry Pi's GPIOs

diff --git a/data/input_2022/Architecture/Impls/hitachi-nrwotdisc.html b/data/input_2022/Architecture/Impls/hitachi-nrwotdisc.html
@@ -1,5 +1,5 @@
 <div class="impl" id="impl-hitachi-nrwotdisc">
-  <h4>WoT-Discovery Plugin for Node-RED: Discoverer</h4>
+  <h4>hitachi-nrwotdisc: WoT-Discovery Plugin for Node-RED: Discoverer</h4>
   <p>
     This plugin uses wot-discovery functionality
     and make it easy to import Things into Node-RED flow editor.

diff --git a/data/input_2022/Architecture/Impls/intel-nodejs.html b/data/input_2022/Architecture/Impls/intel-nodejs.html
@@ -2,6 +2,7 @@
   <h4>intel-nodejs: TD Exposer</h4>
   <p>
   Two services based on a shared NodeJS codebase (not using node-wot):
+  </p>
   <ul>
 	 <li>A simple camera service that interfaces 
 	 with V4L (Video for Linux) to capture still images
@@ -10,5 +11,6 @@ <h4>intel-nodejs: TD Exposer</h4>
 	 <li>A simple text-to-speech output service based on espeak.
 	 </li>
   </ul>
-  </p>
+  <p><b>Usage:</b> Exposer</p>
+  <p><b>Contributing Member Organizations:</b> Intel</p>
 </div>
diff --git a/data/input_2022/Architecture/Impls/intel-proxy.html b/data/input_2022/Architecture/Impls/intel-proxy.html
@@ -12,4 +12,6 @@ <h4>intel-proxy: Intermediary</h4>
   The secure endpoints provided by this service are not given in TDs for the 
   service itself, but added to the TDs for the Things it services.
   </p>
+  <p><b>Usage:</b> Intermediary</p>
+  <p><b>Contributing Member Organizations:</b> Intel</p>
 </div>
diff --git a/data/input_2022/Architecture/Impls/intel-wot-ha.html b/data/input_2022/Architecture/Impls/intel-wot-ha.html
@@ -10,4 +10,6 @@ <h4>intel-wot-ha: TD Directory and TD Exposer</h4>
   entities supported by Home Assistant and access these services
   using WoT affordance abstractions.
   </p>
+  <p><b>Usage:</b> Directory and Exposer</p>
+  <p><b>Contributing Member Organizations:</b> Intel</p>
 </div>
diff --git a/data/input_2022/Architecture/Impls/krellian-cloud.html b/data/input_2022/Architecture/Impls/krellian-cloud.html
@@ -0,0 +1,21 @@
+<div class="impl" id="impl-krellian-cloud">
+  <h4>Krellian Cloud</h4>
+  <p>
+    A hosted cloud service which creates a digital twin of a building to model
+    how it's being used and identify potential optimisations.
+  </p>
+  <p>
+    Implements the Directory Service API from WoT Discovery and consumes web
+    things conforming to WoT Thing Description 1.1 and the HTTP Basic Profile 
+    and HTTP SSE Profile from WoT Profiles.
+  </p>
+  <p>
+    <b>Usage:</b> Cloud service
+  </p>
+  <p>
+    <b>Website:</b> https://krellian.com/services/cloud/
+  </p>
+  <p>
+    <b>Contributing Member Organizations:</b> Invited Experts
+  </p>
+</div>
diff --git a/data/input_2022/Architecture/Impls/philips-hue.html b/data/input_2022/Architecture/Impls/philips-hue.html
@@ -1,5 +1,5 @@
 <div class="impl" id="impl-philips-hue">
-  <h4 id="impl-philips-hue">Philips Hue Integration</h4>
+  <h4 id="impl-philips-hue">philips-hue: Philips Hue Integration</h4>
   <p>
     This implementation leverages the already developed Philips Hue devices. The TDs for them are written by hand and show the use of WoT for brownfield
     devices. Philips Hue uses API Key in the URI, which is one of the features of the TD 1.1.

diff --git a/data/input_2022/Architecture/Impls/python-flask-custom.html b/data/input_2022/Architecture/Impls/python-flask-custom.html
@@ -1,5 +1,5 @@
 <div class="impl" id="impl-python-flask">
-  <h4 id="impl-python-flask">Custom Python Flask Things: Thing</h4>
+  <h4 id="impl-python-flask">flask-tum: Custom Python Flask Things: Thing</h4>
   <p>
     Custom implementation pattern using the Flask library for creating an HTTP server that exposes a TD. 
     This pattern is used in many devices that have been developed.

diff --git a/data/input_2022/Architecture/Impls/tinyiot.html b/data/input_2022/Architecture/Impls/tinyiot.html
@@ -1,5 +1,5 @@
 <div class="impl" id="impl-tinyiot">
-  <h4 id="impl-tinyiot">TinyIoT Thing Directory</h4>
+  <h4 id="impl-tinyiot">tiny-iot: TinyIoT Thing Directory</h4>
   <p>
     This is an implementation of the W3C Web of Things (WoT) Thing Description Directory (TDD).
     This directory is designed to be lightweight and portable, enabling deployment on the edge.

diff --git a/data/input_2022/Architecture/Impls/webthings-gateway.html b/data/input_2022/Architecture/Impls/webthings-gateway.html
@@ -0,0 +1,24 @@
+<div class="impl" id="impl-webthings-gateway">
+  <h4>WebThings Gateway</h4>
+  <p>
+    An open source Web of Things gateway for smart buildings, which bridges a 
+    wide range of IoT protocols to the Web of Things.
+  </p>
+  <p>Exposes a directory of Thing Descriptions conformant with TD 1.1 and a
+    REST API conformant with the HTTP Basic Profile and HTTP SSE Profile from 
+    WoT Profiles.
+  </p>
+  <p>
+    <b>Usage:</b> A web application which can be built from source, installed
+    as a docker image or flashed onto a Raspberry Pi single board computer.
+  </p>
+  <p>
+    <b>Public Repository:</b> https://github.com/WebThingsIO/gateway/
+  </p>
+  <p>
+    <b>Website:</b> https://webthings.io/gateway/
+  </p>
+  <p>
+    <b>Contributing Member Organizations:</b> Invited Experts
+  </p>
+</div>
diff --git a/data/input_2022/Architecture/Impls/wothive.html b/data/input_2022/Architecture/Impls/wothive.html
@@ -3,7 +3,7 @@ <h4 id="impl-wothive-dir">WoT Hive directory</h4>
   <p>
    WoT Hive is an implementation of a W3C Web of Things directory. This implementation is compliant with the standard specification but aims at providing enriched features thanks to the usage of other W3C standards related to Semantic Web technologies.
   </p>
-  <p><b>Usage:</b> Directoryt</p>
+  <p><b>Usage:</b> Directory</p>
   <p><b>Public Repository:</b> https://github.com/oeg-upm/wot-hive</p>
   <p>
     <b>Website:</b> https://github.com/oeg-upm/wot-hive

diff --git a/events/2024.11.Munich/Readme.md b/events/2024.11.Munich/Readme.md
@@ -19,7 +19,7 @@ Stakeholders from related SDOs are welcome to contribute.
 | Organization | Things/Devices/System/Tools                   | Physical | Remote | Virtual | Protocol Supported | Infrastructure requirements, e.g., open ports, power sockets, Wifi | Comments                                                     |Contact|
 |--------------|-----------------------------------------------|----------|--------|---------|--------------------|--------------------------------------------------------------------|--------------------------------------------------------------|-------|
 | Siemens      | Sentron PAC (energy meter)                    |  x       |        |         | Modbus             | LAN                                                                | Table 1                                                      |   tbc |
-| Siemens      | Industrial Edge                               |  x       |        |         | OPC UA, HTTP       | LAN, connection to the Internet                                    | Table 1                                                      |   tbc |
+| Siemens      | Industrial Edge                               |  x       |        |         | OPC UA, HTTP       | LAN, connection to the Internet                                    | Table 1                                                      | Christian|
 | Siemens      | Microscope (Openflexure)                      |  x       |        |         | HTTP               | LAN                                                                | Table 1                                                      | @egekorkan |
 | Siemens      | Thread Border Router                          |  x       |        |         | KNX IoT            |                                                                    | Table 1                                                      | @mkovatsc |
 | Siemens      | Temperature, Humidity and CO2 Sensor          |  x       |        |         | KNX IoT            |                                                                    | Table 1                                                      | @mkovatsc |
@@ -33,6 +33,7 @@ Stakeholders from related SDOs are welcome to contribute.
 | TU Munich    | Diff. rem. devices (raspberry pi,etc)         |          | x      |         | HTTPS              | Internet                                                           | Table 2                                                      |@FadySalama |
 | TU Munich    | Simulated devices (robot arms)                |          |        | x       | HTTP but flexible  | LAN/Wifi                                                           | Table 2                                                      |@FadySalama |
 | Luminem      | Simulated devices (TBC)                       |  x       |        | x       | HTTP               | Laptop to run them locally                                         |                                                              | @lu-zero |
+| Luminem      | esp32c3 [demo thermometer](https://github.com/wot-rust/wot-esp-demo)                      |  x       |        | x       | HTTP               | a [rust esp32c3 board](https://github.com/esp-rs/esp-rust-board) or compatible, Wifi                                         |                                                              | @lu-zero |
 | Intel        | Services (AI, Speech Recog.)                  |  x       | x      | x       | HTTP(s)            |                                                                    | Table 3; Some services can be run locally by someone else    | @mmccool |
 | ArmorSafe    | Cache System 7000                             |  x       |        |         | HTTP               |                                                                    | Table 3; Each time someone deposits cash, it emits an event  |   Michael Robins and Denis Ioan |
 | Ignite Retail| IP Camera                                     |  x       |        |         |                    |                                                                    | Table 3                                                      |   Josh Thomas |

diff --git a/events/2024.11.Munich/TDs/openflexure/microscope.td.jsonld b/events/2024.11.Munich/TDs/openflexure/microscope.td.jsonld
@@ -1,14 +1,13 @@
 {
   "@context": [
-    "https://www.w3.org/2019/wot/td/v1",
-    "https://iot.mozilla.org/schemas/"
+    "https://www.w3.org/2019/wot/td/v1"
   ],
   "@type": [
     "org.openflexure.microscope"
   ],
   "id": "OpenFlexureMicroscopeopenflexure:microscope:9cd38bce-9d27-4f00-8a2a-52d48b96a9fc:96da96db-bf8c-4d98-8fc0-34120158c7e3",
   "title": "OpenFlexure Microscope openflexure:microscope:9cd38bce-9d27-4f00-8a2a-52d48b96a9fc",
-  "description": "Test LabThing-based API for OpenFlexure Microscope",
+  "description": "LabThing-based API for OpenFlexure Microscope",
   "properties": {
     "org.openflexure.zipbuilder/get": {
       "title": "ZipListAPIView",