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

add checking for value

Browse Source
This commit is contained in:
Sem van der Hoeven
2023-05-25 16:56:30 +02:00
parent a05dd8a4b9
commit 3046572d4c
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,26 +114,27 @@ class ApiListener(Node):
{'type': ResponseMessage.ALL_REQUESTS_RESPONSES.name, 'data': result})) {'type': ResponseMessage.ALL_REQUESTS_RESPONSES.name, 'data': result}))
def consume_message(self, message): def consume_message(self, message):
print(f'Consuming message: {message}') self.get_logger().info(f'Consuming message: {message}')
try: try:
message_json = json.loads(str(message)) message_json = json.loads(str(message))
self.get_logger().info(f'JSON: {message_json}')
if not message_json['command']: if not message_json['command']:
self.get_logger().error('Received message without command') self.get_logger().error('Received message without command')
self.send_available_commands() self.send_available_commands()
else: else:
self.get_logger().info( self.get_logger().info(
f'Received command: {message_json["command"]}') f'Received command: {message_json["command"]}')
if message_json['command'] == RequestCommand.TAKEOFF: if message_json['command'] == RequestCommand.TAKEOFF.value:
self.get_logger().info('Takeoff command received') self.get_logger().info('Takeoff command received')
elif message_json['command'] == RequestCommand.LAND: elif message_json['command'] == RequestCommand.LAND.value:
self.get_logger().info('Land command received') self.get_logger().info('Land command received')
elif message_json['command'] == RequestCommand.MOVE_POSITION: elif message_json['command'] == RequestCommand.MOVE_POSITION.value:
self.get_logger().info('Move position command received') self.get_logger().info('Move position command received')
elif message_json['command'] == RequestCommand.MOVE_DIRECTION: elif message_json['command'] == RequestCommand.MOVE_DIRECTION.value:
self.get_logger().info('Move direction command received') self.get_logger().info('Move direction command received')
elif message_json['command'] == RequestCommand.TAKE_PICTURE: elif message_json['command'] == RequestCommand.TAKE_PICTURE.value:
self.process_image_request(message_json) self.process_image_request(message_json)
elif message_json['command'] == RequestCommand.GET: elif message_json['command'] == RequestCommand.GET.value:
self.get_logger().info('Get command received') self.get_logger().info('Get command received')
self.send_available_commands() self.send_available_commands()
else: else: