Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: tentone/tello-ros2
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: MASKOR/tello-ros2
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 7 commits
  • 21 files changed
  • 1 contributor

Commits on Aug 17, 2022

  1. clean up file structure

    Patrick Wiesen committed Aug 17, 2022
    Copy the full SHA
    942e394 View commit details
  2. updated maintainer and node name

    Patrick Wiesen committed Aug 17, 2022
    Copy the full SHA
    be2cc3d View commit details
  3. fixed script dir build error

    Patrick Wiesen committed Aug 17, 2022
    Copy the full SHA
    7d1bb7e View commit details
  4. added install launch files to setup.py

    Patrick Wiesen committed Aug 17, 2022
    Copy the full SHA
    3f85056 View commit details
  5. fixed connection issue

    Patrick Wiesen committed Aug 17, 2022
    Copy the full SHA
    76d3de5 View commit details
  6. toggled tf to default and workaround baro for tf

    Patrick Wiesen committed Aug 17, 2022
    Copy the full SHA
    e5c3630 View commit details
  7. added default camera calibration

    Patrick Wiesen committed Aug 17, 2022
    Copy the full SHA
    2932e32 View commit details
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@ workspace/src/lib/
workspace/src/install/

.vscode/.ropeproject/
.vscode/

log/
libs/
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 4 additions & 0 deletions tello/setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[develop]
script_dir=$base/lib/tello
[install]
install_scripts=$base/lib/tello
14 changes: 11 additions & 3 deletions workspace/src/tello/setup.py → tello/setup.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,31 @@
from setuptools import setup

import os
from glob import glob


package_name = 'tello'

setup(
name='tello',
version='0.1.0',
packages=['tello'],
data_files=[
('share/ament_index/resource_index/packages', ['resource/tello']),
('share/tello', ['package.xml', 'resource/ost.txt', 'resource/ost.yaml']),
(os.path.join('share', package_name), glob('launch/*.launch.py')),
(os.path.join('share', package_name), glob('resource/*.yaml')),
],
install_requires=['setuptools'],
zip_safe=True,
maintainer='tentone',
maintainer_email='tentone@outlook.com',
maintainer='tentone','Patrick Wiesen',
maintainer_email='tentone@outlook.com','wiesen@fh-aachen.de',
description='DJI Tello control package for ROS 2',
license='MIT',
tests_require=[],
entry_points={
'console_scripts': [
'tello = tello.node:main'
'tello_node = tello.tello_node:main'
],
},
)
File renamed without changes.
14 changes: 9 additions & 5 deletions workspace/src/tello/tello/node.py → tello/tello/tello_node.py
Original file line number Diff line number Diff line change
@@ -36,8 +36,8 @@ def __init__(self, node):
self.node.declare_parameter('tello_ip', '192.168.10.1')
self.node.declare_parameter('tf_base', 'map')
self.node.declare_parameter('tf_drone', 'drone')
self.node.declare_parameter('tf_pub', False)
self.node.declare_parameter('camera_info_file', '')
self.node.declare_parameter('tf_pub', True)
self.node.declare_parameter('camera_info_file', '$(find tello)/resources/ost.yaml')

# Get parameters
self.connect_timeout = float(self.node.get_parameter('connect_timeout').value)
@@ -68,7 +68,7 @@ def __init__(self, node):
self.node.get_logger().info('Tello: Connecting to drone')

self.tello = Tello()
self.tello.connect()
self.tello.connect(False)

self.node.get_logger().info('Tello: Connected to drone')

@@ -128,7 +128,11 @@ def status_odom():
t.child_frame_id = self.tf_drone
t.transform.translation.x = 0.0
t.transform.translation.y = 0.0
t.transform.translation.z = (self.tello.get_barometer()) / 100.0
try:
baro = self.tello.get_barometer() / 100.0
except:
baro = 0.0
t.transform.translation.z = baro
self.tf_broadcaster.sendTransform(t)

# IMU
@@ -353,4 +357,4 @@ def main(args=None):
rclpy.shutdown()

if __name__ == '__main__':
main()
main()
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 0 additions & 4 deletions workspace/src/tello/setup.cfg

This file was deleted.