From 2b0f206616e3648f1a1974b3bcfc7b11eede7568 Mon Sep 17 00:00:00 2001 From: Neptune-1 Date: Sat, 8 Dec 2018 15:58:47 +0300 Subject: [PATCH 1/2] fixed bugs --- Drone/Client.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Drone/Client.py b/Drone/Client.py index 54e2077..71e403f 100755 --- a/Drone/Client.py +++ b/Drone/Client.py @@ -62,12 +62,13 @@ def pl_anim(): play_animation.read_animation_file() dtime = time_synch() - time.time() ok = 0 + t_st=0 while True: if 'begin_anim' in command: t_st = int(command[command.index('('):]) - ok=1 - if t_st == dtime+time.time and ok==1: + + if t_st == dtime+time.time: break if 'synch' in command: dtime=time_synch() - time.time() From fef6be5a5fe3d253e2487e5e4f19d2558dc32f74 Mon Sep 17 00:00:00 2001 From: Neptune-1 Date: Sat, 8 Dec 2018 16:01:24 +0300 Subject: [PATCH 2/2] fixed --- Drone/Client.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Drone/Client.py b/Drone/Client.py index c3330f6..71e403f 100755 --- a/Drone/Client.py +++ b/Drone/Client.py @@ -61,20 +61,13 @@ def pl_anim(): global command play_animation.read_animation_file() dtime = time_synch() - time.time() -<<<<<<< HEAD ok = 0 t_st=0 -======= - t_st = None ->>>>>>> d08274e31647cde37c2205ee9ec9b609e0b8b204 while True: if 'begin_anim' in command: t_st = int(command[command.index('('):]) -<<<<<<< HEAD -======= ->>>>>>> d08274e31647cde37c2205ee9ec9b609e0b8b204 if t_st == dtime+time.time: break if 'synch' in command: