Skip to content

Sele/demo presentacion #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RoboticsLeon wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Sele/demo presentacion #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
841ae20
Save copy
Jan 31, 2024
4d3b69f
Save copy
Jan 31, 2024
64f3334
Merge branch 'sele/demo_presentacion' of github.com:ResitanceBot/Gamm…
Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/robot_gui_bridge/gui/gui.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<script type="text/javascript" type="text/javascript">
var ros = new ROSLIB.Ros({
url : 'ws://100.102.246.70:9090'
url : 'ws://localhost:9090'
});

ros.on('connection', function() {
Expand Down Expand Up @@ -108,6 +108,6 @@
<h1>Simple ROS User Interface</h1>
<p>Connection status: <span id="status"></span></p>
<div id="zone_joystick" style="position: relative;"></div>
<img src="http://100.102.246.70:8080/stream?topic=/pred_image" alt="http://100.102.246.70:8080/stream?topic=/pred_image">
<img src="http://localhost:8080/stream?topic=/pred_image" alt="http://localhost:8080/stream?topic=/pred_image">
</body>
</html>
2 changes: 2 additions & 0 deletions src/robot_gui_bridge/launch/websocket.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<launch>
<include file="$(find rosbridge_server)/launch/rosbridge_websocket.launch"/>
<node name="webserver_initializer_script" pkg="robot_gui_bridge" type="http_webserver_initializer.sh" />
<node name="web_video_server" pkg="web_video_server" type="web_video_server" output="screen"/>

</launch>
1 change: 0 additions & 1 deletion src/robot_gui_bridge/scripts/http_webserver_initializer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#! /bin/bash

python3 -m http.server --directory /home/lion/GammaBot
rosrun web_video_server web_video_server