From d35f1c44862400ef7125e118062819b7a740d943 Mon Sep 17 00:00:00 2001 From: MoynaChen <13182321602@163.com> Date: Thu, 17 Oct 2019 21:52:57 +0800 Subject: [PATCH] update --- CMakeLists.txt | 6 +++--- package.xml | 4 ++-- src/tello_control.py | 1 - src/tello_driver_node.py | 3 +-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 95badef..25f7de9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.8.3) -project(tello_ros) +project(tello_driver) ## Find catkin macros and libraries ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz) @@ -64,8 +64,8 @@ include_directories( #add_executable(test_h264_sub src/test_h264_sub.cpp) #target_link_libraries(test_h264_sub ${catkin_LIBRARIES} ${OpenCV_LIBS}) -#add_executable(tello_ros src/tello_control.py) -#target_link_libraries(tello_ros ${catkin_LIBRARIES}) +#add_executable(tello_driver src/tello_control.py) +#target_link_libraries(tello_driver ${catkin_LIBRARIES}) ############# diff --git a/package.xml b/package.xml index 2262bca..4f911d3 100644 --- a/package.xml +++ b/package.xml @@ -1,8 +1,8 @@ - tello_ros + tello_driver 0.0.0 - >tello_ros + >tello_driver Anqi Xu Anqi Xu diff --git a/src/tello_control.py b/src/tello_control.py index 8306cf5..78903e1 100644 --- a/src/tello_control.py +++ b/src/tello_control.py @@ -5,7 +5,6 @@ from sensor_msgs.msg import Image from geometry_msgs.msg import Twist from dynamic_reconfigure.server import Server -from tello_driver.cfg import TelloConfig from cv_bridge import CvBridge, CvBridgeError import time diff --git a/src/tello_driver_node.py b/src/tello_driver_node.py index 620f928..e302c0b 100644 --- a/src/tello_driver_node.py +++ b/src/tello_driver_node.py @@ -7,7 +7,6 @@ from nav_msgs.msg import Odometry from dynamic_reconfigure.server import Server from h264_image_transport.msg import H264Packet -from tello_driver.msg import TelloStatus from tello_driver.cfg import TelloConfig from cv_bridge import CvBridge, CvBridgeError @@ -18,7 +17,7 @@ import threading import time import sys -sys.path.append('/home/tello/TelloPy/') +sys.path.append('/home/tello/catkin_ws/src/TelloPy/')#/home/#your_name/catkin_ws/src/TelloPy from tellopy._internal import tello from tellopy._internal import error from tellopy._internal import protocol