From 69a7de8a7f9500d3e58dcbb99a547b6496cbf73b Mon Sep 17 00:00:00 2001 From: Max Hunt Date: Mon, 10 Feb 2020 17:34:15 +0000 Subject: [PATCH] Update --- main.py | 14 +++++++------- run | 8 ++++++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/main.py b/main.py index 6ae7439..b6dcc54 100755 --- a/main.py +++ b/main.py @@ -459,13 +459,13 @@ tf_service(init=True) # right_pnp.move_to_start(right_pnp.ik_request(pose1)) -try: - print('Done with task, enter x to kill tf service') - while True: - a = raw_input() - if a == 'x' or x == 'X': - print("x has been caught, killing tf service") - tf_service(init=False) + +print('Done with task, enter x to kill tf service') +while True: + a = raw_input() + if a == 'x' or x == 'X': + print("x has been caught, killing tf service") + tf_service(init=False) print("Done, exiting") exit(0) diff --git a/run b/run index efe8706..02063ed 100755 --- a/run +++ b/run @@ -1,9 +1,17 @@ #/bin/bash cd RoboticSandbox +echo 1 git pull +echo 2 mv main.py ../ +echo 3 mv object_tf_service.py ../ +echo 4 cd ../ +echo 5 python main.py +echo 6 mv main.py RoboticSandbox/ +echo 7 +mv object_tf_service.py RoboticSandbox/ echo Done