diff --git a/grpc/python_client/async_client.py b/grpc/python_client/async_client.py index 9561ac8297..55cdbc645f 100755 --- a/grpc/python_client/async_client.py +++ b/grpc/python_client/async_client.py @@ -1,24 +1,28 @@ #!/usr/bin/env python + from __future__ import print_function import grpc import time +import threading import dronecore_pb2 as dc -#import dronecore_pb2_grpc -# import dronecore_pb2_grpc -import action_pb2 as dc_action -import action_pb2_grpc +import dronecore_pb2_grpc +# import action_pb2 as dc_action +# import action_pb2_grpc import telemetry_pb2 as dc_telemetry import telemetry_pb2_grpc + class Colors: BLUE = "\033[34m" RESET = "\033[0m" + def wait_until(status): ret = status.result() return ret + def print_altitude(telemetry_stub, stop): for i, position in enumerate( telemetry_stub.TelemetryPositionSubscription( @@ -32,10 +36,11 @@ def print_altitude(telemetry_stub, stop): if stop.is_set(): break + def run(): channel = grpc.insecure_channel('0.0.0.0:50051') -# stub = dronecore_pb2_grpc.DroneCoreRPCStub(channel) - action_stub = action_pb2_grpc.ActionRPCStub(channel) + stub = dronecore_pb2_grpc.DroneCoreRPCStub(channel) + # action_stub = action_pb2_grpc.ActionRPCStub(channel) telemetry_stub = telemetry_pb2_grpc.TelemetryRPCStub(channel) # We use this stop event later to stop the thread. @@ -69,5 +74,6 @@ def run(): print("landing failed: " + land_result.result_str) time.sleep(3) + if __name__ == '__main__': run() diff --git a/grpc/python_client/fly_mission.py b/grpc/python_client/fly_mission.py index 5dc5d5a22f..192ebeec6d 100755 --- a/grpc/python_client/fly_mission.py +++ b/grpc/python_client/fly_mission.py @@ -6,9 +6,9 @@ from threading import Thread import time import dronecore_pb2 as dc -#import dronecore_pb2_grpc # import dronecore_pb2_grpc -import action_pb2 as dc_action +# import dronecore_pb2_grpc +# import action_pb2 as dc_action import action_pb2_grpc import mission_pb2 as dc_mission import mission_pb2_grpc @@ -27,7 +27,7 @@ def wait_func(future_status): def run(): global thread_status channel = grpc.insecure_channel('0.0.0.0:50051') -# stub = dronecore_pb2_grpc.DroneCoreRPCStub(channel) + # stub = dronecore_pb2_grpc.DroneCoreRPCStub(channel) action_stub = action_pb2_grpc.ActionRPCStub(channel) mission_stub = mission_pb2_grpc.MissionRPCStub(channel) diff --git a/grpc/python_client/sync_client.py b/grpc/python_client/sync_client.py index d85c12243f..8442d3e23a 100755 --- a/grpc/python_client/sync_client.py +++ b/grpc/python_client/sync_client.py @@ -4,10 +4,11 @@ import grpc import time import dronecore_pb2 as dc -#import dronecore_pb2_grpc -import action_pb2 as dc_action +# import dronecore_pb2_grpc +# import action_pb2 as dc_action import action_pb2_grpc + def run(): channel = grpc.insecure_channel('0.0.0.0:50051') # stub = dronecore_pb2_grpc.DroneCoreRPCStub(channel)