sem/5g_drone_ROS2
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix filename

Browse Source
This commit is contained in:
Sem van der Hoeven
2023-05-30 14:58:26 +02:00
parent 23619a9f72
commit 0cc0d16091
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/api_communication/api_communication/api_listener.py
View File

@@ -125,16 +125,19 @@ class ApiListener(Node):
future = self.take_picture_client.call_async(self.take_picture_request) future = self.take_picture_client.call_async(self.take_picture_request)
future.add_done_callback(partial(self.image_request_callback)) future.add_done_callback(partial(self.image_request_callback))
def image_request_callback(self, future): def image_request_callback(self, future):
try: try:
result_filename = future.result().filename result_filename = future.result().filename
result_filename = result_filename.replace("/home/ubuntu/ros2_ws/api/public", "")
self.get_logger().info("Received result filename: " + result_filename) self.get_logger().info("Received result filename: " + result_filename)
with open(result_filename, 'rb') as f:
self.get_logger().info('Reading image')
self.message_queue.append(json.dumps( self.message_queue.append(json.dumps(
{'type': ResponseMessage.IMAGE.name, 'image': result_filename})) {'type': ResponseMessage.IMAGE.name, 'image': image_data}))
image_data = f.read()
except Exception as e: except Exception as e:
self.get_logger().error( self.get_logger().error('Something went wrong while sending a take picture request and waiting for the response: %r' % (e))
'Something went wrong while sending a take picture request and waiting for the response: %r' % (e))
def send_available_commands(self): def send_available_commands(self):
print('Sending available commands') print('Sending available commands')
@@ -231,12 +234,10 @@ class ApiListener(Node):
self.get_logger().info('Emergency stop command received') self.get_logger().info('Emergency stop command received')
# emergency stop: set to attitude mode and stop, also disarm # emergency stop: set to attitude mode and stop, also disarm
else: else:
self.get_logger().error('Received unknown command ' + self.get_logger().error('Received unknown command ' + str(message_json['command']) )
str(message_json['command']))
self.send_available_commands() self.send_available_commands()
except TypeError: except TypeError:
self.get_logger().error('Received unknown type: ' + self.get_logger().error('Received unknown type: ' +str(type(message)) + " " + str(message))
str(type(message)) + " " + str(message))
self.send_available_commands() self.send_available_commands()
except json.JSONDecodeError: except json.JSONDecodeError:
self.get_logger().error('Received invalid JSON') self.get_logger().error('Received invalid JSON')

2
src/camera/camera/camera_controller.py
View File

@@ -21,7 +21,7 @@ class CameraController(Node):
if (request.input_name == "default"): if (request.input_name == "default"):
self.get_logger().info("Taking picture with default filename") self.get_logger().info("Taking picture with default filename")
now = datetime.now().strftime("droneimage_%Y-%m-%d_%H-%M-%S") now = datetime.now().strftime("droneimage_%Y-%m-%d_%H-%M-%S")
imagename = "/home/ubuntu/ros2_ws/api/public/img/" + now + ".jpg" imagename = "/home/ubuntu/drone_img/" + now + ".jpg"
response.filename = imagename response.filename = imagename
else: else:
response.filename = request.input_name response.filename = request.input_name