Skip to content

Commit

Permalink
Merge pull request #603 from w3c/egekorkan-patch-12
Browse files Browse the repository at this point in the history 
Small robot arm and conveyor belts from TUM
  • Loading branch information
@egekorkan
egekorkan authored Nov 14, 2024
2 parents 837328d + 04ba9ad commit 3e82dc5
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion events/2024.11.Munich/Readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ Network:
| Siemens | Room Controller Unit | x | | | KNX IoT | | Table 1 | @mkovatsc | |
| Siemens | S7-1500 connected with conveyor belt and lamp | x | | | OPC UA | LAN | Table 1 | @sebastiankb | |
| Siemens | Temperature, Humidity, and CO2 Sensor (Dev. version) | x | | | HTTP | WiFi | Table NEED | Haoyu Ren, Darko Anicic, @mahdanoura| |
| TU Munich | Robot arm | x | | | HTTP | 2m high, 4m width; LAN/Wifi (no Internet); should be protected | has own table | @FadySalama | |
| TU Munich | Big Robot arm (1.6m radius, 10kg capacity) | x | | | HTTP | 2m high, 4m width; LAN/Wifi (no Internet); should be protected | has own table | @FadySalama | |
| TU Munich | Small Robot arm | x | | | HTTP | | NEED TABLE | @FadySalama | |
| TU Munich | 2 Small Conveyor Belts | x | | | HTTP | | NEED TABLE | @FadySalama | |
| TU Munich | Philips Hue Lamp and Switch | x | | | HTTP | LAN | Table 2 | @FadySalama | |
| 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 | |
Expand Down

0 comments on commit 3e82dc5

Please sign in to comment.