Skip to content

Commit d27651f

Browse files
committed
添加截图、更新使用说明
1 parent 352c628 commit d27651f

File tree

5 files changed

+33
-16
lines changed

5 files changed

+33
-16
lines changed

README.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,28 @@ Control DJI Tello drone with python
88

99
# Examples
1010

11-
11+
\# 引入tello_python包,注意:这里是下划线_连接<br>
1212
from tello_python import tello
1313

14+
\# 初始化无人机对象<br>
1415
drone = tello.Tello()
1516

17+
\# 起飞<br>
1618
drone.takeoff()
1719

20+
\# 前进100cm<br>
1821
drone.forward(100)
1922

23+
\# 顺时针旋转90°<br>
2024
drone.cw(90)
2125

26+
\# 向左翻滚<br>
2227
drone.flip('l')
2328

29+
\# 打开视频流<br>
2430
drone.streamon()
2531

32+
\# 降落<br>
2633
drone.land()
34+
35+
更多命令请参考源码tello.py文件内的方法及注释

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setuptools.setup(
77
name='tello-python',
8-
version='1.0.1',
8+
version='1.0.2',
99
author='C灵C',
1010
author_email='c0c@cocpy.com',
1111
description='Control DJI Tello drone with Python 3',

tello_python/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
__author__ = 'C灵C'
33
__liscence__ = 'MIT'
44
__copyright__ = 'Copyright 2020 C灵C'
5-
__version__ = '1.0.1'
5+
__version__ = '1.0.2'
66
__all__ = ['tello', 'stats']
77

88
from .tello import Tello

tello_python/demo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from . import tello
1+
from tello_python import tello
22

33

44
drone = tello.Tello()

tello_python/tello.py

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import socket
22
import threading
33
import time
4+
import datetime
45

56
import cv2
67

@@ -42,20 +43,20 @@ def send_command(self, command: str, query: bool = False):
4243
self.socket.sendto(command.encode('utf-8'), self.te_address)
4344
# 显示确认消息
4445
if self.debug is True:
45-
print('Sending command: {}'.format(command))
46+
print('发送命令: {}'.format(command))
4647

4748
# 检查命令是否超时(基于MAX_TIME_OUT中的值)
4849
start = time.time()
4950
while not self.log[-1].got_response(): # 在日志中未收到任何响应的情况下运行
5051
now = time.time()
5152
difference = now - start
5253
if difference > self.MAX_TIME_OUT:
53-
print('Connection timed out!')
54+
print('连接超时!')
5455
break
5556

5657
# 打印出无人机响应
5758
if self.debug is True and query is False:
58-
print('Response: {}'.format(self.log[-1].get_response()))
59+
print('响应: {}'.format(self.log[-1].get_response()))
5960

6061
def _receive_thread(self):
6162
while True:
@@ -64,7 +65,7 @@ def _receive_thread(self):
6465
self.response, ip = self.socket.recvfrom(1024)
6566
self.log[-1].add_response(self.response)
6667
except socket.error as exc:
67-
print('Socket error: {}'.format(exc))
68+
print('错误: {}'.format(exc))
6869

6970
def _video_thread(self):
7071
# 创建流捕获对象
@@ -74,17 +75,24 @@ def _video_thread(self):
7475
ret, frame = cap.read()
7576
cv2.imshow('DJI Tello', frame)
7677

77-
# 如果按Esc键,视频流关闭
7878
k = cv2.waitKey(1) & 0xFF
79+
80+
# 如果按Esc键,视频流关闭
7981
if k == 27:
8082
break
83+
84+
# 如果按F1键,截图到当前位置
85+
if k == 0:
86+
str_now = datetime.datetime.now().strftime('%Y.%m.%d-%H:%M:%S')
87+
png_name = str_now + '.png'
88+
cv2.imwrite(png_name, frame)
8189
cap.release()
8290
cv2.destroyAllWindows()
8391

8492
def wait(self, delay: float):
8593
# 显示等待消息
8694
if self.debug is True:
87-
print('Waiting {} seconds...'.format(delay))
95+
print('等待 {} ...'.format(delay))
8896

8997
# 日志条目增加了延迟
9098
self.log.append(Stats('wait', len(self.log)))
@@ -289,31 +297,31 @@ def get_sn(self):
289297
return self.log[-1].get_response()
290298

291299
def get_height(self):
292-
"""获取高度"""
300+
"""获取高度,新版本中已停用"""
293301
self.send_command('height?', True)
294302
return self.log[-1].get_response()
295303

296304
def get_temp(self):
297-
"""获取温度"""
305+
"""获取温度,新版本中已停用"""
298306
self.send_command('temp?', True)
299307
return self.log[-1].get_response()
300308

301309
def get_attitude(self):
302-
"""获取飞行姿态"""
310+
"""获取飞行姿态,新版本中已停用"""
303311
self.send_command('attitude?', True)
304312
return self.log[-1].get_response()
305313

306314
def get_baro(self):
307-
"""获取压力"""
315+
"""获取压力,新版本中已停用"""
308316
self.send_command('baro?', True)
309317
return self.log[-1].get_response()
310318

311319
def get_acceleration(self):
312-
"""获取加速度"""
320+
"""获取加速度,新版本中已停用"""
313321
self.send_command('acceleration?', True)
314322
return self.log[-1].get_response()
315323

316324
def get_tof(self):
317-
"""获取飞行时间"""
325+
"""获取飞行时间,新版本中已停用"""
318326
self.send_command('tof?', True)
319327
return self.log[-1].get_response()

0 commit comments

Comments
 (0)