Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
Waypoint Suite
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Larkin Heintzman
Waypoint Suite
Commits
95583fbf
Commit
95583fbf
authored
Aug 17, 2022
by
Larkin Heintzman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed some typos
parent
e37e77e9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
12 deletions
+12
-12
waypointDriver.py
Onboard-SDK-ROS/dji_sdk/scripts/waypointDriver.py
+12
-12
No files found.
Onboard-SDK-ROS/dji_sdk/scripts/waypointDriver.py
View file @
95583fbf
...
...
@@ -146,28 +146,28 @@ class WaypointDriver():
# make service proxies for all services we need
rospy
.
loginfo
(
"waiting for services..."
)
rospy
.
wait_for_service
(
'
/
dji_sdk/sdk_control_authority'
)
rospy
.
wait_for_service
(
'
/
dji_sdk/mission_waypoint_upload'
)
rospy
.
wait_for_service
(
'
/
dji_sdk/mission_waypoint_action'
)
rospy
.
wait_for_service
(
'
/
dji_sdk/drone_task_control'
)
rospy
.
wait_for_service
(
'dji_sdk/sdk_control_authority'
)
rospy
.
wait_for_service
(
'dji_sdk/mission_waypoint_upload'
)
rospy
.
wait_for_service
(
'dji_sdk/mission_waypoint_action'
)
rospy
.
wait_for_service
(
'dji_sdk/drone_task_control'
)
rospy
.
loginfo
(
"all services ready!"
)
rospy
.
loginfo
(
"waiting for parameters..."
)
while
not
rospy
.
has_param
(
"
~
drone_id"
):
while
not
rospy
.
has_param
(
"drone_id"
):
rospy
.
loginfo
(
"waiting for drone_id param..."
)
self
.
droneId
=
rospy
.
get_param
(
"
~
drone_id"
)
self
.
droneId
=
rospy
.
get_param
(
"drone_id"
)
while
not
rospy
.
has_param
(
"
~
base_speed"
):
while
not
rospy
.
has_param
(
"base_speed"
):
rospy
.
loginfo
(
"waiting for base_speed param..."
)
self
.
baseSpeed
=
rospy
.
get_param
(
"
~
base_speed"
)
self
.
baseSpeed
=
rospy
.
get_param
(
"base_speed"
)
rospy
.
loginfo
(
"all parameters recieved!"
)
self
.
sdkControlProxy
=
rospy
.
ServiceProxy
(
'
/
dji_sdk/sdk_control_authority'
,
SDKControlAuthority
)
self
.
missionWaypointUploadProxy
=
rospy
.
ServiceProxy
(
'
/
dji_sdk/mission_waypoint_upload'
,
MissionWpUpload
)
self
.
missionWaypointActionProxy
=
rospy
.
ServiceProxy
(
'
/
dji_sdk/mission_waypoint_action'
,
MissionWpAction
)
self
.
droneTaskControlProxy
=
rospy
.
ServiceProxy
(
'
/
dji_sdk/drone_task_control'
,
DroneTaskControl
)
self
.
sdkControlProxy
=
rospy
.
ServiceProxy
(
'dji_sdk/sdk_control_authority'
,
SDKControlAuthority
)
self
.
missionWaypointUploadProxy
=
rospy
.
ServiceProxy
(
'dji_sdk/mission_waypoint_upload'
,
MissionWpUpload
)
self
.
missionWaypointActionProxy
=
rospy
.
ServiceProxy
(
'dji_sdk/mission_waypoint_action'
,
MissionWpAction
)
self
.
droneTaskControlProxy
=
rospy
.
ServiceProxy
(
'dji_sdk/drone_task_control'
,
DroneTaskControl
)
rospy
.
Service
(
'waypoint_control'
,
WaypointControl
,
self
.
controlService
)
rospy
.
loginfo
(
"requesting sdk control authority..."
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment