Merge branch 'automatic-ip' of https://github.com/purduerov/X17-Surface…

… into automatic-ip
purduerov · Oct 17, 2024 · 15b6823 · 15b6823
2 parents 5f50ba5 + 526932f
commit 15b6823
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.env b/.env
@@ -1,4 +1,4 @@
-ROV_IP="192.168.1.11" 
+ROV_IP="192.168.1.3" 
 ROV_USERNAME="pi"
 ROV_PASSWORD="pie"
 

diff --git a/ui/launch/surface_launch.yaml b/ui/launch/surface_launch.yaml
@@ -5,7 +5,7 @@ launch:
     exec: app.py
     namespace: rov
 
-- node:
-    pkg: gamepad
-    exec: sender.py
-    namespace: rov
+# - node:
+#     pkg: gamepad
+#     exec: sender.py
+#     namespace: rov
diff --git a/ui/src/app.py b/ui/src/app.py
@@ -6,9 +6,11 @@
 from signal_handler import SignalHandler
 import rclpy
 import signal
+from dotenv import load_dotenv
 
 
 app = Flask(__name__)
+load_dotenv(dotenv_path=f"/workspaces/X17-Surface/.env")   
 
 
 @app.route("/")