Spiri
/
spiri-sdk
12
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

remove dash in model name

This commit is contained in:
Burak Ozter 2024-11-14 10:34:27 -04:00
parent 1dd84706a5
commit 69e6bd30e4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
guiTools/spiri_sdk_guitools/sim_drone.py
View File

@ -252,7 +252,7 @@ class Robot:
] ]
# This path is breaking if this drone_model folder doesnt exist! # This path is breaking if this drone_model folder doesnt exist!
# TODO: fix this model path for minimal code maintenance # TODO: fix this model path for minimal code maintenance
ROS2_CMD = f"ros2 run ros_gz_sim create -world {WORLD_NAME} -file /ardupilot_gazebo/models/{DRONE_MODEL}/model.sdf -name spiri-{sysid} -x {sysid - 1} -y 0 -z 0.195" ROS2_CMD = f"ros2 run ros_gz_sim create -world {WORLD_NAME} -file /ardupilot_gazebo/models/{DRONE_MODEL}/model.sdf -name spiri{sysid} -x {sysid - 1} -y 0 -z 0.195"
xacro_proc = subprocess.Popen( xacro_proc = subprocess.Popen(
XACRO_CMD, XACRO_CMD,
@ -275,7 +275,7 @@ class Robot:
WORLD_NAME = env["WORLD_NAME"] WORLD_NAME = env["WORLD_NAME"]
# http://osrf-distributions.s3.amazonaws.com/gazebo/api/7.1.0/classgazebo_1_1physics_1_1Entity.html # http://osrf-distributions.s3.amazonaws.com/gazebo/api/7.1.0/classgazebo_1_1physics_1_1Entity.html
ENTITY_TYPE_MODEL = 0x00000002 ENTITY_TYPE_MODEL = 0x00000002
REQUEST_ARG = f"name: 'spiri-{sysid}' type: {ENTITY_TYPE_MODEL}" REQUEST_ARG = f"name: 'spiri{sysid}' type: {ENTITY_TYPE_MODEL}"
GZ_SERVICE_CMD = [ GZ_SERVICE_CMD = [
"gz", "gz",
"service", "service",

2
guiTools/spiri_sdk_guitools/video_button.py
View File

@ -4,7 +4,7 @@ from loguru import logger
import os import os
GZ_TOPIC_INFO = ["gz", "topic", "-i", "-t"] GZ_TOPIC_INFO = ["gz", "topic", "-i", "-t"]
ENABLE_STREAMING_TOPIC = "/world/{world_name}/model/spiri-{sysid}/link/pitch_link/sensor/camera/image/enable_streaming" ENABLE_STREAMING_TOPIC = "/world/{world_name}/model/spiri{sysid}/link/pitch_link/sensor/camera/image/enable_streaming"
class EnableStreamingButton(ui.element): class EnableStreamingButton(ui.element):