diff --git a/src/drone_services/CMakeLists.txt b/src/drone_services/CMakeLists.txt index 00b7c0fa..60d7a10b 100644 --- a/src/drone_services/CMakeLists.txt +++ b/src/drone_services/CMakeLists.txt @@ -25,6 +25,7 @@ rosidl_generate_interfaces(${PROJECT_NAME} "srv/SetVelocity.srv" "srv/TakePicture.srv" "srv/SetVehicleControl.srv" + "msg/DroneControlMode.msg" ) if(BUILD_TESTING) diff --git a/src/drone_services/msg/DroneControlMode.msg b/src/drone_services/msg/DroneControlMode.msg new file mode 100644 index 00000000..68758456 --- /dev/null +++ b/src/drone_services/msg/DroneControlMode.msg @@ -0,0 +1 @@ +int32 mode \ No newline at end of file diff --git a/src/test_controls/test_controls/test_controller.py b/src/test_controls/test_controls/test_controller.py index 312780bb..8a6d7bda 100644 --- a/src/test_controls/test_controls/test_controller.py +++ b/src/test_controls/test_controls/test_controller.py @@ -5,6 +5,7 @@ from sshkeyboard import listen_keyboard_manual import asyncio from drone_services.srv import SetAttitude +from drone_services.srv import SetVehicleControl class TestController(Node): @@ -13,7 +14,8 @@ class TestController(Node): super().__init__('test_controller') self.cli = self.create_client(SetAttitude, 'drone/set_attitude') while not self.cli.wait_for_service(timeout_sec=1.0): - self.get_logger().info('service not available, waiting again...') + self.get_logger().info('set attitude service not available, waiting again...') + self.vehicle_control_cli = self.create_client(SetVehicleControl, 'drone/set_vehicle_control') self.req = SetAttitude.Request() self.get_logger().info("Controls:\nW - forward\nS - backward\nA - left\nD - right\nQ - rotate left\nE - rotate right\nSpace - up\nZ - down\nV - Down nudge\nF - Up nudge\nN - emergency stop\nEsc - exit")