Skip to content
Snippets Groups Projects
Commit 102b028c authored by Tommy Persson's avatar Tommy Persson
Browse files

Work on pick-up and drop executors.

parent c2097995
No related branches found
No related tags found
No related merge requests found
Pipeline #54774 passed
...@@ -46,6 +46,7 @@ parser.add_option ("", "--throwtakeoff", action="store_true", dest="throwtakeoff ...@@ -46,6 +46,7 @@ parser.add_option ("", "--throwtakeoff", action="store_true", dest="throwtakeoff
parser.add_option ("", "--land", action="store_true", dest="land", help="Land") parser.add_option ("", "--land", action="store_true", dest="land", help="Land")
parser.add_option ("", "--pickup", action="store_true", dest="pickup", help="Pick Up Payload") parser.add_option ("", "--pickup", action="store_true", dest="pickup", help="Pick Up Payload")
parser.add_option ("", "--drop", action="store_true", dest="drop", help="Drop Payload")
parser.add_option ("", "--lookat", action="store_true", dest="lookat", help="LookAt") parser.add_option ("", "--lookat", action="store_true", dest="lookat", help="LookAt")
parser.add_option ("", "--stop-lookat", action="store_true", dest="stop_lookat", help="Stop LookAt") parser.add_option ("", "--stop-lookat", action="store_true", dest="stop_lookat", help="Stop LookAt")
...@@ -119,12 +120,19 @@ def land(ns, unit): ...@@ -119,12 +120,19 @@ def land(ns, unit):
return (res, reason, timing) return (res, reason, timing)
def pickup(ns, unit): def pickup(ns, unit):
pickup = Node("pick-up", {"execunit": unit, "do-not-ask-for-help": True}) pickup = Node("pick-up", {"execunit": unit, "do-not-ask-for-help": True, "type": "gun"})
tree = Node("seq", {"execunit": unit}, [pickup]) tree = Node("seq", {"execunit": unit}, [pickup])
mo = MissionObject("pickup", ns, options.display, options.verbose) mo = MissionObject("pickup", ns, options.display, options.verbose)
(res, reason, timing) = mo.delegation_process(tree, options.exectree) (res, reason, timing) = mo.delegation_process(tree, options.exectree)
return (res, reason, timing) return (res, reason, timing)
def drop(ns, unit):
drop = Node("drop", {"execunit": unit, "type": "gun"})
tree = Node("seq", {"execunit": unit}, [drop])
mo = MissionObject("drop", ns, options.display, options.verbose)
(res, reason, timing) = mo.delegation_process(tree, options.exectree)
return (res, reason, timing)
def climb (ns, unit, z): def climb (ns, unit, z):
p = wtogp (0, 0, z) p = wtogp (0, 0, z)
print(p) print(p)
...@@ -615,6 +623,9 @@ if __name__ == "__main__": ...@@ -615,6 +623,9 @@ if __name__ == "__main__":
if options.pickup: if options.pickup:
res = pickup(ns, unit) res = pickup(ns, unit)
if options.drop:
res = drop(ns, unit)
if options.climb: if options.climb:
res = climb (ns, unit, options.z) res = climb (ns, unit, options.z)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment