From 16e71f6775f44ec9f346e01225cece6aa425bb7c Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Mon, 23 Sep 2024 10:21:11 +0200 Subject: [PATCH 1/2] Update Readme.md --- events/2024.11.Munich/Readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/events/2024.11.Munich/Readme.md b/events/2024.11.Munich/Readme.md index 4a2475eb..c07cca48 100644 --- a/events/2024.11.Munich/Readme.md +++ b/events/2024.11.Munich/Readme.md @@ -13,6 +13,7 @@ Stakeholders from related SDOs are welcome to contribute. |--------------|-----------------------------------------------|----------|--------|---------|--------------------------------------------------------------------|-----------------------------------------------------|-------| | Siemens | Sentron PAC (energy meter) | x | | | LAN | Modbus | tbc | | Siemens | Industrial Edge | x | | | LAN, connection to the Internet | OPC UA, HTTP | tbc | +| Siemens | Microscope (Openflexure) | x | | | LAN | | tbc | | TU Munich | Hololens | x | | | Wifi | no sec should be used; QR code to TD is needed | tbc | | TU Munich | Robot arm | x | | | 2m high, 4m width; LAN/Wifi (no Internet); should be protoced | | tbc | | TU Munich | Philips Hue Lamp and Switch | x | | | LAN | | tbc | From f2faf2bb6a2e95ea226b992daf0b0b857b1a4fdb Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Tue, 24 Sep 2024 08:26:18 +0200 Subject: [PATCH 2/2] Update events/2024.11.Munich/Readme.md Co-authored-by: Ted Thibodeau Jr --- events/2024.11.Munich/Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/events/2024.11.Munich/Readme.md b/events/2024.11.Munich/Readme.md index c07cca48..4b48a66e 100644 --- a/events/2024.11.Munich/Readme.md +++ b/events/2024.11.Munich/Readme.md @@ -15,7 +15,7 @@ Stakeholders from related SDOs are welcome to contribute. | Siemens | Industrial Edge | x | | | LAN, connection to the Internet | OPC UA, HTTP | tbc | | Siemens | Microscope (Openflexure) | x | | | LAN | | tbc | | TU Munich | Hololens | x | | | Wifi | no sec should be used; QR code to TD is needed | tbc | -| TU Munich | Robot arm | x | | | 2m high, 4m width; LAN/Wifi (no Internet); should be protoced | | tbc | +| TU Munich | Robot arm | x | | | 2m high, 4m width; LAN/Wifi (no Internet); should be protected | | tbc | | TU Munich | Philips Hue Lamp and Switch | x | | | LAN | | tbc | | TU Munich | Diff. rem. devices (raspberry pi,etc) | | x | | Internet | | tbc | | TU Munich | Simulated devices (robot arms) | | | x | LAN/Wifi | | tbc |