From c9aab6319ffed776b0cdd47e1b40bf1c8887abbf Mon Sep 17 00:00:00 2001 From: TSC21 Date: Mon, 25 Nov 2019 11:15:52 +0000 Subject: [PATCH] microRTPS: update headers licenses --- msg/templates/uorb_microcdr/microRTPS_client.cpp.em | 2 +- msg/templates/urtps/Publisher.cpp.em | 2 +- msg/templates/urtps/Publisher.h.em | 2 +- msg/templates/urtps/RtpsTopics.cpp.em | 2 +- msg/templates/urtps/RtpsTopics.h.em | 2 +- msg/templates/urtps/Subscriber.cpp.em | 8 ++++---- msg/templates/urtps/Subscriber.h.em | 6 +++--- msg/templates/urtps/microRTPS_agent.cpp.em | 1 + msg/templates/urtps/microRTPS_agent_CMakeLists.txt.em | 2 +- msg/templates/urtps/microRTPS_transport.h | 2 +- msg/templates/urtps/msg.idl.em | 2 +- msg/tools/generate_microRTPS_bridge.py | 2 +- msg/tools/uorb_rtps_classifier.py | 2 +- msg/tools/uorb_to_ros_msgs.py | 2 +- msg/tools/uorb_to_ros_rtps_ids.py | 2 +- .../micrortps_bridge/micrortps_client/microRTPS_client.h | 1 + 16 files changed, 21 insertions(+), 19 deletions(-) diff --git a/msg/templates/uorb_microcdr/microRTPS_client.cpp.em b/msg/templates/uorb_microcdr/microRTPS_client.cpp.em index 58aba222c6..3604267b83 100644 --- a/msg/templates/uorb_microcdr/microRTPS_client.cpp.em +++ b/msg/templates/uorb_microcdr/microRTPS_client.cpp.em @@ -27,7 +27,7 @@ receive_base_types = [s.short_name for idx, s in enumerate(spec) if scope[idx] = /**************************************************************************** * * Copyright (c) 2017 Proyectos y Sistemas de Mantenimiento SL (eProsima). - * Copyright (c) 2018 PX4 Development Team. All rights reserved. + * Copyright (c) 2018-2019 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/msg/templates/urtps/Publisher.cpp.em b/msg/templates/urtps/Publisher.cpp.em index 99755457bc..71f375e516 100644 --- a/msg/templates/urtps/Publisher.cpp.em +++ b/msg/templates/urtps/Publisher.cpp.em @@ -24,7 +24,7 @@ except AttributeError: /**************************************************************************** * * Copyright 2017 Proyectos y Sistemas de Mantenimiento SL (eProsima). - * Copyright (C) 2018-2019 PX4 Development Team. All rights reserved. + * Copyright (c) 2018-2019 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/msg/templates/urtps/Publisher.h.em b/msg/templates/urtps/Publisher.h.em index eda208e4fd..4b1b356efa 100644 --- a/msg/templates/urtps/Publisher.h.em +++ b/msg/templates/urtps/Publisher.h.em @@ -24,7 +24,7 @@ except AttributeError: /**************************************************************************** * * Copyright 2017 Proyectos y Sistemas de Mantenimiento SL (eProsima). - * Copyright (C) 2018-2019 PX4 Development Team. All rights reserved. + * Copyright (c) 2018-2019 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/msg/templates/urtps/RtpsTopics.cpp.em b/msg/templates/urtps/RtpsTopics.cpp.em index 9d23bebf10..c0a6415d60 100644 --- a/msg/templates/urtps/RtpsTopics.cpp.em +++ b/msg/templates/urtps/RtpsTopics.cpp.em @@ -29,7 +29,7 @@ except AttributeError: /**************************************************************************** * * Copyright 2017 Proyectos y Sistemas de Mantenimiento SL (eProsima). - * Copyright (C) 2018-2019 PX4 Development Team. All rights reserved. + * Copyright (c) 2018-2019 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/msg/templates/urtps/RtpsTopics.h.em b/msg/templates/urtps/RtpsTopics.h.em index 39a606694b..f9cf940b35 100644 --- a/msg/templates/urtps/RtpsTopics.h.em +++ b/msg/templates/urtps/RtpsTopics.h.em @@ -23,7 +23,7 @@ recv_topics = [(alias[idx] if alias[idx] else s.short_name) for idx, s in enumer /**************************************************************************** * * Copyright 2017 Proyectos y Sistemas de Mantenimiento SL (eProsima). - * Copyright (C) 2018-2019 PX4 Development Team. All rights reserved. + * Copyright (c) 2018-2019 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/msg/templates/urtps/Subscriber.cpp.em b/msg/templates/urtps/Subscriber.cpp.em index 259486bfe8..fd957052ef 100644 --- a/msg/templates/urtps/Subscriber.cpp.em +++ b/msg/templates/urtps/Subscriber.cpp.em @@ -24,7 +24,7 @@ except AttributeError: /**************************************************************************** * * Copyright 2017 Proyectos y Sistemas de Mantenimiento SL (eProsima). - * Copyright (C) 2018-2019 PX4 Development Team. All rights reserved. + * Copyright (c) 2018-2019 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -141,7 +141,7 @@ void @(topic)_Subscriber::SubListener::onNewDataMessage(Subscriber* sub) has_msg_cv.wait(has_msg_lock); // Wait till msg has been fetched } has_msg_lock.unlock(); - + // Take data if(sub->takeNextData(&msg, &m_info)) @@ -149,10 +149,10 @@ void @(topic)_Subscriber::SubListener::onNewDataMessage(Subscriber* sub) if(m_info.sampleKind == ALIVE) { std::unique_lock lk(*t_send_queue_mutex); - + ++n_msg; has_msg = true; - + t_send_queue->push(topic_ID); lk.unlock(); t_send_queue_cv->notify_one(); diff --git a/msg/templates/urtps/Subscriber.h.em b/msg/templates/urtps/Subscriber.h.em index 839517a80f..c7c992b9a8 100644 --- a/msg/templates/urtps/Subscriber.h.em +++ b/msg/templates/urtps/Subscriber.h.em @@ -24,7 +24,7 @@ except AttributeError: /**************************************************************************** * * Copyright 2017 Proyectos y Sistemas de Mantenimiento SL (eProsima). - * Copyright (C) 2018-2019 PX4 Development Team. All rights reserved. + * Copyright (c) 2018-2019 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -134,10 +134,10 @@ private: std::atomic_bool has_msg; uint8_t topic_ID; std::condition_variable* t_send_queue_cv; - std::mutex* t_send_queue_mutex; + std::mutex* t_send_queue_mutex; std::queue* t_send_queue; std::condition_variable has_msg_cv; - std::mutex has_msg_mutex; + std::mutex has_msg_mutex; } m_listener; @[if 1.5 <= fastrtpsgen_version <= 1.7]@ diff --git a/msg/templates/urtps/microRTPS_agent.cpp.em b/msg/templates/urtps/microRTPS_agent.cpp.em index 600175d17e..ac0e84e0ab 100644 --- a/msg/templates/urtps/microRTPS_agent.cpp.em +++ b/msg/templates/urtps/microRTPS_agent.cpp.em @@ -22,6 +22,7 @@ recv_topics = [(alias[idx] if alias[idx] else s.short_name) for idx, s in enumer /**************************************************************************** * * Copyright 2017 Proyectos y Sistemas de Mantenimiento SL (eProsima). + * Copyright (c) 2018-2019 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/msg/templates/urtps/microRTPS_agent_CMakeLists.txt.em b/msg/templates/urtps/microRTPS_agent_CMakeLists.txt.em index bba1c29fc3..ca9d8388de 100644 --- a/msg/templates/urtps/microRTPS_agent_CMakeLists.txt.em +++ b/msg/templates/urtps/microRTPS_agent_CMakeLists.txt.em @@ -1,7 +1,7 @@ ################################################################################ # # Copyright 2017 Proyectos y Sistemas de Mantenimiento SL (eProsima). -# Copyright (C) 2018-2019 PX4 Development Team. All rights reserved. +# Copyright (c) 2018-2019 PX4 Development Team. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/msg/templates/urtps/microRTPS_transport.h b/msg/templates/urtps/microRTPS_transport.h index a616886665..afc5b90a28 100644 --- a/msg/templates/urtps/microRTPS_transport.h +++ b/msg/templates/urtps/microRTPS_transport.h @@ -1,7 +1,7 @@ /**************************************************************************** * * Copyright 2017 Proyectos y Sistemas de Mantenimiento SL (eProsima). - * Copyright (C) 2018-2019 PX4 Development Team. All rights reserved. + * Copyright (c) 2018-2019 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/msg/templates/urtps/msg.idl.em b/msg/templates/urtps/msg.idl.em index b3869c8570..04d0e3c5dd 100644 --- a/msg/templates/urtps/msg.idl.em +++ b/msg/templates/urtps/msg.idl.em @@ -7,7 +7,7 @@ @################################################################################ @# @# Copyright 2017 Proyectos y Sistemas de Mantenimiento SL (eProsima). -@# Copyright (C) 2018-2019 PX4 Development Team. All rights reserved. +@# Copyright (c) 2018-2019 PX4 Development Team. All rights reserved. @# @# Redistribution and use in source and binary forms, with or without @# modification, are permitted provided that the following conditions are met: diff --git a/msg/tools/generate_microRTPS_bridge.py b/msg/tools/generate_microRTPS_bridge.py index 48cd6e56e6..fc076fb3c1 100644 --- a/msg/tools/generate_microRTPS_bridge.py +++ b/msg/tools/generate_microRTPS_bridge.py @@ -3,7 +3,7 @@ ################################################################################ # # Copyright 2017 Proyectos y Sistemas de Mantenimiento SL (eProsima). -# 2018-2019 PX4 Development Team. All rights reserved. +# Copyright (c) 2018-2019 PX4 Development Team. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/msg/tools/uorb_rtps_classifier.py b/msg/tools/uorb_rtps_classifier.py index 594bdb018d..15f02da410 100644 --- a/msg/tools/uorb_rtps_classifier.py +++ b/msg/tools/uorb_rtps_classifier.py @@ -2,7 +2,7 @@ ################################################################################ # -# Copyright 2018 PX4 Pro Development Team. All rights reserved. +# Copyright (c) 2018-2019 PX4 Development Team. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/msg/tools/uorb_to_ros_msgs.py b/msg/tools/uorb_to_ros_msgs.py index 283461b31d..d2e981065c 100644 --- a/msg/tools/uorb_to_ros_msgs.py +++ b/msg/tools/uorb_to_ros_msgs.py @@ -12,7 +12,7 @@ __author__ = 'PX4 Development Team' __copyright__ = \ ''' ' - ' Copyright (C) 2018 PX4 Development Team. All rights reserved. + ' Copyright (c) 2018 PX4 Development Team. All rights reserved. ' ' Redistribution and use in source and binary forms, or without ' modification, permitted provided that the following conditions diff --git a/msg/tools/uorb_to_ros_rtps_ids.py b/msg/tools/uorb_to_ros_rtps_ids.py index b739da79e5..6608e86f98 100644 --- a/msg/tools/uorb_to_ros_rtps_ids.py +++ b/msg/tools/uorb_to_ros_rtps_ids.py @@ -12,7 +12,7 @@ __author__ = 'PX4 Development Team' __copyright__ = \ ''' ' - ' Copyright (C) 2018-2019 PX4 Development Team. All rights reserved. + ' Copyright (c) 2018-2019 PX4 Development Team. All rights reserved. ' ' Redistribution and use in source and binary forms, or without ' modification, permitted provided that the following conditions diff --git a/src/modules/micrortps_bridge/micrortps_client/microRTPS_client.h b/src/modules/micrortps_bridge/micrortps_client/microRTPS_client.h index c9fef23bf1..856c369f19 100644 --- a/src/modules/micrortps_bridge/micrortps_client/microRTPS_client.h +++ b/src/modules/micrortps_bridge/micrortps_client/microRTPS_client.h @@ -1,6 +1,7 @@ /**************************************************************************** * * Copyright 2017 Proyectos y Sistemas de Mantenimiento SL (eProsima). + * Copyright (c) 2019 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: