ellensohn/cps_loki
1
0
Fork 0
mirror of https://github.com/bjoernellens1/cps_loki.git synced 2024-11-22 23:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

update: working

Browse Source
This commit is contained in:
Björn Ellensohn 2024-03-27 11:50:03 +01:00
parent beeec6732b
commit 5909c7f840
7 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/caddy/Caddyfile
View File

@ -13,6 +13,11 @@ http://loki {
handle_path /viz* { handle_path /viz* {
reverse_proxy http://foxglove:8080 reverse_proxy http://foxglove:8080
} }
# this is not working right now
handle_path /joy* {
reverse_proxy http://host.docker.internal:8000
}
} }
http://loki.local { http://loki.local {

51
config/caddy/content/overview/index.html
View File

@ -12,30 +12,22 @@
</head> </head>
<header> <header>
<h1 id="HEADLINE">CPS Bot Mini Overview<img src="CPS_Logo_White_square_TRANSP.png" id="LOGO"></h1> <h1 id="HEADLINE">Loki Overview<img src="CPS_Logo_White_square_TRANSP.png" id="LOGO"></h1>
</header> </header>
<body> <body>
<div class="box" id="LEFT">
<p class="mini-heads">Connect to Wi-Fi:</p>
<!-- replace mit relativen Link!!!, bei mir spinnts und es wird das gebrochene Bild symbol angezeigt. Anders geht
es allerdings, falls nicht bei dir sags mir -->
<img src="qr-loki.wifi.svg" class="qr">
<div id="NORM_SET">
<table>
<tr>
<td>SSID:</td>
<td>cps-loki</td>
</tr>
<tr>
<td>Password: </td>
<td>cps-loki</td>
</tr>
</table>
</div>
</div>
<div class="box" id="RIGHT"> <div class="box" id="RIGHT">
<div id="BLOCK_ONE">
<p class="mini-heads">Teleop:</p>
<!-- again -->
<!-- Replace link at href -->
<!-- hier Link zu Joystick -->
<a href="http://loki:8000/">
<img src="joystick.png" class="qr qr_2"></a>
<br>
</div>
<div id="BLOCK_ONE"> <div id="BLOCK_ONE">
<p class="mini-heads">Robot Configuration:</p> <p class="mini-heads">Robot Configuration:</p>
<!-- again --> <!-- again -->
@ -64,7 +56,7 @@
<p class="mini-heads">Manual:</p> <p class="mini-heads">Manual:</p>
<!-- again --> <!-- again -->
<!-- hier Link zu Manual --> <!-- hier Link zu Manual -->
<a href="https://www.unileoben.ac.at/universitaet/lehrstuehle/institute/department-product-engineering/lehrstuhl-fuer-cyber-physical-systems/"> <a href="https://cps.unileoben.ac.at">
<img src="blueprint.svg" class="qr qr_2"> <img src="blueprint.svg" class="qr qr_2">
</a> </a>
<br> <br>
@ -72,6 +64,25 @@
</div> </div>
<div class="box" id="LEFT">
<p class="mini-heads">Connect to Wi-Fi:</p>
<!-- replace mit relativen Link!!!, bei mir spinnts und es wird das gebrochene Bild symbol angezeigt. Anders geht
es allerdings, falls nicht bei dir sags mir -->
<img src="qr-loki.wifi.svg" class="qr">
<div id="NORM_SET">
<table>
<tr>
<td>SSID:</td>
<td>cps-loki</td>
</tr>
<tr>
<td>Password: </td>
<td>cps-loki</td>
</tr>
</table>
</div>
</div>
<div class="info"> <div class="info">
<!-- Link zum Lehrstuhl, einfach den ganzen Div Block rausnehmen falls du das nicht willst --> <!-- Link zum Lehrstuhl, einfach den ganzen Div Block rausnehmen falls du das nicht willst -->
<a href="https://cps.unileoben.ac.at/">Check us out!</a> <a href="https://cps.unileoben.ac.at/">Check us out!</a>

BIN
config/caddy/content/overview/joystick.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
config/caddy/content/overview/qr_dummy_1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 36 KiB

BIN
config/caddy/content/overview/qr_dummy_2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 36 KiB

BIN
config/caddy/content/overview/qr_wifi_actual.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 36 KiB

8
docker-compose.yaml
View File

@ -233,6 +233,8 @@ services:
image: caddy:latest image: caddy:latest
networks: networks:
- caddy_network - caddy_network
extra_hosts:
- "host.docker.internal:host-gateway"
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"
@ -260,10 +262,14 @@ services:
environment: environment:
- ROS_DOMAIN_ID=5 - ROS_DOMAIN_ID=5
- RMW_IMPLEMENTATION=rmw_cyclonedds_cpp - RMW_IMPLEMENTATION=rmw_cyclonedds_cpp
restart: no restart: always
webui-joystick: webui-joystick:
image: husarion/webui-ros-joystick:noetic-0.0.1-20230510-stable image: husarion/webui-ros-joystick:noetic-0.0.1-20230510-stable
network_mode: host network_mode: host
# networks:
# - caddy_network
# ports:
# - 8000:8000
ipc: host ipc: host
environment: environment:
- ROS_DOMAIN_ID=5 - ROS_DOMAIN_ID=5